summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorcvs <cvs@pkgsrc.org>2007-03-23 19:00:19 +0000
committercvs <cvs@pkgsrc.org>2007-03-23 19:00:19 +0000
commitda1b24d6fdfe442753c8272da5432c8fcaa1f43c (patch)
tree8c7c348db30abadfdc6b77822405d9ffe7b79103 /mail
parentda5bb3f20f33565c1db65018aabd8cf59023cfef (diff)
downloadpkgsrc-jlam-pkgviews.tar.gz
Creating branch jlam-pkgviewsjlam-pkgviews
Diffstat (limited to 'mail')
-rw-r--r--mail/GNUMail/DESCR24
-rw-r--r--mail/GNUMail/Makefile26
-rw-r--r--mail/GNUMail/PLIST175
-rw-r--r--mail/GNUMail/distinfo5
-rw-r--r--mail/Makefile242
-rw-r--r--mail/Pantomime/DESCR18
-rw-r--r--mail/Pantomime/Makefile22
-rw-r--r--mail/Pantomime/PLIST68
-rw-r--r--mail/Pantomime/buildlink3.mk27
-rw-r--r--mail/Pantomime/distinfo6
-rw-r--r--mail/Pantomime/patches/patch-aa14
-rw-r--r--mail/YoSucker/DESCR4
-rw-r--r--mail/YoSucker/MESSAGE8
-rw-r--r--mail/YoSucker/Makefile36
-rw-r--r--mail/YoSucker/PLIST22
-rw-r--r--mail/YoSucker/distinfo5
-rw-r--r--mail/anomy-sanitizer/DESCR4
-rw-r--r--mail/anomy-sanitizer/Makefile69
-rw-r--r--mail/anomy-sanitizer/PLIST33
-rw-r--r--mail/anomy-sanitizer/distinfo5
-rw-r--r--mail/archivemail/DESCR4
-rw-r--r--mail/archivemail/Makefile26
-rw-r--r--mail/archivemail/PLIST10
-rw-r--r--mail/archivemail/distinfo6
-rw-r--r--mail/archivemail/patches/patch-aa12
-rw-r--r--mail/autorespond/DESCR11
-rw-r--r--mail/autorespond/Makefile29
-rw-r--r--mail/autorespond/PLIST6
-rw-r--r--mail/autorespond/distinfo6
-rw-r--r--mail/autorespond/patches/patch-aa31
-rw-r--r--mail/avenger/DESCR9
-rw-r--r--mail/avenger/Makefile23
-rw-r--r--mail/avenger/PLIST40
-rw-r--r--mail/avenger/distinfo6
-rw-r--r--mail/avenger/options.mk15
-rw-r--r--mail/avenger/patches/patch-aa18
-rw-r--r--mail/balsa2/DESCR8
-rw-r--r--mail/balsa2/Makefile62
-rw-r--r--mail/balsa2/PLIST161
-rw-r--r--mail/balsa2/distinfo16
-rw-r--r--mail/balsa2/options.mk17
-rw-r--r--mail/balsa2/patches/patch-aa22
-rw-r--r--mail/balsa2/patches/patch-ab14
-rw-r--r--mail/balsa2/patches/patch-ac13
-rw-r--r--mail/balsa2/patches/patch-ae13
-rw-r--r--mail/balsa2/patches/patch-af13
-rw-r--r--mail/balsa2/patches/patch-ag18
-rw-r--r--mail/balsa2/patches/patch-ah12
-rw-r--r--mail/balsa2/patches/patch-ai12
-rw-r--r--mail/balsa2/patches/patch-aj12
-rw-r--r--mail/balsa2/patches/patch-ak12
-rw-r--r--mail/balsa2/patches/patch-ba13
-rw-r--r--mail/bbmail/DESCR3
-rw-r--r--mail/bbmail/Makefile29
-rw-r--r--mail/bbmail/PLIST5
-rw-r--r--mail/bbmail/distinfo5
-rw-r--r--mail/bmf/DESCR3
-rw-r--r--mail/bmf/Makefile17
-rw-r--r--mail/bmf/PLIST5
-rw-r--r--mail/bmf/distinfo7
-rw-r--r--mail/bmf/patches/patch-aa32
-rw-r--r--mail/bmf/patches/patch-ab35
-rw-r--r--mail/bogofilter/DESCR17
-rw-r--r--mail/bogofilter/Makefile27
-rw-r--r--mail/bogofilter/PLIST20
-rw-r--r--mail/bogofilter/distinfo7
-rw-r--r--mail/bogofilter/options.mk27
-rw-r--r--mail/bogofilter/patches/patch-aa29
-rw-r--r--mail/bogofilter/patches/patch-ab61
-rw-r--r--mail/bulk_mailer/DESCR16
-rw-r--r--mail/bulk_mailer/Makefile23
-rw-r--r--mail/bulk_mailer/PLIST3
-rw-r--r--mail/bulk_mailer/distinfo6
-rw-r--r--mail/bulk_mailer/patches/patch-aa13
-rw-r--r--mail/clamav/DEINSTALL9
-rw-r--r--mail/clamav/DESCR5
-rw-r--r--mail/clamav/MESSAGE13
-rw-r--r--mail/clamav/Makefile72
-rw-r--r--mail/clamav/PLIST28
-rw-r--r--mail/clamav/buildlink3.mk24
-rw-r--r--mail/clamav/distinfo8
-rw-r--r--mail/clamav/files/clamd.sh78
-rw-r--r--mail/clamav/files/freshclamd.sh26
-rw-r--r--mail/clamav/options.mk34
-rw-r--r--mail/clamav/patches/patch-ad13
-rw-r--r--mail/clamav/patches/patch-af22
-rw-r--r--mail/clamav/patches/patch-ah31
-rw-r--r--mail/clamsmtp/DESCR9
-rw-r--r--mail/clamsmtp/MESSAGE34
-rw-r--r--mail/clamsmtp/Makefile33
-rw-r--r--mail/clamsmtp/PLIST8
-rw-r--r--mail/clamsmtp/distinfo7
-rw-r--r--mail/clamsmtp/files/clamsmtpd.sh68
-rw-r--r--mail/clamsmtp/patches/patch-aa13
-rw-r--r--mail/clamsmtp/patches/patch-ab13
-rw-r--r--mail/columba/DESCR2
-rw-r--r--mail/columba/Makefile38
-rw-r--r--mail/columba/PLIST20
-rw-r--r--mail/columba/distinfo5
-rw-r--r--mail/coolmail/DESCR7
-rw-r--r--mail/coolmail/Makefile26
-rw-r--r--mail/coolmail/PLIST4
-rw-r--r--mail/coolmail/distinfo8
-rw-r--r--mail/coolmail/patches/patch-aa29
-rw-r--r--mail/coolmail/patches/patch-ab9
-rw-r--r--mail/coolmail/patches/patch-ac24
-rw-r--r--mail/courier-analog/DESCR3
-rw-r--r--mail/courier-analog/Makefile18
-rw-r--r--mail/courier-analog/PLIST3
-rw-r--r--mail/courier-analog/distinfo5
-rw-r--r--mail/courier-imap/DEINSTALL20
-rw-r--r--mail/courier-imap/DESCR18
-rw-r--r--mail/courier-imap/INSTALL38
-rw-r--r--mail/courier-imap/Makefile94
-rw-r--r--mail/courier-imap/PLIST41
-rw-r--r--mail/courier-imap/distinfo13
-rwxr-xr-xmail/courier-imap/files/courierimap.sh52
-rwxr-xr-xmail/courier-imap/files/courierimaps.sh68
-rwxr-xr-xmail/courier-imap/files/courierpop.sh52
-rwxr-xr-xmail/courier-imap/files/courierpops.sh68
-rw-r--r--mail/courier-imap/patches/patch-aa82
-rw-r--r--mail/courier-imap/patches/patch-ad14
-rw-r--r--mail/courier-imap/patches/patch-ae20
-rw-r--r--mail/courier-imap/patches/patch-af20
-rw-r--r--mail/courier-imap/patches/patch-ag20
-rw-r--r--mail/courier-imap/patches/patch-ah20
-rw-r--r--mail/courier-imap/patches/patch-ak12
-rw-r--r--mail/courier-imap/patches/patch-al35
-rw-r--r--mail/courier-maildir/DEINSTALL19
-rw-r--r--mail/courier-maildir/DESCR2
-rw-r--r--mail/courier-maildir/MESSAGE12
-rw-r--r--mail/courier-maildir/Makefile109
-rw-r--r--mail/courier-maildir/PLIST19
-rw-r--r--mail/courier-maildir/distinfo5
-rw-r--r--mail/courier-maildir/files/sharedindexupdate.sh23
-rw-r--r--mail/courier-mta/DEINSTALL93
-rw-r--r--mail/courier-mta/DESCR10
-rw-r--r--mail/courier-mta/MESSAGE27
-rw-r--r--mail/courier-mta/Makefile100
-rw-r--r--mail/courier-mta/Makefile.common60
-rw-r--r--mail/courier-mta/PLIST215
-rw-r--r--mail/courier-mta/PLIST.dsn12
-rw-r--r--mail/courier-mta/PLIST.esmtp31
-rw-r--r--mail/courier-mta/PLIST.fax19
-rw-r--r--mail/courier-mta/PLIST.ldap4
-rw-r--r--mail/courier-mta/PLIST.local6
-rw-r--r--mail/courier-mta/PLIST.uucp9
-rw-r--r--mail/courier-mta/distinfo16
-rw-r--r--mail/courier-mta/files/courier.sh61
-rw-r--r--mail/courier-mta/files/courierd.sh81
-rw-r--r--mail/courier-mta/files/courieresmtp.sh56
-rw-r--r--mail/courier-mta/files/courieresmtpmsa.sh57
-rw-r--r--mail/courier-mta/files/courieresmtps.sh72
-rw-r--r--mail/courier-mta/files/courierfilter.sh57
-rw-r--r--mail/courier-mta/files/courierldapaliasd.sh65
-rw-r--r--mail/courier-mta/files/mailer.conf8
-rw-r--r--mail/courier-mta/options.mk129
-rw-r--r--mail/courier-mta/patches/patch-aa99
-rw-r--r--mail/courier-mta/patches/patch-ab17
-rw-r--r--mail/courier-mta/patches/patch-ac108
-rw-r--r--mail/courier-mta/patches/patch-ad13
-rw-r--r--mail/courier-mta/patches/patch-ae13
-rw-r--r--mail/courier-mta/patches/patch-af13
-rw-r--r--mail/courier-mta/patches/patch-ag12
-rw-r--r--mail/courier-mta/patches/patch-ah24
-rw-r--r--mail/courier-mta/patches/patch-ai13
-rw-r--r--mail/courier-mta/patches/patch-aj170
-rw-r--r--mail/courier-mta/patches/patch-ak13
-rw-r--r--mail/courier-mta/pkginstall.mk69
-rw-r--r--mail/cucipop/DESCR4
-rw-r--r--mail/cucipop/MESSAGE15
-rw-r--r--mail/cucipop/Makefile58
-rw-r--r--mail/cucipop/PLIST5
-rw-r--r--mail/cucipop/distinfo15
-rw-r--r--mail/cucipop/patches/patch-aa24
-rw-r--r--mail/cucipop/patches/patch-ab24
-rw-r--r--mail/cucipop/patches/patch-ac71
-rw-r--r--mail/cucipop/patches/patch-ad27
-rw-r--r--mail/cucipop/patches/patch-ae13
-rw-r--r--mail/cucipop/patches/patch-af13
-rw-r--r--mail/cucipop/patches/patch-ag13
-rw-r--r--mail/cue/DESCR12
-rw-r--r--mail/cue/Makefile56
-rw-r--r--mail/cue/PLIST6
-rw-r--r--mail/cue/distinfo9
-rw-r--r--mail/cue/patches/patch-aa30
-rw-r--r--mail/cue/patches/patch-ab12
-rw-r--r--mail/cue/patches/patch-ac15
-rw-r--r--mail/cue/patches/patch-ad16
-rw-r--r--mail/cyrus-imapd/DEINSTALL38
-rw-r--r--mail/cyrus-imapd/DESCR7
-rw-r--r--mail/cyrus-imapd/MESSAGE17
-rw-r--r--mail/cyrus-imapd/Makefile175
-rw-r--r--mail/cyrus-imapd/PLIST168
-rw-r--r--mail/cyrus-imapd/distinfo21
-rw-r--r--mail/cyrus-imapd/files/cyrus.sh78
-rw-r--r--mail/cyrus-imapd/files/imapd.conf23
-rw-r--r--mail/cyrus-imapd/patches/patch-aa19
-rw-r--r--mail/cyrus-imapd/patches/patch-ab15
-rw-r--r--mail/cyrus-imapd/patches/patch-ac15
-rw-r--r--mail/cyrus-imapd/patches/patch-ad15
-rw-r--r--mail/cyrus-imapd/patches/patch-ae80
-rw-r--r--mail/cyrus-imapd/patches/patch-af34
-rw-r--r--mail/cyrus-imapd/patches/patch-al38
-rw-r--r--mail/cyrus-imapd/patches/patch-am13
-rw-r--r--mail/cyrus-imapd/patches/patch-ap35
-rw-r--r--mail/cyrus-imapd/patches/patch-aq39
-rw-r--r--mail/cyrus-imapd/patches/patch-ba14
-rw-r--r--mail/cyrus-imapd/patches/patch-bb14
-rw-r--r--mail/cyrus-imapd/patches/patch-bc14
-rw-r--r--mail/cyrus-imapd/patches/patch-ca13
-rw-r--r--mail/cyrus-imapd/patches/patch-cb13
-rw-r--r--mail/cyrus-imapd/patches/patch-cc15
-rw-r--r--mail/cyrus-imapd21/DEINSTALL38
-rw-r--r--mail/cyrus-imapd21/DESCR7
-rw-r--r--mail/cyrus-imapd21/MESSAGE19
-rw-r--r--mail/cyrus-imapd21/Makefile181
-rw-r--r--mail/cyrus-imapd21/PLIST144
-rw-r--r--mail/cyrus-imapd21/distinfo21
-rw-r--r--mail/cyrus-imapd21/files/cyrus.sh77
-rw-r--r--mail/cyrus-imapd21/files/imapd.conf23
-rw-r--r--mail/cyrus-imapd21/patches/patch-aa23
-rw-r--r--mail/cyrus-imapd21/patches/patch-ab21
-rw-r--r--mail/cyrus-imapd21/patches/patch-ac22
-rw-r--r--mail/cyrus-imapd21/patches/patch-ad13
-rw-r--r--mail/cyrus-imapd21/patches/patch-ae13
-rw-r--r--mail/cyrus-imapd21/patches/patch-af25
-rw-r--r--mail/cyrus-imapd21/patches/patch-ag13
-rw-r--r--mail/cyrus-imapd21/patches/patch-ah15
-rw-r--r--mail/cyrus-imapd21/patches/patch-ai13
-rw-r--r--mail/cyrus-imapd21/patches/patch-aj13
-rw-r--r--mail/cyrus-imapd21/patches/patch-ak33
-rw-r--r--mail/cyrus-imapd21/patches/patch-ca13
-rw-r--r--mail/cyrus-imapd21/patches/patch-cb13
-rw-r--r--mail/dbmail/DESCR18
-rw-r--r--mail/dbmail/Makefile40
-rw-r--r--mail/dbmail/PLIST24
-rw-r--r--mail/dbmail/distinfo5
-rw-r--r--mail/dbmail/files/dbmail.sh60
-rw-r--r--mail/dbmail/files/dbmailimapd.sh18
-rw-r--r--mail/dbmail/files/dbmaillmtpd.sh18
-rw-r--r--mail/dbmail/files/dbmailpop3d.sh18
-rw-r--r--mail/dbmail/options.mk24
-rw-r--r--mail/deliver/DESCR20
-rw-r--r--mail/deliver/Makefile58
-rw-r--r--mail/deliver/PLIST19
-rw-r--r--mail/deliver/distinfo18
-rw-r--r--mail/deliver/patches/patch-aa40
-rw-r--r--mail/deliver/patches/patch-ab46
-rw-r--r--mail/deliver/patches/patch-ac21
-rw-r--r--mail/deliver/patches/patch-ad59
-rw-r--r--mail/deliver/patches/patch-ae26
-rw-r--r--mail/deliver/patches/patch-af38
-rw-r--r--mail/deliver/patches/patch-ag85
-rw-r--r--mail/deliver/patches/patch-ah29
-rw-r--r--mail/deliver/patches/patch-ai13
-rw-r--r--mail/deliver/patches/patch-aj92
-rw-r--r--mail/deliver/patches/patch-ak13
-rw-r--r--mail/deliver/patches/patch-al26
-rw-r--r--mail/deliver/patches/patch-am19
-rw-r--r--mail/demime/DESCR4
-rw-r--r--mail/demime/Makefile44
-rw-r--r--mail/demime/PLIST4
-rw-r--r--mail/demime/distinfo9
-rw-r--r--mail/demime/patches/patch-aa13
-rw-r--r--mail/distribute/DESCR18
-rw-r--r--mail/distribute/Makefile57
-rw-r--r--mail/distribute/PLIST4
-rw-r--r--mail/distribute/distinfo29
-rw-r--r--mail/distribute/patches/patch-aa32
-rw-r--r--mail/distribute/patches/patch-ab15
-rw-r--r--mail/distribute/patches/patch-ac14
-rw-r--r--mail/dk-milter/DESCR9
-rw-r--r--mail/dk-milter/Makefile55
-rw-r--r--mail/dk-milter/PLIST10
-rw-r--r--mail/dk-milter/distinfo8
-rw-r--r--mail/dk-milter/files/dk-milter.sh27
-rw-r--r--mail/dk-milter/options.mk15
-rw-r--r--mail/dk-milter/patches/patch-aa34
-rw-r--r--mail/dk-milter/patches/patch-ab13
-rw-r--r--mail/dk-milter/patches/patch-ac33
-rw-r--r--mail/dkim-milter/DESCR4
-rw-r--r--mail/dkim-milter/Makefile54
-rw-r--r--mail/dkim-milter/PLIST10
-rw-r--r--mail/dkim-milter/distinfo8
-rw-r--r--mail/dkim-milter/files/dkim-milter.sh27
-rw-r--r--mail/dkim-milter/options.mk15
-rw-r--r--mail/dkim-milter/patches/patch-aa37
-rw-r--r--mail/dkim-milter/patches/patch-ab14
-rw-r--r--mail/dkim-milter/patches/patch-ac33
-rw-r--r--mail/dot-forward/DESCR7
-rw-r--r--mail/dot-forward/Makefile22
-rw-r--r--mail/dot-forward/PLIST4
-rw-r--r--mail/dot-forward/distinfo5
-rw-r--r--mail/dovecot/DESCR3
-rw-r--r--mail/dovecot/MESSAGE8
-rw-r--r--mail/dovecot/Makefile59
-rw-r--r--mail/dovecot/PLIST54
-rw-r--r--mail/dovecot/distinfo8
-rwxr-xr-xmail/dovecot/files/dovecot.sh17
-rw-r--r--mail/dovecot/hacks.mk9
-rw-r--r--mail/dovecot/options.mk100
-rw-r--r--mail/dovecot/patches/patch-aa13
-rw-r--r--mail/dovecot/patches/patch-ab142
-rw-r--r--mail/dovecot/patches/patch-ag13
-rw-r--r--mail/drac/DESCR8
-rw-r--r--mail/drac/MESSAGE7
-rw-r--r--mail/drac/Makefile24
-rw-r--r--mail/drac/PLIST12
-rw-r--r--mail/drac/buildlink3.mk20
-rw-r--r--mail/drac/distinfo6
-rw-r--r--mail/drac/patches/patch-aa67
-rw-r--r--mail/dspam/DESCR10
-rw-r--r--mail/dspam/Makefile152
-rw-r--r--mail/dspam/PLIST115
-rw-r--r--mail/dspam/distinfo7
-rw-r--r--mail/dspam/files/dspam.sh66
-rw-r--r--mail/dspam/options.mk217
-rw-r--r--mail/dspam/patches/patch-aa13
-rw-r--r--mail/dspam/patches/patch-ad61
-rw-r--r--mail/elm-me/DESCR8
-rw-r--r--mail/elm-me/Makefile47
-rw-r--r--mail/elm-me/PLIST61
-rw-r--r--mail/elm-me/distinfo62
-rw-r--r--mail/elm-me/files/config.sh323
-rw-r--r--mail/elm-me/files/elm.mimetypes98
-rw-r--r--mail/elm-me/patches/patch-aa17
-rw-r--r--mail/elm-me/patches/patch-ab13
-rw-r--r--mail/elm-me/patches/patch-ac13
-rw-r--r--mail/elm-me/patches/patch-ad39
-rw-r--r--mail/elm-me/patches/patch-ae23
-rw-r--r--mail/elm-me/patches/patch-af13
-rw-r--r--mail/elm-me/patches/patch-ag13
-rw-r--r--mail/elm-me/patches/patch-ah12
-rw-r--r--mail/elm-me/patches/patch-ai13
-rw-r--r--mail/elm-me/patches/patch-aj12
-rw-r--r--mail/elm-me/patches/patch-ak12
-rw-r--r--mail/elm-me/patches/patch-al12
-rw-r--r--mail/elm-me/patches/patch-am12
-rw-r--r--mail/elm-me/patches/patch-an12
-rw-r--r--mail/elm-me/patches/patch-ao12
-rw-r--r--mail/elm-me/patches/patch-ap12
-rw-r--r--mail/elm-me/patches/patch-aq12
-rw-r--r--mail/elm-me/patches/patch-ar12
-rw-r--r--mail/elm-me/patches/patch-as12
-rw-r--r--mail/elm-me/patches/patch-at12
-rw-r--r--mail/elm-me/patches/patch-au13
-rw-r--r--mail/elm-me/patches/patch-av13
-rw-r--r--mail/elm-me/patches/patch-aw12
-rw-r--r--mail/elm-me/patches/patch-ax13
-rw-r--r--mail/elm-me/patches/patch-ay13
-rw-r--r--mail/elm-me/patches/patch-az13
-rw-r--r--mail/elm-me/patches/patch-ba12
-rw-r--r--mail/elm-me/patches/patch-bb20
-rw-r--r--mail/elm-me/patches/patch-bc13
-rw-r--r--mail/elm-me/patches/patch-bd13
-rw-r--r--mail/elm-me/patches/patch-be13
-rw-r--r--mail/elm-me/patches/patch-bf13
-rw-r--r--mail/elm-me/patches/patch-bg12
-rw-r--r--mail/elm-me/patches/patch-bh12
-rw-r--r--mail/elm-me/patches/patch-bi13
-rw-r--r--mail/elm-me/patches/patch-bj13
-rw-r--r--mail/elm-me/patches/patch-bk12
-rw-r--r--mail/elm-me/patches/patch-bl13
-rw-r--r--mail/elm-me/patches/patch-bm12
-rw-r--r--mail/elm-me/patches/patch-bn13
-rw-r--r--mail/elm-me/patches/patch-bo13
-rw-r--r--mail/elm-me/patches/patch-bp12
-rw-r--r--mail/elm-me/patches/patch-bq13
-rw-r--r--mail/elm-me/patches/patch-br13
-rw-r--r--mail/elm-me/patches/patch-bs12
-rw-r--r--mail/elm-me/patches/patch-bt13
-rw-r--r--mail/elm-me/patches/patch-bu13
-rw-r--r--mail/elm-me/patches/patch-bv12
-rw-r--r--mail/elm-me/patches/patch-bw13
-rw-r--r--mail/elm-me/patches/patch-bx21
-rw-r--r--mail/elm-me/patches/patch-by19
-rw-r--r--mail/elm-me/patches/patch-bz21
-rw-r--r--mail/elm-me/patches/patch-ca29
-rw-r--r--mail/elm-me/patches/patch-cb13
-rw-r--r--mail/elm-me/patches/patch-cc13
-rw-r--r--mail/elm-me/patches/patch-cd13
-rw-r--r--mail/elm-me/patches/patch-ce13
-rw-r--r--mail/elm/DESCR11
-rw-r--r--mail/elm/Makefile41
-rw-r--r--mail/elm/PLIST55
-rw-r--r--mail/elm/distinfo18
-rw-r--r--mail/elm/files/config.sh285
-rw-r--r--mail/elm/patches/patch-aa45
-rw-r--r--mail/elm/patches/patch-ab10
-rw-r--r--mail/elm/patches/patch-ac24
-rw-r--r--mail/elm/patches/patch-ad19
-rw-r--r--mail/elm/patches/patch-ae82
-rw-r--r--mail/elm/patches/patch-af11
-rw-r--r--mail/elm/patches/patch-ag73
-rw-r--r--mail/elm/patches/patch-ah16
-rw-r--r--mail/elm/patches/patch-ai14
-rw-r--r--mail/elm/patches/patch-aj44
-rw-r--r--mail/elm/patches/patch-ak39
-rw-r--r--mail/elm/patches/patch-al29
-rw-r--r--mail/elm/patches/patch-am17
-rw-r--r--mail/elmo/DESCR4
-rw-r--r--mail/elmo/Makefile34
-rw-r--r--mail/elmo/PLIST14
-rw-r--r--mail/elmo/distinfo7
-rw-r--r--mail/elmo/patches/patch-aa20
-rw-r--r--mail/elmo/patches/patch-ab29
-rw-r--r--mail/esmtp/DESCR14
-rw-r--r--mail/esmtp/Makefile43
-rw-r--r--mail/esmtp/PLIST8
-rw-r--r--mail/esmtp/distinfo6
-rw-r--r--mail/esmtp/patches/patch-aa16
-rw-r--r--mail/etach/DESCR6
-rw-r--r--mail/etach/Makefile24
-rw-r--r--mail/etach/PLIST6
-rw-r--r--mail/etach/distinfo5
-rw-r--r--mail/etpan/DESCR12
-rw-r--r--mail/etpan/Makefile31
-rw-r--r--mail/etpan/PLIST6
-rw-r--r--mail/etpan/distinfo7
-rw-r--r--mail/etpan/patches/patch-aa43
-rw-r--r--mail/etpan/patches/patch-ab14
-rw-r--r--mail/evolution-data-server/DESCR2
-rw-r--r--mail/evolution-data-server/Makefile85
-rw-r--r--mail/evolution-data-server/PLIST945
-rw-r--r--mail/evolution-data-server/buildlink3.mk31
-rw-r--r--mail/evolution-data-server/distinfo12
-rw-r--r--mail/evolution-data-server/patches/patch-af13
-rw-r--r--mail/evolution-data-server/patches/patch-ak38
-rw-r--r--mail/evolution-data-server/patches/patch-al16
-rw-r--r--mail/evolution-data-server/patches/patch-ao13
-rw-r--r--mail/evolution-data-server/patches/patch-ap13
-rw-r--r--mail/evolution-data-server/patches/patch-aq13
-rw-r--r--mail/evolution-data-server/patches/patch-ar14
-rw-r--r--mail/evolution-exchange/DESCR2
-rw-r--r--mail/evolution-exchange/Makefile33
-rw-r--r--mail/evolution-exchange/PLIST147
-rw-r--r--mail/evolution-exchange/distinfo5
-rw-r--r--mail/evolution/DESCR9
-rw-r--r--mail/evolution/Makefile141
-rw-r--r--mail/evolution/PLIST692
-rw-r--r--mail/evolution/buildlink3.mk37
-rw-r--r--mail/evolution/distinfo7
-rw-r--r--mail/evolution/patches/patch-aa31
-rw-r--r--mail/evolution/patches/patch-ab13
-rw-r--r--mail/exim-html/DESCR1
-rw-r--r--mail/exim-html/Makefile21
-rw-r--r--mail/exim-html/PLIST145
-rw-r--r--mail/exim-html/distinfo5
-rw-r--r--mail/exim/DESCR18
-rw-r--r--mail/exim/MESSAGE29
-rw-r--r--mail/exim/Makefile106
-rw-r--r--mail/exim/PLIST23
-rw-r--r--mail/exim/PLIST.eximon3
-rw-r--r--mail/exim/distinfo12
-rw-r--r--mail/exim/files/Makefile-DragonFly32
-rw-r--r--mail/exim/files/exim.sh19
-rw-r--r--mail/exim/files/mailer.conf.exim11
-rw-r--r--mail/exim/files/os.h-DragonFly12
-rw-r--r--mail/exim/options.mk145
-rw-r--r--mail/exim/patches/patch-aa119
-rw-r--r--mail/exim/patches/patch-ab13
-rw-r--r--mail/exim/patches/patch-ac13
-rw-r--r--mail/exim/patches/patch-ad13
-rw-r--r--mail/exim/patches/patch-ae31
-rw-r--r--mail/exim/patches/patch-af15
-rw-r--r--mail/exim/patches/patch-ag13
-rw-r--r--mail/exim3/DESCR7
-rw-r--r--mail/exim3/MESSAGE21
-rw-r--r--mail/exim3/Makefile109
-rw-r--r--mail/exim3/PLIST20
-rw-r--r--mail/exim3/distinfo21
-rw-r--r--mail/exim3/files/Makefile-DragonFly18
-rw-r--r--mail/exim3/files/exim.8909
-rw-r--r--mail/exim3/files/exim.sh18
-rw-r--r--mail/exim3/files/exim_newaliases13
-rw-r--r--mail/exim3/files/mailer.conf.exim8
-rw-r--r--mail/exim3/files/os.h-DragonFly10
-rw-r--r--mail/exim3/patches/patch-aa104
-rw-r--r--mail/exim3/patches/patch-ab44
-rw-r--r--mail/exim3/patches/patch-ac13
-rw-r--r--mail/exim3/patches/patch-ad13
-rw-r--r--mail/exim3/patches/patch-ae15
-rw-r--r--mail/exim3/patches/patch-af22
-rw-r--r--mail/exim3/patches/patch-ag22
-rw-r--r--mail/exim3/patches/patch-ah20
-rw-r--r--mail/exim3/patches/patch-ai13
-rw-r--r--mail/exim3/patches/patch-aj13
-rw-r--r--mail/exim3/patches/patch-ak13
-rw-r--r--mail/exim3/patches/patch-al13
-rw-r--r--mail/exim3/patches/patch-am26
-rw-r--r--mail/exim3/patches/patch-an50
-rw-r--r--mail/exim3/patches/patch-ao13
-rw-r--r--mail/exim3/patches/patch-ap24
-rw-r--r--mail/exmh/DESCR23
-rw-r--r--mail/exmh/Makefile57
-rw-r--r--mail/exmh/PLIST203
-rw-r--r--mail/exmh/distinfo6
-rw-r--r--mail/exmh/files/build95
-rw-r--r--mail/exmh/files/config29
-rw-r--r--mail/exmh/patches/patch-aw27
-rw-r--r--mail/ezmlm-idx/DESCR14
-rw-r--r--mail/ezmlm-idx/Makefile52
-rw-r--r--mail/ezmlm-idx/PLIST.idx68
-rw-r--r--mail/ezmlm-idx/distinfo10
-rw-r--r--mail/ezmlm-idx/options.mk29
-rw-r--r--mail/ezmlm-idx/patches/patch-aa22
-rw-r--r--mail/ezmlm-idx/patches/patch-ab12
-rw-r--r--mail/ezmlm/DESCR21
-rw-r--r--mail/ezmlm/Makefile24
-rw-r--r--mail/ezmlm/Makefile.common17
-rw-r--r--mail/ezmlm/PLIST.common33
-rw-r--r--mail/ezmlm/distinfo5
-rw-r--r--mail/ezmlm/files/patch-althash78
-rw-r--r--mail/ezmlm/hacks.mk8
-rw-r--r--mail/ezmlm/options.mk16
-rw-r--r--mail/faces/DESCR3
-rw-r--r--mail/faces/Makefile67
-rw-r--r--mail/faces/PLIST37
-rw-r--r--mail/faces/buildlink3.mk20
-rw-r--r--mail/faces/distinfo34
-rw-r--r--mail/faces/patches/patch-aa11
-rw-r--r--mail/faces/patches/patch-ab216
-rw-r--r--mail/faces/patches/patch-ac92
-rw-r--r--mail/faces/patches/patch-ad35
-rw-r--r--mail/faces/patches/patch-ae84
-rw-r--r--mail/faces/patches/patch-af50
-rw-r--r--mail/faces/patches/patch-ag12
-rw-r--r--mail/faces/patches/patch-ah48
-rw-r--r--mail/faces/patches/patch-ai10
-rw-r--r--mail/faces/patches/patch-aj26
-rw-r--r--mail/faces/patches/patch-ak23
-rw-r--r--mail/faces/patches/patch-al13
-rw-r--r--mail/faces/patches/patch-am13
-rw-r--r--mail/faces/patches/patch-an57
-rw-r--r--mail/faces/patches/patch-ao26
-rw-r--r--mail/faces/patches/patch-ap38
-rw-r--r--mail/faces/patches/patch-aq22
-rw-r--r--mail/faces/patches/patch-ar13
-rw-r--r--mail/faces/patches/patch-as13
-rw-r--r--mail/faces/patches/patch-at83
-rw-r--r--mail/faces/patches/patch-au16
-rw-r--r--mail/faces/patches/patch-av27
-rw-r--r--mail/faces/patches/patch-aw12
-rw-r--r--mail/faces/patches/patch-ax21
-rw-r--r--mail/faces/patches/patch-ay21
-rw-r--r--mail/faces/patches/patch-az13
-rw-r--r--mail/faces/patches/patch-ba15
-rw-r--r--mail/faces/patches/patch-bb16
-rw-r--r--mail/faces/patches/patch-bc16
-rw-r--r--mail/fastforward/DESCR7
-rw-r--r--mail/fastforward/MESSAGE8
-rw-r--r--mail/fastforward/Makefile26
-rw-r--r--mail/fastforward/PLIST24
-rw-r--r--mail/fastforward/distinfo5
-rw-r--r--mail/fetchmail/DESCR6
-rw-r--r--mail/fetchmail/Makefile69
-rw-r--r--mail/fetchmail/PLIST24
-rw-r--r--mail/fetchmail/distinfo5
-rwxr-xr-xmail/fetchmail/files/fetchmail.sh26
-rw-r--r--mail/fetchmail/options.mk72
-rw-r--r--mail/fetchmailconf/DESCR1
-rw-r--r--mail/fetchmailconf/Makefile40
-rw-r--r--mail/fetchmailconf/PLIST6
-rw-r--r--mail/fetchyahoo/DESCR7
-rw-r--r--mail/fetchyahoo/MESSAGE9
-rw-r--r--mail/fetchyahoo/Makefile51
-rw-r--r--mail/fetchyahoo/PLIST12
-rw-r--r--mail/fetchyahoo/distinfo5
-rw-r--r--mail/fix-mime-charset/DESCR12
-rw-r--r--mail/fix-mime-charset/Makefile19
-rw-r--r--mail/fix-mime-charset/PLIST3
-rw-r--r--mail/fix-mime-charset/distinfo5
-rw-r--r--mail/fromto/DESCR1
-rw-r--r--mail/fromto/Makefile29
-rw-r--r--mail/fromto/PLIST2
-rw-r--r--mail/fromto/distinfo5
-rw-r--r--mail/getmail/DESCR5
-rw-r--r--mail/getmail/Makefile19
-rw-r--r--mail/getmail/PLIST63
-rw-r--r--mail/getmail/distinfo6
-rw-r--r--mail/getmail/patches/patch-aa18
-rw-r--r--mail/gld/DESCR5
-rw-r--r--mail/gld/MESSAGE.mysql22
-rw-r--r--mail/gld/Makefile42
-rw-r--r--mail/gld/PLIST12
-rw-r--r--mail/gld/distinfo12
-rw-r--r--mail/gld/files/gld.sh34
-rw-r--r--mail/gld/options.mk28
-rw-r--r--mail/gld/patches/patch-aa36
-rw-r--r--mail/gld/patches/patch-ab33
-rw-r--r--mail/gld/patches/patch-ac81
-rw-r--r--mail/gld/patches/patch-ad65
-rw-r--r--mail/gld/patches/patch-ae95
-rw-r--r--mail/gld/patches/patch-af19
-rw-r--r--mail/gld/patches/patch-ag17
-rw-r--r--mail/gmime/DESCR29
-rw-r--r--mail/gmime/Makefile25
-rw-r--r--mail/gmime/PLIST135
-rw-r--r--mail/gmime/buildlink3.mk21
-rw-r--r--mail/gmime/distinfo7
-rw-r--r--mail/gmime/options.mk10
-rw-r--r--mail/gmime/patches/patch-aa13
-rw-r--r--mail/gmime/patches/patch-ab16
-rw-r--r--mail/gnus/DESCR10
-rw-r--r--mail/gnus/Makefile29
-rw-r--r--mail/gnus/PLIST460
-rw-r--r--mail/gnus/distinfo6
-rw-r--r--mail/gnus/patches/patch-aa15
-rw-r--r--mail/gotmail/DESCR4
-rw-r--r--mail/gotmail/MESSAGE11
-rw-r--r--mail/gotmail/Makefile34
-rw-r--r--mail/gotmail/PLIST7
-rw-r--r--mail/gotmail/distinfo5
-rw-r--r--mail/greetdelay/DESCR4
-rw-r--r--mail/greetdelay/Makefile24
-rw-r--r--mail/greetdelay/PLIST4
-rw-r--r--mail/greetdelay/distinfo5
-rw-r--r--mail/grepmail/DESCR3
-rw-r--r--mail/grepmail/Makefile20
-rw-r--r--mail/grepmail/PLIST1
-rw-r--r--mail/grepmail/distinfo5
-rw-r--r--mail/hypermail/DESCR7
-rw-r--r--mail/hypermail/Makefile20
-rw-r--r--mail/hypermail/PLIST17
-rw-r--r--mail/hypermail/distinfo9
-rw-r--r--mail/hypermail/patches/patch-aa19
-rw-r--r--mail/hypermail/patches/patch-ac32
-rw-r--r--mail/hypermail/patches/patch-ad14
-rw-r--r--mail/hypermail/patches/patch-ae16
-rw-r--r--mail/ifile-procmail/DESCR2
-rw-r--r--mail/ifile-procmail/Makefile37
-rw-r--r--mail/ifile-procmail/PLIST15
-rw-r--r--mail/ifile-procmail/distinfo5
-rw-r--r--mail/ifile/DESCR14
-rw-r--r--mail/ifile/Makefile17
-rw-r--r--mail/ifile/PLIST3
-rw-r--r--mail/ifile/distinfo6
-rw-r--r--mail/ifile/patches/patch-aa13
-rw-r--r--mail/imap-uw-utils/DESCR14
-rw-r--r--mail/imap-uw-utils/Makefile41
-rw-r--r--mail/imap-uw-utils/PLIST5
-rw-r--r--mail/imap-uw-utils/distinfo5
-rw-r--r--mail/imap-uw/DESCR6
-rw-r--r--mail/imap-uw/MESSAGE18
-rw-r--r--mail/imap-uw/MESSAGE.ssl23
-rw-r--r--mail/imap-uw/Makefile143
-rw-r--r--mail/imap-uw/PLIST95
-rw-r--r--mail/imap-uw/buildlink3.mk22
-rw-r--r--mail/imap-uw/distinfo37
-rw-r--r--mail/imap-uw/hacks.mk13
-rw-r--r--mail/imap-uw/options.mk74
-rw-r--r--mail/imap-uw/patches/patch-aa33
-rw-r--r--mail/imap-uw/patches/patch-ab90
-rw-r--r--mail/imap-uw/patches/patch-ac22
-rw-r--r--mail/imap-uw/patches/patch-ad22
-rw-r--r--mail/imap-uw/patches/patch-ae22
-rw-r--r--mail/imap-uw/patches/patch-af20
-rw-r--r--mail/imap-uw/patches/patch-ag12
-rw-r--r--mail/imap-uw/patches/patch-ah12
-rw-r--r--mail/imap-uw/patches/patch-ai16
-rw-r--r--mail/imap-uw/patches/patch-aj20
-rw-r--r--mail/imap-uw/patches/patch-ak23
-rw-r--r--mail/imap-uw/patches/patch-al55
-rw-r--r--mail/imap-uw/patches/patch-am41
-rw-r--r--mail/imap-uw/patches/patch-ao12
-rw-r--r--mail/imap-uw/patches/patch-ap12
-rw-r--r--mail/imap-uw/patches/patch-aq12
-rw-r--r--mail/imap-uw/patches/patch-ar12
-rw-r--r--mail/imap-uw/patches/patch-as12
-rw-r--r--mail/imap-uw/patches/patch-at12
-rw-r--r--mail/imap-uw/patches/patch-au12
-rw-r--r--mail/imap-uw/patches/patch-av12
-rw-r--r--mail/imap-uw/patches/patch-aw12
-rw-r--r--mail/imap-uw/patches/patch-ax12
-rw-r--r--mail/imap-uw/patches/patch-ay12
-rw-r--r--mail/imap-uw/patches/patch-az12
-rw-r--r--mail/imap-uw/patches/patch-ba12
-rw-r--r--mail/imap-uw/patches/patch-bb12
-rw-r--r--mail/imap-uw/patches/patch-bc12
-rw-r--r--mail/imap-uw/patches/patch-bd12
-rw-r--r--mail/imap-uw/patches/patch-be22
-rw-r--r--mail/imap-uw/patches/patch-bf26
-rw-r--r--mail/imap-uw/patches/patch-bg22
-rw-r--r--mail/imapfilter/DESCR4
-rw-r--r--mail/imapfilter/Makefile25
-rw-r--r--mail/imapfilter/PLIST10
-rw-r--r--mail/imapfilter/distinfo6
-rw-r--r--mail/imapfilter/patches/patch-aa69
-rw-r--r--mail/imapproxy/DESCR6
-rw-r--r--mail/imapproxy/Makefile24
-rw-r--r--mail/imapproxy/PLIST11
-rw-r--r--mail/imapproxy/distinfo9
-rw-r--r--mail/imapproxy/patches/patch-aa14
-rw-r--r--mail/imapproxy/patches/patch-ab16
-rw-r--r--mail/imapproxy/patches/patch-ac48
-rw-r--r--mail/imapproxy/patches/patch-ad12
-rw-r--r--mail/imapsync/DESCR7
-rw-r--r--mail/imapsync/Makefile27
-rw-r--r--mail/imapsync/PLIST3
-rw-r--r--mail/imapsync/distinfo5
-rw-r--r--mail/imp/DESCR4
-rw-r--r--mail/imp/MESSAGE21
-rw-r--r--mail/imp/Makefile102
-rw-r--r--mail/imp/PLIST502
-rw-r--r--mail/imp/distinfo5
-rw-r--r--mail/imp/files/imp.conf.dist43
-rw-r--r--mail/imp/options.mk27
-rw-r--r--mail/incm/DESCR2
-rw-r--r--mail/incm/Makefile27
-rw-r--r--mail/incm/PLIST2
-rw-r--r--mail/incm/distinfo5
-rw-r--r--mail/ingo/DESCR6
-rw-r--r--mail/ingo/MESSAGE21
-rw-r--r--mail/ingo/Makefile85
-rw-r--r--mail/ingo/PLIST199
-rw-r--r--mail/ingo/distinfo5
-rw-r--r--mail/ingo/files/ingo.conf.dist31
-rw-r--r--mail/ingo/options.mk34
-rw-r--r--mail/isync/DESCR4
-rw-r--r--mail/isync/Makefile30
-rw-r--r--mail/isync/PLIST17
-rw-r--r--mail/isync/distinfo10
-rw-r--r--mail/isync/patches/patch-aa18
-rw-r--r--mail/isync/patches/patch-ab17
-rw-r--r--mail/isync/patches/patch-ac13
-rw-r--r--mail/isync/patches/patch-ad13
-rw-r--r--mail/isync/patches/patch-ae13
-rw-r--r--mail/ja-mh/DESCR3
-rw-r--r--mail/ja-mh/Makefile36
-rw-r--r--mail/ja-mh/PLIST177
-rw-r--r--mail/ja-mh/distinfo52
-rw-r--r--mail/ja-mh/patches/patch-aa26
-rw-r--r--mail/ja-mh/patches/patch-ab21
-rw-r--r--mail/ja-mh/patches/patch-ac24
-rw-r--r--mail/ja-mh/patches/patch-ad13
-rw-r--r--mail/ja-mh/patches/patch-ae14
-rw-r--r--mail/ja-mh/patches/patch-af14
-rw-r--r--mail/ja-mh/patches/patch-ag110
-rw-r--r--mail/ja-mh/patches/patch-ah26
-rw-r--r--mail/ja-mh/patches/patch-ai25
-rw-r--r--mail/ja-mh/patches/patch-aj15
-rw-r--r--mail/ja-mh/patches/patch-ak12
-rw-r--r--mail/ja-mh/patches/patch-al173
-rw-r--r--mail/ja-mh/patches/patch-am15
-rw-r--r--mail/ja-mh/patches/patch-ao15
-rw-r--r--mail/ja-mh/patches/patch-ap22
-rw-r--r--mail/ja-mh/patches/patch-aq13
-rw-r--r--mail/ja-mh/patches/patch-ar25
-rw-r--r--mail/ja-mh/patches/patch-as57
-rw-r--r--mail/ja-mh/patches/patch-at13
-rw-r--r--mail/ja-mh/patches/patch-au24
-rw-r--r--mail/ja-mh/patches/patch-av23
-rw-r--r--mail/ja-mh/patches/patch-aw24
-rw-r--r--mail/ja-mh/patches/patch-ax15
-rw-r--r--mail/ja-mh/patches/patch-ay12
-rw-r--r--mail/ja-mh/patches/patch-az15
-rw-r--r--mail/ja-mh/patches/patch-ba22
-rw-r--r--mail/ja-mh/patches/patch-bb15
-rw-r--r--mail/ja-mh/patches/patch-bc14
-rw-r--r--mail/ja-mh/patches/patch-bd14
-rw-r--r--mail/ja-mh/patches/patch-be14
-rw-r--r--mail/ja-mh/patches/patch-bf12
-rw-r--r--mail/ja-mh/patches/patch-bg15
-rw-r--r--mail/ja-mh/patches/patch-bh13
-rw-r--r--mail/ja-mh/patches/patch-bi16
-rw-r--r--mail/ja-mh/patches/patch-bj31
-rw-r--r--mail/ja-squirrelmail/DESCR9
-rw-r--r--mail/ja-squirrelmail/MESSAGE29
-rw-r--r--mail/ja-squirrelmail/Makefile89
-rw-r--r--mail/ja-squirrelmail/PLIST478
-rw-r--r--mail/ja-squirrelmail/distinfo12
-rw-r--r--mail/ja-squirrelmail/files/squirrelmail.conf.dist14
-rw-r--r--mail/ja-squirrelmail/patches/patch-aa31
-rw-r--r--mail/jchkmail/DESCR8
-rw-r--r--mail/jchkmail/Makefile34
-rw-r--r--mail/jchkmail/PLIST17
-rw-r--r--mail/jchkmail/distinfo8
-rw-r--r--mail/jchkmail/patches/patch-aa27
-rw-r--r--mail/jchkmail/patches/patch-ab13
-rw-r--r--mail/jchkmail/patches/patch-ac27
-rw-r--r--mail/kbiff/DESCR6
-rw-r--r--mail/kbiff/Makefile27
-rw-r--r--mail/kbiff/PLIST69
-rw-r--r--mail/kbiff/distinfo7
-rw-r--r--mail/kbiff/patches/patch-aa13
-rw-r--r--mail/kbiff/patches/patch-ab22
-rw-r--r--mail/libesmtp/DESCR6
-rw-r--r--mail/libesmtp/Makefile30
-rw-r--r--mail/libesmtp/PLIST11
-rw-r--r--mail/libesmtp/buildlink3.mk28
-rw-r--r--mail/libesmtp/distinfo8
-rw-r--r--mail/libesmtp/patches/patch-aa12
-rw-r--r--mail/libesmtp/patches/patch-ab13
-rw-r--r--mail/libesmtp/patches/patch-ae12
-rw-r--r--mail/libetpan/DESCR7
-rw-r--r--mail/libetpan/Makefile26
-rw-r--r--mail/libetpan/PLIST132
-rw-r--r--mail/libetpan/buildlink3.mk27
-rw-r--r--mail/libetpan/distinfo7
-rw-r--r--mail/libetpan/patches/patch-aa15
-rw-r--r--mail/libetpan/patches/patch-ab13
-rw-r--r--mail/libmilter/DESCR5
-rw-r--r--mail/libmilter/Makefile22
-rw-r--r--mail/libmilter/PLIST5
-rw-r--r--mail/libmilter/buildlink3.mk24
-rw-r--r--mail/libmilter/builtin.mk50
-rw-r--r--mail/libspf-alt/DESCR20
-rw-r--r--mail/libspf-alt/Makefile19
-rw-r--r--mail/libspf-alt/PLIST21
-rw-r--r--mail/libspf-alt/buildlink3.mk23
-rw-r--r--mail/libspf-alt/distinfo5
-rw-r--r--mail/libsylph/DESCR5
-rw-r--r--mail/libsylph/Makefile22
-rw-r--r--mail/libsylph/PLIST70
-rw-r--r--mail/libsylph/buildlink3.mk23
-rw-r--r--mail/libsylph/distinfo5
-rw-r--r--mail/mail-notification/DESCR18
-rw-r--r--mail/mail-notification/Makefile59
-rw-r--r--mail/mail-notification/PLIST45
-rw-r--r--mail/mail-notification/distinfo8
-rw-r--r--mail/mail-notification/patches/patch-ad16
-rw-r--r--mail/mail-notification/patches/patch-ae19
-rw-r--r--mail/mail-notification/patches/patch-af13
-rw-r--r--mail/mailagent/DESCR16
-rw-r--r--mail/mailagent/Makefile64
-rw-r--r--mail/mailagent/PLIST93
-rw-r--r--mail/mailagent/distinfo14
-rw-r--r--mail/mailagent/patches/patch-aa14
-rw-r--r--mail/mailagent/patches/patch-ac23
-rw-r--r--mail/mailagent/patches/patch-ag19
-rw-r--r--mail/mailagent/patches/patch-ah19
-rw-r--r--mail/mailagent/patches/patch-ai19
-rw-r--r--mail/mailagent/patches/patch-aj19
-rw-r--r--mail/mailagent/patches/patch-ak19
-rw-r--r--mail/mailagent/patches/patch-al19
-rw-r--r--mail/mailagent/patches/patch-am21
-rw-r--r--mail/mailcrypt/DESCR16
-rw-r--r--mail/mailcrypt/Makefile21
-rw-r--r--mail/mailcrypt/PLIST18
-rw-r--r--mail/mailcrypt/distinfo6
-rw-r--r--mail/maildrop/DESCR13
-rw-r--r--mail/maildrop/Makefile61
-rw-r--r--mail/maildrop/PLIST34
-rw-r--r--mail/maildrop/distinfo8
-rw-r--r--mail/maildrop/patches/patch-aa63
-rw-r--r--mail/maildrop/patches/patch-ab31
-rw-r--r--mail/maildrop/patches/patch-ac28
-rw-r--r--mail/mailfront/DESCR5
-rw-r--r--mail/mailfront/Makefile41
-rw-r--r--mail/mailfront/PLIST12
-rw-r--r--mail/mailfront/distinfo6
-rw-r--r--mail/mailfront/files/smtpfront.sh65
-rw-r--r--mail/mailfront/patches/patch-aa13
-rw-r--r--mail/mailgraph/DESCR3
-rw-r--r--mail/mailgraph/Makefile57
-rw-r--r--mail/mailgraph/PLIST8
-rw-r--r--mail/mailgraph/distinfo5
-rw-r--r--mail/mailgraph/files/mailgraph.sh19
-rw-r--r--mail/mailman/DESCR9
-rw-r--r--mail/mailman/MESSAGE24
-rw-r--r--mail/mailman/Makefile130
-rw-r--r--mail/mailman/PLIST2212
-rw-r--r--mail/mailman/distinfo12
-rw-r--r--mail/mailman/files/DEINSTALL8
-rw-r--r--mail/mailman/files/INSTALL8
-rw-r--r--mail/mailman/files/mailman.conf.dist30
-rw-r--r--mail/mailman/files/mailman.sh31
-rw-r--r--mail/mailman/patches/patch-aa21
-rw-r--r--mail/mailman/patches/patch-ab37
-rw-r--r--mail/mailman/patches/patch-ad16
-rw-r--r--mail/mailman/patches/patch-ae25
-rw-r--r--mail/mailman/patches/patch-af15
-rw-r--r--mail/mailman/patches/patch-ag21
-rw-r--r--mail/mailman/patches/patch-ah45
-rw-r--r--mail/mailscanner/DESCR22
-rw-r--r--mail/mailscanner/MESSAGE23
-rw-r--r--mail/mailscanner/Makefile145
-rw-r--r--mail/mailscanner/PLIST3
-rw-r--r--mail/mailscanner/distinfo5
-rw-r--r--mail/mailscanner/files/mailscanner.sh17
-rw-r--r--mail/mailserv/DESCR7
-rw-r--r--mail/mailserv/Makefile57
-rw-r--r--mail/mailserv/PLIST31
-rw-r--r--mail/mailserv/distinfo6
-rw-r--r--mail/mailserv/patches/patch-aa22
-rw-r--r--mail/mailsync/DESCR5
-rw-r--r--mail/mailsync/Makefile48
-rw-r--r--mail/mailsync/PLIST13
-rw-r--r--mail/mailsync/distinfo6
-rw-r--r--mail/mailsync/patches/patch-ac72
-rw-r--r--mail/mailwrapper/DEINSTALL21
-rw-r--r--mail/mailwrapper/DESCR13
-rw-r--r--mail/mailwrapper/INSTALL41
-rw-r--r--mail/mailwrapper/MESSAGE.NetBSD7
-rw-r--r--mail/mailwrapper/Makefile40
-rw-r--r--mail/mailwrapper/PLIST8
-rw-r--r--mail/mailwrapper/distinfo6
-rw-r--r--mail/mailwrapper/patches/patch-aa12
-rw-r--r--mail/mairix/DESCR22
-rw-r--r--mail/mairix/Makefile36
-rw-r--r--mail/mairix/PLIST5
-rw-r--r--mail/mairix/distinfo5
-rw-r--r--mail/majordomo/DESCR9
-rw-r--r--mail/majordomo/MESSAGE54
-rw-r--r--mail/majordomo/Makefile121
-rw-r--r--mail/majordomo/PLIST63
-rw-r--r--mail/majordomo/distinfo18
-rw-r--r--mail/majordomo/files/aliases.majordomo127
-rw-r--r--mail/majordomo/files/example-l.info1
-rw-r--r--mail/majordomo/files/example-l.passwd1
-rw-r--r--mail/majordomo/files/keep_me1
-rw-r--r--mail/majordomo/patches/patch-aa140
-rw-r--r--mail/majordomo/patches/patch-ab10
-rw-r--r--mail/majordomo/patches/patch-ac10
-rw-r--r--mail/majordomo/patches/patch-ad17
-rw-r--r--mail/majordomo/patches/patch-ae13
-rw-r--r--mail/majordomo/patches/patch-af20
-rw-r--r--mail/majordomo/patches/patch-ag10
-rw-r--r--mail/majordomo/patches/patch-ah10
-rw-r--r--mail/majordomo/patches/patch-ai17
-rw-r--r--mail/majordomo/patches/patch-aj86
-rw-r--r--mail/majordomo/patches/patch-ak19
-rw-r--r--mail/majordomo/patches/patch-al13
-rw-r--r--mail/majordomo/patches/patch-am16
-rw-r--r--mail/mb2md/DESCR7
-rw-r--r--mail/mb2md/Makefile27
-rw-r--r--mail/mb2md/PLIST2
-rw-r--r--mail/mb2md/distinfo5
-rw-r--r--mail/mdfrm/DESCR2
-rw-r--r--mail/mdfrm/Makefile30
-rw-r--r--mail/mdfrm/PLIST2
-rw-r--r--mail/mdfrm/distinfo5
-rw-r--r--mail/mess822/DESCR23
-rw-r--r--mail/mess822/Makefile38
-rw-r--r--mail/mess822/PLIST48
-rw-r--r--mail/mess822/distinfo7
-rw-r--r--mail/mess822/patches/patch-aa45
-rw-r--r--mail/mess822/patches/patch-ab13
-rw-r--r--mail/metamail/DESCR5
-rw-r--r--mail/metamail/Makefile54
-rw-r--r--mail/metamail/PLIST49
-rw-r--r--mail/metamail/distinfo24
-rw-r--r--mail/metamail/patches/patch-aa156
-rw-r--r--mail/metamail/patches/patch-ab63
-rw-r--r--mail/metamail/patches/patch-ac13
-rw-r--r--mail/metamail/patches/patch-ad30
-rw-r--r--mail/metamail/patches/patch-ae45
-rw-r--r--mail/metamail/patches/patch-af54
-rw-r--r--mail/metamail/patches/patch-ag69
-rw-r--r--mail/metamail/patches/patch-ah48
-rw-r--r--mail/metamail/patches/patch-ai62
-rw-r--r--mail/metamail/patches/patch-aj52
-rw-r--r--mail/metamail/patches/patch-ak83
-rw-r--r--mail/metamail/patches/patch-al60
-rw-r--r--mail/metamail/patches/patch-am13
-rw-r--r--mail/metamail/patches/patch-an13
-rw-r--r--mail/metamail/patches/patch-ao13
-rw-r--r--mail/metamail/patches/patch-ap13
-rw-r--r--mail/metamail/patches/patch-aq47
-rw-r--r--mail/metamail/patches/patch-ar31
-rw-r--r--mail/metamail/patches/patch-as22
-rw-r--r--mail/mew/DESCR8
-rw-r--r--mail/mew/Makefile41
-rw-r--r--mail/mew/PLIST209
-rw-r--r--mail/mew/distinfo5
-rw-r--r--mail/mhonarc/DESCR16
-rw-r--r--mail/mhonarc/Makefile28
-rw-r--r--mail/mhonarc/PLIST483
-rw-r--r--mail/mhonarc/distinfo5
-rw-r--r--mail/milter-greylist/DESCR8
-rw-r--r--mail/milter-greylist/Makefile37
-rw-r--r--mail/milter-greylist/PLIST9
-rw-r--r--mail/milter-greylist/distinfo8
-rw-r--r--mail/milter-greylist/files/milter-greylist.sh44
-rw-r--r--mail/milter-greylist/options.mk36
-rw-r--r--mail/milter-greylist/patches/patch-aa13
-rw-r--r--mail/milter-greylist/patches/patch-ab22
-rw-r--r--mail/milter-greylist/patches/patch-ac22
-rw-r--r--mail/milter-regex/DESCR3
-rw-r--r--mail/milter-regex/Makefile41
-rw-r--r--mail/milter-regex/PLIST4
-rw-r--r--mail/milter-regex/distinfo8
-rw-r--r--mail/milter-regex/files/milter-regex.sh44
-rw-r--r--mail/milter-regex/patches/patch-aa22
-rw-r--r--mail/milter-regex/patches/patch-ab13
-rw-r--r--mail/milter-regex/patches/patch-ac22
-rw-r--r--mail/mimedefang/DESCR20
-rw-r--r--mail/mimedefang/INSTALL11
-rw-r--r--mail/mimedefang/MESSAGE17
-rw-r--r--mail/mimedefang/Makefile91
-rw-r--r--mail/mimedefang/PLIST20
-rw-r--r--mail/mimedefang/distinfo7
-rw-r--r--mail/mimedefang/files/mimedefang-multiplexor.sh57
-rw-r--r--mail/mimedefang/files/mimedefang.sh53
-rw-r--r--mail/mimedefang/patches/patch-ab13
-rw-r--r--mail/mimedefang/patches/patch-ac102
-rw-r--r--mail/mini_sendmail/DESCR9
-rw-r--r--mail/mini_sendmail/MESSAGE12
-rw-r--r--mail/mini_sendmail/Makefile9
-rw-r--r--mail/mini_sendmail/Makefile.common35
-rw-r--r--mail/mini_sendmail/PLIST5
-rw-r--r--mail/mini_sendmail/distinfo9
-rw-r--r--mail/mini_sendmail/files/mailer.conf6
-rw-r--r--mail/mini_sendmail/patches/patch-aa198
-rw-r--r--mail/mini_sendmail/patches/patch-ab35
-rw-r--r--mail/mini_sendmail/patches/patch-ac36
-rw-r--r--mail/mini_sendmail/patches/patch-ad12
-rw-r--r--mail/mpop/DESCR5
-rw-r--r--mail/mpop/Makefile30
-rw-r--r--mail/mpop/PLIST8
-rw-r--r--mail/mpop/distinfo5
-rw-r--r--mail/mpop/options.mk25
-rw-r--r--mail/msmtp/DESCR17
-rw-r--r--mail/msmtp/Makefile34
-rw-r--r--mail/msmtp/PLIST6
-rw-r--r--mail/msmtp/distinfo11
-rw-r--r--mail/msmtp/options.mk31
-rw-r--r--mail/msmtp/patches/patch-aa29
-rw-r--r--mail/msmtp/patches/patch-ab19
-rw-r--r--mail/msmtp/patches/patch-ac12
-rw-r--r--mail/msmtp/patches/patch-ad12
-rw-r--r--mail/msmtp/patches/patch-ae12
-rw-r--r--mail/msmtp/patches/patch-af12
-rw-r--r--mail/mush/DESCR9
-rw-r--r--mail/mush/Makefile51
-rw-r--r--mail/mush/PLIST5
-rw-r--r--mail/mush/distinfo41
-rw-r--r--mail/mush/patches/patch-aa21
-rw-r--r--mail/mush/patches/patch-ab48
-rw-r--r--mail/mush/patches/patch-ac21
-rw-r--r--mail/mush/patches/patch-ad785
-rw-r--r--mail/mush/patches/patch-ae48
-rw-r--r--mail/mush/patches/patch-af938
-rw-r--r--mail/mush/patches/patch-ag83
-rw-r--r--mail/mush/patches/patch-ah50
-rw-r--r--mail/mush/patches/patch-ai20
-rw-r--r--mail/mush/patches/patch-aj36
-rw-r--r--mail/mush/patches/patch-ak207
-rw-r--r--mail/mush/patches/patch-al25
-rw-r--r--mail/mush/patches/patch-am28
-rw-r--r--mail/mush/patches/patch-an33
-rw-r--r--mail/mush/patches/patch-ao49
-rw-r--r--mail/mutt-devel/DEINSTALL7
-rw-r--r--mail/mutt-devel/DESCR9
-rw-r--r--mail/mutt-devel/INSTALL8
-rw-r--r--mail/mutt-devel/Makefile73
-rw-r--r--mail/mutt-devel/PLIST110
-rw-r--r--mail/mutt-devel/distinfo16
-rw-r--r--mail/mutt-devel/options.mk124
-rw-r--r--mail/mutt-devel/patches/patch-aa18
-rw-r--r--mail/mutt-devel/patches/patch-ab33
-rw-r--r--mail/mutt-devel/patches/patch-ac16
-rw-r--r--mail/mutt-devel/patches/patch-ad32
-rw-r--r--mail/mutt-devel/patches/patch-ag15
-rw-r--r--mail/mutt-devel/patches/patch-ah18
-rw-r--r--mail/mutt-devel/patches/patch-ai12
-rw-r--r--mail/mutt-devel/patches/patch-al22
-rw-r--r--mail/mutt/DESCR9
-rw-r--r--mail/mutt/Makefile107
-rw-r--r--mail/mutt/PLIST97
-rw-r--r--mail/mutt/distinfo16
-rw-r--r--mail/mutt/options.mk63
-rw-r--r--mail/mutt/patches/patch-aa18
-rw-r--r--mail/mutt/patches/patch-ab31
-rw-r--r--mail/mutt/patches/patch-ac15
-rw-r--r--mail/mutt/patches/patch-ad91
-rw-r--r--mail/mutt/patches/patch-ag16
-rw-r--r--mail/mutt/patches/patch-ah17
-rw-r--r--mail/mutt/patches/patch-ai11
-rw-r--r--mail/mutt/patches/patch-aj30
-rw-r--r--mail/mutt/patches/patch-ak30
-rw-r--r--mail/mutt/patches/patch-al15
-rw-r--r--mail/mutt/patches/patch-am41
-rw-r--r--mail/nail/DESCR7
-rw-r--r--mail/nail/Makefile42
-rw-r--r--mail/nail/PLIST5
-rw-r--r--mail/nail/distinfo9
-rw-r--r--mail/nail/patches/patch-aa33
-rw-r--r--mail/nail/patches/patch-ab13
-rw-r--r--mail/nail/patches/patch-ac13
-rw-r--r--mail/nail/patches/patch-ad12
-rw-r--r--mail/newmail/DESCR8
-rw-r--r--mail/newmail/Makefile13
-rw-r--r--mail/newmail/PLIST3
-rw-r--r--mail/newmail/distinfo6
-rw-r--r--mail/newmail/patches/patch-aa78
-rw-r--r--mail/newspipe/DESCR9
-rw-r--r--mail/newspipe/Makefile48
-rw-r--r--mail/newspipe/PLIST12
-rw-r--r--mail/newspipe/distinfo7
-rw-r--r--mail/newspipe/patches/patch-aa12
-rw-r--r--mail/newspipe/patches/patch-ab12
-rw-r--r--mail/nmh/DESCR11
-rw-r--r--mail/nmh/Makefile110
-rw-r--r--mail/nmh/PLIST153
-rw-r--r--mail/nmh/distinfo47
-rw-r--r--mail/nmh/files/mhn.defaults.dist14
-rw-r--r--mail/nmh/options.mk20
-rw-r--r--mail/nmh/patches/patch-aa67
-rw-r--r--mail/nmh/patches/patch-ab13
-rw-r--r--mail/nmh/patches/patch-ac13
-rw-r--r--mail/nmh/patches/patch-ad13
-rw-r--r--mail/nmh/patches/patch-ae14
-rw-r--r--mail/nmh/patches/patch-af115
-rw-r--r--mail/nmh/patches/patch-ag13
-rw-r--r--mail/nmh/patches/patch-ah12
-rw-r--r--mail/nmh/patches/patch-ai13
-rw-r--r--mail/nmh/patches/patch-aj13
-rw-r--r--mail/nmh/patches/patch-ak13
-rw-r--r--mail/nmh/patches/patch-al12
-rw-r--r--mail/nmh/patches/patch-am13
-rw-r--r--mail/nmh/patches/patch-an12
-rw-r--r--mail/nmh/patches/patch-ao12
-rw-r--r--mail/nmh/patches/patch-ap13
-rw-r--r--mail/nmh/patches/patch-aq13
-rw-r--r--mail/nmh/patches/patch-ar12
-rw-r--r--mail/nmh/patches/patch-as13
-rw-r--r--mail/nmh/patches/patch-at12
-rw-r--r--mail/nmh/patches/patch-au13
-rw-r--r--mail/nmh/patches/patch-av13
-rw-r--r--mail/nmh/patches/patch-aw13
-rw-r--r--mail/nmh/patches/patch-ax21
-rw-r--r--mail/nmh/patches/patch-ay24
-rw-r--r--mail/nmh/patches/patch-az13
-rw-r--r--mail/nmh/patches/patch-ba13
-rw-r--r--mail/nmh/patches/patch-bb13
-rw-r--r--mail/nmh/patches/patch-bc13
-rw-r--r--mail/nmh/patches/patch-bd13
-rw-r--r--mail/nmh/patches/patch-be13
-rw-r--r--mail/nmh/patches/patch-bf12
-rw-r--r--mail/nmh/patches/patch-bg13
-rw-r--r--mail/nmh/patches/patch-bh13
-rw-r--r--mail/nmh/patches/patch-bi13
-rw-r--r--mail/nmh/patches/patch-ca64
-rw-r--r--mail/nmh/patches/patch-cb39
-rw-r--r--mail/nmh/patches/patch-cd25
-rw-r--r--mail/nmh/patches/patch-ce36
-rw-r--r--mail/nmh/patches/patch-ci16
-rw-r--r--mail/nmh/patches/patch-cj59
-rw-r--r--mail/nmh/patches/patch-ck21
-rw-r--r--mail/nullmailer/DEINSTALL11
-rw-r--r--mail/nullmailer/DESCR3
-rw-r--r--mail/nullmailer/INSTALL10
-rw-r--r--mail/nullmailer/MESSAGE35
-rw-r--r--mail/nullmailer/Makefile67
-rw-r--r--mail/nullmailer/PLIST26
-rw-r--r--mail/nullmailer/distinfo8
-rw-r--r--mail/nullmailer/files/mailer.conf7
-rw-r--r--mail/nullmailer/files/nullmailer.sh29
-rw-r--r--mail/nullmailer/patches/patch-aa18
-rw-r--r--mail/nullmailer/patches/patch-ab25
-rw-r--r--mail/nullmailer/patches/patch-ac21
-rw-r--r--mail/oe2mbx/DESCR6
-rw-r--r--mail/oe2mbx/Makefile28
-rw-r--r--mail/oe2mbx/PLIST4
-rw-r--r--mail/oe2mbx/distinfo6
-rw-r--r--mail/oe2mbx/patches/patch-aa36
-rw-r--r--mail/offlineimap/DESCR5
-rw-r--r--mail/offlineimap/MESSAGE7
-rw-r--r--mail/offlineimap/Makefile35
-rw-r--r--mail/offlineimap/PLIST106
-rw-r--r--mail/offlineimap/distinfo5
-rw-r--r--mail/p5-Email-Abstract/DESCR15
-rw-r--r--mail/p5-Email-Abstract/Makefile19
-rw-r--r--mail/p5-Email-Abstract/PLIST1
-rw-r--r--mail/p5-Email-Abstract/distinfo5
-rw-r--r--mail/p5-Email-Simple/DESCR5
-rw-r--r--mail/p5-Email-Simple/Makefile16
-rw-r--r--mail/p5-Email-Simple/PLIST1
-rw-r--r--mail/p5-Email-Simple/distinfo5
-rw-r--r--mail/p5-Email-Valid/DESCR2
-rw-r--r--mail/p5-Email-Valid/Makefile19
-rw-r--r--mail/p5-Email-Valid/PLIST1
-rw-r--r--mail/p5-Email-Valid/distinfo5
-rw-r--r--mail/p5-GMail-IMAPD/DESCR2
-rw-r--r--mail/p5-GMail-IMAPD/Makefile20
-rw-r--r--mail/p5-GMail-IMAPD/PLIST1
-rw-r--r--mail/p5-GMail-IMAPD/distinfo6
-rw-r--r--mail/p5-GMail-IMAPD/patches/patch-aa13
-rw-r--r--mail/p5-IMAP-Admin/DESCR10
-rw-r--r--mail/p5-IMAP-Admin/Makefile18
-rw-r--r--mail/p5-IMAP-Admin/PLIST1
-rw-r--r--mail/p5-IMAP-Admin/distinfo5
-rw-r--r--mail/p5-MIME-Lite-HTML/DESCR3
-rw-r--r--mail/p5-MIME-Lite-HTML/Makefile17
-rw-r--r--mail/p5-MIME-Lite-HTML/PLIST1
-rw-r--r--mail/p5-MIME-Lite-HTML/distinfo5
-rw-r--r--mail/p5-MIME-Lite/DESCR4
-rw-r--r--mail/p5-MIME-Lite/Makefile15
-rw-r--r--mail/p5-MIME-Lite/PLIST1
-rw-r--r--mail/p5-MIME-Lite/distinfo5
-rw-r--r--mail/p5-MIME-Types/DESCR7
-rw-r--r--mail/p5-MIME-Types/Makefile17
-rw-r--r--mail/p5-MIME-Types/PLIST1
-rw-r--r--mail/p5-MIME-Types/distinfo5
-rw-r--r--mail/p5-MIME-tools/DESCR3
-rw-r--r--mail/p5-MIME-tools/Makefile26
-rw-r--r--mail/p5-MIME-tools/PLIST1
-rw-r--r--mail/p5-MIME-tools/distinfo5
-rw-r--r--mail/p5-Mail-Audit/DESCR5
-rw-r--r--mail/p5-Mail-Audit/Makefile23
-rw-r--r--mail/p5-Mail-Audit/PLIST1
-rw-r--r--mail/p5-Mail-Audit/distinfo7
-rw-r--r--mail/p5-Mail-Audit/patches/patch-aa29
-rw-r--r--mail/p5-Mail-Audit/patches/patch-ab38
-rw-r--r--mail/p5-Mail-Box/DESCR5
-rw-r--r--mail/p5-Mail-Box/Makefile32
-rw-r--r--mail/p5-Mail-Box/PLIST1
-rw-r--r--mail/p5-Mail-Box/distinfo6
-rw-r--r--mail/p5-Mail-Box/patches/patch-aa83
-rw-r--r--mail/p5-Mail-ClamAV/DESCR2
-rw-r--r--mail/p5-Mail-ClamAV/Makefile43
-rw-r--r--mail/p5-Mail-ClamAV/PLIST1
-rw-r--r--mail/p5-Mail-ClamAV/distinfo5
-rw-r--r--mail/p5-Mail-DKIM/DESCR2
-rw-r--r--mail/p5-Mail-DKIM/Makefile31
-rw-r--r--mail/p5-Mail-DKIM/PLIST1
-rw-r--r--mail/p5-Mail-DKIM/distinfo5
-rw-r--r--mail/p5-Mail-Ezmlm/DESCR1
-rw-r--r--mail/p5-Mail-Ezmlm/Makefile31
-rw-r--r--mail/p5-Mail-Ezmlm/PLIST1
-rw-r--r--mail/p5-Mail-Ezmlm/distinfo6
-rw-r--r--mail/p5-Mail-Ezmlm/patches/patch-aa17
-rw-r--r--mail/p5-Mail-IMAPClient/DESCR19
-rw-r--r--mail/p5-Mail-IMAPClient/Makefile20
-rw-r--r--mail/p5-Mail-IMAPClient/PLIST1
-rw-r--r--mail/p5-Mail-IMAPClient/distinfo5
-rw-r--r--mail/p5-Mail-ListDetector/DESCR7
-rw-r--r--mail/p5-Mail-ListDetector/Makefile21
-rw-r--r--mail/p5-Mail-ListDetector/PLIST1
-rw-r--r--mail/p5-Mail-ListDetector/distinfo5
-rw-r--r--mail/p5-Mail-Mbox-MessageParser/DESCR4
-rw-r--r--mail/p5-Mail-Mbox-MessageParser/Makefile33
-rw-r--r--mail/p5-Mail-Mbox-MessageParser/PLIST1
-rw-r--r--mail/p5-Mail-Mbox-MessageParser/distinfo5
-rw-r--r--mail/p5-Mail-Milter/DESCR3
-rw-r--r--mail/p5-Mail-Milter/Makefile19
-rw-r--r--mail/p5-Mail-Milter/PLIST1
-rw-r--r--mail/p5-Mail-Milter/distinfo5
-rw-r--r--mail/p5-Mail-SPF-Query/DESCR3
-rw-r--r--mail/p5-Mail-SPF-Query/Makefile25
-rw-r--r--mail/p5-Mail-SPF-Query/PLIST1
-rw-r--r--mail/p5-Mail-SPF-Query/distinfo5
-rw-r--r--mail/p5-Mail-SRS/DESCR14
-rw-r--r--mail/p5-Mail-SRS/Makefile22
-rw-r--r--mail/p5-Mail-SRS/PLIST1
-rw-r--r--mail/p5-Mail-SRS/distinfo6
-rw-r--r--mail/p5-Mail-SRS/patches/patch-aa22
-rw-r--r--mail/p5-Mail-Sender-Easy/DESCR20
-rw-r--r--mail/p5-Mail-Sender-Easy/Makefile19
-rw-r--r--mail/p5-Mail-Sender-Easy/PLIST1
-rw-r--r--mail/p5-Mail-Sender-Easy/distinfo5
-rw-r--r--mail/p5-Mail-Sender/DESCR3
-rw-r--r--mail/p5-Mail-Sender/Makefile21
-rw-r--r--mail/p5-Mail-Sender/PLIST1
-rw-r--r--mail/p5-Mail-Sender/distinfo5
-rw-r--r--mail/p5-Mail-Sendmail/DESCR4
-rw-r--r--mail/p5-Mail-Sendmail/Makefile18
-rw-r--r--mail/p5-Mail-Sendmail/PLIST1
-rw-r--r--mail/p5-Mail-Sendmail/distinfo5
-rw-r--r--mail/p5-Mail-Webmail-Gmail/DESCR2
-rw-r--r--mail/p5-Mail-Webmail-Gmail/Makefile20
-rw-r--r--mail/p5-Mail-Webmail-Gmail/PLIST1
-rw-r--r--mail/p5-Mail-Webmail-Gmail/distinfo6
-rw-r--r--mail/p5-Mail-Webmail-Gmail/patches/patch-aa13
-rw-r--r--mail/p5-MailTools/DESCR11
-rw-r--r--mail/p5-MailTools/Makefile22
-rw-r--r--mail/p5-MailTools/PLIST1
-rw-r--r--mail/p5-MailTools/distinfo5
-rw-r--r--mail/p5-Net-LMTP/DESCR5
-rw-r--r--mail/p5-Net-LMTP/Makefile17
-rw-r--r--mail/p5-Net-LMTP/PLIST1
-rw-r--r--mail/p5-Net-LMTP/distinfo5
-rw-r--r--mail/p5-Net-SMTP_auth/DESCR3
-rw-r--r--mail/p5-Net-SMTP_auth/Makefile19
-rw-r--r--mail/p5-Net-SMTP_auth/PLIST1
-rw-r--r--mail/p5-Net-SMTP_auth/distinfo5
-rw-r--r--mail/p5-Sendmail-AccessDB/DESCR6
-rw-r--r--mail/p5-Sendmail-AccessDB/Makefile18
-rw-r--r--mail/p5-Sendmail-AccessDB/PLIST1
-rw-r--r--mail/p5-Sendmail-AccessDB/distinfo5
-rw-r--r--mail/p5-Sendmail-PMilter/DESCR16
-rw-r--r--mail/p5-Sendmail-PMilter/Makefile22
-rw-r--r--mail/p5-Sendmail-PMilter/PLIST1
-rw-r--r--mail/p5-Sendmail-PMilter/distinfo5
-rw-r--r--mail/p5-User-Identity/DESCR4
-rw-r--r--mail/p5-User-Identity/Makefile20
-rw-r--r--mail/p5-User-Identity/PLIST1
-rw-r--r--mail/p5-User-Identity/distinfo5
-rw-r--r--mail/p5-razor-agents/DESCR13
-rw-r--r--mail/p5-razor-agents/Makefile26
-rw-r--r--mail/p5-razor-agents/PLIST1
-rw-r--r--mail/p5-razor-agents/distinfo5
-rw-r--r--mail/pear-Mail/DESCR5
-rw-r--r--mail/pear-Mail/Makefile15
-rw-r--r--mail/pear-Mail/PLIST1
-rw-r--r--mail/pear-Mail/distinfo5
-rw-r--r--mail/pear-Mail_Mime/DESCR9
-rw-r--r--mail/pear-Mail_Mime/Makefile12
-rw-r--r--mail/pear-Mail_Mime/PLIST1
-rw-r--r--mail/pear-Mail_Mime/distinfo5
-rw-r--r--mail/perdition-bdb/Makefile14
-rw-r--r--mail/perdition-bdb/PLIST4
-rw-r--r--mail/perdition-gdbm/Makefile12
-rw-r--r--mail/perdition-gdbm/PLIST4
-rw-r--r--mail/perdition-ldap/Makefile13
-rw-r--r--mail/perdition-ldap/PLIST4
-rw-r--r--mail/perdition-mysql/Makefile10
-rw-r--r--mail/perdition-mysql/PLIST4
-rw-r--r--mail/perdition-odbc/Makefile13
-rw-r--r--mail/perdition-odbc/PLIST4
-rw-r--r--mail/perdition-postgresql/Makefile11
-rw-r--r--mail/perdition-postgresql/PLIST4
-rw-r--r--mail/perdition/DESCR11
-rw-r--r--mail/perdition/Makefile23
-rw-r--r--mail/perdition/Makefile.common48
-rw-r--r--mail/perdition/PLIST29
-rw-r--r--mail/perdition/buildlink3.mk26
-rw-r--r--mail/perdition/distinfo12
-rwxr-xr-xmail/perdition/files/perdition.imap4.sh17
-rwxr-xr-xmail/perdition/files/perdition.imap4s.sh17
-rwxr-xr-xmail/perdition/files/perdition.pop3.sh17
-rwxr-xr-xmail/perdition/files/perdition.pop3s.sh17
-rw-r--r--mail/perdition/options.mk30
-rw-r--r--mail/perdition/patches/patch-aa17
-rw-r--r--mail/perdition/patches/patch-ab17
-rw-r--r--mail/perdition/patches/patch-ac21
-rw-r--r--mail/perdition/patches/patch-ad13
-rw-r--r--mail/perdition/patches/patch-ae13
-rw-r--r--mail/perdition/patches/patch-af13
-rw-r--r--mail/perdition/patches/patch-ag13
-rw-r--r--mail/pfqueue/DESCR11
-rw-r--r--mail/pfqueue/Makefile22
-rw-r--r--mail/pfqueue/PLIST3
-rw-r--r--mail/pfqueue/distinfo5
-rw-r--r--mail/php-imap/DESCR3
-rw-r--r--mail/php-imap/Makefile27
-rw-r--r--mail/pine-pgp-filters/DESCR4
-rw-r--r--mail/pine-pgp-filters/Makefile31
-rw-r--r--mail/pine-pgp-filters/PLIST12
-rw-r--r--mail/pine-pgp-filters/distinfo8
-rw-r--r--mail/pine-pgp-filters/patches/patch-aa30
-rw-r--r--mail/pine-pgp-filters/patches/patch-ab16
-rw-r--r--mail/pine-pgp-filters/patches/patch-ac30
-rw-r--r--mail/pine/DESCR5
-rw-r--r--mail/pine/MESSAGE14
-rw-r--r--mail/pine/Makefile121
-rw-r--r--mail/pine/PLIST23
-rw-r--r--mail/pine/distinfo18
-rw-r--r--mail/pine/files/pine.conf.fixed15
-rw-r--r--mail/pine/patches/patch-aa35
-rw-r--r--mail/pine/patches/patch-ab74
-rw-r--r--mail/pine/patches/patch-ac74
-rw-r--r--mail/pine/patches/patch-ad32
-rw-r--r--mail/pine/patches/patch-ae11
-rw-r--r--mail/pine/patches/patch-af73
-rw-r--r--mail/pine/patches/patch-ag12
-rw-r--r--mail/pine/patches/patch-al104
-rw-r--r--mail/pine/patches/patch-ap78
-rw-r--r--mail/pine/patches/patch-aq74
-rw-r--r--mail/popa3d/DEINSTALL11
-rw-r--r--mail/popa3d/DESCR15
-rw-r--r--mail/popa3d/MESSAGE18
-rw-r--r--mail/popa3d/Makefile43
-rw-r--r--mail/popa3d/PLIST11
-rw-r--r--mail/popa3d/distinfo7
-rwxr-xr-xmail/popa3d/files/popa3d.sh25
-rw-r--r--mail/popa3d/patches/patch-aa53
-rw-r--r--mail/popa3d/patches/patch-ab47
-rw-r--r--mail/poppassd/DESCR2
-rw-r--r--mail/poppassd/MESSAGE14
-rw-r--r--mail/poppassd/Makefile41
-rw-r--r--mail/poppassd/PLIST4
-rw-r--r--mail/poppassd/distinfo15
-rw-r--r--mail/poppassd/options.mk12
-rw-r--r--mail/poppassd/patches/patch-aa116
-rw-r--r--mail/poppassd/patches/patch-ab22
-rw-r--r--mail/poppassd/patches/patch-ac406
-rw-r--r--mail/poppassd/patches/patch-ad14
-rw-r--r--mail/poppassd/patches/patch-ae12
-rw-r--r--mail/poppassd/patches/patch-af12
-rw-r--r--mail/poppassd/patches/patch-ag13
-rw-r--r--mail/poppy/DESCR8
-rw-r--r--mail/poppy/Makefile22
-rw-r--r--mail/poppy/PLIST3
-rw-r--r--mail/poppy/distinfo5
-rw-r--r--mail/postfix-current/DESCR13
-rw-r--r--mail/postfix-current/MESSAGE17
-rw-r--r--mail/postfix-current/MESSAGE.NetBSD13
-rw-r--r--mail/postfix-current/MESSAGE.sasl34
-rw-r--r--mail/postfix-current/Makefile161
-rw-r--r--mail/postfix-current/PLIST173
-rw-r--r--mail/postfix-current/distinfo8
-rw-r--r--mail/postfix-current/files/mailer.conf10
-rw-r--r--mail/postfix-current/files/postfix.sh71
-rw-r--r--mail/postfix-current/options.mk101
-rw-r--r--mail/postfix-current/patches/patch-aa42
-rw-r--r--mail/postfix-current/patches/patch-ag14
-rw-r--r--mail/postfix-current/patches/patch-ai87
-rw-r--r--mail/postfix/DESCR13
-rw-r--r--mail/postfix/MESSAGE17
-rw-r--r--mail/postfix/MESSAGE.NetBSD13
-rw-r--r--mail/postfix/MESSAGE.sasl34
-rw-r--r--mail/postfix/Makefile161
-rw-r--r--mail/postfix/PLIST173
-rw-r--r--mail/postfix/distinfo8
-rw-r--r--mail/postfix/files/mailer.conf10
-rw-r--r--mail/postfix/files/postfix.sh71
-rw-r--r--mail/postfix/options.mk110
-rw-r--r--mail/postfix/patches/patch-aa42
-rw-r--r--mail/postfix/patches/patch-ag14
-rw-r--r--mail/postfix/patches/patch-ai87
-rw-r--r--mail/postgrey/DESCR9
-rw-r--r--mail/postgrey/Makefile82
-rw-r--r--mail/postgrey/PLIST10
-rw-r--r--mail/postgrey/distinfo5
-rw-r--r--mail/postgrey/files/postgrey.sh25
-rw-r--r--mail/prayer/DESCR19
-rw-r--r--mail/prayer/Makefile59
-rw-r--r--mail/prayer/PLIST94
-rw-r--r--mail/prayer/distinfo14
-rw-r--r--mail/prayer/files/prayer.sh118
-rw-r--r--mail/prayer/patches/patch-aa100
-rw-r--r--mail/prayer/patches/patch-ab36
-rw-r--r--mail/prayer/patches/patch-ac65
-rw-r--r--mail/prayer/patches/patch-ad39
-rw-r--r--mail/prayer/patches/patch-ae37
-rw-r--r--mail/prayer/patches/patch-af16
-rw-r--r--mail/prayer/patches/patch-ag19
-rw-r--r--mail/prayer/patches/patch-ah13
-rw-r--r--mail/prayer/patches/patch-ai13
-rw-r--r--mail/procmail/DESCR1
-rw-r--r--mail/procmail/MESSAGE9
-rw-r--r--mail/procmail/Makefile58
-rw-r--r--mail/procmail/PLIST11
-rw-r--r--mail/procmail/distinfo12
-rw-r--r--mail/procmail/hacks.mk10
-rw-r--r--mail/procmail/patches/patch-aa31
-rw-r--r--mail/procmail/patches/patch-ab19
-rw-r--r--mail/procmail/patches/patch-ac15
-rw-r--r--mail/procmail/patches/patch-ad12
-rw-r--r--mail/procmail/patches/patch-ae31
-rw-r--r--mail/procmail/patches/patch-af13
-rw-r--r--mail/procmail/patches/patch-ag12
-rw-r--r--mail/proxsmtp/DESCR6
-rw-r--r--mail/proxsmtp/Makefile30
-rw-r--r--mail/proxsmtp/PLIST9
-rw-r--r--mail/proxsmtp/distinfo7
-rw-r--r--mail/proxsmtp/files/proxsmtpd.sh72
-rw-r--r--mail/proxsmtp/patches/patch-aa13
-rw-r--r--mail/proxsmtp/patches/patch-ab13
-rw-r--r--mail/pulsar/DESCR2
-rw-r--r--mail/pulsar/Makefile25
-rw-r--r--mail/pulsar/PLIST28
-rw-r--r--mail/pulsar/distinfo12
-rw-r--r--mail/pulsar/patches/patch-aa70
-rw-r--r--mail/pulsar/patches/patch-ab12
-rw-r--r--mail/pulsar/patches/patch-ac30
-rw-r--r--mail/pulsar/patches/patch-ad25
-rw-r--r--mail/pulsar/patches/patch-ae21
-rw-r--r--mail/pulsar/patches/patch-af16
-rw-r--r--mail/pulsar/patches/patch-ag17
-rw-r--r--mail/pymsgauth/DEINSTALL10
-rw-r--r--mail/pymsgauth/DESCR2
-rw-r--r--mail/pymsgauth/INSTALL12
-rw-r--r--mail/pymsgauth/Makefile48
-rw-r--r--mail/pymsgauth/PLIST16
-rw-r--r--mail/pymsgauth/distinfo5
-rw-r--r--mail/qcheck/DESCR5
-rw-r--r--mail/qcheck/Makefile23
-rw-r--r--mail/qcheck/PLIST4
-rw-r--r--mail/qcheck/distinfo6
-rw-r--r--mail/qcheck/patches/patch-aa11
-rw-r--r--mail/qgreylist/DESCR4
-rw-r--r--mail/qgreylist/MESSAGE7
-rw-r--r--mail/qgreylist/Makefile52
-rw-r--r--mail/qgreylist/PLIST4
-rw-r--r--mail/qgreylist/distinfo6
-rw-r--r--mail/qgreylist/patches/patch-aa32
-rw-r--r--mail/qmHandle/DESCR12
-rw-r--r--mail/qmHandle/Makefile35
-rw-r--r--mail/qmHandle/PLIST4
-rw-r--r--mail/qmHandle/distinfo5
-rw-r--r--mail/qmail-conf/DESCR19
-rw-r--r--mail/qmail-conf/Makefile30
-rw-r--r--mail/qmail-conf/PLIST6
-rw-r--r--mail/qmail-conf/distinfo8
-rw-r--r--mail/qmail-lint/DESCR4
-rw-r--r--mail/qmail-lint/Makefile29
-rw-r--r--mail/qmail-lint/PLIST2
-rw-r--r--mail/qmail-lint/distinfo5
-rw-r--r--mail/qmail-qfilter/DESCR3
-rw-r--r--mail/qmail-qfilter/Makefile46
-rw-r--r--mail/qmail-qfilter/PLIST7
-rw-r--r--mail/qmail-qfilter/distinfo6
-rw-r--r--mail/qmail-qfilter/patches/patch-aa13
-rw-r--r--mail/qmail-run/DESCR3
-rw-r--r--mail/qmail-run/INSTALL50
-rw-r--r--mail/qmail-run/MESSAGE23
-rw-r--r--mail/qmail-run/Makefile73
-rw-r--r--mail/qmail-run/PLIST13
-rw-r--r--mail/qmail-run/files/README.pkgsrc46
-rw-r--r--mail/qmail-run/files/mailer.conf10
-rw-r--r--mail/qmail-run/files/qmail-procmail.sh13
-rw-r--r--mail/qmail-run/files/qmail-qfilter-queue.sh35
-rw-r--r--mail/qmail-run/files/qmail-qread-client.sh10
-rw-r--r--mail/qmail-run/files/qmail.sh93
-rw-r--r--mail/qmail-run/files/qmailpop3d.sh95
-rw-r--r--mail/qmail-run/files/qmailqread.sh45
-rw-r--r--mail/qmail-run/files/qmailsend.sh106
-rw-r--r--mail/qmail-run/files/qmailsmtpd.sh95
-rw-r--r--mail/qmail/DEINSTALL17
-rw-r--r--mail/qmail/DESCR20
-rw-r--r--mail/qmail/INSTALL77
-rw-r--r--mail/qmail/MESSAGE14
-rw-r--r--mail/qmail/Makefile136
-rw-r--r--mail/qmail/PLIST196
-rw-r--r--mail/qmail/distinfo32
-rw-r--r--mail/qmail/files/README.pkgsrc30
-rw-r--r--mail/qmail/hacks.mk9
-rw-r--r--mail/qmail/options.mk111
-rw-r--r--mail/qmailanalog/DESCR12
-rw-r--r--mail/qmailanalog/MESSAGE7
-rw-r--r--mail/qmailanalog/Makefile18
-rw-r--r--mail/qmailanalog/PLIST44
-rw-r--r--mail/qmailanalog/distinfo5
-rw-r--r--mail/qmqtool/DESCR9
-rw-r--r--mail/qmqtool/Makefile37
-rw-r--r--mail/qmqtool/PLIST16
-rw-r--r--mail/qmqtool/distinfo6
-rw-r--r--mail/qmqtool/patches/patch-aa54
-rw-r--r--mail/qpopper/DESCR5
-rw-r--r--mail/qpopper/MESSAGE17
-rw-r--r--mail/qpopper/Makefile59
-rw-r--r--mail/qpopper/Makefile.common16
-rw-r--r--mail/qpopper/PLIST9
-rw-r--r--mail/qpopper/distinfo19
-rw-r--r--mail/qpopper/files/qpopper.sh19
-rw-r--r--mail/qpopper/options.mk44
-rw-r--r--mail/qpopper/patches/patch-aa18
-rw-r--r--mail/qpopper/patches/patch-ab13
-rw-r--r--mail/qpopper/patches/patch-ac13
-rw-r--r--mail/qpopper/patches/patch-ad12
-rw-r--r--mail/qpopper/patches/patch-ae47
-rw-r--r--mail/qpopper/patches/patch-af13
-rw-r--r--mail/qpopper/patches/patch-ag22
-rw-r--r--mail/qpopper/patches/patch-al19
-rw-r--r--mail/qpopper/patches/patch-am124
-rw-r--r--mail/qpopper/patches/patch-an22
-rw-r--r--mail/qpopper/patches/patch-ap41
-rw-r--r--mail/qtools/DESCR3
-rw-r--r--mail/qtools/MESSAGE6
-rw-r--r--mail/qtools/Makefile19
-rw-r--r--mail/qtools/PLIST17
-rw-r--r--mail/qtools/distinfo6
-rw-r--r--mail/qtools/patches/patch-aa16
-rw-r--r--mail/queue-fix/DESCR6
-rw-r--r--mail/queue-fix/Makefile22
-rw-r--r--mail/queue-fix/PLIST4
-rw-r--r--mail/queue-fix/distinfo5
-rw-r--r--mail/queue-repair/DESCR4
-rw-r--r--mail/queue-repair/MESSAGE8
-rw-r--r--mail/queue-repair/Makefile22
-rw-r--r--mail/queue-repair/PLIST2
-rw-r--r--mail/queue-repair/distinfo5
-rw-r--r--mail/rblcheck/DESCR16
-rw-r--r--mail/rblcheck/Makefile24
-rw-r--r--mail/rblcheck/PLIST6
-rw-r--r--mail/rblcheck/distinfo6
-rw-r--r--mail/rblcheck/hacks.mk11
-rw-r--r--mail/rblcheck/patches/patch-aa124
-rw-r--r--mail/relay-ctrl/DESCR3
-rw-r--r--mail/relay-ctrl/MESSAGE14
-rw-r--r--mail/relay-ctrl/Makefile50
-rw-r--r--mail/relay-ctrl/PLIST21
-rw-r--r--mail/relay-ctrl/distinfo5
-rw-r--r--mail/relay-ctrl/files/dovecot-settcpremoteip.sh6
-rw-r--r--mail/relay-ctrl/files/ifrelayclient.sh39
-rw-r--r--mail/ripmime/DESCR4
-rw-r--r--mail/ripmime/Makefile17
-rw-r--r--mail/ripmime/PLIST3
-rw-r--r--mail/ripmime/distinfo6
-rw-r--r--mail/ripmime/patches/patch-aa31
-rw-r--r--mail/rmail-mime/DESCR2
-rw-r--r--mail/rmail-mime/Makefile29
-rw-r--r--mail/rmail-mime/PLIST3
-rw-r--r--mail/rmail-mime/distinfo5
-rw-r--r--mail/rss2email/DESCR2
-rw-r--r--mail/rss2email/Makefile47
-rw-r--r--mail/rss2email/PLIST7
-rw-r--r--mail/rss2email/distinfo6
-rw-r--r--mail/rss2email/files/config.py76
-rw-r--r--mail/rss2email/files/r2e7
-rw-r--r--mail/rss2email/files/r2e.1169
-rw-r--r--mail/rss2email/patches/patch-ad34
-rw-r--r--mail/ruby-actionmailer/DESCR7
-rw-r--r--mail/ruby-actionmailer/Makefile31
-rw-r--r--mail/ruby-actionmailer/PLIST18
-rw-r--r--mail/ruby-actionmailer/distinfo5
-rw-r--r--mail/ruby-tmail/DESCR2
-rw-r--r--mail/ruby-tmail/Makefile32
-rw-r--r--mail/ruby-tmail/PLIST70
-rw-r--r--mail/ruby-tmail/distinfo5
-rw-r--r--mail/safecat/DESCR10
-rw-r--r--mail/safecat/Makefile19
-rw-r--r--mail/safecat/PLIST7
-rw-r--r--mail/safecat/distinfo6
-rw-r--r--mail/safecat/patches/patch-aa18
-rw-r--r--mail/sendmail/DESCR8
-rw-r--r--mail/sendmail/MESSAGE21
-rw-r--r--mail/sendmail/Makefile100
-rw-r--r--mail/sendmail/Makefile.common49
-rw-r--r--mail/sendmail/PLIST235
-rw-r--r--mail/sendmail/distinfo18
-rw-r--r--mail/sendmail/files/mailer.conf10
-rwxr-xr-xmail/sendmail/files/sendmail.sh58
-rw-r--r--mail/sendmail/files/site.config.m425
-rw-r--r--mail/sendmail/files/site.config.m4-db25
-rw-r--r--mail/sendmail/files/site.config.m4-db45
-rw-r--r--mail/sendmail/files/site.config.m4-ldap5
-rw-r--r--mail/sendmail/files/site.config.m4-milter4
-rw-r--r--mail/sendmail/files/site.config.m4-sasl25
-rw-r--r--mail/sendmail/files/site.config.m4-starttls5
-rw-r--r--mail/sendmail/files/site.config.m4-tcpwrappers5
-rw-r--r--mail/sendmail/files/site.config.m4-v64
-rw-r--r--mail/sendmail/files/site.config.m4-v6-not-solaris4
-rwxr-xr-xmail/sendmail/files/smmsp.sh28
-rw-r--r--mail/sendmail/options.mk52
-rw-r--r--mail/sendmail/patches/patch-aa24
-rw-r--r--mail/sendmail/patches/patch-ab12
-rw-r--r--mail/sendmail/patches/patch-ac12
-rw-r--r--mail/sendmail/patches/patch-ad12
-rw-r--r--mail/sendmail/patches/patch-ae12
-rw-r--r--mail/sendmail/patches/patch-af14
-rw-r--r--mail/sendmail/patches/patch-ag16
-rw-r--r--mail/sendmail/patches/patch-ah38
-rw-r--r--mail/sendmail/patches/patch-ai53
-rw-r--r--mail/sendmail/patches/patch-aj18
-rw-r--r--mail/sendmail/patches/patch-ak23
-rw-r--r--mail/sendmail/patches/patch-al12
-rw-r--r--mail/sendmail/patches/patch-am12
-rw-r--r--mail/sendmail812/DESCR8
-rw-r--r--mail/sendmail812/MESSAGE21
-rw-r--r--mail/sendmail812/Makefile89
-rw-r--r--mail/sendmail812/Makefile.common57
-rw-r--r--mail/sendmail812/PLIST215
-rw-r--r--mail/sendmail812/distinfo20
-rw-r--r--mail/sendmail812/files/mailer.conf10
-rw-r--r--mail/sendmail812/files/site.config.m424
-rw-r--r--mail/sendmail812/files/site.config.m4-db25
-rw-r--r--mail/sendmail812/files/site.config.m4-db45
-rw-r--r--mail/sendmail812/files/site.config.m4-ldap5
-rw-r--r--mail/sendmail812/files/site.config.m4-milter4
-rw-r--r--mail/sendmail812/files/site.config.m4-sasl25
-rw-r--r--mail/sendmail812/files/site.config.m4-solaris9
-rw-r--r--mail/sendmail812/files/site.config.m4-starttls5
-rw-r--r--mail/sendmail812/files/site.config.m4-tcpwrappers5
-rw-r--r--mail/sendmail812/files/site.config.m4-v64
-rw-r--r--mail/sendmail812/files/site.config.m4-v6-not-solaris3
-rw-r--r--mail/sendmail812/options.mk66
-rw-r--r--mail/sendmail812/patches/patch-aa25
-rw-r--r--mail/sendmail812/patches/patch-ab12
-rw-r--r--mail/sendmail812/patches/patch-ac12
-rw-r--r--mail/sendmail812/patches/patch-ad12
-rw-r--r--mail/sendmail812/patches/patch-ae12
-rw-r--r--mail/sendmail812/patches/patch-af14
-rw-r--r--mail/sendmail812/patches/patch-ag38
-rw-r--r--mail/sendmail812/patches/patch-ah22
-rw-r--r--mail/sendmail812/patches/patch-ai103
-rw-r--r--mail/sendmail812/patches/patch-aj21
-rw-r--r--mail/sendmail812/patches/patch-ak8
-rw-r--r--mail/sendmail812/patches/patch-al12
-rw-r--r--mail/sendymail/DESCR5
-rw-r--r--mail/sendymail/MESSAGE22
-rw-r--r--mail/sendymail/Makefile41
-rw-r--r--mail/sendymail/PLIST11
-rw-r--r--mail/sendymail/distinfo5
-rw-r--r--mail/serialmail/DESCR21
-rw-r--r--mail/serialmail/Makefile26
-rw-r--r--mail/serialmail/PLIST20
-rw-r--r--mail/serialmail/distinfo6
-rw-r--r--mail/serialmail/patches/patch-aa47
-rw-r--r--mail/sigrot/DESCR2
-rw-r--r--mail/sigrot/Makefile35
-rw-r--r--mail/sigrot/PLIST10
-rw-r--r--mail/sigrot/distinfo5
-rw-r--r--mail/sma/DESCR5
-rw-r--r--mail/sma/MESSAGE6
-rw-r--r--mail/sma/Makefile33
-rw-r--r--mail/sma/PLIST7
-rw-r--r--mail/sma/distinfo6
-rw-r--r--mail/sma/patches/patch-aa13
-rw-r--r--mail/smtpfeed/DESCR17
-rw-r--r--mail/smtpfeed/MESSAGE11
-rw-r--r--mail/smtpfeed/Makefile47
-rw-r--r--mail/smtpfeed/PLIST21
-rw-r--r--mail/smtpfeed/distinfo17
-rw-r--r--mail/smtpfeed/hacks.mk11
-rw-r--r--mail/smtpfeed/patches/patch-aa10
-rw-r--r--mail/smtpfeed/patches/patch-ac143
-rw-r--r--mail/smtpfeed/patches/patch-ad14
-rw-r--r--mail/smtpfeed/patches/patch-ae1089
-rw-r--r--mail/smtpfeed/patches/patch-af99
-rw-r--r--mail/smtpfeed/patches/patch-ag100
-rw-r--r--mail/smtpfeed/patches/patch-ah25
-rw-r--r--mail/smtpfeed/patches/patch-ai136
-rw-r--r--mail/smtpfeed/patches/patch-aj31
-rw-r--r--mail/smtpfeed/patches/patch-ak23
-rw-r--r--mail/smtpfeed/patches/patch-al967
-rw-r--r--mail/smtpfeed/patches/patch-am212
-rw-r--r--mail/solid-pop3d/DESCR6
-rw-r--r--mail/solid-pop3d/MESSAGE16
-rw-r--r--mail/solid-pop3d/Makefile57
-rw-r--r--mail/solid-pop3d/PLIST16
-rw-r--r--mail/solid-pop3d/PLIST.apop2
-rw-r--r--mail/solid-pop3d/distinfo6
-rw-r--r--mail/solid-pop3d/patches/patch-aa13
-rw-r--r--mail/spamass-milter/DESCR3
-rw-r--r--mail/spamass-milter/Makefile21
-rw-r--r--mail/spamass-milter/PLIST4
-rw-r--r--mail/spamass-milter/distinfo6
-rw-r--r--mail/spamass-milter/files/spamass-milter.sh33
-rw-r--r--mail/spamass-milter/patches/patch-aa13
-rw-r--r--mail/spamassassin/DESCR24
-rw-r--r--mail/spamassassin/MESSAGE15
-rw-r--r--mail/spamassassin/Makefile204
-rw-r--r--mail/spamassassin/PLIST10
-rw-r--r--mail/spamassassin/distinfo9
-rw-r--r--mail/spamassassin/files/netbsd_lists.cf36
-rw-r--r--mail/spamassassin/options.mk109
-rw-r--r--mail/spamassassin/patches/patch-ab36
-rw-r--r--mail/spamassassin/patches/patch-ae31
-rw-r--r--mail/spamassassin/patches/patch-aq66
-rw-r--r--mail/spamassassin/patches/patch-ay14
-rw-r--r--mail/spamd/DESCR13
-rw-r--r--mail/spamd/MESSAGE9
-rw-r--r--mail/spamd/Makefile62
-rw-r--r--mail/spamd/PLIST18
-rw-r--r--mail/spamd/distinfo5
-rw-r--r--mail/spamd/files/pfspamd.sh23
-rw-r--r--mail/spamprobe/DESCR14
-rw-r--r--mail/spamprobe/MESSAGE9
-rw-r--r--mail/spamprobe/Makefile21
-rw-r--r--mail/spamprobe/PLIST3
-rw-r--r--mail/spamprobe/distinfo6
-rw-r--r--mail/spamprobe/options.mk17
-rw-r--r--mail/spamprobe/patches/patch-aa12
-rw-r--r--mail/squirrelmail-decode/DESCR7
-rw-r--r--mail/squirrelmail-decode/Makefile23
-rw-r--r--mail/squirrelmail-decode/PLIST34
-rw-r--r--mail/squirrelmail-decode/distinfo5
-rw-r--r--mail/squirrelmail-locales/DESCR1
-rw-r--r--mail/squirrelmail-locales/Makefile30
-rw-r--r--mail/squirrelmail-locales/PLIST973
-rw-r--r--mail/squirrelmail-locales/distinfo5
-rw-r--r--mail/squirrelmail/DESCR7
-rw-r--r--mail/squirrelmail/MESSAGE23
-rw-r--r--mail/squirrelmail/Makefile83
-rw-r--r--mail/squirrelmail/PLIST478
-rw-r--r--mail/squirrelmail/buildlink3.mk19
-rw-r--r--mail/squirrelmail/distinfo6
-rw-r--r--mail/squirrelmail/files/squirrelmail.conf.dist14
-rw-r--r--mail/squirrelmail/patches/patch-aa31
-rw-r--r--mail/squirrelmail/plugin.mk25
-rw-r--r--mail/sqwebmail/DEINSTALL29
-rw-r--r--mail/sqwebmail/DESCR7
-rw-r--r--mail/sqwebmail/INSTALL22
-rw-r--r--mail/sqwebmail/MESSAGE36
-rw-r--r--mail/sqwebmail/Makefile134
-rw-r--r--mail/sqwebmail/PLIST128
-rw-r--r--mail/sqwebmail/distinfo10
-rw-r--r--mail/sqwebmail/files/sqwebmail.sh69
-rw-r--r--mail/sqwebmail/patches/patch-aa30
-rw-r--r--mail/sqwebmail/patches/patch-ad41
-rw-r--r--mail/sqwebmail/patches/patch-ah13
-rw-r--r--mail/sqwebmail/patches/patch-ai22
-rw-r--r--mail/sqwebmail/patches/patch-aj13
-rw-r--r--mail/ssmtp/DESCR10
-rw-r--r--mail/ssmtp/MESSAGE15
-rw-r--r--mail/ssmtp/Makefile48
-rw-r--r--mail/ssmtp/PLIST7
-rw-r--r--mail/ssmtp/distinfo10
-rw-r--r--mail/ssmtp/files/mailer.conf6
-rw-r--r--mail/ssmtp/options.mk16
-rw-r--r--mail/ssmtp/patches/patch-aa13
-rw-r--r--mail/ssmtp/patches/patch-ab15
-rw-r--r--mail/ssmtp/patches/patch-ac24
-rw-r--r--mail/ssmtp/patches/patch-ad13
-rw-r--r--mail/ssmtp/patches/patch-ae17
-rw-r--r--mail/sylpheed-claws/DESCR21
-rw-r--r--mail/sylpheed-claws/MESSAGE.plugins7
-rw-r--r--mail/sylpheed-claws/Makefile96
-rw-r--r--mail/sylpheed-claws/Makefile.common21
-rw-r--r--mail/sylpheed-claws/PLIST251
-rw-r--r--mail/sylpheed-claws/PLIST.plugins3
-rw-r--r--mail/sylpheed-claws/buildlink3.mk20
-rw-r--r--mail/sylpheed-claws/distinfo6
-rw-r--r--mail/sylpheed-claws/files/mime.types471
-rw-r--r--mail/sylpheed-claws/patches/patch-ab11
-rw-r--r--mail/sylpheed-claws/plugins.mk33
-rw-r--r--mail/sylpheed-devel/DESCR17
-rw-r--r--mail/sylpheed-devel/Makefile41
-rw-r--r--mail/sylpheed-devel/PLIST111
-rw-r--r--mail/sylpheed-devel/distinfo5
-rw-r--r--mail/sylpheed-devel/files/mime.types592
-rw-r--r--mail/sylpheed-devel/options.mk47
-rw-r--r--mail/sylpheed/DESCR17
-rw-r--r--mail/sylpheed/Makefile40
-rw-r--r--mail/sylpheed/PLIST110
-rw-r--r--mail/sylpheed/distinfo5
-rw-r--r--mail/sylpheed/files/mime.types592
-rw-r--r--mail/sylpheed/options.mk46
-rw-r--r--mail/sympa/DESCR12
-rw-r--r--mail/sympa/MESSAGE15
-rw-r--r--mail/sympa/Makefile133
-rw-r--r--mail/sympa/PLIST1375
-rw-r--r--mail/sympa/distinfo10
-rw-r--r--mail/sympa/patches/patch-aa31
-rw-r--r--mail/sympa/patches/patch-ab41
-rw-r--r--mail/sympa/patches/patch-ac13
-rw-r--r--mail/sympa/patches/patch-ad25
-rw-r--r--mail/sympa/patches/patch-ae25
-rw-r--r--mail/teapop/DESCR3
-rw-r--r--mail/teapop/Makefile33
-rw-r--r--mail/teapop/PLIST7
-rw-r--r--mail/teapop/distinfo7
-rw-r--r--mail/teapop/files/teapop.sh19
-rw-r--r--mail/teapop/options.mk57
-rw-r--r--mail/teapop/patches/patch-aa13
-rw-r--r--mail/teapop/patches/patch-ab12
-rw-r--r--mail/thunderbird-bin-nightly/DESCR3
-rw-r--r--mail/thunderbird-bin-nightly/Makefile15
-rw-r--r--mail/thunderbird-bin-nightly/Makefile.Linux.i3866
-rw-r--r--mail/thunderbird-bin-nightly/Makefile.NetBSD.i3867
-rw-r--r--mail/thunderbird-bin-nightly/Makefile.SunOS.sparc6
-rw-r--r--mail/thunderbird-bin-nightly/PLIST2
-rw-r--r--mail/thunderbird-gtk1/DESCR3
-rw-r--r--mail/thunderbird-gtk1/Makefile9
-rw-r--r--mail/thunderbird-gtk1/PLIST2893
-rw-r--r--mail/thunderbird/DESCR3
-rw-r--r--mail/thunderbird/Makefile11
-rw-r--r--mail/thunderbird/Makefile-thunderbird.common33
-rw-r--r--mail/thunderbird/PLIST2901
-rw-r--r--mail/thunderbird/distinfo55
-rw-r--r--mail/thunderbird/patches/patch-aa21
-rw-r--r--mail/thunderbird/patches/patch-ab72
-rw-r--r--mail/thunderbird/patches/patch-ac59
-rw-r--r--mail/thunderbird/patches/patch-ad76
-rw-r--r--mail/thunderbird/patches/patch-ae42
-rw-r--r--mail/thunderbird/patches/patch-af25
-rw-r--r--mail/thunderbird/patches/patch-ag14
-rw-r--r--mail/thunderbird/patches/patch-ah49
-rw-r--r--mail/thunderbird/patches/patch-ai71
-rw-r--r--mail/thunderbird/patches/patch-aj40
-rw-r--r--mail/thunderbird/patches/patch-ak62
-rw-r--r--mail/thunderbird/patches/patch-al22
-rw-r--r--mail/thunderbird/patches/patch-an14
-rw-r--r--mail/thunderbird/patches/patch-ao76
-rw-r--r--mail/thunderbird/patches/patch-ap13
-rw-r--r--mail/thunderbird/patches/patch-aq40
-rw-r--r--mail/thunderbird/patches/patch-ar15
-rw-r--r--mail/thunderbird/patches/patch-as13
-rw-r--r--mail/thunderbird/patches/patch-at36
-rw-r--r--mail/thunderbird/patches/patch-aw12
-rw-r--r--mail/thunderbird/patches/patch-ax15
-rw-r--r--mail/thunderbird/patches/patch-ba126
-rw-r--r--mail/thunderbird/patches/patch-bb26
-rw-r--r--mail/thunderbird/patches/patch-bm32
-rw-r--r--mail/thunderbird/patches/patch-bo74
-rw-r--r--mail/thunderbird/patches/patch-bq13
-rw-r--r--mail/thunderbird/patches/patch-br22
-rw-r--r--mail/thunderbird/patches/patch-bs33
-rw-r--r--mail/thunderbird/patches/patch-bu179
-rw-r--r--mail/thunderbird/patches/patch-bv211
-rw-r--r--mail/thunderbird/patches/patch-bx84
-rw-r--r--mail/thunderbird/patches/patch-by50
-rw-r--r--mail/thunderbird/patches/patch-bz122
-rw-r--r--mail/thunderbird/patches/patch-ca166
-rw-r--r--mail/thunderbird/patches/patch-cb26
-rw-r--r--mail/thunderbird/patches/patch-da13
-rw-r--r--mail/thunderbird/patches/patch-db14
-rw-r--r--mail/thunderbird/patches/patch-dc23
-rw-r--r--mail/thunderbird/patches/patch-de17
-rw-r--r--mail/thunderbird/patches/patch-df13
-rw-r--r--mail/thunderbird/patches/patch-dg32
-rw-r--r--mail/thunderbird/patches/patch-dh19
-rw-r--r--mail/thunderbird/patches/patch-dj14
-rw-r--r--mail/thunderbird/patches/patch-dk14
-rw-r--r--mail/thunderbird/patches/patch-dl89
-rw-r--r--mail/thunderbird/patches/patch-dm16
-rw-r--r--mail/thunderbird/patches/patch-do88
-rw-r--r--mail/thunderbird/patches/patch-ds14
-rw-r--r--mail/thunderbird/patches/patch-dt14
-rw-r--r--mail/thunderbird/patches/patch-dw13
-rw-r--r--mail/tmda/DESCR7
-rw-r--r--mail/tmda/Makefile94
-rw-r--r--mail/tmda/PLIST391
-rw-r--r--mail/tmda/distinfo6
-rwxr-xr-xmail/tmda/files/tofmipd.sh34
-rw-r--r--mail/tmda/patches/patch-ab19
-rw-r--r--mail/tnef/DESCR7
-rw-r--r--mail/tnef/Makefile27
-rw-r--r--mail/tnef/PLIST3
-rw-r--r--mail/tnef/distinfo5
-rw-r--r--mail/tnef2txt/DESCR19
-rw-r--r--mail/tnef2txt/Makefile21
-rw-r--r--mail/tnef2txt/PLIST2
-rw-r--r--mail/tnef2txt/distinfo6
-rw-r--r--mail/tnef2txt/patches/patch-aa19
-rw-r--r--mail/turba/DESCR12
-rw-r--r--mail/turba/MESSAGE26
-rw-r--r--mail/turba/Makefile90
-rw-r--r--mail/turba/PLIST277
-rw-r--r--mail/turba/distinfo5
-rw-r--r--mail/turba/files/turba.conf.dist31
-rw-r--r--mail/turba/options.mk21
-rw-r--r--mail/up-imapproxy/DESCR4
-rw-r--r--mail/up-imapproxy/Makefile38
-rw-r--r--mail/up-imapproxy/PLIST10
-rw-r--r--mail/up-imapproxy/distinfo12
-rw-r--r--mail/up-imapproxy/files/upimapproxy.sh19
-rw-r--r--mail/up-imapproxy/patches/patch-aa15
-rw-r--r--mail/up-imapproxy/patches/patch-ab15
-rw-r--r--mail/up-imapproxy/patches/patch-ac12
-rw-r--r--mail/up-imapproxy/patches/patch-ad12
-rw-r--r--mail/up-imapproxy/patches/patch-ae12
-rw-r--r--mail/up-imapproxy/patches/patch-af15
-rw-r--r--mail/up-imapproxy/patches/patch-ag13
-rw-r--r--mail/vm/DESCR7
-rw-r--r--mail/vm/Makefile55
-rw-r--r--mail/vm/PLIST175
-rw-r--r--mail/vm/distinfo7
-rw-r--r--mail/vm/patches/patch-aa44
-rw-r--r--mail/vm/patches/patch-ab13
-rw-r--r--mail/wl/DESCR20
-rw-r--r--mail/wl/Makefile54
-rw-r--r--mail/wl/PLIST346
-rw-r--r--mail/wl/distinfo6
-rw-r--r--mail/wl/patches/patch-aa13
-rw-r--r--mail/wmbiff/DESCR2
-rw-r--r--mail/wmbiff/Makefile26
-rw-r--r--mail/wmbiff/PLIST10
-rw-r--r--mail/wmbiff/distinfo8
-rw-r--r--mail/wmbiff/patches/patch-aa13
-rw-r--r--mail/wmbiff/patches/patch-ab35
-rw-r--r--mail/wmbiff/patches/patch-ac17
-rw-r--r--mail/wmmail/DESCR3
-rw-r--r--mail/wmmail/Makefile26
-rw-r--r--mail/wmmail/PLIST54
-rw-r--r--mail/wmmail/distinfo8
-rw-r--r--mail/wmmail/patches/patch-aa20
-rw-r--r--mail/wmmail/patches/patch-ac12
-rw-r--r--mail/wmmail/patches/patch-ad25
-rw-r--r--mail/xbuffy/DESCR7
-rw-r--r--mail/xbuffy/Makefile22
-rw-r--r--mail/xbuffy/PLIST4
-rw-r--r--mail/xbuffy/distinfo12
-rw-r--r--mail/xbuffy/patches/patch-ab21
-rw-r--r--mail/xbuffy/patches/patch-ac12
-rw-r--r--mail/xbuffy/patches/patch-ad30
-rw-r--r--mail/xbuffy/patches/patch-ae30
-rw-r--r--mail/xbuffy/patches/patch-af30
-rw-r--r--mail/xbuffy/patches/patch-ag12
-rw-r--r--mail/xbuffy/patches/patch-ah16
-rw-r--r--mail/xfmail/DESCR12
-rw-r--r--mail/xfmail/Makefile32
-rw-r--r--mail/xfmail/PLIST39
-rw-r--r--mail/xfmail/distinfo10
-rw-r--r--mail/xfmail/patches/patch-aa13
-rw-r--r--mail/xfmail/patches/patch-ab16
-rw-r--r--mail/xfmail/patches/patch-ac13
-rw-r--r--mail/xfmail/patches/patch-ad13
-rw-r--r--mail/xfmail/patches/patch-ae22
-rw-r--r--mail/xmailbox/DESCR19
-rw-r--r--mail/xmailbox/Makefile28
-rw-r--r--mail/xmailbox/PLIST14
-rw-r--r--mail/xmailbox/distinfo8
-rw-r--r--mail/xmailbox/patches/patch-aa28
-rw-r--r--mail/xmailbox/patches/patch-ab12
-rw-r--r--mail/xmailbox/patches/patch-ac13
-rw-r--r--mail/xmailwatcher/DESCR3
-rw-r--r--mail/xmailwatcher/Makefile17
-rw-r--r--mail/xmailwatcher/PLIST3
-rw-r--r--mail/xmailwatcher/distinfo6
-rw-r--r--mail/xmailwatcher/patches/patch-aa22
-rw-r--r--mail/yatsvrs/DEINSTALL24
-rw-r--r--mail/yatsvrs/DESCR12
-rw-r--r--mail/yatsvrs/INSTALL20
-rw-r--r--mail/yatsvrs/MESSAGE22
-rw-r--r--mail/yatsvrs/Makefile59
-rw-r--r--mail/yatsvrs/PLIST13
-rw-r--r--mail/yatsvrs/distinfo46
-rw-r--r--mail/yatsvrs/patches/patch-aa13
-rw-r--r--mail/yatsvrs/patches/patch-ab45
-rw-r--r--mail/yatsvrs/patches/patch-ac13
-rw-r--r--mail/yatsvrs/patches/patch-ad39
-rw-r--r--mail/yatsvrs/patches/patch-ae29
-rw-r--r--mail/yatsvrs/patches/patch-af41
-rw-r--r--mail/yatsvrs/patches/patch-ag51
-rw-r--r--mail/yatsvrs/patches/patch-ah29
-rw-r--r--mail/yatsvrs/patches/patch-ai45
-rw-r--r--mail/yatsvrs/patches/patch-aj39
-rw-r--r--mail/yatsvrs/patches/patch-ak29
-rw-r--r--mail/yatsvrs/patches/patch-al63
-rw-r--r--mail/yatsvrs/patches/patch-am26
-rw-r--r--mail/yatsvrs/patches/patch-ao31
-rw-r--r--mail/yatsvrs/patches/patch-ap35
-rw-r--r--mail/yatsvrs/patches/patch-aq45
-rw-r--r--mail/yatsvrs/patches/patch-ar22
-rw-r--r--mail/yatsvrs/patches/patch-as138
-rw-r--r--mail/yatsvrs/patches/patch-at88
-rw-r--r--mail/yatsvrs/patches/patch-au22
-rw-r--r--mail/yatsvrs/patches/patch-av13
-rw-r--r--mail/yatsvrs/patches/patch-aw13
-rw-r--r--mail/yatsvrs/patches/patch-ax31
-rw-r--r--mail/yatsvrs/patches/patch-ay72
-rw-r--r--mail/yatsvrs/patches/patch-az22
-rw-r--r--mail/yatsvrs/patches/patch-ba13
-rw-r--r--mail/yatsvrs/patches/patch-bb36
-rw-r--r--mail/yatsvrs/patches/patch-bc13
-rw-r--r--mail/yatsvrs/patches/patch-bd29
-rw-r--r--mail/yatsvrs/patches/patch-be13
-rw-r--r--mail/yatsvrs/patches/patch-bf20
-rw-r--r--mail/yatsvrs/patches/patch-bg13
-rw-r--r--mail/yatsvrs/patches/patch-bh19
-rw-r--r--mail/yatsvrs/patches/patch-bi13
-rw-r--r--mail/yatsvrs/patches/patch-bj64
-rw-r--r--mail/yatsvrs/patches/patch-bk40
-rw-r--r--mail/yatsvrs/patches/patch-bl13
-rw-r--r--mail/yatsvrs/patches/patch-bm31
-rw-r--r--mail/yatsvrs/patches/patch-bn28
-rw-r--r--mail/yatsvrs/patches/patch-bo15
-rw-r--r--mail/yatsvrs/patches/patch-bp12
2034 files changed, 0 insertions, 77430 deletions
diff --git a/mail/GNUMail/DESCR b/mail/GNUMail/DESCR
deleted file mode 100644
index 626176bfd7e..00000000000
--- a/mail/GNUMail/DESCR
+++ /dev/null
@@ -1,24 +0,0 @@
- GNUMail.app is a clone of NeXT/Apple's excellent Mail.app application.
-It uses the GNUstep development framework or Apple Cocoa, which is based
-on the OpenStep specification provided by NeXT, Inc.. GNUMail.app is
-licensed under the GPL, and the full sources of the application are
-available.
-
- GNUMail.app was written from scratch. It uses Pantomime as its mail
-handling framework.
-
- Features include:
- * Multiple POP3 (with APOP support) accounts with local
- cache support (for leaving messages on server);
- * Multiple delivery agents (SMTP or local mailer);
- * Mail spool file support for receiving;
- * Good IMAP support with local caching;
- * Full RFC822 and RFC2822 support;
- * Read, compose, bounce, reply and forward mails ;
- * Mailbox management (create, delete, locking and transfer messages)
- using the Berkeley mbox format;
- * A full MIME types manager;
- * Address Book with groups support;
- * Find Panel with regular expressions support;
- * Automatic or manual fetching of your mails (user's choice);
- * Powerful filters that supports regular expressions;
diff --git a/mail/GNUMail/Makefile b/mail/GNUMail/Makefile
deleted file mode 100644
index 7f494b9f2dc..00000000000
--- a/mail/GNUMail/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2006/09/22 07:08:16 rillig Exp $
-#
-
-DISTNAME= GNUMail-1.1.2
-PKGREVISION= 6
-CATEGORIES= mail gnustep
-MASTER_SITES= http://debian.uni-essen.de/misc/GNUstep/Apps/GNUMail/
-
-MAINTAINER= rh@NetBSD.org
-HOMEPAGE= http://www.collaboration-world.com/gnumail/
-COMMENT= GNUstep clone of NeXT's Mail.app application
-
-USE_LANGUAGES= objc
-
-WRKSRC= ${WRKDIR}/GNUMail
-NO_CONFIGURE= yes
-MAKE_FILE= GNUmakefile
-
-post-extract:
- ${RM} -r ${WRKSRC}/*/*/CVS
-
-.include "../../mail/Pantomime/buildlink3.mk"
-.include "../../misc/Addresses/buildlink3.mk"
-.include "../../x11/gnustep-back/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/GNUMail/PLIST b/mail/GNUMail/PLIST
deleted file mode 100644
index 005bfdb47ba..00000000000
--- a/mail/GNUMail/PLIST
+++ /dev/null
@@ -1,175 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/25 04:50:01 rh Exp $
-share/GNUstep/Local/Applications/GNUMail.app/GNUMail
-share/GNUstep/Local/Applications/GNUMail.app/Resources/AddressBook_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/AddressManager_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/Address_bcc.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/Address_cc.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/Address_to.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/Czech.lproj/Localizable.strings
-share/GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/Localizable.strings
-share/GNUstep/Local/Applications/GNUMail.app/Resources/French.lproj/Localizable.strings
-share/GNUstep/Local/Applications/GNUMail.app/Resources/GNUMail.desktop
-share/GNUstep/Local/Applications/GNUMail.app/Resources/GNUMail.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/GNUMail_Full.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/GNUMail_big.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/German.lproj/Localizable.strings
-share/GNUstep/Local/Applications/GNUMail.app/Resources/Info-gnustep.plist
-share/GNUstep/Local/Applications/GNUMail.app/Resources/ScriptingInfo.plist
-share/GNUstep/Local/Applications/GNUMail.app/Resources/Spanish.lproj/Localizable.strings
-share/GNUstep/Local/Applications/GNUMail.app/Resources/Swedish.lproj/Localizable.strings
-share/GNUstep/Local/Applications/GNUMail.app/Resources/Welcome
-share/GNUstep/Local/Applications/GNUMail.app/Resources/add.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/add_bcc_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/add_bcc_48.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/add_cc_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/add_cc_48.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/addresses_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/addresses_48.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/anim-logo-1.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/anim-logo-2.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/anim-logo-3.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/anim-logo-4.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/anim-logo-5.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/anim-logo-6.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/anim-logo-7.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/anim-logo-8.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/answered-flag.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/attach_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/attach_48.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/closedFolder.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/common_Unknown.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/create_16.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/create_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/create_48.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/delete_16.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/delete_20.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/delete_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/delete_48.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/down.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/down_15.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/drag_mail.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/drag_mails.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/duplicate.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/edit.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/find_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/find_48.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/forward_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/forward_48.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/hand.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/mailbox_add_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/mailbox_copy_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/mailbox_move_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/mailbox_rename_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/mailboxes_16.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/mailboxes_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/mailboxes_48.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/mime-flag.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/new-flag.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/openFolder.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/pgp-mail-small.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/pgp-mail.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/raw_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/raw_48.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/remove_bcc_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/remove_bcc_48.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/remove_cc_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/remove_cc_48.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/reply_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/reply_48.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/retrieve_16.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/retrieve_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/retrieve_48.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/send_16.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/send_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/send_48.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/show_all_headers_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/show_all_headers_48.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/sort_down.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/sort_left.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/sort_right.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/sort_up.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/stop_32.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/stop_48.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/up.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/up_15.tiff
-share/GNUstep/Local/Applications/GNUMail.app/library_paths.openapp
-share/GNUstep/Local/Applications/GNUMail.app/stamp.make
-share/GNUstep/Local/Library/GNUMail/Account.prefs/Account
-share/GNUstep/Local/Library/GNUMail/Account.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/GNUMail/Account.prefs/Resources/account.tiff
-share/GNUstep/Local/Library/GNUMail/Account.prefs/stamp.make
-share/GNUstep/Local/Library/GNUMail/Advanced.prefs/Advanced
-share/GNUstep/Local/Library/GNUMail/Advanced.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/GNUMail/Advanced.prefs/Resources/advanced.tiff
-share/GNUstep/Local/Library/GNUMail/Advanced.prefs/stamp.make
-share/GNUstep/Local/Library/GNUMail/Colors.prefs/Colors
-share/GNUstep/Local/Library/GNUMail/Colors.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/GNUMail/Colors.prefs/Resources/colors.tiff
-share/GNUstep/Local/Library/GNUMail/Colors.prefs/stamp.make
-share/GNUstep/Local/Library/GNUMail/Compose.prefs/Compose
-share/GNUstep/Local/Library/GNUMail/Compose.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/GNUMail/Compose.prefs/Resources/MailIcon_create.tiff
-share/GNUstep/Local/Library/GNUMail/Compose.prefs/stamp.make
-share/GNUstep/Local/Library/GNUMail/Filtering.prefs/Filtering
-share/GNUstep/Local/Library/GNUMail/Filtering.prefs/Resources/Filtering.tiff
-share/GNUstep/Local/Library/GNUMail/Filtering.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/GNUMail/Filtering.prefs/stamp.make
-share/GNUstep/Local/Library/GNUMail/Fonts.prefs/Fonts
-share/GNUstep/Local/Library/GNUMail/Fonts.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/GNUMail/Fonts.prefs/Resources/fonts.tiff
-share/GNUstep/Local/Library/GNUMail/Fonts.prefs/stamp.make
-share/GNUstep/Local/Library/GNUMail/Import.bundle/Import
-share/GNUstep/Local/Library/GNUMail/Import.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/GNUMail/Import.bundle/stamp.make
-share/GNUstep/Local/Library/GNUMail/MIME.prefs/MIME
-share/GNUstep/Local/Library/GNUMail/MIME.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/GNUMail/MIME.prefs/Resources/mime.tiff
-share/GNUstep/Local/Library/GNUMail/MIME.prefs/stamp.make
-share/GNUstep/Local/Library/GNUMail/Receiving.prefs/Receiving
-share/GNUstep/Local/Library/GNUMail/Receiving.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/GNUMail/Receiving.prefs/Resources/MailIcon_retrieve.tiff
-share/GNUstep/Local/Library/GNUMail/Receiving.prefs/stamp.make
-share/GNUstep/Local/Library/GNUMail/Sending.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/GNUMail/Sending.prefs/Resources/MailIcon_send.tiff
-share/GNUstep/Local/Library/GNUMail/Sending.prefs/Sending
-share/GNUstep/Local/Library/GNUMail/Sending.prefs/stamp.make
-share/GNUstep/Local/Library/GNUMail/Viewing.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/GNUMail/Viewing.prefs/Resources/viewing.tiff
-share/GNUstep/Local/Library/GNUMail/Viewing.prefs/Viewing
-share/GNUstep/Local/Library/GNUMail/Viewing.prefs/stamp.make
-share/GNUstep/Local/Library/Libraries/libGNUMail.so
-share/GNUstep/Local/Library/Libraries/libGNUMail.so.0.0.1
-@comment in gnustep-make: @dirrm share/GNUstep/Local/Library/Libraries
-@dirrm share/GNUstep/Local/Library/GNUMail/Viewing.prefs/Resources
-@dirrm share/GNUstep/Local/Library/GNUMail/Viewing.prefs
-@dirrm share/GNUstep/Local/Library/GNUMail/Sending.prefs/Resources
-@dirrm share/GNUstep/Local/Library/GNUMail/Sending.prefs
-@dirrm share/GNUstep/Local/Library/GNUMail/Receiving.prefs/Resources
-@dirrm share/GNUstep/Local/Library/GNUMail/Receiving.prefs
-@dirrm share/GNUstep/Local/Library/GNUMail/MIME.prefs/Resources
-@dirrm share/GNUstep/Local/Library/GNUMail/MIME.prefs
-@dirrm share/GNUstep/Local/Library/GNUMail/Import.bundle/Resources
-@dirrm share/GNUstep/Local/Library/GNUMail/Import.bundle
-@dirrm share/GNUstep/Local/Library/GNUMail/Fonts.prefs/Resources
-@dirrm share/GNUstep/Local/Library/GNUMail/Fonts.prefs
-@dirrm share/GNUstep/Local/Library/GNUMail/Filtering.prefs/Resources
-@dirrm share/GNUstep/Local/Library/GNUMail/Filtering.prefs
-@dirrm share/GNUstep/Local/Library/GNUMail/Compose.prefs/Resources
-@dirrm share/GNUstep/Local/Library/GNUMail/Compose.prefs
-@dirrm share/GNUstep/Local/Library/GNUMail/Colors.prefs/Resources
-@dirrm share/GNUstep/Local/Library/GNUMail/Colors.prefs
-@dirrm share/GNUstep/Local/Library/GNUMail/Advanced.prefs/Resources
-@dirrm share/GNUstep/Local/Library/GNUMail/Advanced.prefs
-@dirrm share/GNUstep/Local/Library/GNUMail/Account.prefs/Resources
-@dirrm share/GNUstep/Local/Library/GNUMail/Account.prefs
-@dirrm share/GNUstep/Local/Library/GNUMail
-@comment in gnustep-make: @dirrm share/GNUstep/Local/Library
-@dirrm share/GNUstep/Local/Applications/GNUMail.app/Resources/Swedish.lproj
-@dirrm share/GNUstep/Local/Applications/GNUMail.app/Resources/Spanish.lproj
-@dirrm share/GNUstep/Local/Applications/GNUMail.app/Resources/German.lproj
-@dirrm share/GNUstep/Local/Applications/GNUMail.app/Resources/French.lproj
-@dirrm share/GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj
-@dirrm share/GNUstep/Local/Applications/GNUMail.app/Resources/Czech.lproj
-@dirrm share/GNUstep/Local/Applications/GNUMail.app/Resources
-@dirrm share/GNUstep/Local/Applications/GNUMail.app
-@comment in gnustep-make: @dirrm share/GNUstep/Local/Applications
diff --git a/mail/GNUMail/distinfo b/mail/GNUMail/distinfo
deleted file mode 100644
index 62fb6f07f49..00000000000
--- a/mail/GNUMail/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 09:59:20 agc Exp $
-
-SHA1 (GNUMail-1.1.2.tar.gz) = 311a53d724ea0aa4852b781aa909983242748b5c
-RMD160 (GNUMail-1.1.2.tar.gz) = 6e4af69d93ed2218eff044a83ba47d90173af1be
-Size (GNUMail-1.1.2.tar.gz) = 1078949 bytes
diff --git a/mail/Makefile b/mail/Makefile
deleted file mode 100644
index 41e926fd96b..00000000000
--- a/mail/Makefile
+++ /dev/null
@@ -1,242 +0,0 @@
-# $NetBSD: Makefile,v 1.308 2007/03/02 10:55:58 abs Exp $
-#
-
-COMMENT= Electronic mail utilities
-
-SUBDIR+= GNUMail
-SUBDIR+= Pantomime
-SUBDIR+= YoSucker
-SUBDIR+= anomy-sanitizer
-SUBDIR+= archivemail
-SUBDIR+= autorespond
-SUBDIR+= avenger
-SUBDIR+= balsa2
-SUBDIR+= bbmail
-SUBDIR+= bmf
-SUBDIR+= bogofilter
-SUBDIR+= bulk_mailer
-SUBDIR+= clamav
-SUBDIR+= clamsmtp
-SUBDIR+= columba
-SUBDIR+= coolmail
-SUBDIR+= courier-analog
-SUBDIR+= courier-imap
-SUBDIR+= courier-maildir
-SUBDIR+= courier-mta
-SUBDIR+= cucipop
-SUBDIR+= cue
-SUBDIR+= cyrus-imapd
-SUBDIR+= cyrus-imapd21
-SUBDIR+= dbmail
-SUBDIR+= deliver
-SUBDIR+= demime
-SUBDIR+= distribute
-SUBDIR+= dk-milter
-SUBDIR+= dkim-milter
-SUBDIR+= dot-forward
-SUBDIR+= dovecot
-SUBDIR+= drac
-SUBDIR+= dspam
-SUBDIR+= elm
-SUBDIR+= elm-me
-SUBDIR+= elmo
-SUBDIR+= esmtp
-SUBDIR+= etach
-SUBDIR+= etpan
-SUBDIR+= evolution
-SUBDIR+= evolution-data-server
-SUBDIR+= evolution-exchange
-SUBDIR+= exim
-SUBDIR+= exim-html
-SUBDIR+= exim3
-SUBDIR+= exmh
-SUBDIR+= ezmlm
-SUBDIR+= ezmlm-idx
-SUBDIR+= faces
-SUBDIR+= fastforward
-SUBDIR+= fetchmail
-SUBDIR+= fetchmailconf
-SUBDIR+= fetchyahoo
-SUBDIR+= fix-mime-charset
-SUBDIR+= fromto
-SUBDIR+= getmail
-SUBDIR+= gld
-SUBDIR+= gmime
-SUBDIR+= gnus
-SUBDIR+= gotmail
-SUBDIR+= greetdelay
-SUBDIR+= grepmail
-SUBDIR+= hypermail
-SUBDIR+= ifile
-SUBDIR+= ifile-procmail
-SUBDIR+= imap-uw
-SUBDIR+= imap-uw-utils
-SUBDIR+= imapfilter
-SUBDIR+= imapproxy
-SUBDIR+= imapsync
-SUBDIR+= imp
-SUBDIR+= incm
-SUBDIR+= ingo
-SUBDIR+= isync
-SUBDIR+= ja-mh
-SUBDIR+= ja-squirrelmail
-SUBDIR+= jchkmail
-SUBDIR+= kbiff
-SUBDIR+= libesmtp
-SUBDIR+= libetpan
-SUBDIR+= libmilter
-SUBDIR+= libspf-alt
-SUBDIR+= libsylph
-SUBDIR+= mail-notification
-SUBDIR+= mailagent
-SUBDIR+= mailcrypt
-SUBDIR+= maildrop
-SUBDIR+= mailfront
-SUBDIR+= mailgraph
-SUBDIR+= mailman
-SUBDIR+= mailscanner
-SUBDIR+= mailserv
-SUBDIR+= mailsync
-SUBDIR+= mailwrapper
-SUBDIR+= mairix
-SUBDIR+= majordomo
-SUBDIR+= mb2md
-SUBDIR+= mdfrm
-SUBDIR+= mess822
-SUBDIR+= metamail
-SUBDIR+= mew
-SUBDIR+= mhonarc
-SUBDIR+= milter-greylist
-SUBDIR+= milter-regex
-SUBDIR+= mimedefang
-SUBDIR+= mini_sendmail
-SUBDIR+= mpop
-SUBDIR+= msmtp
-SUBDIR+= mush
-SUBDIR+= mutt
-SUBDIR+= mutt-devel
-SUBDIR+= nail
-SUBDIR+= newmail
-SUBDIR+= newspipe
-SUBDIR+= nmh
-SUBDIR+= nullmailer
-SUBDIR+= oe2mbx
-SUBDIR+= offlineimap
-SUBDIR+= p5-Email-Abstract
-SUBDIR+= p5-Email-Simple
-SUBDIR+= p5-Email-Valid
-SUBDIR+= p5-GMail-IMAPD
-SUBDIR+= p5-IMAP-Admin
-SUBDIR+= p5-MIME-Lite
-SUBDIR+= p5-MIME-Lite-HTML
-SUBDIR+= p5-MIME-Types
-SUBDIR+= p5-MIME-tools
-SUBDIR+= p5-Mail-Audit
-SUBDIR+= p5-Mail-Box
-SUBDIR+= p5-Mail-ClamAV
-SUBDIR+= p5-Mail-DKIM
-SUBDIR+= p5-Mail-Ezmlm
-SUBDIR+= p5-Mail-IMAPClient
-SUBDIR+= p5-Mail-ListDetector
-SUBDIR+= p5-Mail-Mbox-MessageParser
-SUBDIR+= p5-Mail-Milter
-SUBDIR+= p5-Mail-SPF-Query
-SUBDIR+= p5-Mail-SRS
-SUBDIR+= p5-Mail-Sender
-SUBDIR+= p5-Mail-Sender-Easy
-SUBDIR+= p5-Mail-Sendmail
-SUBDIR+= p5-Mail-Webmail-Gmail
-SUBDIR+= p5-MailTools
-SUBDIR+= p5-Net-LMTP
-SUBDIR+= p5-Net-SMTP_auth
-SUBDIR+= p5-Sendmail-AccessDB
-SUBDIR+= p5-Sendmail-PMilter
-SUBDIR+= p5-User-Identity
-SUBDIR+= p5-razor-agents
-SUBDIR+= pear-Mail
-SUBDIR+= pear-Mail_Mime
-SUBDIR+= perdition
-SUBDIR+= perdition-bdb
-SUBDIR+= perdition-gdbm
-SUBDIR+= perdition-ldap
-SUBDIR+= perdition-mysql
-SUBDIR+= perdition-odbc
-SUBDIR+= perdition-postgresql
-SUBDIR+= pfqueue
-SUBDIR+= php-imap
-SUBDIR+= pine
-SUBDIR+= pine-pgp-filters
-SUBDIR+= popa3d
-SUBDIR+= poppassd
-SUBDIR+= poppy
-SUBDIR+= postfix
-SUBDIR+= postfix-current
-SUBDIR+= postgrey
-SUBDIR+= prayer
-SUBDIR+= procmail
-SUBDIR+= proxsmtp
-SUBDIR+= pulsar
-SUBDIR+= pymsgauth
-SUBDIR+= qcheck
-SUBDIR+= qgreylist
-SUBDIR+= qmHandle
-SUBDIR+= qmail
-SUBDIR+= qmail-conf
-SUBDIR+= qmail-lint
-SUBDIR+= qmail-qfilter
-SUBDIR+= qmail-run
-SUBDIR+= qmailanalog
-SUBDIR+= qmqtool
-SUBDIR+= qpopper
-SUBDIR+= qtools
-SUBDIR+= queue-fix
-SUBDIR+= queue-repair
-SUBDIR+= rblcheck
-SUBDIR+= relay-ctrl
-SUBDIR+= ripmime
-SUBDIR+= rmail-mime
-SUBDIR+= rss2email
-SUBDIR+= ruby-actionmailer
-SUBDIR+= ruby-tmail
-SUBDIR+= safecat
-SUBDIR+= sendmail
-SUBDIR+= sendmail812
-SUBDIR+= sendymail
-SUBDIR+= serialmail
-SUBDIR+= sigrot
-SUBDIR+= sma
-SUBDIR+= smtpfeed
-SUBDIR+= solid-pop3d
-SUBDIR+= spamass-milter
-SUBDIR+= spamassassin
-SUBDIR+= spamd
-SUBDIR+= spamprobe
-SUBDIR+= squirrelmail
-SUBDIR+= squirrelmail-decode
-SUBDIR+= squirrelmail-locales
-SUBDIR+= sqwebmail
-SUBDIR+= ssmtp
-SUBDIR+= sylpheed
-SUBDIR+= sylpheed-claws
-SUBDIR+= sylpheed-devel
-SUBDIR+= sympa
-SUBDIR+= teapop
-SUBDIR+= thunderbird
-SUBDIR+= thunderbird-bin-nightly
-SUBDIR+= thunderbird-gtk1
-SUBDIR+= tmda
-SUBDIR+= tnef
-SUBDIR+= tnef2txt
-SUBDIR+= turba
-SUBDIR+= up-imapproxy
-SUBDIR+= vm
-SUBDIR+= wl
-SUBDIR+= wmbiff
-SUBDIR+= wmmail
-SUBDIR+= xbuffy
-SUBDIR+= xfmail
-SUBDIR+= xmailbox
-SUBDIR+= xmailwatcher
-SUBDIR+= yatsvrs
-
-.include "../mk/bsd.pkg.subdir.mk"
diff --git a/mail/Pantomime/DESCR b/mail/Pantomime/DESCR
deleted file mode 100644
index 887f8275f15..00000000000
--- a/mail/Pantomime/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
- Pantomime provides a set of Objective-C classes that model a mail system.
-Pantomime can be seen as a JavaMail 1.2 clone written in Objective-C.
-Pantomime is almost entirely written in Objective-C. The C language is
-only used where performance is critical. Pantomime uses a little bit of
-ELM code.
-
- Pantomime provides the following features:
-
- * A full MIME encoder and decoder
- * A 'folder view' to local mailboxes (Berkeley Format), POP3 accounts
- or IMAP mailboxes
- * A powerful API to work on all aspects of Message objects
- * A local mailer and a SMTP conduit for sending messages
- * APOP and SMTP AUTH support
- * IMAP and POP3 URL Scheme support
- * iconv and Core Foundation support
- * SSL support for IMAP and POP3
- * and more!
diff --git a/mail/Pantomime/Makefile b/mail/Pantomime/Makefile
deleted file mode 100644
index d81603b3532..00000000000
--- a/mail/Pantomime/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2006/09/22 07:08:16 rillig Exp $
-#
-
-DISTNAME= Pantomime-1.1.2
-PKGREVISION= 3
-CATEGORIES= mail gnustep
-MASTER_SITES= http://debian.uni-essen.de/misc/GNUstep/Apps/GNUMail/
-
-MAINTAINER= rh@NetBSD.org
-HOMEPAGE= http://www.collaboration-world.com/pantomime/
-COMMENT= Objective-C mail system class library
-
-USE_LANGUAGES= objc
-
-WRKSRC= ${WRKDIR}/Pantomime
-NO_CONFIGURE= yes
-MAKE_ENV+= ADDITIONAL_CPPFLAGS=-DMKDIR
-MAKE_FILE= GNUmakefile
-
-.include "../../devel/gnustep-base/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/Pantomime/PLIST b/mail/Pantomime/PLIST
deleted file mode 100644
index b62ad6ab908..00000000000
--- a/mail/Pantomime/PLIST
+++ /dev/null
@@ -1,68 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/12/05 11:25:58 adam Exp $
-share/GNUstep/Local/Library/Headers/Pantomime/Charset.h
-share/GNUstep/Local/Library/Headers/Pantomime/Connection.h
-share/GNUstep/Local/Library/Headers/Pantomime/Constants.h
-share/GNUstep/Local/Library/Headers/Pantomime/Container.h
-share/GNUstep/Local/Library/Headers/Pantomime/Flags.h
-share/GNUstep/Local/Library/Headers/Pantomime/Folder.h
-share/GNUstep/Local/Library/Headers/Pantomime/FolderInformation.h
-share/GNUstep/Local/Library/Headers/Pantomime/IMAPCacheManager.h
-share/GNUstep/Local/Library/Headers/Pantomime/IMAPFolder.h
-share/GNUstep/Local/Library/Headers/Pantomime/IMAPMessage.h
-share/GNUstep/Local/Library/Headers/Pantomime/IMAPStore.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_1.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_10.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_11.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_13.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_14.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_15.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_2.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_3.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_4.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_5.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_6.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_7.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_8.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_9.h
-share/GNUstep/Local/Library/Headers/Pantomime/InternetAddress.h
-share/GNUstep/Local/Library/Headers/Pantomime/KOI8_R.h
-share/GNUstep/Local/Library/Headers/Pantomime/KOI8_U.h
-share/GNUstep/Local/Library/Headers/Pantomime/LocalFolder.h
-share/GNUstep/Local/Library/Headers/Pantomime/LocalFolderCacheManager.h
-share/GNUstep/Local/Library/Headers/Pantomime/LocalMessage.h
-share/GNUstep/Local/Library/Headers/Pantomime/LocalStore.h
-share/GNUstep/Local/Library/Headers/Pantomime/MD5.h
-share/GNUstep/Local/Library/Headers/Pantomime/Message.h
-share/GNUstep/Local/Library/Headers/Pantomime/MimeMultipart.h
-share/GNUstep/Local/Library/Headers/Pantomime/MimeUtility.h
-share/GNUstep/Local/Library/Headers/Pantomime/NSData+Extensions.h
-share/GNUstep/Local/Library/Headers/Pantomime/NSRegEx.h
-share/GNUstep/Local/Library/Headers/Pantomime/NSString+Extensions.h
-share/GNUstep/Local/Library/Headers/Pantomime/POP3CacheManager.h
-share/GNUstep/Local/Library/Headers/Pantomime/POP3CacheObject.h
-share/GNUstep/Local/Library/Headers/Pantomime/POP3Folder.h
-share/GNUstep/Local/Library/Headers/Pantomime/POP3Message.h
-share/GNUstep/Local/Library/Headers/Pantomime/POP3Store.h
-share/GNUstep/Local/Library/Headers/Pantomime/Pantomime.h
-share/GNUstep/Local/Library/Headers/Pantomime/Parser.h
-share/GNUstep/Local/Library/Headers/Pantomime/Part.h
-share/GNUstep/Local/Library/Headers/Pantomime/SMTP.h
-share/GNUstep/Local/Library/Headers/Pantomime/Sendmail.h
-share/GNUstep/Local/Library/Headers/Pantomime/Service.h
-share/GNUstep/Local/Library/Headers/Pantomime/Store.h
-share/GNUstep/Local/Library/Headers/Pantomime/TCPConnection.h
-share/GNUstep/Local/Library/Headers/Pantomime/Transport.h
-share/GNUstep/Local/Library/Headers/Pantomime/URLName.h
-share/GNUstep/Local/Library/Headers/Pantomime/UTF8.h
-share/GNUstep/Local/Library/Headers/Pantomime/UUFile.h
-share/GNUstep/Local/Library/Headers/Pantomime/WINDOWS_1250.h
-share/GNUstep/Local/Library/Headers/Pantomime/WINDOWS_1251.h
-share/GNUstep/Local/Library/Headers/Pantomime/WINDOWS_1252.h
-share/GNUstep/Local/Library/Headers/Pantomime/WINDOWS_1253.h
-share/GNUstep/Local/Library/Headers/Pantomime/WINDOWS_1254.h
-share/GNUstep/Local/Library/Headers/Pantomime/elm_defs.h
-share/GNUstep/Local/Library/Headers/Pantomime/elm_lib.h
-share/GNUstep/Local/Library/Headers/Pantomime/parseaddrs.h
-share/GNUstep/Local/Library/Libraries/libPantomime.so
-share/GNUstep/Local/Library/Libraries/libPantomime.so.1.1.0
-@dirrm share/GNUstep/Local/Library/Headers/Pantomime
diff --git a/mail/Pantomime/buildlink3.mk b/mail/Pantomime/buildlink3.mk
deleted file mode 100644
index 907b3e47975..00000000000
--- a/mail/Pantomime/buildlink3.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:56 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PANTOMIME_BUILDLINK3_MK:= ${PANTOMIME_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= Pantomime
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NPantomime}
-BUILDLINK_PACKAGES+= Pantomime
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Pantomime
-
-.if !empty(PANTOMIME_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.Pantomime+= Pantomime>=1.1.2
-BUILDLINK_ABI_DEPENDS.Pantomime+= Pantomime>=1.1.2nb3
-BUILDLINK_PKGSRCDIR.Pantomime?= ../../mail/Pantomime
-
-.include "../../devel/gnustep-make/gnustep.mk"
-
-BUILDLINK_INCDIRS.Pantomime+= ${GNUSTEP_LOCAL_ROOT:Q}/${GNUSTEP_IDIR:Q}/Pantomime
-
-.endif # PANTOMIME_BUILDLINK3_MK
-
-.include "../../devel/gnustep-base/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/Pantomime/distinfo b/mail/Pantomime/distinfo
deleted file mode 100644
index 53b12e434e7..00000000000
--- a/mail/Pantomime/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/01/20 03:24:10 joerg Exp $
-
-SHA1 (Pantomime-1.1.2.tar.gz) = 06755835a74ff3686eca35ba5169722f17cf968e
-RMD160 (Pantomime-1.1.2.tar.gz) = 2d6a3bf2c5e1cd146ba3f72ac69970ed6b5ee999
-Size (Pantomime-1.1.2.tar.gz) = 394509 bytes
-SHA1 (patch-aa) = ef93a034eb706006ae9c7f0b6f393d8117656129
diff --git a/mail/Pantomime/patches/patch-aa b/mail/Pantomime/patches/patch-aa
deleted file mode 100644
index 67c24875b7c..00000000000
--- a/mail/Pantomime/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/01/20 03:24:10 joerg Exp $
-
---- Headers/Pantomime/elm_lib.h.orig 2006-01-20 03:19:01.000000000 +0000
-+++ Headers/Pantomime/elm_lib.h
-@@ -69,8 +69,8 @@ int elm_access P_((const char *, int));
-
-
- /* errno.c */
-+#include <errno.h>
-
--extern int errno;
- #ifndef STRERROR
- char *strerror P_((int));
- #endif
diff --git a/mail/YoSucker/DESCR b/mail/YoSucker/DESCR
deleted file mode 100644
index c2afeb97c89..00000000000
--- a/mail/YoSucker/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-YoSucker is a simple portable Perl application, that simulates user
-actions to retrieve mail from Yahoo Mail to a local inbox. It simply
-connects to the Yahoo Mail web site, parses the HTML code and
-fetches new messages.
diff --git a/mail/YoSucker/MESSAGE b/mail/YoSucker/MESSAGE
deleted file mode 100644
index 3e766399959..00000000000
--- a/mail/YoSucker/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/08/15 11:18:46 wiz Exp $
-
- To use YoSucker, copy the file header-translation and a
- sample config file from ${PREFIX}/share/examples/YoSucker
- to ~/.yosucker and edit the config file.
-
-===========================================================================
diff --git a/mail/YoSucker/Makefile b/mail/YoSucker/Makefile
deleted file mode 100644
index b7a7780c8f9..00000000000
--- a/mail/YoSucker/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:29:57 jlam Exp $
-#
-
-DISTNAME= YoSucker-pr37
-PKGNAME= ${DISTNAME:S/pr//}
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=yosucker/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://yosucker.sourceforge.net/
-COMMENT= Download mails from Yahoo webmail into mbox
-
-DEPENDS+= p5-Term-ReadKey-[0-9]*:../../devel/p5-Term-ReadKey
-DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
-DEPENDS+= p5-IO-Socket-SSL-[0-9]*:../../security/p5-IO-Socket-SSL
-DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
-
-USE_TOOLS+= perl:run
-REPLACE_PERL= bin/EncProxyPasswd bin/EncPasswd bin/YoSucker
-
-NO_BUILD= yes
-
-EGDIR= ${PREFIX}/share/examples/YoSucker
-DOCDIR= ${PREFIX}/share/doc/YoSucker
-INSTALLATION_DIRS= bin lib
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/lib
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/conf/* ${EGDIR}
- ${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/YoSucker/PLIST b/mail/YoSucker/PLIST
deleted file mode 100644
index 350a9721d1d..00000000000
--- a/mail/YoSucker/PLIST
+++ /dev/null
@@ -1,22 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/08/15 11:18:46 wiz Exp $
-bin/EncPasswd
-bin/EncProxyPasswd
-bin/YoSucker
-lib/haiku.pm
-lib/sputnik.pm
-share/doc/YoSucker/ChangeLog
-share/doc/YoSucker/Configuration
-share/doc/YoSucker/Credits
-share/doc/YoSucker/FAQ
-share/doc/YoSucker/FastCheck
-share/doc/YoSucker/Migration
-share/doc/YoSucker/TODO
-share/doc/YoSucker/Tuning
-share/examples/YoSucker/README
-share/examples/YoSucker/header-translation
-share/examples/YoSucker/sample1.conf
-share/examples/YoSucker/sample2.conf
-share/examples/YoSucker/sample3-procmail.conf
-share/examples/YoSucker/sample4-proxy.conf
-@dirrm share/examples/YoSucker
-@dirrm share/doc/YoSucker
diff --git a/mail/YoSucker/distinfo b/mail/YoSucker/distinfo
deleted file mode 100644
index 38836073214..00000000000
--- a/mail/YoSucker/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:20 agc Exp $
-
-SHA1 (YoSucker-pr37.tar.gz) = df2fa3a7272f79a4a152dcc20650e30fb7178ef8
-RMD160 (YoSucker-pr37.tar.gz) = b5b8280f67a686d0305e45b19528ced14a75f3c6
-Size (YoSucker-pr37.tar.gz) = 35226 bytes
diff --git a/mail/anomy-sanitizer/DESCR b/mail/anomy-sanitizer/DESCR
deleted file mode 100644
index 6fbf26a9e8d..00000000000
--- a/mail/anomy-sanitizer/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Anomy Sanitizer filters mail messages checking for common exploits and
-hostile file attachments. For instance: it can remove attachments,
-rename unknown file types, "defang" HTML messages, fix MIME headers,
-and call external virus scanners to scan email attachments.
diff --git a/mail/anomy-sanitizer/Makefile b/mail/anomy-sanitizer/Makefile
deleted file mode 100644
index cb26f491a9d..00000000000
--- a/mail/anomy-sanitizer/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2006/12/21 19:33:28 rillig Exp $
-#
-
-DISTNAME= anomy-sanitizer-1.76
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= http://mailtools.anomy.net/dist/
-
-MAINTAINER= kim@tac.nyc.ny.us
-HOMEPAGE= http://mailtools.anomy.net/
-COMMENT= Mail message filter and sanitizer
-
-DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
-DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-.include "../../mk/bsd.prefs.mk"
-
-WRKSRC= ${WRKDIR}/anomy
-USE_TOOLS+= perl:run
-
-REPLACE_PERL+= bin/*.pl
-CHECK_INTERPRETER_SKIP+= *.pm
-
-ANOMYLIB= ${PREFIX}/lib/anomy-sanitizer
-ANOMYDOC= ${PREFIX}/share/doc/anomy-sanitizer
-
-INSTALLATION_DIRS= sbin
-
-post-extract:
- chmod -R u+w,go-w,a+r ${WRKSRC}
- cd ${WRKSRC}/bin/Anomy && chmod -x *.pm */*.pm
-
-do-build:
- set -e; \
- cd ${WRKSRC}; \
- for i in mailblogger sanitizer simplify; do \
- ( \
- ${ECHO} '#!${SH}'; \
- ${ECHO} 'ANOMY=${ANOMYLIB}'; \
- ${ECHO} 'export ANOMY'; \
- ${ECHO} 'exec $${ANOMY}/bin/'"$$i"'.pl "$$@"'; \
- ) > "$$i"; \
- done; \
- [ -d contrib/.tmp ] && rmdir contrib/.tmp
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/sanitizer ${PREFIX}/sbin
- ${INSTALL_SCRIPT} ${WRKSRC}/simplify ${PREFIX}/sbin
- ${INSTALL_DATA_DIR} ${ANOMYDOC}
- cd ${WRKSRC} && pax -rw -s',.*\.orig$$,,' -s',^\..*$$,,' \
- CHANGELOG.sanitizer \
- CREDITS \
- README.sanitizer \
- UNICODE.TXT \
- contrib \
- sanitizer.html \
- ${ANOMYDOC}
- chown -R ${SHAREOWN}:${SHAREGRP} ${ANOMYDOC}
- ${INSTALL_DATA_DIR} ${ANOMYLIB}
- ${INSTALL_DATA_DIR} ${ANOMYLIB}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/mailblogger.pl ${ANOMYLIB}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/sanitizer.pl ${ANOMYLIB}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/simplify.pl ${ANOMYLIB}/bin
- cd ${WRKSRC}/bin && pax -rw -s',.*\.orig$$,,' Anomy ${ANOMYLIB}/bin
- chown -R ${LIBOWN}:${LIBGRP} ${ANOMYLIB}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/anomy-sanitizer/PLIST b/mail/anomy-sanitizer/PLIST
deleted file mode 100644
index 8e63494d937..00000000000
--- a/mail/anomy-sanitizer/PLIST
+++ /dev/null
@@ -1,33 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2006/02/01 00:57:39 kim Exp $
-lib/anomy-sanitizer/bin/Anomy/HTMLCleaner.pm
-lib/anomy-sanitizer/bin/Anomy/Log.pm
-lib/anomy-sanitizer/bin/Anomy/MIMEStream.pm
-lib/anomy-sanitizer/bin/Anomy/Sanitizer.pm
-lib/anomy-sanitizer/bin/Anomy/Sanitizer/FProt.pm
-lib/anomy-sanitizer/bin/Anomy/Sanitizer/FileTypes.pm
-lib/anomy-sanitizer/bin/Anomy/Sanitizer/MacroScanner.pm
-lib/anomy-sanitizer/bin/Anomy/Sanitizer/Scoring.pm
-lib/anomy-sanitizer/bin/mailblogger.pl
-lib/anomy-sanitizer/bin/sanitizer.pl
-lib/anomy-sanitizer/bin/simplify.pl
-@dirrm lib/anomy-sanitizer/bin/Anomy/Sanitizer
-@dirrm lib/anomy-sanitizer/bin/Anomy
-@dirrm lib/anomy-sanitizer/bin
-@dirrm lib/anomy-sanitizer
-sbin/sanitizer
-sbin/simplify
-share/doc/anomy-sanitizer/CHANGELOG.sanitizer
-share/doc/anomy-sanitizer/CREDITS
-share/doc/anomy-sanitizer/README.sanitizer
-share/doc/anomy-sanitizer/UNICODE.TXT
-share/doc/anomy-sanitizer/contrib/anomy.m4
-share/doc/anomy-sanitizer/contrib/check_for_virus
-share/doc/anomy-sanitizer/contrib/postfix.txt
-share/doc/anomy-sanitizer/contrib/sanitizer.procmail
-share/doc/anomy-sanitizer/contrib/sendmail-m4.txt
-share/doc/anomy-sanitizer/contrib/tnef2multipart.pl
-share/doc/anomy-sanitizer/contrib/zip_policy.pl
-share/doc/anomy-sanitizer/contrib/zip_script
-share/doc/anomy-sanitizer/sanitizer.html
-@dirrm share/doc/anomy-sanitizer/contrib
-@dirrm share/doc/anomy-sanitizer
diff --git a/mail/anomy-sanitizer/distinfo b/mail/anomy-sanitizer/distinfo
deleted file mode 100644
index 8e0faa4bd2a..00000000000
--- a/mail/anomy-sanitizer/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.10 2006/02/01 00:57:39 kim Exp $
-
-SHA1 (anomy-sanitizer-1.76.tar.gz) = 621f7ce20876d8d5f8c3d756f8756a66dcbf7950
-RMD160 (anomy-sanitizer-1.76.tar.gz) = 30c005dd475442e655aaaf7c0021cf1d54107d1b
-Size (anomy-sanitizer-1.76.tar.gz) = 172722 bytes
diff --git a/mail/archivemail/DESCR b/mail/archivemail/DESCR
deleted file mode 100644
index 5cf2299f5dd..00000000000
--- a/mail/archivemail/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-archivemail is a tool written in Python for archiving and compressing
-old email in mailboxes. It can move messages older than the specified
-number of days to a separate mbox format mailbox that is compressed
-with gzip, or optionally just delete old email.
diff --git a/mail/archivemail/Makefile b/mail/archivemail/Makefile
deleted file mode 100644
index 8adc2154270..00000000000
--- a/mail/archivemail/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2006/11/14 13:50:42 joerg Exp $
-#
-
-DISTNAME= archivemail-0.6.1
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=archivemail/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://archivemail.sourceforge.net/
-COMMENT= Tool for archiving and compressing old email in mailboxes
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-PYDISTUTILSPKG= yes
-
-INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/archivemail
-
-post-install:
- cd ${WRKSRC} && ${INSTALL_DATA} \
- CHANGELOG FAQ MANIFEST PKG-INFO README TODO \
- ${DESTDIR}${PREFIX}/share/archivemail
- ${INSTALL_MAN} ${WRKSRC}/archivemail.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../lang/python/extension.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/archivemail/PLIST b/mail/archivemail/PLIST
deleted file mode 100644
index b697a13a4f4..00000000000
--- a/mail/archivemail/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/30 19:12:13 hubertf Exp $
-bin/archivemail
-man/man1/archivemail.1
-share/archivemail/CHANGELOG
-share/archivemail/FAQ
-share/archivemail/MANIFEST
-share/archivemail/PKG-INFO
-share/archivemail/README
-share/archivemail/TODO
-@dirrm share/archivemail
diff --git a/mail/archivemail/distinfo b/mail/archivemail/distinfo
deleted file mode 100644
index 01154ed9037..00000000000
--- a/mail/archivemail/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:20 agc Exp $
-
-SHA1 (archivemail-0.6.1.tar.gz) = bc39a4192cf6dc375ce6274527a88a88563a3820
-RMD160 (archivemail-0.6.1.tar.gz) = a2ac69e628753bd88041c03550860b3300887c82
-Size (archivemail-0.6.1.tar.gz) = 34874 bytes
-SHA1 (patch-aa) = 168e9c7a0aa65c55b7ff7d995612b1c9ce7f652b
diff --git a/mail/archivemail/patches/patch-aa b/mail/archivemail/patches/patch-aa
deleted file mode 100644
index 4a1eaba1122..00000000000
--- a/mail/archivemail/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/06/30 19:16:07 hubertf Exp $
-
---- archivemail.orig Wed Mar 17 01:31:23 2004
-+++ archivemail Wed Mar 17 01:46:48 2004
-@@ -757,7 +757,7 @@
-
- # files in the maildir 'cur' directory are no longer new,
- # they are the same as messages with 'Status: O' headers in mbox
-- (None, last_dir) = os.path.split(os.path.dirname(message.fp.name))
-+ (foo, last_dir) = os.path.split(os.path.dirname(message.fp.name))
- if last_dir == "cur":
- status = status + "O"
diff --git a/mail/autorespond/DESCR b/mail/autorespond/DESCR
deleted file mode 100644
index 75628e0997a..00000000000
--- a/mail/autorespond/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-This is a simple autoresponder for qmail.
-
-Mail is sent to help@my-company.com. An automatically generated response
-is sent back to the user with an address of "help@my-company.com". You
-can set the envelope sender to an empty string. However, some programs
-will parse the message for the "From:" field and send an autoresponse
-back to it. It is received at your autoresponder, and you now have a mail
-loop.
-
-This autoresponder also catches some other simple situations such as mail
-from a mailer-daemon, empty envelope sender, bulk precedence headers, etc.
diff --git a/mail/autorespond/Makefile b/mail/autorespond/Makefile
deleted file mode 100644
index 1a1b09062a9..00000000000
--- a/mail/autorespond/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:57 rillig Exp $
-#
-
-DISTNAME= autorespond-2.0.5
-CATEGORIES= mail
-MASTER_SITES= ${HOMEPAGE}
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://www.inter7.com/devel/
-COMMENT= Simple autoresponder add-on package for qmail
-
-DEPENDS+= qmail>=1.03:../../mail/qmail
-
-
-SUBST_CLASSES+= qmaildir
-SUBST_STAGE.qmaildir= do-configure
-SUBST_FILES.qmaildir= autorespond.c
-SUBST_SED.qmaildir= -e 's|/var/qmail|${QMAILDIR}|g'
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/autorespond ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/autorespond.1 ${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/autorespond
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/autorespond
- ${INSTALL_DATA} ${WRKSRC}/qmail-auto ${PREFIX}/share/doc/autorespond
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/autorespond/PLIST b/mail/autorespond/PLIST
deleted file mode 100644
index 9e92618ab20..00000000000
--- a/mail/autorespond/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/07/21 23:42:04 schmonz Exp $
-bin/autorespond
-man/man1/autorespond.1
-share/doc/autorespond/README
-share/doc/autorespond/qmail-auto
-@dirrm share/doc/autorespond
diff --git a/mail/autorespond/distinfo b/mail/autorespond/distinfo
deleted file mode 100644
index 45cd9340e16..00000000000
--- a/mail/autorespond/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/02/19 00:00:22 wiz Exp $
-
-SHA1 (autorespond-2.0.5.tar.gz) = 9bdd160e93e886932b7679e915d72dca90d8de6a
-RMD160 (autorespond-2.0.5.tar.gz) = c86f56d02ac1f609605a4349a59b4293eff2ca15
-Size (autorespond-2.0.5.tar.gz) = 9707 bytes
-SHA1 (patch-aa) = 66fe261b019a44f1a0521a54765a1636860810e6
diff --git a/mail/autorespond/patches/patch-aa b/mail/autorespond/patches/patch-aa
deleted file mode 100644
index 8c1b83684bf..00000000000
--- a/mail/autorespond/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/02/19 00:00:22 wiz Exp $
-
---- autorespond.c.orig 2003-09-18 20:17:57.000000000 +0000
-+++ autorespond.c
-@@ -376,7 +376,7 @@ void read_headers( FILE *fp )
- /*********************************************************
- ** find string in string - ignore case **/
-
--char *strcasestr( char *_s1, char *_s2 )
-+char *mystrcasestr( char *_s1, char *_s2 )
- {
- char *s1;
- char *s2;
-@@ -419,7 +419,7 @@ char *inspect_headers( char * tag, char
- if ( ss == (char *)NULL )
- return act_header->content;
-
-- if ( strcasestr( act_header->content, ss ) != (char *)NULL )
-+ if ( mystrcasestr( act_header->content, ss ) != (char *)NULL )
- return act_header->content;
-
- return (char *)NULL;
-@@ -440,7 +440,7 @@ char *get_content_boundary()
- if ( (s = inspect_headers( "Content-Type", (char *)NULL )) == (char *)NULL)
- return (char *)NULL;
-
-- if ( (r = strcasestr( s, "boundary=" )) == (char *)NULL)
-+ if ( (r = mystrcasestr( s, "boundary=" )) == (char *)NULL)
- return (char *)NULL;
-
- *(r+strlen(r)-2) = '\0'; /* delete quote at the end */
diff --git a/mail/avenger/DESCR b/mail/avenger/DESCR
deleted file mode 100644
index cf879c0f3db..00000000000
--- a/mail/avenger/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Mail Avenger is a highly-configurable, MTA-independent SMTP server
-daemon. It lets users run messages through filters like ClamAV and
-SpamAssassin during SMTP transactions, so the server can reject mail
-before assuming responsibility for its delivery. Other unique features
-include TCP SYN fingerprint and network route recording, verification of
-sender addresses through SMTP callbacks, SPF (sender policy framework)
-as a general policy language, qmail-style control over both SMTP-level
-behavior and local delivery of extension addresses, mail-bomb
-protection, integration with kernel firewalls, and more.
diff --git a/mail/avenger/Makefile b/mail/avenger/Makefile
deleted file mode 100644
index 7a420d4f0d4..00000000000
--- a/mail/avenger/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/10/25 14:05:31 rillig Exp $
-#
-
-DISTNAME= avenger-0.7.7
-CATEGORIES= mail
-MASTER_SITES= http://www.mailavenger.org/dist/
-
-MAINTAINER= rillig@NetBSD.org
-HOMEPAGE= http://www.mailavenger.org/dist/
-COMMENT= SMTP server with filtering capabilities
-
-PKG_SYSCONFSUBDIR= avenger
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-db=${BUILDLINK_PREFIX.db4}
-CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR}
-USE_LIBTOOL= yes
-USE_LANGUAGES= c c++
-USE_TOOLS+= perl
-
-.include "options.mk"
-
-.include "../../databases/db4/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/avenger/PLIST b/mail/avenger/PLIST
deleted file mode 100644
index 3c64d942608..00000000000
--- a/mail/avenger/PLIST
+++ /dev/null
@@ -1,40 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/10/25 14:05:31 rillig Exp $
-bin/aliascheck
-bin/dbutil
-bin/deliver
-bin/dotlock
-bin/edinplace
-bin/escape
-bin/macutil
-bin/mailexec
-bin/match
-bin/sendmac
-bin/smtpdcheck
-bin/synos
-libexec/avenger
-libexec/avenger.local
-man/man1/aliascheck.1
-man/man1/avenger.1
-man/man1/dbutil.1
-man/man1/deliver.1
-man/man1/dotlock.1
-man/man1/edinplace.1
-man/man1/escape.1
-man/man1/macutil.1
-man/man1/mailexec.1
-man/man1/match.1
-man/man1/smtpdcheck.1
-man/man1/synos.1
-man/man5/asmtpd.conf.5
-man/man8/asmtpd.8
-man/man8/avenger.local.8
-sbin/asmtpd
-share/avenger/INSTALL
-share/avenger/INSTALL.html
-share/avenger/asmtpd.conf
-share/avenger/avsendmail.m4
-share/avenger/smtp-filter.iptables
-share/avenger/smtp-filter.pf
-share/avenger/unknown
-share/pf.os
-@dirrm share/avenger
diff --git a/mail/avenger/distinfo b/mail/avenger/distinfo
deleted file mode 100644
index 71ef4af3030..00000000000
--- a/mail/avenger/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/10/25 14:05:31 rillig Exp $
-
-SHA1 (avenger-0.7.7.tar.gz) = 2ba44c82be8b78cf31758a25a79c8366ee6626b8
-RMD160 (avenger-0.7.7.tar.gz) = f01eebb2f41224e8e8ad655ca15afa2d1ee06ce2
-Size (avenger-0.7.7.tar.gz) = 824862 bytes
-SHA1 (patch-aa) = 7df2d9ac15feaf69bbc93e33de59ca25891c4223
diff --git a/mail/avenger/options.mk b/mail/avenger/options.mk
deleted file mode 100644
index 892967bbe92..00000000000
--- a/mail/avenger/options.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/10/25 14:05:31 rillig Exp $
-#
-
-PKG_SUPPORTED_OPTIONS= sasl
-PKG_SUGGESTED_OPTIONS= # none
-PKG_OPTIONS_VAR= PKG_OPTIONS.avenger
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Msasl)
-.include "../../security/cyrus-sasl/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-sasl
-.else
-CONFIGURE_ARGS+= --disable-sasl
-.endif
diff --git a/mail/avenger/patches/patch-aa b/mail/avenger/patches/patch-aa
deleted file mode 100644
index 0e8aad63f8f..00000000000
--- a/mail/avenger/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/10/25 14:05:31 rillig Exp $
-
---- configure.orig 2006-10-23 13:49:50.000000000 +0200
-+++ configure 2006-10-23 13:57:09.000000000 +0200
-@@ -27069,9 +27069,10 @@ test -z "${with_db+set}" && with_db=yes
-
- echo "$as_me:$LINENO: checking for BerkeleyDB library" >&5
- echo $ECHO_N "checking for BerkeleyDB library... $ECHO_C" >&6
--if test "$DB_DIR" -a "$with_db" = yes; then
-- CPPFLAGS="$CPPFLAGS "'-I$(top_builddir)/'"$DB_DIR/dist"
-- DB_LIB='$(top_builddir)/'"$DB_DIR/dist/.libs/libdb-*.a"
-+if true; then
-+ # let's cheat a bit -- the detection is much too complicated.
-+ DB_DIR="${prefix}"
-+ DB_LIB="-ldb4"
- echo "$as_me:$LINENO: result: using distribution in $DB_DIR subdirectory" >&5
- echo "${ECHO_T}using distribution in $DB_DIR subdirectory" >&6
- elif test x"$with_db" != xno; then
diff --git a/mail/balsa2/DESCR b/mail/balsa2/DESCR
deleted file mode 100644
index 1145d85b9ee..00000000000
--- a/mail/balsa2/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
- Balsa is an e-mail reader. This client is part of the GNOME2 desktop
-environment. It supports local mailboxes, POP3 and IMAP. It supports:
-
- * Local mailboxes (mbox, maildir, mh)
- * POP3
- * IMAP
- * MIME (in progress)
- * many other things that I can't think of right now! :-)
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
deleted file mode 100644
index 3e6331d8c86..00000000000
--- a/mail/balsa2/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-# $NetBSD: Makefile,v 1.59 2007/03/21 12:05:47 wiz Exp $
-
-DISTNAME= balsa-2.3.10
-PKGREVISION= 6
-CATEGORIES= mail gnome
-MASTER_SITES= http://balsa.gnome.org/ \
- ftp://ftp.newton.cx/pub/balsa/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://balsa.gnome.org/
-COMMENT= GNOME2 EMail client
-
-USE_DIRS+= gnome2-1.5
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake intltool msgfmt perl pkg-config
-
-CONFIGURE_ARGS+= --with-gpgme=${BUILDLINK_PREFIX.gpgme:Q}/bin/gpgme-config
-CONFIGURE_ARGS+= --disable-more-warnings
-CONFIGURE_ARGS+= --enable-threads
-CONFIGURE_ARGS+= --enable-pcre
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ENV+= ac_cv_lib_iconv_iconv_open=yes
-
-EGDIR= ${PREFIX}/share/examples/balsa
-.for cnf in balsa.soundlist email.soundlist
-CONF_FILES+= ${EGDIR}/${cnf} ${PKG_SYSCONFDIR}/sound/events/${cnf}
-.endfor
-
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-
-BUILDLINK_TRANSFORM+= rm:-DGNOME_DISABLE_DEPRECATED
-BUILDLINK_TRANSFORM+= rm:-DGNOME_VFS_DISABLE_DEPRECATED
-BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
-
-BUILDLINK_API_DEPENDS.gmime+= gmime>=2.1.9
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libltdl/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../mail/gmime/buildlink3.mk"
-.include "../../mail/libesmtp/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
-.include "../../print/libgnomeprint/buildlink3.mk"
-.include "../../print/libgnomeprintui/buildlink3.mk"
-.include "../../security/gpgme/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/aspell/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
-.include "../../www/gtkhtml38/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/balsa2/PLIST b/mail/balsa2/PLIST
deleted file mode 100644
index c23157bddbb..00000000000
--- a/mail/balsa2/PLIST
+++ /dev/null
@@ -1,161 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/17 07:07:23 jlam Exp $
-bin/balsa
-bin/balsa-ab
-lib/bonobo/servers/GNOME_Balsa.server
-man/man1/balsa.1
-share/applications/balsa.desktop
-share/balsa/hicolor/16x16/apps/balsa-encrypted.png
-share/balsa/hicolor/16x16/apps/balsa-mark-all.png
-share/balsa/hicolor/16x16/apps/balsa-mbox-draft.png
-share/balsa/hicolor/16x16/apps/balsa-mbox-sent.png
-share/balsa/hicolor/16x16/apps/balsa-mbox-tray-empty.png
-share/balsa/hicolor/16x16/apps/balsa-mbox-tray-full.png
-share/balsa/hicolor/16x16/apps/balsa-next-flagged.png
-share/balsa/hicolor/16x16/apps/balsa-next-part.png
-share/balsa/hicolor/16x16/apps/balsa-next-unread.png
-share/balsa/hicolor/16x16/apps/balsa-next.png
-share/balsa/hicolor/16x16/apps/balsa-postpone.png
-share/balsa/hicolor/16x16/apps/balsa-previous-part.png
-share/balsa/hicolor/16x16/apps/balsa-previous.png
-share/balsa/hicolor/16x16/apps/balsa-reply-all.png
-share/balsa/hicolor/16x16/apps/balsa-signature-bad.png
-share/balsa/hicolor/16x16/apps/balsa-signature-good.png
-share/balsa/hicolor/16x16/apps/balsa-signature-notrust.png
-share/balsa/hicolor/16x16/apps/balsa-signature-unknown.png
-share/balsa/hicolor/22x22
-share/balsa/hicolor/24x24/apps/balsa-crypt-check.png
-share/balsa/hicolor/24x24/apps/balsa-encrypt.png
-share/balsa/hicolor/24x24/apps/balsa-encrypted.png
-share/balsa/hicolor/24x24/apps/balsa-mark-all.png
-share/balsa/hicolor/24x24/apps/balsa-marked-new.png
-share/balsa/hicolor/24x24/apps/balsa-next-flagged.png
-share/balsa/hicolor/24x24/apps/balsa-next-part.png
-share/balsa/hicolor/24x24/apps/balsa-next-unread.png
-share/balsa/hicolor/24x24/apps/balsa-next.png
-share/balsa/hicolor/24x24/apps/balsa-postpone.png
-share/balsa/hicolor/24x24/apps/balsa-preview.png
-share/balsa/hicolor/24x24/apps/balsa-previous-part.png
-share/balsa/hicolor/24x24/apps/balsa-previous.png
-share/balsa/hicolor/24x24/apps/balsa-reply-all.png
-share/balsa/hicolor/24x24/apps/balsa-sign.png
-share/balsa/hicolor/24x24/apps/balsa-signature-bad.png
-share/balsa/hicolor/24x24/apps/balsa-signature-good.png
-share/balsa/hicolor/24x24/apps/balsa-signature-notrust.png
-share/balsa/hicolor/24x24/apps/balsa-signature-unknown.png
-share/balsa/hicolor/24x24/apps/balsa-trash-empty.png
-share/balsa/pixmaps/attachment.png
-share/balsa/pixmaps/balsa-logo.png
-share/balsa/pixmaps/balsa-top.png
-share/balsa/pixmaps/balsa-watermark.png
-share/balsa/pixmaps/balsa_icon.png
-share/balsa/pixmaps/balsa_logo.png
-share/examples/balsa/balsa.soundlist
-share/gnome/help/balsa/C/balsa.xml
-share/gnome/help/balsa/C/fdl-appendix.xml
-share/gnome/help/balsa/C/figures/address-book-ldap.png
-share/gnome/help/balsa/C/figures/address-book-modify.png
-share/gnome/help/balsa/C/figures/address-book-start.png
-share/gnome/help/balsa/C/figures/address-book-vcard.png
-share/gnome/help/balsa/C/figures/address-book.png
-share/gnome/help/balsa/C/figures/balsa_logo.png
-share/gnome/help/balsa/C/figures/druid-start.png
-share/gnome/help/balsa/C/figures/example-alias.png
-share/gnome/help/balsa/C/figures/figuresdobaaddress-book-modify.png
-share/gnome/help/balsa/C/figures/main-window-toolbar.png
-share/gnome/help/balsa/C/figures/main-window.png
-share/gnome/help/balsa/C/figures/message-window.png
-share/gnome/help/balsa/C/figures/msg-part-select.png
-share/gnome/help/balsa/C/figures/newmsg-window-attachments.png
-share/gnome/help/balsa/C/figures/newmsg-window-toolbar.png
-share/gnome/help/balsa/C/figures/newmsg-window.png
-share/gnome/help/balsa/C/figures/preferences-window.png
-share/gnome/help/balsa/C/figures/spell-check.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pgp-signature.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pkcs7-mime.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pkcs7-signature.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-pkcs7-signature.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-message-disposition-notification.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-message-external-body.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-message.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-multipart-alternative.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-multipart-encrypted.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-multipart-signed.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-multipart.png
-share/idl/Balsa.idl
-share/locale/am/LC_MESSAGES/balsa.mo
-share/locale/az/LC_MESSAGES/balsa.mo
-share/locale/bg/LC_MESSAGES/balsa.mo
-share/locale/ca/LC_MESSAGES/balsa.mo
-share/locale/cs/LC_MESSAGES/balsa.mo
-share/locale/da/LC_MESSAGES/balsa.mo
-share/locale/de/LC_MESSAGES/balsa.mo
-share/locale/el/LC_MESSAGES/balsa.mo
-share/locale/en_CA/LC_MESSAGES/balsa.mo
-share/locale/en_GB/LC_MESSAGES/balsa.mo
-share/locale/es/LC_MESSAGES/balsa.mo
-share/locale/et/LC_MESSAGES/balsa.mo
-share/locale/fi/LC_MESSAGES/balsa.mo
-share/locale/fr/LC_MESSAGES/balsa.mo
-share/locale/ga/LC_MESSAGES/balsa.mo
-share/locale/he/LC_MESSAGES/balsa.mo
-share/locale/hi/LC_MESSAGES/balsa.mo
-share/locale/hr/LC_MESSAGES/balsa.mo
-share/locale/hu/LC_MESSAGES/balsa.mo
-share/locale/it/LC_MESSAGES/balsa.mo
-share/locale/ja/LC_MESSAGES/balsa.mo
-share/locale/ko/LC_MESSAGES/balsa.mo
-share/locale/lt/LC_MESSAGES/balsa.mo
-share/locale/lv/LC_MESSAGES/balsa.mo
-share/locale/ml/LC_MESSAGES/balsa.mo
-share/locale/ms/LC_MESSAGES/balsa.mo
-share/locale/nb/LC_MESSAGES/balsa.mo
-share/locale/ne/LC_MESSAGES/balsa.mo
-share/locale/nl/LC_MESSAGES/balsa.mo
-share/locale/nn/LC_MESSAGES/balsa.mo
-share/locale/no/LC_MESSAGES/balsa.mo
-share/locale/pa/LC_MESSAGES/balsa.mo
-share/locale/pl/LC_MESSAGES/balsa.mo
-share/locale/pt/LC_MESSAGES/balsa.mo
-share/locale/pt_BR/LC_MESSAGES/balsa.mo
-share/locale/ro/LC_MESSAGES/balsa.mo
-share/locale/ru/LC_MESSAGES/balsa.mo
-share/locale/rw/LC_MESSAGES/balsa.mo
-share/locale/sk/LC_MESSAGES/balsa.mo
-share/locale/sl/LC_MESSAGES/balsa.mo
-share/locale/sq/LC_MESSAGES/balsa.mo
-share/locale/sr/LC_MESSAGES/balsa.mo
-share/locale/sr@Latn/LC_MESSAGES/balsa.mo
-share/locale/sv/LC_MESSAGES/balsa.mo
-share/locale/tr/LC_MESSAGES/balsa.mo
-share/locale/uk/LC_MESSAGES/balsa.mo
-share/locale/vi/LC_MESSAGES/balsa.mo
-share/locale/wa/LC_MESSAGES/balsa.mo
-share/locale/zh_CN/LC_MESSAGES/balsa.mo
-share/locale/zh_HK/LC_MESSAGES/balsa.mo
-share/locale/zh_TW/LC_MESSAGES/balsa.mo
-share/omf/balsa/balsa-C.omf
-share/pixmaps/gnome-balsa2.png
-share/sounds/balsa/newmail.wav
-share/sounds/balsa/startup.wav
-@dirrm share/sounds/balsa
-@comment in xdg-dirs: @dirrm share/sounds
-@comment in xdg-dirs: @dirrm share/pixmaps
-@dirrm share/omf/balsa
-@comment in scrollkeeper: @dirrm share/omf
-@comment in ORBit2: @dirrm share/idl
-@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/mimetypes
-@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
-@dirrm share/gnome/help/balsa/C/figures
-@dirrm share/gnome/help/balsa/C
-@dirrm share/gnome/help/balsa
-@comment in gnome2-dirs: @dirrm share/gnome/help
-@dirrm share/examples/balsa
-@dirrm share/balsa/pixmaps
-@dirrm share/balsa/hicolor/24x24/apps
-@dirrm share/balsa/hicolor/24x24
-@dirrm share/balsa/hicolor/16x16/apps
-@dirrm share/balsa/hicolor/16x16
-@dirrm share/balsa/hicolor
-@dirrm share/balsa
-@comment in xdg-dirs: @dirrm share/applications
-@comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/mail/balsa2/distinfo b/mail/balsa2/distinfo
deleted file mode 100644
index 0131720e0ad..00000000000
--- a/mail/balsa2/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.15 2006/02/11 14:17:51 joerg Exp $
-
-SHA1 (balsa-2.3.10.tar.bz2) = 74315661721a7b222403988b2af8fbc690c1ddc4
-RMD160 (balsa-2.3.10.tar.bz2) = 2fba2b3ae62e0fa3c3d8092f559f8ab7a488c22c
-Size (balsa-2.3.10.tar.bz2) = 3273478 bytes
-SHA1 (patch-aa) = 4093290f39ee76d1a02a80c84ecf8d38ddadd3d7
-SHA1 (patch-ab) = 47083f65d404e64ee238bc3e4f3e25008f5f82c8
-SHA1 (patch-ac) = 808f4546204fbc4a23007291637e4b4ca4175db1
-SHA1 (patch-ae) = fcd0ab1c062018b42469b033a98b4575ee2851f3
-SHA1 (patch-af) = 53e77f5f5df0e05f503713f7be163589c2381f07
-SHA1 (patch-ag) = 47036c9108405f25e862ea6402220a70bd0a0cc9
-SHA1 (patch-ah) = 9a17ea3c3f302acf4380c7868ab8c769d9acfc39
-SHA1 (patch-ai) = 44e704eefd63873900609d7c7186469b4b5214d1
-SHA1 (patch-aj) = 4d068d3aa551c11edcc2c7fdc189ebab98a69953
-SHA1 (patch-ak) = a5a5a31d49c1d79610c4ea73557039b2a1b8076d
-SHA1 (patch-ba) = 76b51ced11626e6f36e0763ca64519cc8605c936
diff --git a/mail/balsa2/options.mk b/mail/balsa2/options.mk
deleted file mode 100644
index 411a7970c02..00000000000
--- a/mail/balsa2/options.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: options.mk,v 1.6 2007/02/22 19:26:40 wiz Exp $
-#
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.balsa2
-PKG_SUPPORTED_OPTIONS= ldap ssl
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mldap)
-CONFIGURE_ARGS+= --with-ldap
-. include "../../databases/openldap-client/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl}
-. include "../../security/openssl/buildlink3.mk"
-.endif
diff --git a/mail/balsa2/patches/patch-aa b/mail/balsa2/patches/patch-aa
deleted file mode 100644
index 25197b1013f..00000000000
--- a/mail/balsa2/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2006/02/11 14:17:51 joerg Exp $
-
---- configure.orig 2006-02-11 13:51:23.000000000 +0000
-+++ configure
-@@ -23041,7 +23041,7 @@ if test "${ac_cv_lib_esmtp_smtp_start_se
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lesmtp -lpthread $LIBS"
-+LIBS="-lesmtp ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -23100,7 +23100,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_esmtp_smtp_start_session" >&5
- echo "${ECHO_T}$ac_cv_lib_esmtp_smtp_start_session" >&6
- if test $ac_cv_lib_esmtp_smtp_start_session = yes; then
-- LIBS="$LIBS -lesmtp -lpthread"
-+ LIBS="$LIBS -lesmtp ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
- else
- { { echo "$as_me:$LINENO: error: *** You enabled ESMTP but esmtp library is not found." >&5
- echo "$as_me: error: *** You enabled ESMTP but esmtp library is not found." >&2;}
diff --git a/mail/balsa2/patches/patch-ab b/mail/balsa2/patches/patch-ab
deleted file mode 100644
index 8d4cac881bc..00000000000
--- a/mail/balsa2/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/04/27 00:42:58 rh Exp $
-
---- src/threads.h.orig 2003-01-25 23:04:31.000000000 +1000
-+++ src/threads.h
-@@ -21,6 +21,9 @@
-
- #ifndef __THREADS_H__
- #define __THREADS_H__
-+
-+#include <pthread.h>
-+
- /* FIXME: mailbox_lock is really an internal libbalsa mutex. */
- extern pthread_mutex_t mailbox_lock;
-
diff --git a/mail/balsa2/patches/patch-ac b/mail/balsa2/patches/patch-ac
deleted file mode 100644
index 8c24f326a2f..00000000000
--- a/mail/balsa2/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2004/11/25 09:33:41 adam Exp $
-
---- sounds/Makefile.in.orig 2004-11-20 20:58:54.000000000 +0000
-+++ sounds/Makefile.in
-@@ -227,7 +227,7 @@ target_alias = @target_alias@
- balsa_SOUNDS = startup.wav newmail.wav
- balsasoundsdir = $(datadir)/sounds/balsa
- balsasounds_DATA = $(balsa_SOUNDS)
--soundlistdir = $(sysconfdir)/sound/events
-+soundlistdir = ${prefix}/share/examples/balsa
- soundlist_in_files = balsa.soundlist.in
- soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist)
- EXTRA_DIST = $(balsa_SOUNDS) $(soundlist_in_files)
diff --git a/mail/balsa2/patches/patch-ae b/mail/balsa2/patches/patch-ae
deleted file mode 100644
index 29991048c08..00000000000
--- a/mail/balsa2/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/11/25 09:33:41 adam Exp $
-
---- libbalsa/filter-file.c.orig 2004-10-30 09:35:58.000000000 +0000
-+++ libbalsa/filter-file.c
-@@ -30,7 +30,7 @@
- #include "config.h"
-
- /* define _XOPEN_SOURCE to make strptime visible */
--#define _XOPEN_SOURCE
-+#define _XOPEN_SOURCE 600
- /* extensions needed additonally on Solaris for strptime */
- #define __EXTENSIONS__
- #include <stdlib.h>
diff --git a/mail/balsa2/patches/patch-af b/mail/balsa2/patches/patch-af
deleted file mode 100644
index af36dbc9666..00000000000
--- a/mail/balsa2/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/07/25 18:25:46 drochner Exp $
-
---- src/filter-edit-callbacks.c.orig 2003-07-25 20:01:17.000000000 +0200
-+++ src/filter-edit-callbacks.c 2003-07-25 20:01:30.000000000 +0200
-@@ -25,7 +25,7 @@
-
- #include "config.h"
-
--#define _XOPEN_SOURCE /* glibc2 needs this */
-+#define _XOPEN_SOURCE 600 /* glibc2 needs this */
- /* yellow dog has crappy libc and needs pthread.h to be included here */
- #ifdef BALSA_USE_THREADS
- # include <pthread.h>
diff --git a/mail/balsa2/patches/patch-ag b/mail/balsa2/patches/patch-ag
deleted file mode 100644
index 674adfedc74..00000000000
--- a/mail/balsa2/patches/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2006/02/08 18:25:24 drochner Exp $
-
---- libbalsa/imap/imap-handle.c.orig 2005-06-11 10:23:54.000000000 +0200
-+++ libbalsa/imap/imap-handle.c
-@@ -20,9 +20,13 @@
-
- #define _POSIX_C_SOURCE 199506L
- #define _XOPEN_SOURCE 500
-+#define _NETBSD_SOURCE 1
-
- #include <sys/types.h>
- #include <sys/socket.h>
-+#ifdef __NetBSD__
-+#include <netinet/in.h>
-+#endif
- #include <netdb.h>
- #include <glib.h>
- #include <glib-object.h>
diff --git a/mail/balsa2/patches/patch-ah b/mail/balsa2/patches/patch-ah
deleted file mode 100644
index 87b6e887311..00000000000
--- a/mail/balsa2/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2006/02/08 18:25:24 drochner Exp $
-
---- libbalsa/imap/imap-search.c.orig 2005-06-22 22:08:59.000000000 +0200
-+++ libbalsa/imap/imap-search.c
-@@ -19,6 +19,7 @@
-
- #define _POSIX_C_SOURCE 199506L
- #define _XOPEN_SOURCE 500
-+#define _NETBSD_SOURCE 1
-
- #include <string.h>
- #include <time.h>
diff --git a/mail/balsa2/patches/patch-ai b/mail/balsa2/patches/patch-ai
deleted file mode 100644
index 43fdb34459b..00000000000
--- a/mail/balsa2/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2006/02/08 18:25:24 drochner Exp $
-
---- libbalsa/mailbox_mh.c.orig 2005-05-22 23:11:29.000000000 +0200
-+++ libbalsa/mailbox_mh.c
-@@ -26,6 +26,7 @@
- #define _XOPEN_SOURCE_EXTENDED 1
- /* to compile this on BSD/Darwin */
- #undef _POSIX_SOURCE
-+#define _NETBSD_SOURCE 1
-
- #include <unistd.h>
- #include <fcntl.h>
diff --git a/mail/balsa2/patches/patch-aj b/mail/balsa2/patches/patch-aj
deleted file mode 100644
index 062bd6ef0d6..00000000000
--- a/mail/balsa2/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2006/02/08 18:25:24 drochner Exp $
-
---- libbalsa/misc.c.orig 2005-06-22 21:01:51.000000000 +0200
-+++ libbalsa/misc.c
-@@ -24,6 +24,7 @@
-
- #define _SVID_SOURCE 1
- #define _XOPEN_SOURCE 500
-+#define _NETBSD_SOURCE 1
- #include <ctype.h>
- #include <dirent.h>
- #include <errno.h>
diff --git a/mail/balsa2/patches/patch-ak b/mail/balsa2/patches/patch-ak
deleted file mode 100644
index 9b6427eba41..00000000000
--- a/mail/balsa2/patches/patch-ak
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/02/11 14:17:51 joerg Exp $
-
---- libbalsa/misc.h.orig 2006-02-11 13:54:44.000000000 +0000
-+++ libbalsa/misc.h
-@@ -32,6 +32,7 @@
- #endif
-
- #ifdef HAVE_PCRE
-+# include <pcre.h>
- # include <pcreposix.h>
- #else
- # include <sys/types.h>
diff --git a/mail/balsa2/patches/patch-ba b/mail/balsa2/patches/patch-ba
deleted file mode 100644
index 47d2fca0385..00000000000
--- a/mail/balsa2/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2006/02/08 18:25:24 drochner Exp $
-
---- ./libbalsa/address-book-ldap.c.orig 2005-08-25 23:29:45.000000000 +0200
-+++ ./libbalsa/address-book-ldap.c
-@@ -732,7 +731,7 @@ libbalsa_address_book_ldap_modify_addres
- }
- /* fall through */
- default:
-- fprintf(stderr, "ldap_modify for dn=\2%s\" failed[0x%x]: %s\n",
-+ fprintf(stderr, "ldap_modify for dn=\"%s\" failed[0x%x]: %s\n",
- dn, rc, ldap_err2string(rc));
- }
- } while(cnt++<1);
diff --git a/mail/bbmail/DESCR b/mail/bbmail/DESCR
deleted file mode 100644
index d862ae90e4f..00000000000
--- a/mail/bbmail/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This Tool displays the status of your mailbox and warns you when new
-mail has arrived. It is designed to look the same as the Blackbox toolbar
-(Blackbox is a Windowmanager for X11).
diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile
deleted file mode 100644
index 076662104ac..00000000000
--- a/mail/bbmail/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2007/02/15 14:46:27 joerg Exp $
-#
-
-DISTNAME= bbmail-0.8.3
-PKGREVISION= 1
-CATEGORIES= mail x11
-MASTER_SITES= http://bbtools.windsofstorm.net/sources/
-
-MAINTAINER= jschauma@NetBSD.org
-HOMEPAGE= http://bbtools.windsofstorm.net/
-COMMENT= Mailbox monitor (not only) for the blackbox windowmanager
-
-GNU_CONFIGURE= YES
-USE_LANGUAGES= c c++
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bbmail ${PREFIX}/bin/
- ${INSTALL_MAN} ${WRKSRC}/bbmail.1 ${PREFIX}/${PKGMANDIR}/man1/
- ${INSTALL_DATA_DIR} ${PREFIX}/share/bbtools/
- ${INSTALL_DATA} ${WRKSRC}/data/bbmail.bb ${PREFIX}/share/bbtools/
-
-BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/bbmail/PLIST b/mail/bbmail/PLIST
deleted file mode 100644
index 2f8e4c5314f..00000000000
--- a/mail/bbmail/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/10/09 14:35:39 jschauma Exp $
-bin/bbmail
-man/man1/bbmail.1
-share/bbtools/bbmail.bb
-@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || ${TRUE}
diff --git a/mail/bbmail/distinfo b/mail/bbmail/distinfo
deleted file mode 100644
index c70bc063e39..00000000000
--- a/mail/bbmail/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 09:59:20 agc Exp $
-
-SHA1 (bbmail-0.8.3.tar.gz) = 1707500785614805b88b77d4e86c3fbb059744e2
-RMD160 (bbmail-0.8.3.tar.gz) = 9a4de2c12b60cfa4306c572446e2ba7e2ad9a4b7
-Size (bbmail-0.8.3.tar.gz) = 123318 bytes
diff --git a/mail/bmf/DESCR b/mail/bmf/DESCR
deleted file mode 100644
index 81a423f38f1..00000000000
--- a/mail/bmf/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a mail filter which uses the Bayes algorithm as explained in Paul
-Graham's article "A Plan for Spam". It aims to be faster, smaller, and more
-versatile than similar applicatios.
diff --git a/mail/bmf/Makefile b/mail/bmf/Makefile
deleted file mode 100644
index aca4a773cda..00000000000
--- a/mail/bmf/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:29:57 jlam Exp $
-#
-
-DISTNAME= bmf-0.9.4
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bmf/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/bmf/
-COMMENT= Self contained and extremely efficient Bayesian mail filter
-
-HAS_CONFIGURE= YES
-
-CONFIGURE_ARGS+= --without-mysql
-MAKE_ENV+= DESTDIR=${PREFIX:Q} BINDIR=/bin MANDIR=/man
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/bmf/PLIST b/mail/bmf/PLIST
deleted file mode 100644
index e49bd22e766..00000000000
--- a/mail/bmf/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/10/10 11:05:31 mjl Exp $
-bin/bmf
-bin/bmfconv
-man/man1/bmf.1
-man/man1/bmfconv.1
diff --git a/mail/bmf/distinfo b/mail/bmf/distinfo
deleted file mode 100644
index 18fe6bdba4b..00000000000
--- a/mail/bmf/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/01/08 13:50:53 joerg Exp $
-
-SHA1 (bmf-0.9.4.tar.gz) = d0b7ab253a531a533fefc6bc0691cc7af7ccea79
-RMD160 (bmf-0.9.4.tar.gz) = 3b8d73879d8e616d52d00bf838395ed7f6a7fc4d
-Size (bmf-0.9.4.tar.gz) = 36740 bytes
-SHA1 (patch-aa) = d7b2492915aa0d3f29d8b29c74c7d24af78370a6
-SHA1 (patch-ab) = 3975eed6acd129f292631bcb2ddc6916b079e3e7
diff --git a/mail/bmf/patches/patch-aa b/mail/bmf/patches/patch-aa
deleted file mode 100644
index b1ac5579df4..00000000000
--- a/mail/bmf/patches/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/01/08 13:50:53 joerg Exp $
-
---- configure.orig Tue Oct 8 11:39:14 2002
-+++ configure Tue Oct 8 11:45:11 2002
-@@ -140,6 +140,27 @@
- LIBDB_LIB=""
- MYSQL_LIB="-lmysqlclient"
- ;;
-+ NetBSD | DragonFly)
-+ OSVER=40
-+ if [ "$with_debug" = "yes" ]; then
-+ CCDBG="-g"
-+ LDDBG="-g"
-+ else
-+ CCDBG="-DNDEBUG"
-+ LDDBG=""
-+ fi
-+ CC=gcc
-+ CFLAGS="$CCDBG -D_UNIX -D_BSD=$OSVER -Wall"
-+ CXX=g++
-+ CXXFLAGS=${CFLAGS}
-+ AR=ar
-+ ARFLAGS="-rc"
-+ LD=gcc
-+ LDFLAGS="$LDDBG"
-+ SYSLIBS=""
-+ LIBDB_LIB=""
-+ MYSQL_LIB="-lmysqlclient"
-+ ;;
- OpenBSD)
- # I'm guessing OpenBSD looks mostly like FreeBSD 4.x
- OSVER=40
diff --git a/mail/bmf/patches/patch-ab b/mail/bmf/patches/patch-ab
deleted file mode 100644
index a52b0b3c3ad..00000000000
--- a/mail/bmf/patches/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/12/13 23:18:12 minskim Exp $
-
---- Makefile.in.orig 2002-10-20 15:27:56.000000000 -0500
-+++ Makefile.in
-@@ -1,7 +1,7 @@
- # Makefile for bmf
-
--BINDIR=/usr/bin
--MANDIR=/usr/share/man
-+BINDIR?=/usr/bin
-+MANDIR?=/usr/share/man
-
- VERSION=0.9.4
-
-@@ -30,13 +30,13 @@ bmfconv: bmfconv.o dbmysql.o dbdb.o dbte
- bmfconv.o: bmfconv.c
- $(CC) $(CFLAGS) -DPACKAGE=\"bmfconv\" -DVERSION=\"$(VERSION)\" -c $<
-
--install: checkroot bmf bmf.1 bmfconv bmfconv.1
-- [ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
-- [ -d $(DESTDIR)$(MANDIR)/man1 ] || mkdir -p $(DESTDIR)$(MANDIR)/man1
-- cp bmf $(DESTDIR)$(BINDIR)
-- cp bmf.1 $(DESTDIR)$(MANDIR)/man1
-- cp bmfconv $(DESTDIR)$(BINDIR)
-- cp bmfconv.1 $(DESTDIR)$(MANDIR)/man1
-+install: bmf bmf.1 bmfconv bmfconv.1
-+ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(BINDIR)
-+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man1
-+ $(BSD_INSTALL_PROGRAM) bmf $(DESTDIR)$(BINDIR)
-+ $(BSD_INSTALL_MAN) bmf.1 $(DESTDIR)$(MANDIR)/man1
-+ $(BSD_INSTALL_PROGRAM) bmfconv $(DESTDIR)$(BINDIR)
-+ $(BSD_INSTALL_MAN) bmfconv.1 $(DESTDIR)$(MANDIR)/man1
-
- uninstall: checkroot
- rm -f $(DESTDIR)$(BINDIR)/bmf
diff --git a/mail/bogofilter/DESCR b/mail/bogofilter/DESCR
deleted file mode 100644
index 84449ce0906..00000000000
--- a/mail/bogofilter/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-Bogofilter is a mail filter that classifies mail as spam or ham
-(non-spam) by a statistical analysis of the message's header and
-content (body). It is able to learn from the user's classifications
-and corrections.
-
-The statistical technique is known as the Bayesian technique and
-its use for spam was first described by Paul Graham in his article
-A Plan For Spam. Gary Robinson, in his weblog Rants, suggests some
-refinements for improved discrimination between spam and ham.
-Bogofilter's primary algorithm uses the f(w) parameter and the
-Fisher inverse chi-square technique that he describes.
-
-Bogofilter is run by an MDA script to classify an incoming message
-as spam or ham (using wordlists stored by BerkeleyDB). Bogofilter
-provides processing for plain text and HTML. It supports multi-part
-mime message with decoding of base64, quoted-printable, and
-uuencoded text and ignores attachments, such as images.
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
deleted file mode 100644
index 854d424644f..00000000000
--- a/mail/bogofilter/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.36 2007/02/16 15:47:39 obache Exp $
-
-DISTNAME= bogofilter-1.0.3
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bogofilter/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://bogofilter.sourceforge.net/
-COMMENT= Bayesian spam filter written in C
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-GNU_CONFIGURE= YES
-
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-
-EGDIR= ${PREFIX}/share/examples/bogofilter
-CONF_FILES= ${EGDIR}/bogofilter.cf ${PKG_SYSCONFDIR}/bogofilter.cf
-
-USE_TOOLS+= perl:run
-REPLACE_PERL= src/bogoupgrade
-
-.include "options.mk"
-
-.include "../../math/gsl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/bogofilter/PLIST b/mail/bogofilter/PLIST
deleted file mode 100644
index be5637d4068..00000000000
--- a/mail/bogofilter/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2007/02/16 15:47:39 obache Exp $
-bin/bf_compact
-bin/bf_copy
-bin/bf_tar
-${QDBM}bin/bogoQDBMupgrade
-bin/bogofilter
-bin/bogolexer
-bin/bogotune
-bin/bogoupgrade
-bin/bogoutil
-man/man1/bf_compact.1
-man/man1/bf_copy.1
-man/man1/bf_tar.1
-man/man1/bogofilter.1
-man/man1/bogolexer.1
-man/man1/bogotune.1
-man/man1/bogoupgrade.1
-man/man1/bogoutil.1
-share/examples/bogofilter/bogofilter.cf
-@dirrm share/examples/bogofilter
diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo
deleted file mode 100644
index ddabd0b07f5..00000000000
--- a/mail/bogofilter/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.17 2007/02/16 15:47:39 obache Exp $
-
-SHA1 (bogofilter-1.0.3.tar.bz2) = 88d72c810dc3ae613cb4178e19b45c6508062210
-RMD160 (bogofilter-1.0.3.tar.bz2) = d4b6d5329919cefbc4e17168350157b27bb08b9c
-Size (bogofilter-1.0.3.tar.bz2) = 778983 bytes
-SHA1 (patch-aa) = 8403c5e8a723fef0bef9a87feba639a8cabfe99e
-SHA1 (patch-ab) = f55a9956d82f56cef686a9125983ec5fd6942809
diff --git a/mail/bogofilter/options.mk b/mail/bogofilter/options.mk
deleted file mode 100644
index 19286529c6c..00000000000
--- a/mail/bogofilter/options.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2007/02/16 15:47:39 obache Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.bogofilter
-PKG_OPTIONS_REQUIRED_GROUPS= database
-PKG_OPTIONS_GROUP.database= db4 qdbm sqlite
-PKG_SUGGESTED_OPTIONS= db4
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mdb4)
-CONFIGURE_ARGS+= --with-database=db
-.include "../../databases/db4/buildlink3.mk"
-BUILDLINK_TRANSFORM+= l:db:db4
-.endif
-
-.if !empty(PKG_OPTIONS:Mqdbm)
-CONFIGURE_ARGS+= --with-database=qdbm
-PLIST_SUBST+= QDBM=
-.include "../../databases/qdbm/buildlink3.mk"
-.else
-PLIST_SUBST+= QDBM="@comment "
-.endif
-
-.if !empty(PKG_OPTIONS:Msqlite)
-CONFIGURE_ARGS+= --with-database=sqlite3
-.include "../../databases/sqlite3/buildlink3.mk"
-.endif
diff --git a/mail/bogofilter/patches/patch-aa b/mail/bogofilter/patches/patch-aa
deleted file mode 100644
index 8ddac42f0d6..00000000000
--- a/mail/bogofilter/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2007/02/16 15:47:40 obache Exp $
-
---- Makefile.in.orig 2006-07-10 10:14:49.000000000 +0000
-+++ Makefile.in
-@@ -258,6 +258,7 @@ SYSCONFDIR = @sysconfdir@
-
- # what to build
- sysconf_DATA = bogofilter.cf.example
-+egdir = $(prefix)/share/examples/bogofilter
-
- # what to distribute
- EXTRA_DIST = autogen.sh gsl config.rpath bogofilter.cf.example \
-@@ -412,14 +413,8 @@ bogogrep.obj: contrib/bogogrep.c
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bogogrep.obj `if test -f 'contrib/bogogrep.c'; then $(CYGPATH_W) 'contrib/bogogrep.c'; else $(CYGPATH_W) '$(srcdir)/contrib/bogogrep.c'; fi`
- uninstall-info-am:
- install-sysconfDATA: $(sysconf_DATA)
-- @$(NORMAL_INSTALL)
-- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
-- @list='$(sysconf_DATA)'; for p in $$list; do \
-- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
-- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-- done
-+ $(mkdir_p) $(egdir)
-+ $(INSTALL_DATA) $(sysconf_DATA) $(egdir)/bogofilter.cf
-
- uninstall-sysconfDATA:
- @$(NORMAL_UNINSTALL)
diff --git a/mail/bogofilter/patches/patch-ab b/mail/bogofilter/patches/patch-ab
deleted file mode 100644
index ada72e06938..00000000000
--- a/mail/bogofilter/patches/patch-ab
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/06/29 02:20:17 snj Exp $
-
---- gsl/gsl_math.h.orig 2004-06-10 14:17:35.000000000 -0700
-+++ gsl/gsl_math.h 2004-06-28 12:44:15.000000000 -0700
-@@ -129,44 +129,44 @@ double gsl_min (double a, double b);
- /* inline-friendly strongly typed versions */
- #if HAVE_EXTERN_INLINE
-
--extern inline int GSL_MAX_INT (int a, int b);
--extern inline int GSL_MIN_INT (int a, int b);
--extern inline double GSL_MAX_DBL (double a, double b);
--extern inline double GSL_MIN_DBL (double a, double b);
--extern inline long double GSL_MAX_LDBL (long double a, long double b);
--extern inline long double GSL_MIN_LDBL (long double a, long double b);
-+static inline int GSL_MAX_INT (int a, int b);
-+static inline int GSL_MIN_INT (int a, int b);
-+static inline double GSL_MAX_DBL (double a, double b);
-+static inline double GSL_MIN_DBL (double a, double b);
-+static inline long double GSL_MAX_LDBL (long double a, long double b);
-+static inline long double GSL_MIN_LDBL (long double a, long double b);
-
--extern inline int
-+static inline int
- GSL_MAX_INT (int a, int b)
- {
- return GSL_MAX (a, b);
- }
-
--extern inline int
-+static inline int
- GSL_MIN_INT (int a, int b)
- {
- return GSL_MIN (a, b);
- }
-
--extern inline double
-+static inline double
- GSL_MAX_DBL (double a, double b)
- {
- return GSL_MAX (a, b);
- }
-
--extern inline double
-+static inline double
- GSL_MIN_DBL (double a, double b)
- {
- return GSL_MIN (a, b);
- }
-
--extern inline long double
-+static inline long double
- GSL_MAX_LDBL (long double a, long double b)
- {
- return GSL_MAX (a, b);
- }
-
--extern inline long double
-+static inline long double
- GSL_MIN_LDBL (long double a, long double b)
- {
- return GSL_MIN (a, b);
diff --git a/mail/bulk_mailer/DESCR b/mail/bulk_mailer/DESCR
deleted file mode 100644
index 5c8b3c8b875..00000000000
--- a/mail/bulk_mailer/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-bulk_mailer assists with "bulk" mailing, such as large majordomo
-lists under sendmail. For input, it takes a file of recipient
-addresses (one address per line) and a message (with headers already
-attached) to be sent to the recipients. It sorts the recipient
-list by reversed domain (so similar ones sort together), splits up
-the recipients into several groups containing no more than N domains
-each, creates an SMTP envelope for each group of recipients, and
-feeds that envelope to "/usr/lib/sendmail -bs".
-
-Splitting the envelopes up allows sendmail to perform delivery in
-parallel, so instead of having one large queue entry (for which
-sendmail might take awhile to get around to attempting delivery
-for some recipients), it has several smaller queue entries.
-Depending on your point-of-view, this can still be considered
-"cluttering up your mail queue", but it does seem to deliver messages
-more quickly to most recipients.
diff --git a/mail/bulk_mailer/Makefile b/mail/bulk_mailer/Makefile
deleted file mode 100644
index 67d04a269e4..00000000000
--- a/mail/bulk_mailer/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:57 rillig Exp $
-#
-
-DISTNAME= bulk_mailer-1.13
-CATEGORIES= mail
-MASTER_SITES= ftp://cs.utk.edu/pub/moore/bulk_mailer/
-
-MAINTAINER= abs@NetBSD.org
-COMMENT= Assist in delivery of mail to large numbers of recipients
-
-HAS_CONFIGURE= YES
-BUILD_TARGET= bulk_mailer
-
-CPPFLAGS.SunOS+= -DPIPECOMMAND=\"/usr/sbin/sendmail -bs %s\"
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bulk_mailer ${PREFIX}/bin/bulk_mailer
- ${INSTALL_MAN} ${WRKSRC}/bulk_mailer.1 ${PREFIX}/${PKGMANDIR}/man1/bulk_mailer.1
-
-.include "../../devel/sysexits/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/bulk_mailer/PLIST b/mail/bulk_mailer/PLIST
deleted file mode 100644
index c5c353a6eb1..00000000000
--- a/mail/bulk_mailer/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:59:40 zuntum Exp $
-bin/bulk_mailer
-man/man1/bulk_mailer.1
diff --git a/mail/bulk_mailer/distinfo b/mail/bulk_mailer/distinfo
deleted file mode 100644
index bd9f0e62bff..00000000000
--- a/mail/bulk_mailer/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 09:59:20 agc Exp $
-
-SHA1 (bulk_mailer-1.13.tar.gz) = 2886641461b6702affc4624456829b5944581a35
-RMD160 (bulk_mailer-1.13.tar.gz) = fc4cc57d9d13429311e2d17ca4c51c95003246c4
-Size (bulk_mailer-1.13.tar.gz) = 34854 bytes
-SHA1 (patch-aa) = d4f8142c33df51ea0ede408defa039697a4ec10d
diff --git a/mail/bulk_mailer/patches/patch-aa b/mail/bulk_mailer/patches/patch-aa
deleted file mode 100644
index b58f9e6e90e..00000000000
--- a/mail/bulk_mailer/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/06/08 10:57:42 cjep Exp $
-
---- bulk_mailer.c.orig 2000-05-24 20:34:33.000000000 +0100
-+++ bulk_mailer.c
-@@ -101,7 +101,7 @@
- #include "patchlevel.h"
-
- #ifndef PIPECOMMAND
--#define PIPECOMMAND "/usr/lib/sendmail -bs %s"
-+#define PIPECOMMAND "/usr/sbin/sendmail -bs %s"
- #endif
-
- #ifndef HAVE_STRERROR
diff --git a/mail/clamav/DEINSTALL b/mail/clamav/DEINSTALL
deleted file mode 100644
index 77d64386323..00000000000
--- a/mail/clamav/DEINSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2006/11/08 17:33:26 ghen Exp $
-
-case ${STAGE} in
-DEINSTALL)
- # Unconditionally remove the virus databases when deinstalling.
- ${RM} -f @CLAMAV_DBDIR@/daily.cvd
- ${RM} -f @CLAMAV_DBDIR@/main.cvd
- ;;
-esac
diff --git a/mail/clamav/DESCR b/mail/clamav/DESCR
deleted file mode 100644
index 7621892cd95..00000000000
--- a/mail/clamav/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Clam AntiVirus is an anti-virus toolkit written from scratch. It is licensed
-under GNU GPL2 and uses the virus database from OpenAntiVirus, which is an
-another free anti-virus project. In contrast to OpenAntiVirus (which is written
-in Java), Clam AntiVirus is written entirely in C and its database is KEPT UP
-TO DATE. It also detects polymorphic viruses as well.
diff --git a/mail/clamav/MESSAGE b/mail/clamav/MESSAGE
deleted file mode 100644
index 332db2378ee..00000000000
--- a/mail/clamav/MESSAGE
+++ /dev/null
@@ -1,13 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2004/10/30 10:23:02 grant Exp $
-
-You should update the virus databases to the latest ones available
-before using ClamAV. This can be done by running the following command
-as `${ROOT_USER}' or `${CLAMAV_USER}':
-
- ${PREFIX}/bin/freshclam
-
-Note that as of version 0.80, clamav.conf has been replaced by
-clamd.conf. Be sure to update your configuration to reflect this.
-
-===========================================================================
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
deleted file mode 100644
index cc4bc7f7999..00000000000
--- a/mail/clamav/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# $NetBSD: Makefile,v 1.71 2007/03/15 03:15:25 rillig Exp $
-
-DISTNAME= clamav-${CLAMAV_VERSION}
-PKGNAME= clamav-${CLAMAV_VERSION:S/-/./}
-#PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clamav/}
-
-MAINTAINER= grant@NetBSD.org
-HOMEPAGE= http://www.clamav.net/
-COMMENT= Anti-virus toolkit
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-CLAMAV_VERSION= 0.90.1
-
-USE_LIBTOOL= yes
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-clamav
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR:Q}
-CONFIGURE_ARGS+= --with-uid=${CLAMAV_USER:Q}
-CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP:Q}
-CONFIGURE_ARGS+= --with-tcpwrappers
-CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.*)
-CONFIGURE_ARGS+= --disable-readdir-r
-.else
-CONFIGURE_ARGS+= --enable-readdir_r
-.endif
-
-BUILD_DEFS+= CLAMAV_USER CLAMAV_GROUP CLAMAV_DBDIR
-FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER:Q}
-MESSAGE_SUBST+= CLAMAV_USER=${CLAMAV_USER}
-
-RCD_SCRIPTS= clamd freshclamd
-PKG_GROUPS+= ${CLAMAV_GROUP}
-PKG_USERS+= ${CLAMAV_USER}:${CLAMAV_GROUP}
-
-EGDIR= ${PREFIX}/share/examples/clamav
-FILES_SUBST+= CLAMAV_DBDIR=${CLAMAV_DBDIR:Q}
-
-OWN_DIRS_PERMS= ${CLAMAV_DBDIR} ${CLAMAV_USER} ${CLAMAV_GROUP} 0775
-CONF_FILES= # empty
-CONF_FILES_PERMS= # empty
-.for i in clamd.conf freshclam.conf
-CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i}
-.endfor
-.for i in daily.cvd main.cvd
-CONF_FILES_PERMS+= ${EGDIR}/${i} ${CLAMAV_DBDIR}/${i} \
- ${CLAMAV_USER} ${CLAMAV_GROUP} 0664
-.endfor
-
-INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} CFGINST=${EGDIR} DBINST=${EGDIR}
-
-.include "options.mk"
-
-# pkgsrc enforces a "secure" version of zlib, so don't let this check
-# bomb the build.
-CONFIGURE_ARGS+= --disable-zlib-vcheck
-
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../devel/gmp/buildlink3.mk"
-.include "../../security/tcp_wrappers/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/clamav/PLIST b/mail/clamav/PLIST
deleted file mode 100644
index f0bc67f78f1..00000000000
--- a/mail/clamav/PLIST
+++ /dev/null
@@ -1,28 +0,0 @@
-@comment $NetBSD: PLIST,v 1.18 2007/02/16 14:40:41 xtraeme Exp $
-bin/clamav-config
-bin/clamconf
-bin/clamdscan
-bin/clamscan
-bin/freshclam
-bin/sigtool
-include/clamav.h
-lib/libclamav.la
-lib/pkgconfig/libclamav.pc
-man/man1/clamconf.1
-man/man1/clamdscan.1
-man/man1/clamscan.1
-man/man1/freshclam.1
-man/man1/sigtool.1
-man/man5/clamd.conf.5
-man/man5/freshclam.conf.5
-man/man8/clamav-milter.8
-man/man8/clamd.8
-${MILTER}sbin/clamav-milter
-sbin/clamd
-share/examples/clamav/clamd.conf
-share/examples/clamav/daily.cvd
-share/examples/clamav/freshclam.conf
-share/examples/clamav/main.cvd
-share/examples/rc.d/clamd
-share/examples/rc.d/freshclamd
-@dirrm share/examples/clamav
diff --git a/mail/clamav/buildlink3.mk b/mail/clamav/buildlink3.mk
deleted file mode 100644
index 954569a0635..00000000000
--- a/mail/clamav/buildlink3.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:57 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-CLAMAV_BUILDLINK3_MK:= ${CLAMAV_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= clamav
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nclamav}
-BUILDLINK_PACKAGES+= clamav
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clamav
-
-.if !empty(CLAMAV_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.clamav+= clamav>=0.60nb1
-BUILDLINK_ABI_DEPENDS.clamav+= clamav>=0.88nb1
-BUILDLINK_PKGSRCDIR.clamav?= ../../mail/clamav
-.endif # CLAMAV_BUILDLINK3_MK
-
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../devel/gmp/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
deleted file mode 100644
index 98ac2042a98..00000000000
--- a/mail/clamav/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.42 2007/03/06 10:32:34 martti Exp $
-
-SHA1 (clamav-0.90.1.tar.gz) = d51f279fce2d702c3e97b2e08fe3b4b863f0acc6
-RMD160 (clamav-0.90.1.tar.gz) = 1fd343d6510fea337a676e32bb1e4e404da4bd6d
-Size (clamav-0.90.1.tar.gz) = 11643310 bytes
-SHA1 (patch-ad) = 554c183224c04357609111c90d0145c08e13c1d0
-SHA1 (patch-af) = fe93995448f968c479ff91d52c1fa2a1e67ef137
-SHA1 (patch-ah) = 0b0865cca6bb8534740b510b7052dbe3390b996c
diff --git a/mail/clamav/files/clamd.sh b/mail/clamav/files/clamd.sh
deleted file mode 100644
index 85ac1b00508..00000000000
--- a/mail/clamav/files/clamd.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: clamd.sh,v 1.9 2004/11/09 10:08:06 salo Exp $
-#
-# clamd does anti-virus checking.
-#
-# PROVIDE: clamd
-# REQUIRE: DAEMON
-# BEFORE: mail local
-# KEYWORD: shutdown
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="clamd"
-rcvar=$name
-command="@PREFIX@/sbin/${name}"
-scan_command="@PREFIX@/bin/clamdscan"
-required_files="@PKG_SYSCONFDIR@/clamd.conf"
-start_precmd="clamd_precmd"
-stop_cmd="clamd_stopcmd"
-
-if [ -f "${required_files}" ]; then
- pidfile_=`@AWK@ '/^#/ {next}; /^PidFile[ ]/ {r = $2};
- END {print r}' ${required_files}`
- if [ -n "${pidfile_}" ]; then
- pidfile=${pidfile_}
- fi
- logfile=`@AWK@ 'BEGIN {r = "/tmp/clamd.log"};
- /^#/ {next}; /^LogFile[ ]/ {r = $2};
- END {print r}' ${required_files}`
- socket=`@AWK@ 'BEGIN {r = "/tmp/clamd"};
- /^#/ {next}; /^LocalSocket[ ]/ {r = $2};
- END {print r}' ${required_files}`
- clamd_user=`@AWK@ 'BEGIN {r = "@CLAMAV_USER@"};
- /^#/ {next}; /^User[ ]/ {r = $2};
- END {print r}' ${required_files}`
-fi
-
-clamd_precmd()
-{
- @RM@ -f ${socket}
- if [ -n "${logfile}" ]; then
- @TOUCH@ ${logfile}
- @CHOWN@ ${clamd_user} ${logfile}
- fi
- if [ -n "${pidfile}" ]; then
- @TOUCH@ ${pidfile}
- @CHOWN@ ${clamd_user} ${pidfile}
- fi
-}
-
-clamd_stopcmd()
-{
- # Workaround bug when clamd is built against pth by send TERM to
- # clamd, then forcing it to start a worker thread that exits.
- # This forces the main thread to awaken and realize that it's
- # supposed to shutdown.
- #
- @ECHO@ "Stopping ${name}."
- doit="@SU@ -m ${clamd_user} -c \"kill -TERM $rc_pid\""
- if ! eval $doit && [ -z "$rc_force" ]; then
- return 1
- fi
- ${scan_command} --quiet ${scan_command} 2>/dev/null
- wait_for_pids $rc_pid
-}
-
-if [ -f /etc/rc.subr -a -f /etc/rc.conf \
- -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- @ECHO@ -n " ${name}"
- eval ${start_precmd}
- ${command} ${clamd_flags} ${command_args}
-fi
diff --git a/mail/clamav/files/freshclamd.sh b/mail/clamav/files/freshclamd.sh
deleted file mode 100644
index 25bab124e2a..00000000000
--- a/mail/clamav/files/freshclamd.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: freshclamd.sh,v 1.3 2006/06/20 20:24:45 jnemeth Exp $
-#
-# PROVIDE: freshclamd
-# REQUIRE: DAEMON LOGIN clamd
-
-
-name="freshclamd"
-rcvar=$name
-command="@PREFIX@/bin/freshclam"
-required_files="@PKG_SYSCONFDIR@/freshclam.conf"
-pidfile="@VARBASE@/run/${name}.pid"
-sig_stop="KILL"
-freshclamd_user="@CLAMAV_USER@"
-freshclamd_flags=${freshclamd_flags:=-c 2}
-command_args="-d"
-
-. /etc/rc.subr
-
-load_rc_config $name
-run_rc_command "$1"
-
-if [ "$1" != "stop" ]; then
- echo $(check_process $command) > $pidfile
-fi
diff --git a/mail/clamav/options.mk b/mail/clamav/options.mk
deleted file mode 100644
index e8726d41db7..00000000000
--- a/mail/clamav/options.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2007/02/28 20:42:05 xtraeme Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.clamav
-PKG_SUPPORTED_OPTIONS= curl milter clamav-experimental
-PKG_SUGGESTED_OPTIONS= curl
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mmilter)
-# force use of pkgsrc version of libmilter -- clamav uses the sendmail binary
-# to check API compatibility(!), so it must build with as new a version of
-# libmilter as pkgsrc is capable of providing
-USE_BUILTIN.libmilter= no
-. include "../../mail/libmilter/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-milter
-PLIST_SUBST+= MILTER=
-.else
-CONFIGURE_ARGS+= --disable-milter
-# XXX --disable-milter doesn't work as expected, so we need this
-CONFIGURE_ENV+= ac_cv_header_libmilter_mfapi_h=no
-PLIST_SUBST+= MILTER="@comment "
-.endif
-
-.if !empty(PKG_OPTIONS:Mcurl)
-. include "../../www/curl/buildlink3.mk"
-CONFIGURE_ARGS+= --with-libcurl
-BUILDLINK_API_DEPENDS.curl+=curl>=7.10.0
-.else
-CONFIGURE_ARGS+= --without-libcurl
-.endif
-
-.if !empty(PKG_OPTIONS:Mclamav-experimental)
-CONFIGURE_ARGS+= --enable-experimental
-.endif
diff --git a/mail/clamav/patches/patch-ad b/mail/clamav/patches/patch-ad
deleted file mode 100644
index 5fb5220bcc7..00000000000
--- a/mail/clamav/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.11 2007/02/16 14:40:41 xtraeme Exp $
-
---- docs/Makefile.in.orig 2007-02-16 15:25:08.000000000 +0100
-+++ docs/Makefile.in 2007-02-16 15:25:38.000000000 +0100
-@@ -203,6 +203,8 @@
- man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 man/freshclam.conf.5 man/clamconf.1
- all: all-am
-
-+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@MILTER_MANS = man/clamav-milter.8
-+
- .SUFFIXES:
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
diff --git a/mail/clamav/patches/patch-af b/mail/clamav/patches/patch-af
deleted file mode 100644
index bf65efcdd68..00000000000
--- a/mail/clamav/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.3 2007/02/16 14:40:41 xtraeme Exp $
-
---- database/Makefile.in.orig 2007-02-16 15:27:18.000000000 +0100
-+++ database/Makefile.in 2007-02-16 15:28:06.000000000 +0100
-@@ -359,17 +359,6 @@
- $(mkinstalldirs) $(DESTDIR)$(DBINST)
- @test -f $(DESTDIR)$(DBINST)/main.cvd || test -d $(DESTDIR)$(DBINST)/main.inc || $(INSTALL_DATA) $(srcdir)/main.cvd $(DESTDIR)$(DBINST)
- @test -f $(DESTDIR)$(DBINST)/daily.cvd || test -d $(DESTDIR)$(DBINST)/daily.inc || $(INSTALL_DATA) $(srcdir)/daily.cvd $(DESTDIR)$(DBINST)
-- @if test `id|sed -e 's/^.[^(]*(\([^)]*\)).*/\1/'` = "root" && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \
-- chmod 775 $(DESTDIR)$(DBINST); \
-- chown ${CLAMAVUSER} $(DESTDIR)$(DBINST); \
-- chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST); \
-- if test -f $(DESTDIR)$(DBINST)/main.cvd; then chmod 664 $(DESTDIR)$(DBINST)/main.cvd; fi;\
-- if test -f $(DESTDIR)$(DBINST)/main.cvd; then chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/main.cvd; fi;\
-- if test -f $(DESTDIR)$(DBINST)/main.cvd; then chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/main.cvd; fi;\
-- if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chmod 664 $(DESTDIR)$(DBINST)/daily.cvd; fi;\
-- if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/daily.cvd; fi;\
-- if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/daily.cvd; fi;\
-- fi
- # 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.
- .NOEXPORT:
diff --git a/mail/clamav/patches/patch-ah b/mail/clamav/patches/patch-ah
deleted file mode 100644
index 7e807f9d55b..00000000000
--- a/mail/clamav/patches/patch-ah
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ah,v 1.9 2007/03/06 10:32:34 martti Exp $
-
---- clamav-milter/clamav-milter.c.orig 2007-03-02 01:27:19.000000000 +0200
-+++ clamav-milter/clamav-milter.c 2007-03-06 12:24:12.000000000 +0200
-@@ -3455,7 +3455,7 @@
- * the postmaster, so include
- * some useful information
- */
-- fprintf(sendmail, _("The message %1$s sent from %2$s to\n"),
-+ fprintf(sendmail, _("The message %s sent from %s to\n"),
- sendmailId, privdata->from);
- else
- fprintf(sendmail, _("A message sent from %s to\n"),
-@@ -3469,7 +3469,7 @@
- fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename);
-
- if(hflag) {
-- fprintf(sendmail, _("\nThe message was received by %1$s from %2$s via %3$s\n\n"),
-+ fprintf(sendmail, _("\nThe message was received by %s from %s via %s\n\n"),
- smfi_getsymval(ctx, "j"), privdata->from,
- smfi_getsymval(ctx, "_"));
- fputs(_("For your information, the original message headers were:\n\n"), sendmail);
-@@ -4612,7 +4612,7 @@
- cli_dbgmsg("qfile move '%s' to '%s'\n", privdata->filename, newname);
-
- if(move(privdata->filename, newname) < 0) {
-- logg(_("^Can't rename %1$s to %2$s\n"),
-+ logg(_("^Can't rename %s to %s\n"),
- privdata->filename, newname);
- free(newname);
- return -1;
diff --git a/mail/clamsmtp/DESCR b/mail/clamsmtp/DESCR
deleted file mode 100644
index 506b710076a..00000000000
--- a/mail/clamsmtp/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-ClamSMTP is an SMTP filter that allows you to check for viruses using
-the ClamAV anti-virus software. It accepts SMTP connections and
-forwards the SMTP commands and responses to another SMTP server. The
-'DATA' email body is intercepted and scanned before forwarding.
-
-ClamSMTP aims to be lightweight, reliable, and simple rather than have
-a myriad of options. It's written in C without major dependencies.
-If you need more options then you could use something big like AMaViS
-which is written in PERL and can do almost anything.
diff --git a/mail/clamsmtp/MESSAGE b/mail/clamsmtp/MESSAGE
deleted file mode 100644
index c9b8d61f472..00000000000
--- a/mail/clamsmtp/MESSAGE
+++ /dev/null
@@ -1,34 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/08/03 08:23:06 jlam Exp $
-
-In order to use with postfix, a possible configuration using clamsmtpd as
-an after-queue content filter would be:
-
-[main.cf]
-
-content_filter = scan:localhost:10025
-receive_override_options = no_address_mappings
-
-[master.cf]
-
-# AV scan filter (used by content_filter)
-scan unix - - n - 16 smtp
- -o smtp_send_xforward_command=yes
-# For injecting mail back into postfix from the filter
-localhost:10026 inet n - n - 16 smtpd
- -o content_filter=
- -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks
- -o smtpd_helo_restrictions=
- -o smtpd_client_restrictions=
- -o smtpd_sender_restrictions=
- -o smtpd_recipient_restrictions=permit_mynetworks,reject
- -o mynetworks_style=host
- -o smtpd_authorized_xforward_hosts=127.0.0.0/8
-
-That's all! please visit the following links for more information on this
-setup:
-
- ${HOMEPAGE}postfix.html
- http://www.postfix.org/FILTER_README.html
-
-===========================================================================
diff --git a/mail/clamsmtp/Makefile b/mail/clamsmtp/Makefile
deleted file mode 100644
index aa7092a38d5..00000000000
--- a/mail/clamsmtp/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2006/10/27 17:37:18 xtraeme Exp $
-
-DISTNAME= clamsmtp-1.8
-CATEGORIES= mail
-MASTER_SITES= http://memberwebs.com/nielsen/software/clamsmtp/
-
-MAINTAINER= xtraeme@NetBSD.org
-HOMEPAGE= http://memberwebs.com/nielsen/software/clamsmtp/
-COMMENT= SMTP filter that allows you to check for viruses
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-GNU_CONFIGURE= yes
-RCD_SCRIPTS= clamsmtpd
-
-MESSAGE_SUBST+= HOMEPAGE=${HOMEPAGE}
-FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER:Q}
-
-# Doesn't work with GNU pth (missing required mutex features)
-PTHREAD_OPTS+= require native
-
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES= ${EGDIR}/clamsmtpd.conf \
- ${PKG_SYSCONFDIR}/clamsmtpd.conf
-
-INSTALLATION_DIRS= share/examples/${PKGBASE}
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/doc/clamsmtpd.conf ${EGDIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/scripts/virus_action.sh ${EGDIR}
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/clamsmtp/PLIST b/mail/clamsmtp/PLIST
deleted file mode 100644
index 27e989a0e06..00000000000
--- a/mail/clamsmtp/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2005/05/02 20:33:59 reed Exp $
-man/man5/clamsmtpd.conf.5
-man/man8/clamsmtpd.8
-sbin/clamsmtpd
-share/examples/clamsmtp/clamsmtpd.conf
-share/examples/clamsmtp/virus_action.sh
-share/examples/rc.d/clamsmtpd
-@dirrm share/examples/clamsmtp
diff --git a/mail/clamsmtp/distinfo b/mail/clamsmtp/distinfo
deleted file mode 100644
index 367a7694ff3..00000000000
--- a/mail/clamsmtp/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.20 2006/10/27 17:37:18 xtraeme Exp $
-
-SHA1 (clamsmtp-1.8.tar.gz) = ad12dce1355f5e57a7e2a216795287145a5e566a
-RMD160 (clamsmtp-1.8.tar.gz) = f80745af5628f8058d591f7f1636ae2f0a88c2f0
-Size (clamsmtp-1.8.tar.gz) = 184285 bytes
-SHA1 (patch-aa) = 4a59000b6c9ca4dfcfa37e125f620a5f674beafa
-SHA1 (patch-ab) = ec4533d12bfcd52188575deb87a1d260a92b8cbd
diff --git a/mail/clamsmtp/files/clamsmtpd.sh b/mail/clamsmtp/files/clamsmtpd.sh
deleted file mode 100644
index bd2ddf90ea7..00000000000
--- a/mail/clamsmtp/files/clamsmtpd.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: clamsmtpd.sh,v 1.5 2005/10/08 08:56:48 xtraeme Exp $
-#
-# PROVIDE: clamsmtpd
-# REQUIRE: LOGIN clamd
-# BEFORE: mail
-# KEYWORD: shutdown
-#
-# You will need to set some variables in /etc/rc.conf to start clamsmtpd:
-#
-# clamsmtpd=YES
-#
-# The following variables are optional:
-#
-# clamsmtpd_user="@CLAMAV_USER@" # user to run clamsmtpd as
-# clamsmtpd_addr="localhost:10026" # address to forward mail to;
-# # see clamsmtpd(8).
-#
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="clamsmtpd"
-rcvar=$name
-command="@PREFIX@/sbin/${name}"
-pidfile="@VARBASE@/run/clamsmtpd.pid"
-
-start_precmd="clamsmtpd_prestart"
-start_cmd="clamsmtpd_start"
-
-clamav_conffile="@PKG_SYSCONFDIR@/clamav.conf"
-if [ -f "${clamav_conffile}" ]; then
- socket=`@AWK@ 'BEGIN {r = "/tmp/clamd"};
- /^#/ {next}; /^LocalSocket[ ]/ {r = $2};
- END {print r}' ${clamav_conffile}`
- : ${clamsmtpd_user=`@AWK@ 'BEGIN {r = "@CLAMAV_USER@"};
- /^#/ {next}; /^User[ ]/ {r = $2};
- END {print r}' ${clamav_conffile}`}
-else
- : ${clamsmtpd_user="@CLAMAV_USER@"}
-fi
-
-clamsmtpd_prestart()
-{
- @TOUCH@ ${pidfile}
- @CHOWN@ ${clamsmtpd_user} ${pidfile}
-}
-
-clamsmtpd_start()
-{
- @ECHO@ "Starting ${name}."
- doit="${command} ${clamsmtpd_flags} -p ${pidfile}"
- @SU@ -m ${clamsmtpd_user} -c "$doit"
-}
-
-if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- if [ -f /etc/rc.conf ]; then
- . /etc/rc.conf
- fi
- @ECHO@ -n " ${name}"
- eval ${start_precmd}
- eval ${start_cmd}
-fi
diff --git a/mail/clamsmtp/patches/patch-aa b/mail/clamsmtp/patches/patch-aa
deleted file mode 100644
index 6fe62f45f04..00000000000
--- a/mail/clamsmtp/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/04/08 21:56:56 ghen Exp $
-
---- doc/clamsmtpd.conf.orig 2006-04-06 16:42:26.000000000 +0200
-+++ doc/clamsmtpd.conf
-@@ -29,7 +29,7 @@ OutAddress: 10026
- #Listen: 0.0.0.0:10025
-
- # The address clamd is listening on
--#ClamAddress: /var/run/clamav/clamd
-+#ClamAddress: /tmp/clamd
-
- # A header to add to all scanned email
- #Header: X-Virus-Scanned: ClamAV using ClamSMTP
diff --git a/mail/clamsmtp/patches/patch-ab b/mail/clamsmtp/patches/patch-ab
deleted file mode 100644
index edc19f3918c..00000000000
--- a/mail/clamsmtp/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/08/25 06:31:00 xtraeme Exp $
-
---- src/clamsmtpd.c.orig 2006-08-25 08:26:44.000000000 +0200
-+++ src/clamsmtpd.c 2006-08-25 08:26:59.000000000 +0200
-@@ -107,7 +107,7 @@
- #endif
-
- #define DEFAULT_CONFIG CONF_PREFIX "/clamsmtpd.conf"
--#define DEFAULT_CLAMAV "/var/run/clamav/clamd"
-+#define DEFAULT_CLAMAV "/tmp/clamd"
- #define DEFAULT_HEADER "X-Virus-Scanned: ClamAV using ClamSMTP"
- #define VIRUS_HEADER "X-Virus-Infected: Virus Detected!"
-
diff --git a/mail/columba/DESCR b/mail/columba/DESCR
deleted file mode 100644
index 773822b293c..00000000000
--- a/mail/columba/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Columba is an Email Client written in Java, featuring a user-friendly
-graphical interface with wizards and internationalization support.
diff --git a/mail/columba/Makefile b/mail/columba/Makefile
deleted file mode 100644
index ae3693527a9..00000000000
--- a/mail/columba/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:40 wiz Exp $
-#
-
-DISTNAME= columba-unix-1.0_M2-bin
-PKGNAME= columba-1.0M2
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=columba/}
-EXTRACT_SUFX= .zip
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://columba.sourceforge.net/
-COMMENT= Graphical Email Client written in JAVA (TM)
-
-NO_BUILD= yes
-USE_JAVA2= yes
-PKG_JVMS_ACCEPTED= sun-jdk13 sun-jdk14 jdk14
-
-SUBST_CLASSES+= columba
-SUBST_STAGE.columba= pre-configure
-SUBST_MESSAGE.columba= Fixing path to columba\'s executable.
-SUBST_FILES.columba= run.sh
-SUBST_SED.columba= -e 's,columba.jar,${PREFIX}/share/${PKGBASE}/columba.jar,'
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/${PKGBASE}/lib
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE}
- ${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/share/${PKGBASE}/lib
- ${INSTALL_DATA} ${WRKSRC}/columba.jar ${PREFIX}/share/${PKGBASE}
-.for f in AUTHORS LICENSE CHANGES README
- ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/${PKGBASE}
-.endfor
- ${INSTALL_SCRIPT} ${WRKSRC}/run.sh ${PREFIX}/bin/columba
-
-.include "../../mk/java-vm.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/columba/PLIST b/mail/columba/PLIST
deleted file mode 100644
index 2c1274dafcf..00000000000
--- a/mail/columba/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/08 14:27:44 xtraeme Exp $
-bin/columba
-share/columba/columba.jar
-share/columba/lib/clover.jar
-share/columba/lib/forms-1.0.3.jar
-share/columba/lib/jargs.jar
-share/columba/lib/jhall.jar
-share/columba/lib/junit.jar
-share/columba/lib/jwizz-0.1.1.jar
-share/columba/lib/lucene-1.3-final.jar
-share/columba/lib/plastic-1.2.0.jar
-share/columba/lib/ristretto-1.0pre1.jar
-share/columba/lib/usermanual.jar
-share/doc/columba/AUTHORS
-share/doc/columba/CHANGES
-share/doc/columba/LICENSE
-share/doc/columba/README
-@dirrm share/doc/columba
-@dirrm share/columba/lib
-@dirrm share/columba
diff --git a/mail/columba/distinfo b/mail/columba/distinfo
deleted file mode 100644
index 4fed09c647b..00000000000
--- a/mail/columba/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:21 agc Exp $
-
-SHA1 (columba-unix-1.0_M2-bin.zip) = 03fda34781f19b24b59eba189a8e0f86e90c16b8
-RMD160 (columba-unix-1.0_M2-bin.zip) = 6242b01cf898890c8a1968f59e6ad5ee9575fda5
-Size (columba-unix-1.0_M2-bin.zip) = 5174883 bytes
diff --git a/mail/coolmail/DESCR b/mail/coolmail/DESCR
deleted file mode 100644
index d69bf124641..00000000000
--- a/mail/coolmail/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Coolmail is like xbiff -- it watches your inbox mail file
-and lets you know when you have mail. But unlike xbiff, it can launch
-your favorite mail utility when you click on it, and it has cool
-animated 3D graphics.
-
-Please send bug reports and suggestions to me, Byron C. Darrah,
-darrah@kaiwan.com. If that address bounces, try bdarr@sed.hac.com.
diff --git a/mail/coolmail/Makefile b/mail/coolmail/Makefile
deleted file mode 100644
index 3049885848a..00000000000
--- a/mail/coolmail/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2007/02/06 18:31:53 joerg Exp $
-
-DISTNAME= coolmail-1.3
-PKGREVISION= 2
-CATEGORIES= mail x11
-MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/mail/biffs/}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= root@garbled.net
-COMMENT= Xbiff replacement with 3D animation and sound
-
-OPSYSVARS+= EXTRA_LIBS
-EXTRA_LIBS.*= -lcompat
-EXTRA_LIBS.Interix= -lSM
-EXTRA_LIBS.IRIX= # empty
-MAKE_ENV+= EXTRA_LIBS=${EXTRA_LIBS:Q}
-MAKE_ENV+= X11BASE=${PREFIX:Q}
-USE_X11BASE= yes
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/Coolmail.ad \
- ${PREFIX}/lib/X11/app-defaults/Coolmail
-
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/coolmail/PLIST b/mail/coolmail/PLIST
deleted file mode 100644
index 9498fa9c76d..00000000000
--- a/mail/coolmail/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:59:41 zuntum Exp $
-bin/coolmail
-lib/X11/app-defaults/Coolmail
-man/man1/coolmail.1
diff --git a/mail/coolmail/distinfo b/mail/coolmail/distinfo
deleted file mode 100644
index 69c139aa824..00000000000
--- a/mail/coolmail/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/10/22 17:56:31 rillig Exp $
-
-SHA1 (coolmail-1.3.tgz) = 7b8dccf16f575827a595f1025294dfc66f00a6dc
-RMD160 (coolmail-1.3.tgz) = e23a8e8a465d700163393e70ebed60870ddcbc95
-Size (coolmail-1.3.tgz) = 26809 bytes
-SHA1 (patch-aa) = 3baa02ca2f01c67724c1e01c095c0fbe65038df7
-SHA1 (patch-ab) = 35879a8f39e83e47b1598b761adcfa412d6b3104
-SHA1 (patch-ac) = 1054bda16101047024e2f6811034cfdc4d340a66
diff --git a/mail/coolmail/patches/patch-aa b/mail/coolmail/patches/patch-aa
deleted file mode 100644
index c0c91ab8f6d..00000000000
--- a/mail/coolmail/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2005/10/22 16:17:14 rillig Exp $
-
---- Makefile.orig Thu Jan 11 10:55:40 1996
-+++ Makefile Thu Jul 16 05:07:04 1998
-@@ -26,6 +26,6 @@
- LINK = $(CC)
--INCLUDES = -I/usr/X11R5/include
--LIB_DIRS = -L/usr/X11R5/lib
--BINDIR = /usr/local/bin
--MANDIR = /usr/local/man/man1
-+INCLUDES = -I$(X11BASE)/include
-+LIB_DIRS = -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib
-+BINDIR = $(PREFIX)/bin
-+MANDIR = $(PREFIX)/man/man1
-
-@@ -33,4 +33,6 @@
- # feature.
--AUDIO = -DAUDIO
--AUDIO_MODULE = audio.o
-+# Note. Audio works. I have no soundcards at present though, so I cannot
-+# test it appropriately.
-+#AUDIO = -DAUDIO
-+#AUDIO_MODULE = audio.o
-
-@@ -38,3 +40,3 @@
-
--LIBS = $(LIB_DIRS) -lXt -lX11 -lm -lXext
-+LIBS = $(LIB_DIRS) -lXt -lX11 -lm -lXext $(EXTRA_LIBS)
- COPTS = $(CFLAGS) $(AUDIO)
diff --git a/mail/coolmail/patches/patch-ab b/mail/coolmail/patches/patch-ab
deleted file mode 100644
index 5f001f458d8..00000000000
--- a/mail/coolmail/patches/patch-ab
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:09:29 agc Exp $
-
---- coolmail.c.orig Thu Jul 16 05:09:10 1998
-+++ coolmail.c Thu Jul 16 05:11:28 1998
-@@ -36,3 +36,3 @@
-
--#define DEFAULT_MAIL_DIR "/var/spool/mail/"
-+#define DEFAULT_MAIL_DIR "/var/mail/"
- #define DEFAULT_COMMAND "xterm -n Elm -e mail\0"
diff --git a/mail/coolmail/patches/patch-ac b/mail/coolmail/patches/patch-ac
deleted file mode 100644
index 7e653733a1c..00000000000
--- a/mail/coolmail/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/10/22 17:56:31 rillig Exp $
-
-The IRIX C compiler does not allow non-constant initializers for struct
-members.
-
---- system/X11/display_list.c.orig Thu Jan 11 19:14:30 1996
-+++ system/X11/display_list.c Sat Oct 22 19:49:39 2005
-@@ -149,7 +149,7 @@ void disp_config(void)
- XtResource mailfile = {"inbox", "Inbox", XtRString,
- sizeof(str), 0, XtRString, mailfile_str};
- XtResource monoflag = {"monochrome", "Monochrome", XtRBoolean,
-- sizeof(mono), 0, XtRBoolean, &mono};
-+ sizeof(mono), 0, XtRBoolean, NULL};
- XtResource frmcount = {"frameCount", "FrameCount", XtRInt,
- sizeof(frames), 0, XtRInt, &frames};
-
-@@ -164,6 +164,7 @@ void disp_config(void)
- strcpy(command_str, str);
- XtGetApplicationResources(toplevel, &str, &mailfile, 1, NULL, 0);
- strcpy(mailfile_str, str);
-+ monoflag.default_addr = &mono;
- XtGetApplicationResources(toplevel, &mono, &monoflag, 1, NULL, 0);
- if (mono) color_mode = 0;
-
diff --git a/mail/courier-analog/DESCR b/mail/courier-analog/DESCR
deleted file mode 100644
index f4df328db99..00000000000
--- a/mail/courier-analog/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This is an optional package, the Courier log analyzer. Courier-analog generates
-log summaries for incoming and outgoing SMTP connections, and IMAP and POP3
-activity. courier-analog can generate output in text or HTML format.
diff --git a/mail/courier-analog/Makefile b/mail/courier-analog/Makefile
deleted file mode 100644
index c71638b2cce..00000000000
--- a/mail/courier-analog/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/01/03 12:56:13 adrianp Exp $
-#
-
-DISTNAME= courier-analog-0.13
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://courier.sourceforge.net/
-COMMENT= Courier log analyzer
-
-USE_TOOLS+= perl:run
-
-GNU_CONFIGURE= yes
-USE_LANGUAGES= # none
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-analog/PLIST b/mail/courier-analog/PLIST
deleted file mode 100644
index a11ea1909c6..00000000000
--- a/mail/courier-analog/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/03 12:56:13 adrianp Exp $
-bin/courier-analog
-man/man8/courier-analog.8
diff --git a/mail/courier-analog/distinfo b/mail/courier-analog/distinfo
deleted file mode 100644
index 08e08c7e128..00000000000
--- a/mail/courier-analog/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/01/03 12:56:13 adrianp Exp $
-
-SHA1 (courier-analog-0.13.tar.bz2) = 6fb4e0899ac00816ed54d8a80d9701790e112f62
-RMD160 (courier-analog-0.13.tar.bz2) = 85facdf5f8b7b1e91e729808cd984b33d66ec45a
-Size (courier-analog-0.13.tar.bz2) = 60485 bytes
diff --git a/mail/courier-imap/DEINSTALL b/mail/courier-imap/DEINSTALL
deleted file mode 100644
index 7735903e02c..00000000000
--- a/mail/courier-imap/DEINSTALL
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.8 2006/06/09 22:12:10 jlam Exp $
-
-case ${STAGE} in
-DEINSTALL)
- #
- # Note some additional files that may be created by the sysadmin
- # that can probably be removed.
- #
- if ${TEST} -x ./+FILES; then
- for file in \
- ${PKG_SYSCONFDIR}/imapd.pem \
- ${PKG_SYSCONFDIR}/imapd.rand \
- ${PKG_SYSCONFDIR}/pop3d.pem \
- ${PKG_SYSCONFDIR}/pop3d.rand
- do
- ${ECHO} "# FILE: $file . /dev/null" >> ./+FILES
- done
- fi
- ;;
-esac
diff --git a/mail/courier-imap/DESCR b/mail/courier-imap/DESCR
deleted file mode 100644
index e79e619dd80..00000000000
--- a/mail/courier-imap/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-Courier-IMAP is a server that provides IMAP access to maildirs. This
-IMAP server does NOT handle traditional mailbox files (/var/spool/mail,
-and derivatives), it was written for the specific purpose of providing
-IMAP access to maildirs.
-
-"Maildir" is a directory-based mail storage format originally introduced
-in the Qmail mail server, and adopted as an alternative mail storage
-format by both Exim and Postfix. Courier-IMAP is popular on
-Qmail/Exim/Postfix sites that are configured to use maildirs. The
-primary advantage of maildirs is that multiple applications can access
-the same maildir simultaneously without requiring any kind of locking
-whatsoever. It is a faster and more efficient way to store mail. It
-works particularly well over NFS, which has a long history of
-locking-related woes.
-
-This package differs from a vanilla Courier-IMAP installation in that
-the files are installed at locations that more closely correspond to
-a Courier installation.
diff --git a/mail/courier-imap/INSTALL b/mail/courier-imap/INSTALL
deleted file mode 100644
index 21a7d381538..00000000000
--- a/mail/courier-imap/INSTALL
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: INSTALL,v 1.5 2006/06/09 22:12:10 jlam Exp $
-
-case ${STAGE} in
-POST-INSTALL)
- TLS_CERTFILE=
- oldcert="@SSLCERTS@/imapd.pem"
- newcert="@PKG_SYSCONFDIR@/imapd.pem"
- if ${TEST} -f @PKG_SYSCONFDIR@/imapd-ssl; then
- . @PKG_SYSCONFDIR@/imapd-ssl
- if ${TEST} "$TLS_CERTFILE" != "$newcert"; then
- imapdmsg="$oldcert -> $newcert"
- fi
- fi
- TLS_CERTFILE=
- oldcert="@SSLCERTS@/pop3d.pem"
- newcert="@PKG_SYSCONFDIR@/pop3d.pem"
- if ${TEST} -f @PKG_SYSCONFDIR@/pop3d-ssl; then
- . @PKG_SYSCONFDIR@/pop3d-ssl
- if ${TEST} "$TLS_CERTFILE" != "$newcert"; then
- pop3dmsg="$oldcert -> $newcert"
- fi
- fi
- if ${TEST} -n "$imapdmsg" -o -n "$pop3dmsg"; then
- ${CAT} << EOF
-===========================================================================
-
-If you are upgrading Courier-IMAP from a previous version, please note
-that the default locations of the SSL certificates for the IMAP and
-POP3 servers have moved:
-
- $imapdmsg
- $pop3dmsg
-
-===========================================================================
-EOF
- fi
- ;;
-esac
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
deleted file mode 100644
index bde5b281afd..00000000000
--- a/mail/courier-imap/Makefile
+++ /dev/null
@@ -1,94 +0,0 @@
-# $NetBSD: Makefile,v 1.59 2006/10/10 12:55:39 ben Exp $
-
-DISTNAME= courier-imap-4.1.1
-PKGREVISION= 3
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= jlam@pkgsrc.org
-COMMENT= IMAP server for access to maildir-style mailboxes
-HOMEPAGE= http://www.courier-mta.org/imap/
-
-DEPENDS+= courier-maildir>=0.53.1:../../mail/courier-maildir
-DEPENDS+= couriertcpd>=0.53.2nb2:../../net/couriertcpd
-
-USE_TOOLS+= env gmake openssl:run perl
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-
-PKG_SUPPORTED_OPTIONS+= fam
-
-# PKGNAME is a parameter to the following file
-PKGNAME= ${DISTNAME}
-.include "../../mail/courier-mta/Makefile.common"
-
-CONFIGURE_ARGS+= --datadir=${DATADIR:Q}
-CONFIGURE_ARGS+= --libexecdir=${LIBEXECDIR:Q}
-
-CONFIGURE_ARGS+= --with-mailuser=${ROOT_USER:Q}
-CONFIGURE_ARGS+= --with-piddir=${VARBASE:Q}/run
-CONFIGURE_ARGS+= --program-transform-name='s/\.rc$$//'
-CONFIGURE_ENV+= OPENSSL=${TOOLS_OPENSSL:Q}
-
-INSTALL_AM_MAKEFLAGS= sysconfdir=${EGDIR:Q}
-INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
-
-# Used in ${PKGDIR}/INSTALL
-FILES_SUBST+= SSLCERTS=${SSLCERTS:Q}
-
-REQD_DIRS+= ${DATADIR} ${DOCDIR} ${EGDIR} ${LIBEXECDIR}
-
-.for _file_ in imapd.cnf imapd.dist imapd-ssl.dist \
- pop3d.cnf pop3d.dist pop3d-ssl.dist
-CONF_FILES_PERMS+= ${EGDIR}/${_file_} \
- ${PKG_SYSCONFDIR}/${_file_:S/.dist$//} \
- ${COURIER_FILE_PERMS}
-.endfor
-RCD_SCRIPTS= courierimap courierimaps courierpop courierpops
-
-SUBST_CLASSES+= bdb
-SUBST_MESSAGE.bdb= Configuring to use $(BDB_LIBS)
-SUBST_STAGE.bdb= post-patch
-SUBST_FILES.bdb= configure bdbobj/configure.in bdbobj/configure
-SUBST_SED.bdb= -e "s,-ldb,${BDB_LIBS},g"
-
-SUBST_CLASSES+= courier
-SUBST_FILES.courier= imap/imapd-ssl.dist.in imap/imapd.8.in \
- imap/imapd.cnf.in imap/imapd.dist.in \
- imap/mkimapdcert.8.in imap/mkimapdcert.html.in \
- imap/mkimapdcert.in imapd-ssl.rc.in imapd.rc.in
-SUBST_FILES.courier+= imap/courierpop3d.8.in imap/mkpop3dcert.8.in \
- imap/mkpop3dcert.html.in imap/mkpop3dcert.in \
- imap/pop3d-ssl.dist.in imap/pop3d.cnf.in \
- imap/pop3d.dist.in pop3d-ssl.rc.in pop3d.rc.in
-SUBST_SED.courier= -e "s|^IMAPDSTART=.*|IMAPDSTART=YES|g" \
- -e "s|^IMAPDSSLSTART=.*|IMAPDSSLSTART=YES|g" \
- -e "s|^POP3DSTART=.*|POP3DSTART=YES|g" \
- -e "s|^POP3DSSLSTART=.*|POP3DSSLSTART=YES|g" \
- -e "s|@datadir@/imapd.pem|@sysconfdir@/imapd.pem|g" \
- -e "s|@datadir@/imapd.rand|@sysconfdir@/imapd.rand|g" \
- -e "s|@datadir@/pop3d.pem|@sysconfdir@/pop3d.pem|g" \
- -e "s|@datadir@/pop3d.rand|@sysconfdir@/pop3d.rand|g" \
- -e "s|@libexecdir@/couriertcpd|@sbindir@/couriertcpd|g" \
- -e "s|@sbindir@/imaplogin|@libexecdir@/imaplogin|g" \
- -e "s|@sbindir@/pop3login|@libexecdir@/courierpop3login|g" \
- -e "s|@bindir@/pop3d|@libexecdir@/courierpop3d|g"
-SUBST_STAGE.courier= pre-configure
-
-.include "../../security/courier-authlib/buildlink3.mk"
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA_DIR} ${DOCDIR}/imap
- ${INSTALL_DATA} ${WRKSRC}/imap/BUGS.html ${DOCDIR}/imap
- ${INSTALL_DATA} ${WRKSRC}/imap/README.html ${DOCDIR}/imap
- ${INSTALL_DATA} ${WRKSRC}/imap/README.proxy.html ${DOCDIR}/imap
- ${INSTALL_DATA} ${WRKSRC}/imap/courierpop3d.html ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/imap/imapd.html ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/imap/mkimapdcert.html ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/imap/mkpop3dcert.html ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/imap/imapd.pam ${EGDIR}/imap.authpam
- ${INSTALL_DATA} ${WRKSRC}/imap/pop3d.pam ${EGDIR}/pop3.authpam
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-imap/PLIST b/mail/courier-imap/PLIST
deleted file mode 100644
index d67c443c6d1..00000000000
--- a/mail/courier-imap/PLIST
+++ /dev/null
@@ -1,41 +0,0 @@
-@comment $NetBSD: PLIST,v 1.15 2006/06/09 22:12:10 jlam Exp $
-bin/imapd
-libexec/courier/courierpop3d
-libexec/courier/courierpop3login
-libexec/courier/imaplogin
-man/man8/courierimapd.8
-man/man8/courierpop3d.8
-man/man8/mkimapdcert.8
-man/man8/mkpop3dcert.8
-sbin/imapd
-sbin/imapd-ssl
-sbin/mkimapdcert
-sbin/mkpop3dcert
-sbin/pop3d
-sbin/pop3d-ssl
-share/courier/imapd
-share/courier/imapd-ssl
-share/courier/mkimapdcert
-share/courier/mkpop3dcert
-share/courier/pop3d
-share/courier/pop3d-ssl
-share/doc/courier/courierpop3d.html
-share/doc/courier/imap/BUGS.html
-share/doc/courier/imap/README.html
-share/doc/courier/imap/README.proxy.html
-share/doc/courier/imapd.html
-share/doc/courier/mkimapdcert.html
-share/doc/courier/mkpop3dcert.html
-share/examples/courier/imap.authpam
-share/examples/courier/imapd-ssl.dist
-share/examples/courier/imapd.cnf
-share/examples/courier/imapd.dist
-share/examples/courier/pop3.authpam
-share/examples/courier/pop3d-ssl.dist
-share/examples/courier/pop3d.cnf
-share/examples/courier/pop3d.dist
-share/examples/rc.d/courierimap
-share/examples/rc.d/courierimaps
-share/examples/rc.d/courierpop
-share/examples/rc.d/courierpops
-@dirrm share/doc/courier/imap
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
deleted file mode 100644
index ccf0d24a924..00000000000
--- a/mail/courier-imap/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.19 2006/10/10 12:55:39 ben Exp $
-
-SHA1 (courier-imap-4.1.1.tar.bz2) = 505f35a8a7d6f55b9d624e544785bc758700135c
-RMD160 (courier-imap-4.1.1.tar.bz2) = e7f4c0d7cbb0ccf061c31de1b0b2387ec9d87084
-Size (courier-imap-4.1.1.tar.bz2) = 3211569 bytes
-SHA1 (patch-aa) = 81b1f736141da4a38226be12b342c8e69f1ee55c
-SHA1 (patch-ad) = c23fdfcf1a37fb828850c9fbf3b9d0c8a9eb6f9e
-SHA1 (patch-ae) = 9d925f4639086af9f6faecd6a2fab2a9ecab670c
-SHA1 (patch-af) = 37c54ed8aca2f86ac142f8fa920c217058c5fc29
-SHA1 (patch-ag) = 6ddd8b3f6a2cfbab4d814b51552dbf364384cf57
-SHA1 (patch-ah) = 1870daea8320cc9748961fc7e37237bd5cde1b3c
-SHA1 (patch-ak) = 8919d48a0bc8093f30e2cc8316ff242752bcbc4a
-SHA1 (patch-al) = 5e3d549c96a0d25f963ecd08f8bf9f077263cd38
diff --git a/mail/courier-imap/files/courierimap.sh b/mail/courier-imap/files/courierimap.sh
deleted file mode 100755
index 2c1403ac380..00000000000
--- a/mail/courier-imap/files/courierimap.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: courierimap.sh,v 1.13 2006/06/17 19:26:48 jlam Exp $
-#
-# Courier IMAP services daemon
-#
-# PROVIDE: courierimap
-# REQUIRE: authdaemond
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="courierimap"
-rcvar=${name}
-command="@PREFIX@/sbin/couriertcpd"
-ctl_command="@PREFIX@/sbin/imapd"
-pidfile="@VARBASE@/run/imapd.pid"
-required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
-
-start_cmd="courierimap_doit start"
-stop_cmd="courierimap_doit stop"
-
-courierimap_doit()
-{
- action=$1
- case $action in
- start)
- for f in $required_files; do
- if [ ! -r "$f" ]; then
- @ECHO@ 1>&2 "$0: WARNING: $f is not readable"
- return 1
- fi
- done
-
- . @PKG_SYSCONFDIR@/imapd
-
- case x$IMAPDSTART in
- x[yY]*)
- @ECHO@ "Starting ${name}."
- ${ctl_command} $action
- ;;
- esac
- ;;
- stop)
- @ECHO@ "Stopping ${name}."
- ${ctl_command} $action
- ;;
- esac
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/courier-imap/files/courierimaps.sh b/mail/courier-imap/files/courierimaps.sh
deleted file mode 100755
index 96ac9141757..00000000000
--- a/mail/courier-imap/files/courierimaps.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: courierimaps.sh,v 1.15 2006/06/17 19:26:48 jlam Exp $
-#
-# Courier IMAP/SSL services daemon
-#
-# PROVIDE: courierimaps
-# REQUIRE: authdaemond
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="courierimaps"
-rcvar=${name}
-command="@PREFIX@/sbin/couriertcpd"
-ctl_command="@PREFIX@/sbin/imapd-ssl"
-pidfile="@VARBASE@/run/imapd-ssl.pid"
-required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
-
-start_cmd="courierimaps_doit start"
-stop_cmd="courierimaps_doit stop"
-
-courierimaps_doit()
-{
- action=$1
- case $action in
- start)
- for f in $required_files; do
- if [ ! -r "$f" ]; then
- @ECHO@ 1>&2 "$0: WARNING: $f is not readable"
- return 1
- fi
- done
-
- . @PKG_SYSCONFDIR@/imapd
- . @PKG_SYSCONFDIR@/imapd-ssl
-
- f="$TLS_CERTFILE"
- if [ -z "$f" ]; then
- @ECHO@ 1>&2 "$0: WARNING: TLS_CERTFILE is empty"
- return 1
- fi
- if [ ! -f "$f" ] && \
- [ "$f" = "@PKG_SYSCONFDIR@/imapd.pem" ]; then
- @ECHO@ "Generating IMAP SSL certificate in $f."
- @PREFIX@/sbin/mkimapdcert >/dev/null 2>&1
- fi
- if [ ! -r "$f" ]; then
- @ECHO@ 1>&2 "$0: WARNING: $f is not readable"
- return 1
- fi
-
- case x$IMAPDSSLSTART in
- x[yY]*)
- @ECHO@ "Starting ${name}."
- ${ctl_command} $action
- ;;
- esac
- ;;
- stop)
- @ECHO@ "Stopping ${name}."
- ${ctl_command} $action
- ;;
- esac
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/courier-imap/files/courierpop.sh b/mail/courier-imap/files/courierpop.sh
deleted file mode 100755
index 500a2b09401..00000000000
--- a/mail/courier-imap/files/courierpop.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: courierpop.sh,v 1.13 2006/06/17 19:26:48 jlam Exp $
-#
-# Courier POP3 services daemon
-#
-# PROVIDE: courierpop
-# REQUIRE: authdaemond
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="courierpop"
-rcvar=${name}
-command="@PREFIX@/sbin/couriertcpd"
-ctl_command="@PREFIX@/sbin/pop3d"
-pidfile="@VARBASE@/run/pop3d.pid"
-required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
-
-start_cmd="courierpop_doit start"
-stop_cmd="courierpop_doit stop"
-
-courierpop_doit()
-{
- action=$1
- case $action in
- start)
- for f in $required_files; do
- if [ ! -r "$f" ]; then
- @ECHO@ 1>&2 "$0: WARNING: $f is not readable"
- return 1
- fi
- done
-
- . @PKG_SYSCONFDIR@/pop3d
-
- case x$POP3DSTART in
- x[yY]*)
- @ECHO@ "Starting ${name}."
- ${ctl_command} $action
- ;;
- esac
- ;;
- stop)
- @ECHO@ "Stopping ${name}."
- ${ctl_command} $action
- ;;
- esac
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/courier-imap/files/courierpops.sh b/mail/courier-imap/files/courierpops.sh
deleted file mode 100755
index 28d8426e3fa..00000000000
--- a/mail/courier-imap/files/courierpops.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: courierpops.sh,v 1.15 2006/06/17 19:26:48 jlam Exp $
-#
-# Courier POP3/SSL services daemon
-#
-# PROVIDE: courierpops
-# REQUIRE: authdaemond
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="courierpops"
-rcvar=${name}
-command="@PREFIX@/sbin/couriertcpd"
-ctl_command="@PREFIX@/sbin/pop3d-ssl"
-pidfile="@VARBASE@/run/pop3d-ssl.pid"
-required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
-
-start_cmd="courierpops_doit start"
-stop_cmd="courierpops_doit stop"
-
-courierpops_doit()
-{
- action=$1
- case $action in
- start)
- for f in $required_files; do
- if [ ! -r "$f" ]; then
- @ECHO@ 1>&2 "$0: WARNING: $f is not readable"
- return 1
- fi
- done
-
- . @PKG_SYSCONFDIR@/pop3d
- . @PKG_SYSCONFDIR@/pop3d-ssl
-
- f="$TLS_CERTFILE"
- if [ -z "$f" ]; then
- @ECHO@ 1>&2 "$0: WARNING: TLS_CERTFILE is empty"
- return 1
- fi
- if [ ! -f "$f" ] && \
- [ "$f" = "@PKG_SYSCONFDIR@/pop3d.pem" ]; then
- @ECHO@ "Generating POP3 SSL certificate in $f."
- @PREFIX@/sbin/mkpop3dcert >/dev/null 2>&1
- fi
- if [ ! -r "$f" ]; then
- @ECHO@ 1>&2 "$0: WARNING: $f is not readable"
- return 1
- fi
-
- case x$POP3DSSLSTART in
- x[yY]*)
- @ECHO@ "Starting ${name}."
- ${ctl_command} $action
- ;;
- esac
- ;;
- stop)
- @ECHO@ "Stopping ${name}."
- ${ctl_command} $action
- ;;
- esac
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/courier-imap/patches/patch-aa b/mail/courier-imap/patches/patch-aa
deleted file mode 100644
index 8d959a2479b..00000000000
--- a/mail/courier-imap/patches/patch-aa
+++ /dev/null
@@ -1,82 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2006/06/09 22:12:10 jlam Exp $
-
---- Makefile.in.orig 2006-05-24 19:51:00.000000000 -0400
-+++ Makefile.in
-@@ -246,10 +246,11 @@ DIST_SUBDIRS = numlib md5 sha1 bdbobj gd
-
--sbin_SCRIPTS = sharedindexinstall sharedindexsplit
-+sbin_SCRIPTS =
- CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS)
- databindir = $(datadir)
--databin_SCRIPTS = mkimapdcert mkpop3dcert
--binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw
--sbinPROGRAMS = imaplogin pop3login
--libexecPROGRAMS = makedatprog couriertcpd
--man_MANS = couriertcpd.1 deliverquota.8 maildirmake.1 maildiracl.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1
-+databin_SCRIPTS = mkimapdcert mkpop3dcert \
-+ imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
-+binPROGRAMS = imapd
-+sbinPROGRAMS =
-+libexecPROGRAMS = imaplogin courierpop3login courierpop3d
-+man_MANS = courierimapd.8 courierpop3d.8 mkimapdcert.8 mkpop3dcert.8
-
-@@ -264,5 +265,5 @@ EXTRA_DIST = 00README.NOW.OR.SUFFER READ
- sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
-- imapd.cnf pop3d.cnf quotawarnmsg.example
-+ imapd.cnf pop3d.cnf
-
--libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
-+libexec_SCRIPTS =
- HTML2TXT = links -dump -no-numbering
-@@ -1031,7 +1032,7 @@ sharedindexsplit: maildir/sharedindexspl
-
--pop3login$(EXEEXT): imap/pop3login$(EXEEXT)
-- cp imap/pop3login$(EXEEXT) .
-+courierpop3login$(EXEEXT): imap/pop3login$(EXEEXT)
-+ cp imap/pop3login$(EXEEXT) ./$@
-
--pop3d$(EXEEXT): imap/pop3d$(EXEEXT)
-- cp imap/pop3d$(EXEEXT) .
-+courierpop3d$(EXEEXT): imap/pop3d$(EXEEXT)
-+ cp imap/pop3d$(EXEEXT) ./$@
-
-@@ -1079,4 +1080,7 @@ maildirkw.1: maildir/maildirkw.1
-
--imapd.8: imap/imapd.8
-- cp imap/imapd.8 .
-+courierimapd.8: imap/imapd.8
-+ cp imap/imapd.8 ./$@
-+
-+courierpop3d.8: imap/courierpop3d.8
-+ cp imap/courierpop3d.8 .
-
-@@ -1106,6 +1110,4 @@ install-exec-local:
- $(mkinstalldirs) $(DESTDIR)$(bindir)
-- test ! -x tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
-- tcpd/couriertls $(DESTDIR)$(bindir)/couriertls
- $(mkinstalldirs) $(DESTDIR)$(sbindir)
-- for f in mkimapdcert mkpop3dcert ; \
-+ for f in imapd-ssl imapd mkimapdcert mkpop3dcert pop3d pop3d-ssl ; \
- do rm -f $(DESTDIR)$(sbindir)/$$f ; \
-@@ -1115,17 +1117,4 @@ install-exec-local:
- install-exec-hook:
-- chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example
-- mkdir -p $(DESTDIR)$(sysconfdir)/shared
-- chmod 755 $(DESTDIR)$(sysconfdir)/shared
-- mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
-- chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
-
- install-data-local: install-man
-- test -d $(DESTDIR)/etc/pam.d || exit 0 ; \
-- test -w $(DESTDIR)/etc/pam.d || exit 0 ; \
-- test -f $(DESTDIR)/etc/pam.d/imap || \
-- $(INSTALL_DATA) $(srcdir)/imap/imapd.pam \
-- $(DESTDIR)/etc/pam.d/imap || exit 1 ;\
-- test -f $(DESTDIR)/etc/pam.d/pop3 || \
-- $(INSTALL_DATA) $(srcdir)/imap/pop3d.pam \
-- $(DESTDIR)/etc/pam.d/pop3 || exit 1
- for f in $(man_MANS); do chmod a+r $(DESTDIR)$(mandir)/*/$$f; done
-@@ -1136,3 +1125,2 @@ uninstall-local:
- do rm -f $(DESTDIR)$(sbindir)/$$f ; done
-- rm -f $(DESTDIR)$(bindir)/couriertls
-
diff --git a/mail/courier-imap/patches/patch-ad b/mail/courier-imap/patches/patch-ad
deleted file mode 100644
index 375b3ce7908..00000000000
--- a/mail/courier-imap/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2006/04/28 18:15:20 jlam Exp $
-
---- configure.orig 2006-02-25 12:16:40.000000000 -0500
-+++ configure
-@@ -20892,9 +20892,6 @@ else
- ac_configure_args="$ac_configure_args --with-authchangepwdir=/var/tmp/dev/null"
- fi;
-
--INSTALL_DATA='${INSTALL} -m 0600'
--INSTALL_SCRIPT='${INSTALL}'
--
- if ulimit -v 2>/dev/null
- then
- ULIMIT='ulimit -v'
diff --git a/mail/courier-imap/patches/patch-ae b/mail/courier-imap/patches/patch-ae
deleted file mode 100644
index 1bdb7131522..00000000000
--- a/mail/courier-imap/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.8 2005/08/11 00:04:01 jlam Exp $
-
---- imapd-ssl.rc.in.orig 2005-07-01 21:13:56.000000000 -0400
-+++ imapd-ssl.rc.in
-@@ -9,6 +9,7 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- bindir=@bindir@
- libexecdir=@libexecdir@
-+sbindir=@sbindir@
-
- if test ! -f @sysconfdir@/imapd
- then
-@@ -40,6 +41,7 @@ start)
- exec_prefix=@exec_prefix@ ;
- bindir=@bindir@ ;
- libexecdir=@libexecdir@ ;
-+ sbindir=@sbindir@ ;
- . @sysconfdir@/imapd ; \
- . @sysconfdir@/imapd-ssl ; \
- PROXY_HOSTNAME=$PROXY_HOSTNAME ; \
diff --git a/mail/courier-imap/patches/patch-af b/mail/courier-imap/patches/patch-af
deleted file mode 100644
index bc8923ddc57..00000000000
--- a/mail/courier-imap/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.8 2005/08/11 00:04:01 jlam Exp $
-
---- imapd.rc.in.orig 2005-07-01 21:13:56.000000000 -0400
-+++ imapd.rc.in
-@@ -9,6 +9,7 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- bindir=@bindir@
- libexecdir=@libexecdir@
-+sbindir=@sbindir@
-
- if test ! -f @sysconfdir@/imapd
- then
-@@ -40,6 +41,7 @@ start)
- exec_prefix=@exec_prefix@ ;
- bindir=@bindir@ ;
- libexecdir=@libexecdir@ ;
-+ sbindir=@sbindir@ ;
- . @sysconfdir@/imapd ; \
- . @sysconfdir@/imapd-ssl ; \
- IMAP_STARTTLS=$IMAPDSTARTTLS ; \
diff --git a/mail/courier-imap/patches/patch-ag b/mail/courier-imap/patches/patch-ag
deleted file mode 100644
index b6853df3051..00000000000
--- a/mail/courier-imap/patches/patch-ag
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ag,v 1.8 2005/08/11 00:04:01 jlam Exp $
-
---- pop3d-ssl.rc.in.orig 2005-07-01 21:13:56.000000000 -0400
-+++ pop3d-ssl.rc.in
-@@ -9,6 +9,7 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- bindir=@bindir@
- libexecdir=@libexecdir@
-+sbindir=@sbindir@
-
- if test ! -f @sysconfdir@/pop3d
- then
-@@ -33,6 +34,7 @@ start)
- exec_prefix=@exec_prefix@ ;
- bindir=@bindir@ ;
- libexecdir=@libexecdir@ ;
-+ sbindir=@sbindir@ ;
- . @sysconfdir@/pop3d ; \
- . @sysconfdir@/pop3d-ssl ; \
- PROXY_HOSTNAME=$PROXY_HOSTNAME ; \
diff --git a/mail/courier-imap/patches/patch-ah b/mail/courier-imap/patches/patch-ah
deleted file mode 100644
index 5add83baa0c..00000000000
--- a/mail/courier-imap/patches/patch-ah
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ah,v 1.7 2005/08/11 00:04:01 jlam Exp $
-
---- pop3d.rc.in.orig 2005-07-01 21:13:56.000000000 -0400
-+++ pop3d.rc.in
-@@ -9,6 +9,7 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- bindir=@bindir@
- libexecdir=@libexecdir@
-+sbindir=@sbindir@
-
- if test ! -f @sysconfdir@/pop3d
- then
-@@ -32,6 +33,7 @@ start)
- exec_prefix=@exec_prefix@ ;
- bindir=@bindir@ ;
- libexecdir=@libexecdir@ ;
-+ sbindir=@sbindir@ ;
- . @sysconfdir@/pop3d ; \
- . @sysconfdir@/pop3d-ssl ; \
- PROXY_HOSTNAME=$PROXY_HOSTNAME ; \
diff --git a/mail/courier-imap/patches/patch-ak b/mail/courier-imap/patches/patch-ak
deleted file mode 100644
index 6ab2df9673e..00000000000
--- a/mail/courier-imap/patches/patch-ak
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/04/28 18:15:20 jlam Exp $
-
---- imap/mkimapdcert.in.orig 2005-06-29 14:01:17.000000000 -0400
-+++ imap/mkimapdcert.in
-@@ -30,7 +30,6 @@ cleanup() {
- exit 1
- }
-
--cd @datadir@
- dd if=@RANDOMV@ of=@datadir@/imapd.rand count=1 2>/dev/null
- @OPENSSL@ req -new -x509 -days 365 -nodes \
- -config @sysconfdir@/imapd.cnf -out @datadir@/imapd.pem -keyout @datadir@/imapd.pem || cleanup
diff --git a/mail/courier-imap/patches/patch-al b/mail/courier-imap/patches/patch-al
deleted file mode 100644
index 460ce4425cb..00000000000
--- a/mail/courier-imap/patches/patch-al
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/10/10 12:55:39 ben Exp $
-
---- bdbobj/Makefile.in.orig 2006-01-29 12:36:19.000000000 -0500
-+++ bdbobj/Makefile.in
-@@ -225,21 +225,6 @@ all: config.h
-
- .SUFFIXES:
- .SUFFIXES: .C .c .lo .o .obj
--am--refresh:
-- @:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-- @for dep in $?; do \
-- case '$(am__configure_deps)' in \
-- *$$dep*) \
-- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-- cd $(srcdir) && $(AUTOMAKE) --foreign \
-- && exit 0; \
-- exit 1;; \
-- esac; \
-- done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --foreign Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -618,7 +603,7 @@ ps-am:
-
- uninstall-am: uninstall-info-am
-
--.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-+.PHONY: CTAGS GTAGS all all-am check check-am clean \
- clean-generic clean-libtool clean-noinstLTLIBRARIES \
- clean-noinstPROGRAMS ctags dist dist-all dist-bzip2 dist-gzip \
- dist-shar dist-tarZ dist-zip distcheck distclean \
diff --git a/mail/courier-maildir/DEINSTALL b/mail/courier-maildir/DEINSTALL
deleted file mode 100644
index b10782e3650..00000000000
--- a/mail/courier-maildir/DEINSTALL
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2005/02/18 22:12:50 jlam Exp $
-
-case ${STAGE} in
-DEINSTALL)
- #
- # Note some additional files that may be created by the sysadmin
- # that can probably be removed.
- #
- if ${TEST} -x ./+FILES; then
- for file in \
- ${PKG_SYSCONFDIR}/autoresponsesquota \
- ${PKG_SYSCONFDIR}/maildirfilterconfig \
- ${PKG_SYSCONFDIR}/maildirshared
- do
- ${ECHO} "# FILE: $file . /dev/null" >> ./+FILES
- done
- fi
- ;;
-esac
diff --git a/mail/courier-maildir/DESCR b/mail/courier-maildir/DESCR
deleted file mode 100644
index 62b953c4cdf..00000000000
--- a/mail/courier-maildir/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This package contains the utilities used to manipulate the extended
-maildirs used by the Courier mail packages.
diff --git a/mail/courier-maildir/MESSAGE b/mail/courier-maildir/MESSAGE
deleted file mode 100644
index c0d7043875e..00000000000
--- a/mail/courier-maildir/MESSAGE
+++ /dev/null
@@ -1,12 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2005/02/18 22:12:50 jlam Exp $
-
-If you are planning on using Courier-IMAP or SqWebMail to serve mail
-on the system and you will be using shared maildirs, then you should
-create a cron job that runs at regular intervals (once every few hours
-is fine) that executes the following script to update the shared folder
-index:
-
- ${PKG_SYSCONFDIR}/sharedindexupdate
-
-===========================================================================
diff --git a/mail/courier-maildir/Makefile b/mail/courier-maildir/Makefile
deleted file mode 100644
index 0882f1ca51e..00000000000
--- a/mail/courier-maildir/Makefile
+++ /dev/null
@@ -1,109 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2006/11/03 19:23:55 joerg Exp $
-
-DISTNAME= courier-${COURIER_VERSION}
-PKGNAME= ${DISTNAME:S/-/-maildir-/}
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= jlam@pkgsrc.org
-COMMENT= Courier maildir utilities
-HOMEPAGE= http://www.courier-mta.org/
-
-CONFLICTS= courier-maildirmake-[0-9]*
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-USE_TOOLS+= gmake perl:run
-USE_LANGUAGES= c c++
-
-.include "../../mail/courier-mta/Makefile.common"
-
-# This package doesn't need to depend on courier-authlib -- just fake
-# out the top-level configure script that thinks it needs
-# courierauthconfig.
-#
-CONFIGURE_ENV+= ac_cv_path_COURIERAUTHCONFIG=${TRUE:Q}
-
-# These are files required by the Courier configure scripts.
-WRKSRC_FILES= courier/courier.c config.guess config.sub \
- configure depcomp install-sh ltmain.sh missing \
- sysconftool
-WRKSRC_FILES+= Makefile.in courier.spec.in courier.lpspec.in \
- dbobj.h.in dbobj.config.in courier.sysvinit.in
-
-# These are subdirectories containing libraries used by courier-maildir.
-#
-WRKSRC_SUBDIRS= bdbobj numlib liblock unicode rfc822 maildir
-
-EXTRACT_ELEMENTS= ${WRKSRC_FILES:S/^/${DISTNAME}\//}
-EXTRACT_ELEMENTS+= ${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//}
-
-BUILD_DIRS= ${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
-INSTALLATION_DIRS= bin sbin \
- ${PKGMANDIR}/man1 ${PKGMANDIR}/man7 \
- ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \
- ${DOCDIR} ${EGDIR}
-
-REQD_DIRS= ${DOCDIR} ${EGDIR}
-OWN_DIRS_PERMS= ${PKG_SYSCONFDIR}/shared \
- ${COURIER_DIR_PERMS}
-OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/shared.tmp \
- ${COURIER_DIR_PERMS}
-CONF_FILES_PERMS+= ${EGDIR}/quotawarnmsg \
- ${PKG_SYSCONFDIR}/quotawarnmsg \
- ${COURIER_FILE_PERMS}
-CONF_FILES_PERMS+= ${EGDIR}/sharedindexupdate \
- ${PKG_SYSCONFDIR}/sharedindexupdate \
- ${COURIER_SCRIPT_PERMS}
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= ${WRKDIR}/sharedindexupdate.sh
-SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+= -e 's,@MKDIR@,${MKDIR},g'
-SUBST_SED.paths+= -e 's,@RM@,${RM},g'
-SUBST_SED.paths+= -e 's,@SH@,${SH},g'
-SUBST_SED.paths+= -e 's,@TEST@,${TEST},g'
-SUBST_STAGE.paths= post-patch
-
-post-extract:
- ${CP} ${FILESDIR}/sharedindexupdate.sh ${WRKDIR}/sharedindexupdate.sh
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/maildir/deliverquota \
- ${DESTDIR}${PREFIX}/bin/deliverquota
- ${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildiracl \
- ${DESTDIR}${PREFIX}/bin/courier-maildiracl
- ${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildirkw \
- ${DESTDIR}${PREFIX}/bin/courier-maildirkw
- ${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildirmake \
- ${DESTDIR}${PREFIX}/bin/courier-maildirmake
- ${INSTALL_MAN} ${WRKSRC}/maildir/maildiracl.1 \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/courier-maildiracl.1
- ${INSTALL_MAN} ${WRKSRC}/maildir/maildirkw.1 \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/courier-maildirkw.1
- ${INSTALL_MAN} ${WRKSRC}/maildir/maildirmake.1 \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/courier-maildirmake.1
- ${INSTALL_MAN} ${WRKSRC}/maildir/maildir.5 \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/courier-maildir.5
- ${INSTALL_MAN} ${WRKSRC}/maildir/maildirquota.7 \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/maildirquota.7
- ${INSTALL_MAN} ${WRKSRC}/maildir/deliverquota.8 \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/deliverquota.8
- ${INSTALL_DATA} ${WRKSRC}/maildir/quotawarnmsg \
- ${DESTDIR}${EGDIR}/quotawarnmsg
- ${INSTALL_SCRIPT} ${WRKSRC}/maildir/sharedindexinstall \
- ${DESTDIR}${PREFIX}/sbin/sharedindexinstall
- ${INSTALL_SCRIPT} ${WRKSRC}/maildir/sharedindexsplit \
- ${DESTDIR}${PREFIX}/sbin/sharedindexsplit
- ${INSTALL_SCRIPT} ${WRKDIR}/sharedindexupdate.sh \
- ${DESTDIR}${EGDIR}/sharedindexupdate
- grep "^${DOCDIR:S/${PREFIX}\///}" ${PKGDIR}/PLIST | \
- while read file; do \
- src=${WRKSRC:Q}/maildir/`basename $$file`; \
- dst=${DESTDIR}${PREFIX:Q}"/$$file"; \
- ${INSTALL_DATA} "$$src" "$$dst"; \
- done
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-maildir/PLIST b/mail/courier-maildir/PLIST
deleted file mode 100644
index 5d680ccefaa..00000000000
--- a/mail/courier-maildir/PLIST
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/06/09 22:11:42 jlam Exp $
-bin/courier-maildiracl
-bin/courier-maildirkw
-bin/courier-maildirmake
-bin/deliverquota
-man/man1/courier-maildiracl.1
-man/man1/courier-maildirkw.1
-man/man1/courier-maildirmake.1
-man/man5/courier-maildir.5
-man/man7/maildirquota.7
-man/man8/deliverquota.8
-sbin/sharedindexinstall
-sbin/sharedindexsplit
-share/doc/courier/README.imapkeywords.html
-share/doc/courier/README.maildirfilter.html
-share/doc/courier/README.maildirquota.html
-share/doc/courier/README.sharedfolders.html
-share/examples/courier/quotawarnmsg
-share/examples/courier/sharedindexupdate
diff --git a/mail/courier-maildir/distinfo b/mail/courier-maildir/distinfo
deleted file mode 100644
index 640f141a2f3..00000000000
--- a/mail/courier-maildir/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.9 2006/06/09 22:11:42 jlam Exp $
-
-SHA1 (courier-0.53.2.tar.bz2) = 89c6a9a57467adf8c1ac815a5ffacf47e5e694a3
-RMD160 (courier-0.53.2.tar.bz2) = a6efce3a8d6572923190ea49ed6085906317ebd8
-Size (courier-0.53.2.tar.bz2) = 6942557 bytes
diff --git a/mail/courier-maildir/files/sharedindexupdate.sh b/mail/courier-maildir/files/sharedindexupdate.sh
deleted file mode 100644
index 401dbe26393..00000000000
--- a/mail/courier-maildir/files/sharedindexupdate.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!@SH@
-#
-# $NetBSD: sharedindexupdate.sh,v 1.3 2005/02/28 21:18:16 jlam Exp $
-#
-# This script updates the index of shared folders on the system and is
-# only needed if Courier-IMAP or SqWebMail used to serve mail and shared
-# folders are used. If so, then this script should be run regularly as a
-# system process to ensure the shared folder index is kept up-to-date.
-#
-# The courier-authlib package must be separately installed to provide the
-# "authenumerate" program used in this script.
-
-sysconfdir="@PKG_SYSCONFDIR@"
-sbindir="@PREFIX@/sbin"
-
-@RM@ -rf $sysconfdir/shared.tmp
-@MKDIR@ $sysconfdir/shared.tmp || exit 1
-
-@TEST@ -x $sbindir/authenumerate || exit 1
-$sbindir/authenumerate > $sysconfdir/shared.tmp/.tmplist || exit 1
-$sbindir/sharedindexsplit $sysconfdir/shared.tmp 1 < $sysconfdir/shared.tmp/.tmplist || exit 1
-@RM@ -f $sysconfdir/shared.tmp/.tmplist
-$sbindir/sharedindexinstall
diff --git a/mail/courier-mta/DEINSTALL b/mail/courier-mta/DEINSTALL
deleted file mode 100644
index ecac4e0cffb..00000000000
--- a/mail/courier-mta/DEINSTALL
+++ /dev/null
@@ -1,93 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-
-case ${STAGE} in
-DEINSTALL)
- #
- # Note some additional files that may be created by the sysadmin
- # that can probably be removed.
- #
- if ${TEST} -x ./+FILES; then
- for file in \
- ${PKG_SYSCONFDIR}/aliases-esmtp \
- ${PKG_SYSCONFDIR}/aliases-esmtp.dat \
- ${PKG_SYSCONFDIR}/aliases-local \
- ${PKG_SYSCONFDIR}/aliases-local.dat \
- ${PKG_SYSCONFDIR}/aliases-uucp \
- ${PKG_SYSCONFDIR}/aliases-uucp.dat \
- ${PKG_SYSCONFDIR}/aliases.dat \
- ${PKG_SYSCONFDIR}/aliasfilteracct \
- ${PKG_SYSCONFDIR}/backuprelay \
- ${PKG_SYSCONFDIR}/batchsize \
- ${PKG_SYSCONFDIR}/bofh \
- ${PKG_SYSCONFDIR}/dotextension \
- ${PKG_SYSCONFDIR}/dsnfrom \
- ${PKG_SYSCONFDIR}/dsnlimit \
- ${PKG_SYSCONFDIR}/esmtpacceptmailfor \
- ${PKG_SYSCONFDIR}/esmtpacceptmailfor.dat \
- ${PKG_SYSCONFDIR}/esmtpd.pem \
- ${PKG_SYSCONFDIR}/esmtpd.rand \
- ${PKG_SYSCONFDIR}/esmtpdelay \
- ${PKG_SYSCONFDIR}/esmtpgreeting \
- ${PKG_SYSCONFDIR}/esmtphelo \
- ${PKG_SYSCONFDIR}/esmtppercentrelay \
- ${PKG_SYSCONFDIR}/esmtppercentrelay.dat \
- ${PKG_SYSCONFDIR}/esmtproutes \
- ${PKG_SYSCONFDIR}/esmtptimeout \
- ${PKG_SYSCONFDIR}/esmtptimeoutconnect \
- ${PKG_SYSCONFDIR}/esmtptimeoutdata \
- ${PKG_SYSCONFDIR}/esmtptimeouthelo \
- ${PKG_SYSCONFDIR}/esmtptimeoutkeepalive \
- ${PKG_SYSCONFDIR}/esmtptimeoutkeepaliveping \
- ${PKG_SYSCONFDIR}/esmtptimeoutquit \
- ${PKG_SYSCONFDIR}/faxqueuetime \
- ${PKG_SYSCONFDIR}/hosteddomains \
- ${PKG_SYSCONFDIR}/hosteddomains.dat \
- ${PKG_SYSCONFDIR}/locals \
- ${PKG_SYSCONFDIR}/localtimeout \
- ${PKG_SYSCONFDIR}/me \
- ${PKG_SYSCONFDIR}/msgidhost \
- ${PKG_SYSCONFDIR}/nochangingfrom \
- ${PKG_SYSCONFDIR}/queuefill \
- ${PKG_SYSCONFDIR}/queuehi \
- ${PKG_SYSCONFDIR}/queuelo \
- ${PKG_SYSCONFDIR}/queuetime \
- ${PKG_SYSCONFDIR}/retryalpha \
- ${PKG_SYSCONFDIR}/retrybeta \
- ${PKG_SYSCONFDIR}/retrydelta \
- ${PKG_SYSCONFDIR}/retrygamma \
- ${PKG_SYSCONFDIR}/sizelimit \
- ${PKG_SYSCONFDIR}/smtpaccess.dat \
- ${PKG_SYSCONFDIR}/submitdelay \
- ${PKG_SYSCONFDIR}/usexsender \
- ${PKG_SYSCONFDIR}/uucpme \
- ${PKG_SYSCONFDIR}/uucpneighbors \
- ${PKG_SYSCONFDIR}/uucprewriteheaders \
- ${PKG_SYSCONFDIR}/warntime \
- ${PKG_SYSCONFDIR}/webadmin/password
- do
- ${ECHO} "# FILE: $file . /dev/null" >> ./+FILES
- done
- fi
-
- # Unconditionally remove socket files.
- for sockfile in \
- @COURIER_STATEDIR@/allfilters/.dupfilter \
- @COURIER_STATEDIR@/allfilters/.perlfilter \
- @COURIER_STATEDIR@/allfilters/dupfilter \
- @COURIER_STATEDIR@/allfilters/perlfilter \
- @COURIER_STATEDIR@/filters/.dupfilter \
- @COURIER_STATEDIR@/filters/.perlfilter \
- @COURIER_STATEDIR@/filters/dupfilter \
- @COURIER_STATEDIR@/filters/perlfilter
- do
- if ${TEST} -f "$sockfile"; then
- ${ECHO} "Removing socket file:"
- ${ECHO} " $sockfile"
- ${RM} -f $sockfile
- fi
- done
-
- # Unconditionally remove temporary files.
- ${RM} -rf @COURIER_STATEDIR@/tmp/*
- ;;
-esac
diff --git a/mail/courier-mta/DESCR b/mail/courier-mta/DESCR
deleted file mode 100644
index e4c448e01e0..00000000000
--- a/mail/courier-mta/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-The Courier mail transfer agent (MTA) is a modular multiprotocol mail
-server that's designed to strike a balance between reasonable performance,
-flexibility and features.
-
-When Courier-MTA is installed together with Courier-IMAP and SqWebMail,
-they form an integrated mail/groupware server suite that provides
-ESMTP, IMAP, POP3, webmail, and mailing list services within a single,
-consistent framework. A web-based administration and configuration
-tool is included for comprehensive configuration of the entire Courier
-software suite.
diff --git a/mail/courier-mta/MESSAGE b/mail/courier-mta/MESSAGE
deleted file mode 100644
index f84f4debf14..00000000000
--- a/mail/courier-mta/MESSAGE
+++ /dev/null
@@ -1,27 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-
-It is recommended that Courier-MTA be installed together with Courier-IMAP
-and SqWebMail -- together, they form an integrated mail/groupware
-server suite that provides ESMTP, IMAP, POP3, webmail, and mailing
-list services within a single, consistent framework that may be managed
-through a web CGI application.
-
-There are two things which must be done to make the Courier ``webadmin''
-CGI application accessible through your HTTP server:
-
- (1) Copy the ``courierwebadmin'' CGI binary to the appropriate place in
- your HTTP document root, e.g. ${PREFIX}/libexec/cgi-bin, then
- Courier webadmin would be accessible through:
-
- http://your.domain.com/cgi-bin/courierwebadmin
-
- (2) Install a password to protect the ``webadmin'' CGI application by
- creating a one-line file containing the plaintext password at:
-
- ${PKG_SYSCONFDIR}/webadmin/password
-
- This file should be owned by ${COURIER_USER}:${COURIER_GROUP} with
- read-only permissions restricted to the owner (mode 0400).
-
-===========================================================================
diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile
deleted file mode 100644
index 2014e5a60db..00000000000
--- a/mail/courier-mta/Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2006/06/26 05:21:17 jlam Exp $
-
-DISTNAME= courier-${COURIER_VERSION}
-PKGREVISION= 3
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
-EXTRACT_SUFX= .tar.bz2
-
-CONFLICTS+= postfix-[0-9]* qmail-[0-9]* sendmail-[0-9]*
-
-MAINTAINER= jlam@pkgsrc.org
-COMMENT= Courier mail transport agent
-HOMEPAGE= http://www.courier-mta.org/
-
-DEPENDS+= courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
-DEPENDS+= couriertcpd>=${COURIER_VERSION}nb2:../../net/couriertcpd
-DEPENDS+= maildrop>=2.0.2:../../mail/maildrop
-
-USE_TOOLS+= gmake openssl:run perl:run
-USE_LANGUAGES= c c++
-
-PKGNAME= ${DISTNAME:S/-/-mta-/}
-# PKGNAME is a parameter to the following file.
-.include "Makefile.common"
-
-PLIST_SRC+= ${PKGDIR}/PLIST
-
-.include "pkginstall.mk"
-.include "options.mk"
-
-USERGROUP_PHASE= configure
-
-CONFIGURE_ENV+= OPENSSL=${TOOLS_OPENSSL:Q}
-CONFIGURE_ENV+= PROCMAIL=${LOCALBASE:Q}/bin/procmail
-
-CONFIGURE_ARGS+= --datadir=${DATADIR:Q}
-CONFIGURE_ARGS+= --with-mailuid=${PKG_UID.${COURIER_USER}}
-CONFIGURE_ARGS+= --with-mailgid=${PKG_GID.${COURIER_GROUP}}
-CONFIGURE_ARGS+= --with-paranoid-smtpext
-CONFIGURE_ARGS+= --with-piddir=${VARBASE:Q}/run
-CONFIGURE_ARGS+= --with-transport=${COURIER_TRANSPORTS:M*:Q}
-CONFIGURE_ARGS+= --without-certdb
-
-# This argument is actually here just to make the "webmail" configure
-# script work. The value is not actually used since in reality, we are
-# using the sqwebmail package to provide the Courier webmail component.
-#
-CONFIGURE_ARGS+= --enable-mimetypes=/nonexistent
-
-INSTALL_DIRS= webadmin courier
-INSTALL_AM_MAKEFLAGS+= sysconfdir=${EGDIR:Q}
-INSTALL_AM_MAKEFLAGS+= htmldocdir=${DOCDIR:Q}
-INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
-
-SUBST_CLASSES+= courier
-SUBST_FILES.courier= courier/doc/mkesmtpdcert.8.in \
- courier/doc/mkesmtpdcert.html.in \
- courier/filters/courierfilter.8.in \
- courier/filters/courierfilter.html.in \
- courier/module.esmtp/esmtpd-msa.dist.in \
- courier/module.esmtp/esmtpd-ssl.dist.in \
- courier/module.esmtp/esmtpd.cnf.in \
- courier/module.esmtp/esmtpd.dist.in \
- courier/module.esmtp/mkesmtpdcert.in
-SUBST_SED.courier= -e "s|^ESMTPDSTART=.*|ESMTPDSTART=YES|g" \
- -e "s|^ESMTPDSSLSTART=.*|ESMTPDSSLSTART=YES|g" \
- -e "s|@datadir@/esmtpd.pem|@sysconfdir@/esmtpd.pem|g" \
- -e "s|@datadir@/esmtpd.rand|@sysconfdir@/esmtpd.rand|g" \
- -e "s|@libexecdir@/filters|@libexecdir@/courier/filters|g"
-SUBST_STAGE.courier= pre-configure
-
-SUBST_CLASSES+= perms
-SUBST_FILES.perms= courier/perms.sh.in
-SUBST_SED.perms+= -e "s,@ROOT_USER@,"${ROOT_USER:Q}",g" \
- -e "s,@ROOT_GROUP@,"${ROOT_GROUP:Q}",g"
-SUBST_STAGE.perms= pre-configure
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= ${WRKDIR}/mailer.conf
-SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
-SUBST_STAGE.paths= post-patch
-
-.include "../../lang/perl5/buildlink3.mk"
-.include "../../security/courier-authlib/buildlink3.mk"
-
-post-extract:
- ${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
-
-post-build:
- ${CAT} /dev/null > ${WRKDIR}/locallowercase
- ${ECHO} ${PREFIX:Q}"/bin/maildrop" > ${WRKDIR}/maildropfilter
-
-post-install:
- cd ${WRKSRC}/courier && \
- ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install-permissions
- ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EGDIR}
- ${INSTALL_DATA} ${WRKDIR}/locallowercase ${EGDIR}/locallowercase
- ${INSTALL_DATA} ${WRKDIR}/maildropfilter ${EGDIR}/maildropfilter
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-mta/Makefile.common b/mail/courier-mta/Makefile.common
deleted file mode 100644
index 1dac3edebce..00000000000
--- a/mail/courier-mta/Makefile.common
+++ /dev/null
@@ -1,60 +0,0 @@
-# $NetBSD: Makefile.common,v 1.2 2006/06/09 22:12:18 jlam Exp $
-#
-# Package Makefiles should include this file after setting PKGNAME and
-# PKG_SUPPORTED_OPTIONS.
-
-COURIER_VERSION= 0.53.2
-
-.if !defined(PKGNAME)
-PKG_FAIL_REASON+= "[courier/Makefile.common] PKGNAME must be set."
-.endif
-
-.include "../../mk/bsd.prefs.mk"
-
-DATADIR= ${PREFIX}/share/courier
-DOCDIR= ${PREFIX}/share/doc/courier
-EGDIR= ${PREFIX}/share/examples/courier
-LIBEXECDIR= ${PREFIX}/libexec/courier
-COURIER_STATEDIR= ${VARBASE}/courier
-
-PKG_SYSCONFSUBDIR= courier
-PKG_SYSCONFDIR_PERMS= ${COURIER_USER} ${COURIER_GROUP} 0755
-COURIER_FILE_PERMS= ${COURIER_USER} ${COURIER_GROUP} 0644
-COURIER_DIR_PERMS= ${COURIER_USER} ${COURIER_GROUP} 0755
-COURIER_SCRIPT_PERMS= ${COURIER_USER} ${COURIER_GROUP} 0755
-
-FILES_SUBST+= COURIER_STATEDIR=${COURIER_STATEDIR:Q}
-
-.include "../../security/courier-authlib/Makefile.common"
-
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --localstatedir=${COURIER_STATEDIR:Q}
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-
-CONFIGURE_ARGS+= --disable-root-check
-CONFIGURE_ARGS+= --enable-unicode
-CONFIGURE_ARGS+= --enable-utf7-folder-encoding
-CONFIGURE_ARGS+= --with-trashquota
-
-USE_DB185= yes
-CONFIGURE_ARGS+= --with-db=db
-.include "../../mk/bdb.buildlink3.mk"
-
-CONFIGURE_ENV+= SYSCONFTOOL_PERL=${PERL5:Q}
-
-# Note: This expression is the same as ${PKGBASE}, but the latter is
-# not defined yet, so we cannot use it here.
-PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
-.include "../../mk/bsd.options.mk"
-
-# The maildir subdirectory can be built with a "fam" option, but it's only
-# useful for the imap server and the webmail client. Handle the option
-# here, but the corresponding package Makefiles should note that "fam" is
-# a supported option on their own.
-#
-.if !empty(PKG_OPTIONS:Mfam)
-. include "../../mk/fam.buildlink3.mk"
-.endif
-
-.include "../../devel/pcre/buildlink3.mk"
diff --git a/mail/courier-mta/PLIST b/mail/courier-mta/PLIST
deleted file mode 100644
index ab4366c0980..00000000000
--- a/mail/courier-mta/PLIST
+++ /dev/null
@@ -1,215 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/06/09 22:12:18 jlam Exp $
-bin/cancelmsg
-bin/courier-config
-bin/couriermlm
-bin/dotforward
-bin/mailq
-bin/rmail
-bin/sendmail
-bin/testmxlookup
-libexec/courier/aliascombine
-libexec/courier/aliascreate
-libexec/courier/aliasexp
-libexec/courier/cgi-bin/courierwebadmin
-libexec/courier/courierd
-libexec/courier/filters/dupfilter
-libexec/courier/filters/perlfilter
-libexec/courier/submit
-libexec/courier/submitmkdir
-man/man1/cancelmsg.1
-man/man1/couriermlm.1
-man/man1/dot-forward.1
-man/man1/dotforward.1
-man/man1/mailq.1
-man/man1/preline.1
-man/man1/rmail.1
-man/man1/sendmail.1
-man/man1/testmxlookup.1
-man/man5/dot-courier.5
-man/man7/localmailfilter.7
-man/man8/aliaslookup.8
-man/man8/courier.8
-man/man8/courierfilter.8
-man/man8/courierldapaliasd.8
-man/man8/courierperlfilter.8
-man/man8/dupfilter.8
-man/man8/esmtpd-msa.8
-man/man8/esmtpd.8
-man/man8/filterctl.8
-man/man8/makeacceptmailfor.8
-man/man8/makealiases.8
-man/man8/makehosteddomains.8
-man/man8/makepercentrelay.8
-man/man8/makesmtpaccess-msa.8
-man/man8/makesmtpaccess.8
-man/man8/mkesmtpdcert.8
-man/man8/pop3d.8
-man/man8/submit.8
-sbin/aliaslookup
-sbin/courier
-sbin/courierfilter
-sbin/filterctl
-sbin/makealiases
-sbin/makehosteddomains
-sbin/showconfig
-sbin/showmodules
-share/courier/courierctl.start
-share/courier/couriermlm/adminrequest.tmpl
-share/courier/couriermlm/confsubj.tmpl
-share/courier/couriermlm/digestsubj.tmpl
-share/courier/couriermlm/fetch.tmpl
-share/courier/couriermlm/fetchsubj.tmpl
-share/courier/couriermlm/help.tmpl
-share/courier/couriermlm/idxheader2html.tmpl
-share/courier/couriermlm/idxheaderhtml.tmpl
-share/courier/couriermlm/idxheadertxt.tmpl
-share/courier/couriermlm/idxsubject.tmpl
-share/courier/couriermlm/modrejbody.tmpl
-share/courier/couriermlm/modreject.tmpl
-share/courier/couriermlm/modrejheader.tmpl
-share/courier/couriermlm/modsubject.tmpl
-share/courier/couriermlm/modtext.tmpl
-share/courier/couriermlm/modtext2.tmpl
-share/courier/couriermlm/sub.tmpl
-share/courier/couriermlm/sub2.tmpl
-share/courier/couriermlm/sub3.tmpl
-share/courier/couriermlm/sub4.tmpl
-share/courier/couriermlm/sub5.tmpl
-share/courier/couriermlm/subreportfooter.tmpl
-share/courier/couriermlm/subreporthdr.tmpl
-share/courier/couriermlm/subreporthdr1.tmpl
-share/courier/couriermlm/subreporthdr2.tmpl
-share/courier/couriermlm/subreporthdr3.tmpl
-share/courier/couriermlm/unsub.tmpl
-share/courier/couriermlm/unsub2.tmpl
-share/courier/couriermlm/unsub3.tmpl
-share/courier/couriermlm/warn1headers.tmpl
-share/courier/couriermlm/warn1text.tmpl
-share/courier/couriermlm/warn1text2.tmpl
-share/courier/couriermlm/warn2msg.tmpl
-share/courier/courierwebadmin/admin-00machine.html
-share/courier/courierwebadmin/admin-00machine.pl
-share/courier/courierwebadmin/admin-05local.html
-share/courier/courierwebadmin/admin-05local.pl
-share/courier/courierwebadmin/admin-10password.html
-share/courier/courierwebadmin/admin-10password.pl
-share/courier/courierwebadmin/admin-15ldap.html
-share/courier/courierwebadmin/admin-15ldap.pl
-share/courier/courierwebadmin/admin-15ldapa.html
-share/courier/courierwebadmin/admin-15ldapa.pl
-share/courier/courierwebadmin/admin-15mysql.html
-share/courier/courierwebadmin/admin-15mysql.pl
-share/courier/courierwebadmin/admin-15pgsql.html
-share/courier/courierwebadmin/admin-15pgsql.pl
-share/courier/courierwebadmin/admin-20aliases.html
-share/courier/courierwebadmin/admin-20aliases.pl
-share/courier/courierwebadmin/admin-30esmtp.html
-share/courier/courierwebadmin/admin-30esmtp.pl
-share/courier/courierwebadmin/admin-31esmtp.html
-share/courier/courierwebadmin/admin-31esmtp.pl
-share/courier/courierwebadmin/admin-30xspf.html
-share/courier/courierwebadmin/admin-30xspf.pl
-share/courier/courierwebadmin/admin-34fax.html
-share/courier/courierwebadmin/admin-34fax.pl
-share/courier/courierwebadmin/admin-35fax.html
-share/courier/courierwebadmin/admin-35fax.pl
-share/courier/courierwebadmin/admin-40imap.html
-share/courier/courierwebadmin/admin-40imap.pl
-share/courier/courierwebadmin/admin-45pop3.html
-share/courier/courierwebadmin/admin-45pop3.pl
-share/courier/courierwebadmin/admin-47webmail.html
-share/courier/courierwebadmin/admin-47webmail.pl
-share/courier/courierwebadmin/admin-50bofh.html
-share/courier/courierwebadmin/admin-50bofh.pl
-share/courier/courierwebadmin/admin-cancel.pl
-share/courier/courierwebadmin/admin-main.html
-share/courier/courierwebadmin/admin-main.pl
-share/courier/courierwebadmin/admin-save.html
-share/courier/courierwebadmin/admin-save.pl
-share/courier/courierwebadmin/dumpenv.pl
-share/courier/courierwebadmin/login.html
-share/courier/courierwebadmin/notsupp.html
-share/courier/courierwebadmin/unsecure.html
-share/courier/courierwebadmin/webadmin.pl
-share/courier/courierwebadmin/webadmin.pm
-share/courier/filterctl
-share/courier/makealiases
-share/courier/makehosteddomains
-share/courier/perlfilter-wrapper.pl
-share/courier/perlfilter-example.pl
-share/doc/courier/FAQ.html
-share/doc/courier/aliaslookup.html
-share/doc/courier/aliases.html
-share/doc/courier/bg.gif
-share/doc/courier/cancelmsg.html
-share/doc/courier/changelog.html
-share/doc/courier/courier.html
-share/doc/courier/courierd.html
-share/doc/courier/courierdsn.html
-share/doc/courier/courierfilter.html
-share/doc/courier/courierldapaliasd.html
-share/doc/courier/couriermlm.html
-share/doc/courier/courierperlfilter.html
-share/doc/courier/cvs.html
-share/doc/courier/documentation.html
-share/doc/courier/dot-courier.html
-share/doc/courier/dot-forward.html
-share/doc/courier/download.php
-share/doc/courier/draft-varshavchik-exdata-smtpext.txt
-share/doc/courier/draft-varshavchik-security-smtpext.txt
-share/doc/courier/draft-varshavchik-verp-smtpext.txt
-share/doc/courier/dupfilter.html
-share/doc/courier/esmtp.html
-share/doc/courier/esmtpd.html
-share/doc/courier/footer.html
-share/doc/courier/frame.js
-share/doc/courier/header.html
-share/doc/courier/icon.gif
-share/doc/courier/index.html
-share/doc/courier/install.html
-share/doc/courier/intro.html
-share/doc/courier/japanese_flag.png
-share/doc/courier/layout.html
-share/doc/courier/links.html
-share/doc/courier/local.html
-share/doc/courier/localmailfilter.html
-share/doc/courier/mailq.html
-share/doc/courier/main.html
-share/doc/courier/makeacceptmailfor.html
-share/doc/courier/makealiases.html
-share/doc/courier/makehosteddomains.html
-share/doc/courier/makepercentrelay.html
-share/doc/courier/makesmtpaccess.html
-share/doc/courier/menu.html
-share/doc/courier/mkesmtpdcert.html
-share/doc/courier/modules.html
-share/doc/courier/pop3d.html
-share/doc/courier/preline.html
-share/doc/courier/queue.html
-share/doc/courier/rpm.html
-share/doc/courier/sendmail.html
-share/doc/courier/status.html
-share/doc/courier/structures.html
-share/doc/courier/style.css
-share/doc/courier/submit.html
-share/doc/courier/testmxlookup.html
-share/examples/courier/aliases/system
-share/examples/courier/courierd.dist
-share/examples/courier/enablefiltering
-share/examples/courier/locallowercase
-share/examples/courier/maildrop
-share/examples/courier/maildropfilter
-share/examples/courier/mailer.conf
-share/examples/courier/rfcerr2045.txt
-share/examples/courier/rfcerr2046.txt
-share/examples/courier/rfcerr2047.txt
-share/examples/courier/rfcerrheader.txt
-share/examples/courier/smtpaccess/default
-share/examples/rc.d/courier
-share/examples/rc.d/courierd
-share/examples/rc.d/courierfilter
-@dirrm share/examples/courier/smtpaccess
-@dirrm share/examples/courier/aliases
-@dirrm share/courier/courierwebadmin
-@dirrm share/courier/couriermlm
-@dirrm libexec/courier/filters
diff --git a/mail/courier-mta/PLIST.dsn b/mail/courier-mta/PLIST.dsn
deleted file mode 100644
index 67f3c9478ab..00000000000
--- a/mail/courier-mta/PLIST.dsn
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST.dsn,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-libexec/courier/modules/dsn/courierdsn
-share/examples/courier/dsndelayed.txt
-share/examples/courier/dsndelivered.txt
-share/examples/courier/dsnfailed.txt
-share/examples/courier/dsnfooter.txt
-share/examples/courier/dsnheader.txt
-share/examples/courier/dsnrelayed.txt
-share/examples/courier/dsnsubjectnotice.txt
-share/examples/courier/dsnsubjectwarn.txt
-share/examples/courier/module.dsn
-@dirrm libexec/courier/modules/dsn
diff --git a/mail/courier-mta/PLIST.esmtp b/mail/courier-mta/PLIST.esmtp
deleted file mode 100644
index aadd7d50877..00000000000
--- a/mail/courier-mta/PLIST.esmtp
+++ /dev/null
@@ -1,31 +0,0 @@
-@comment $NetBSD: PLIST.esmtp,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-bin/addcr
-libexec/courier/modules/esmtp/addcr
-libexec/courier/modules/esmtp/courieresmtp
-libexec/courier/modules/esmtp/courieresmtpd
-sbin/courieresmtpd
-sbin/esmtpd
-sbin/esmtpd-ssl
-sbin/esmtpd-msa
-sbin/makeacceptmailfor
-sbin/makepercentrelay
-sbin/makesmtpaccess
-sbin/makesmtpaccess-msa
-sbin/mkesmtpdcert
-share/courier/esmtpd
-share/courier/esmtpd-ssl
-share/courier/makeacceptmailfor
-share/courier/makepercentrelay
-share/courier/makesmtpaccess
-share/courier/mkesmtpdcert
-share/examples/courier/esmtp.authpam
-share/examples/courier/esmtpauthclient
-share/examples/courier/esmtpd-msa.dist
-share/examples/courier/esmtpd-ssl.dist
-share/examples/courier/esmtpd.cnf
-share/examples/courier/esmtpd.dist
-share/examples/courier/module.esmtp
-share/examples/rc.d/courieresmtp
-share/examples/rc.d/courieresmtpmsa
-share/examples/rc.d/courieresmtps
-@dirrm libexec/courier/modules/esmtp
diff --git a/mail/courier-mta/PLIST.fax b/mail/courier-mta/PLIST.fax
deleted file mode 100644
index b00622a2170..00000000000
--- a/mail/courier-mta/PLIST.fax
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $NetBSD: PLIST.fax,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-libexec/courier/modules/fax/courierfax
-man/man8/courierfax.8
-share/courier/faxmail/application-pdf.filter
-share/courier/faxmail/application-postscript.filter
-share/courier/faxmail/coverpage
-share/courier/faxmail/image-gif.filter
-share/courier/faxmail/image-jpeg.filter
-share/courier/faxmail/image-png.filter
-share/courier/faxmail/init
-share/courier/faxmail/new_fax
-share/courier/faxmail/text-plain.filter
-share/doc/courier/courierfax.html
-share/examples/courier/faxcoverpage.tr.dist
-share/examples/courier/faxnotifyrc.dist
-share/examples/courier/faxrc.dist
-share/examples/courier/module.fax
-@dirrm share/courier/faxmail
-@dirrm libexec/courier/modules/fax
diff --git a/mail/courier-mta/PLIST.ldap b/mail/courier-mta/PLIST.ldap
deleted file mode 100644
index 2b48df9ff36..00000000000
--- a/mail/courier-mta/PLIST.ldap
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.ldap,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-sbin/courierldapaliasd
-share/examples/courier/ldapaliasrc.dist
-share/examples/rc.d/courierldapaliasd
diff --git a/mail/courier-mta/PLIST.local b/mail/courier-mta/PLIST.local
deleted file mode 100644
index df65fd6c048..00000000000
--- a/mail/courier-mta/PLIST.local
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST.local,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-bin/preline
-libexec/courier/modules/local/courierdeliver
-libexec/courier/modules/local/courierlocal
-share/examples/courier/module.local
-@dirrm libexec/courier/modules/local
diff --git a/mail/courier-mta/PLIST.uucp b/mail/courier-mta/PLIST.uucp
deleted file mode 100644
index e807c259235..00000000000
--- a/mail/courier-mta/PLIST.uucp
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST.uucp,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-libexec/courier/modules/uucp/courieruucp
-man/man8/courieruucp.8
-man/man8/makeuucpneighbors.8
-sbin/makeuucpneighbors
-share/courier/makeuucpneighbors
-share/doc/courier/courieruucp.html
-share/examples/courier/module.uucp
-@dirrm libexec/courier/modules/uucp
diff --git a/mail/courier-mta/distinfo b/mail/courier-mta/distinfo
deleted file mode 100644
index 1d7f49e59ee..00000000000
--- a/mail/courier-mta/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/06/09 22:12:18 jlam Exp $
-
-SHA1 (courier-0.53.2.tar.bz2) = 89c6a9a57467adf8c1ac815a5ffacf47e5e694a3
-RMD160 (courier-0.53.2.tar.bz2) = a6efce3a8d6572923190ea49ed6085906317ebd8
-Size (courier-0.53.2.tar.bz2) = 6942557 bytes
-SHA1 (patch-aa) = 13c353d22a0c14fb0f769658223795c1d4d8fcf4
-SHA1 (patch-ab) = d02d396512cec5be8e3cedceb36da0127461a533
-SHA1 (patch-ac) = e20e3af10138adf53628fcb08c1657386b93edd3
-SHA1 (patch-ad) = b0e88586d90e071ac135443634153131f548e05f
-SHA1 (patch-ae) = 5a5d6b6aea3cca9d9f577d8da9ba463dd64e6902
-SHA1 (patch-af) = e17ce772bc92ec45507fed340d33856f71fbe3f6
-SHA1 (patch-ag) = 9044e5f36e9604d4d7b751bcc9042149080d61d2
-SHA1 (patch-ah) = 9f2001e1e309b2557640d8ecc9187ed793d0c5dd
-SHA1 (patch-ai) = 5324b99ebc0492c77f67a8c627ceb3c3efa9d852
-SHA1 (patch-aj) = 4b2901f200f6d68a8377a85f7c3962cf9851ca8f
-SHA1 (patch-ak) = 8ba39a1ef912399e5f5fc224a43d36142780d09c
diff --git a/mail/courier-mta/files/courier.sh b/mail/courier-mta/files/courier.sh
deleted file mode 100644
index 16a3f3db14c..00000000000
--- a/mail/courier-mta/files/courier.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: courier.sh,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-#
-# KEYWORD: nostart
-#
-# This script is intended for the end-user.
-# It is not started by /etc/rc.
-# It manipulates various Courier mail services which are
-# controlled via their appropriate rc.conf(5) settings.
-#
-
-. /etc/rc.subr
-
-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
- @TEST@ ! -x "$rcd_dir/$file" || $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
- @TEST@ ! -x "$rcd_dir/$file" || $rcd_dir/$file $rc_arg
- done
-}
-
-COMMAND_LIST=
-COMMAND_LIST="$COMMAND_LIST courierfilter"
-COMMAND_LIST="$COMMAND_LIST courierldapaliasd"
-COMMAND_LIST="$COMMAND_LIST courierd"
-COMMAND_LIST="$COMMAND_LIST courieresmtp"
-COMMAND_LIST="$COMMAND_LIST courieresmtpmsa"
-COMMAND_LIST="$COMMAND_LIST courieresmtps"
-COMMAND_LIST="$COMMAND_LIST courierimap"
-COMMAND_LIST="$COMMAND_LIST courierimaps"
-COMMAND_LIST="$COMMAND_LIST courierpop"
-COMMAND_LIST="$COMMAND_LIST courierpops"
-COMMAND_LIST="$COMMAND_LIST sqwebmail"
-
-name="courier"
-start_cmd="forward_commands"
-stop_cmd="reverse_commands"
-extra_commands="reload status"
-
-run_rc_command "$1"
diff --git a/mail/courier-mta/files/courierd.sh b/mail/courier-mta/files/courierd.sh
deleted file mode 100644
index e94a71b8523..00000000000
--- a/mail/courier-mta/files/courierd.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: courierd.sh,v 1.3 2006/06/17 19:38:43 jlam Exp $
-#
-# Courier core processes
-#
-# PROVIDE: courierd
-# REQUIRE: courierfilter courierldapaliasd
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="courierd"
-rcvar=${name}
-command="@PREFIX@/sbin/${name}"
-ctl_command="@PREFIX@/sbin/courier"
-
-restart_cmd="courierd_doit restart"
-start_precmd="courierd_prestart"
-start_cmd="courierd_doit start"
-stop_cmd="courierd_doit stop"
-
-mkdir_perms() {
- dir="$1"; user="$2"; group="$3"; mode="$4"
- @TEST@ -d $dir || @MKDIR@ $dir
- @CHOWN@ $user $dir
- @CHGRP@ $group $dir
- @CHMOD@ $mode $dir
-}
-
-courierd_prestart() {
- # Courier mail submission directories
- mkdir_perms @COURIER_STATEDIR@/msgq \
- @COURIER_USER@ @COURIER_GROUP@ 0750
- mkdir_perms @COURIER_STATEDIR@/msgs \
- @COURIER_USER@ @COURIER_GROUP@ 0750
- mkdir_perms @COURIER_STATEDIR@/tmp\
- @COURIER_USER@ @COURIER_GROUP@ 0770
- mkdir_perms @COURIER_STATEDIR@/track \
- @COURIER_USER@ @COURIER_GROUP@ 0755
-
- # Courier webadmin directories
- mkdir_perms @COURIER_STATEDIR@/webadmin \
- @COURIER_USER@ @COURIER_GROUP@ 0700
- mkdir_perms @COURIER_STATEDIR@/webadmin/added \
- @COURIER_USER@ @COURIER_GROUP@ 0700
- mkdir_perms @COURIER_STATEDIR@/webadmin/removed \
- @COURIER_USER@ @COURIER_GROUP@ 0700
-
- # Courier delivery configuration directories
- mkdir_perms @PKG_SYSCONFDIR@/aliasdir \
- @COURIER_USER@ @COURIER_GROUP@ 0755
- mkdir_perms @PKG_SYSCONFDIR@/aliases \
- @COURIER_USER@ @COURIER_GROUP@ 0750
- mkdir_perms @PKG_SYSCONFDIR@/smtpaccess \
- @COURIER_USER@ @COURIER_GROUP@ 0755
-}
-
-courierd_doit()
-{
- action=$1
-
- case $action in
- restart)
- @ECHO@ "Restarting ${name}."
- ;;
- start)
- @TEST@ -f @PKG_SYSCONFDIR@/aliases.dat ||
- @PREFIX@/sbin/makealiases
- @ECHO@ "Starting ${name}."
- ;;
- stop)
- @ECHO@ "Stopping ${name}."
- ;;
- esac
-
- ${ctl_command} $action
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/courier-mta/files/courieresmtp.sh b/mail/courier-mta/files/courieresmtp.sh
deleted file mode 100644
index c1480540249..00000000000
--- a/mail/courier-mta/files/courieresmtp.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: courieresmtp.sh,v 1.2 2006/06/17 19:26:48 jlam Exp $
-#
-# Courier ESMTP services daemon
-#
-# PROVIDE: courieresmtp
-# REQUIRE: authdaemond courierd
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="courieresmtp"
-rcvar=${name}
-command="@PREFIX@/sbin/couriertcpd"
-ctl_command="@PREFIX@/sbin/esmtpd"
-pidfile="@VARBASE@/run/esmtp.pid"
-required_files="@PKG_SYSCONFDIR@/esmtpd @PKG_SYSCONFDIR@/esmtpd-ssl"
-
-start_cmd="courieresmtp_doit start"
-stop_cmd="courieresmtp_doit stop"
-
-courieresmtp_doit()
-{
- action=$1
- case $action in
- start)
- for f in $required_files; do
- if [ ! -r "$f" ]; then
- @ECHO@ 1>&2 "$0: WARNING: $f is not readable"
- return 1
- fi
- done
-
- . @PKG_SYSCONFDIR@/esmtpd
-
- case x$ESMTPDSTART in
- x[yY]*)
- @ECHO@ "Starting ${name}."
- @TEST@ -f @PKG_SYSCONFDIR@/esmtpacceptmailfor.dat ||
- @PREFIX@/sbin/makeacceptmailfor
- @TEST@ -f @PKG_SYSCONFDIR@/${ACCESSFILE}.dat ||
- @PREFIX@/sbin/makesmtpaccess
- ${ctl_command} $action
- ;;
- esac
- ;;
- stop)
- @ECHO@ "Stopping ${name}."
- ${ctl_command} $action
- ;;
- esac
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/courier-mta/files/courieresmtpmsa.sh b/mail/courier-mta/files/courieresmtpmsa.sh
deleted file mode 100644
index 4f59dae201e..00000000000
--- a/mail/courier-mta/files/courieresmtpmsa.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: courieresmtpmsa.sh,v 1.2 2006/06/17 19:26:48 jlam Exp $
-#
-# Courier ESMTP-MSA (RFC 2476) services daemon
-#
-# PROVIDE: courieresmtpmsa
-# REQUIRE: authdaemond courierd
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="courieresmtpmsa"
-rcvar=${name}
-command="@PREFIX@/sbin/couriertcpd"
-ctl_command="@PREFIX@/sbin/esmtpd-msa"
-pidfile="@VARBASE@/run/esmtpd-msa.pid"
-required_files="@PKG_SYSCONFDIR@/esmtpd @PKG_SYSCONFDIR@/esmtpd-msa"
-
-start_cmd="courieresmtpmsa_doit start"
-stop_cmd="courieresmtpmsa_doit stop"
-
-courieresmtpmsa_doit()
-{
- action=$1
- case ${action} in
- start)
- for f in $required_files; do
- if [ ! -r "$f" ]; then
- @ECHO@ 1>&2 "$0: WARNING: $f is not readable"
- return 1
- fi
- done
-
- . @PKG_SYSCONFDIR@/esmtpd
- . @PKG_SYSCONFDIR@/esmtpd-msa
-
- case x$ESMTPDSTART in
- x[yY]*)
- @ECHO@ "Starting ${name}."
- @TEST@ -f @PKG_SYSCONFDIR@/esmtpacceptmailfor.dat ||
- @PREFIX@/sbin/makeacceptmailfor
- @TEST@ -f @PKG_SYSCONFDIR@/${ACCESSFILE}.dat ||
- @PREFIX@/sbin/makesmtpaccess-msa
- ${ctl_command} $action
- ;;
- esac
- ;;
- stop)
- @ECHO@ "Stopping ${name}."
- ${ctl_command} $action
- ;;
- esac
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/courier-mta/files/courieresmtps.sh b/mail/courier-mta/files/courieresmtps.sh
deleted file mode 100644
index d3d20e8f3f6..00000000000
--- a/mail/courier-mta/files/courieresmtps.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: courieresmtps.sh,v 1.2 2006/06/17 19:26:48 jlam Exp $
-#
-# Courier ESMTP/SSL services daemon
-#
-# PROVIDE: courieresmtps
-# REQUIRE: authdaemond courierd
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="courieresmtps"
-rcvar=${name}
-command="@PREFIX@/sbin/couriertcpd"
-ctl_command="@PREFIX@/sbin/esmtpd-ssl"
-pidfile="@VARBASE@/run/esmtpd-ssl.pid"
-required_files="@PKG_SYSCONFDIR@/esmtpd @PKG_SYSCONFDIR@/esmtpd-ssl"
-
-start_cmd="courieresmtps_doit start"
-stop_cmd="courieresmtps_doit stop"
-
-courieresmtps_doit()
-{
- action=$1
- case $action in
- start)
- for f in $required_files; do
- if [ ! -r "$f" ]; then
- @ECHO@ 1>&2 "$0: WARNING: $f is not readable"
- return 1
- fi
- done
-
- . @PKG_SYSCONFDIR@/esmtpd
- . @PKG_SYSCONFDIR@/esmtpd-ssl
-
- f="$TLS_CERTFILE"
- if [ -z "$f" ]; then
- @ECHO@ 1>&2 "$0: WARNING: TLS_CERTFILE is empty"
- return 1
- fi
- if [ ! -f "$f" ] &&
- [ "$f" = "@PKG_SYSCONFDIR@/esmtpd.pem ]; then
- @ECHO@ "Generating ESMTP SSL certificate in $f."
- @PREFIX@/sbin/mkesmtpdcert >/dev/null 2>&1
- fi
- if [ ! -r "$f" ]; then
- @ECHO@ 1>&2 "$0: WARNING: $f is not readable"
- return 1
- fi
-
- case x$ESMTPDSSLSTART in
- x[yY]*)
- @ECHO@ "Starting ${name}."
- @TEST@ -f @PKG_SYSCONFDIR@/esmtpacceptmailfor.dat ||
- @PREFIX@/sbin/makeacceptmailfor
- @TEST@ -f @PKG_SYSCONFDIR@/${ACCESSFILE}.dat ||
- @PREFIX@/sbin/makesmtpaccess
- ${ctl_command} $action
- ;;
- esac
- ;;
- stop)
- @ECHO@ "Stopping ${name}."
- ${ctl_command} $action
- ;;
- esac
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/courier-mta/files/courierfilter.sh b/mail/courier-mta/files/courierfilter.sh
deleted file mode 100644
index 9e351792d87..00000000000
--- a/mail/courier-mta/files/courierfilter.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: courierfilter.sh,v 1.3 2006/06/17 19:38:43 jlam Exp $
-#
-# Courier mail filter daemon
-#
-# PROVIDE: courierfilter
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="courierfilter"
-rcvar=${name}
-command="@PREFIX@/sbin/${name}"
-pidfile="@VARBASE@/run/${name}.pid"
-
-restart_cmd="courierfilter_doit restart"
-start_precmd="courierfilter_prestart"
-start_cmd="courierfilter_doit start"
-stop_cmd="courierfilter_doit stop"
-
-mkdir_perms() {
- dir="$1"; user="$2"; group="$3"; mode="$4"
- @TEST@ -d $dir || @MKDIR@ $dir
- @CHOWN@ $user $dir
- @CHGRP@ $group $dir
- @CHMOD@ $mode $dir
-}
-
-courierfilter_prestart() {
- # Courier filter directories
- mkdir_perms @COURIER_STATEDIR@/allfilters \
- @COURIER_USER@ @COURIER_GROUP@ 0750
- mkdir_perms @COURIER_STATEDIR@/filters \
- @COURIER_USER@ @COURIER_GROUP@ 0750
- mkdir_perms @PKG_SYSCONFDIR@/filters \
- @COURIER_USER@ @COURIER_GROUP@ 0750
- mkdir_perms @PKG_SYSCONFDIR@/filters/active \
- @COURIER_USER@ @COURIER_GROUP@ 0750
-}
-
-courierfilter_doit()
-{
- action=$1
-
- case $action in
- restart) @ECHO@ "Restarting ${name}." ;;
- start) @ECHO@ "Starting ${name}." ;;
- stop) @ECHO@ "Stopping ${name}." ;;
- esac
-
- ${command} $action
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/courier-mta/files/courierldapaliasd.sh b/mail/courier-mta/files/courierldapaliasd.sh
deleted file mode 100644
index 12c1e339d3f..00000000000
--- a/mail/courier-mta/files/courierldapaliasd.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: courierldapaliasd.sh,v 1.3 2006/06/17 19:38:43 jlam Exp $
-#
-# Courier LDAP mail aliasing daemon
-#
-# PROVIDE: courierldapaliasd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="courierldapaliasd"
-rcvar=${name}
-command="@PREFIX@/sbin/${name}"
-pidfile="@COURIER_STATEDIR@/tmp/ldapaliasd.pid"
-required_files="@PKG_SYSCONFDIR@/ldapaliasrc"
-
-restart_cmd="courierldapaliasd_doit restart"
-start_precmd="courierldapaliasd_prestart"
-start_cmd="courierldapaliasd_doit start"
-stop_cmd="courierldapaliasd_doit stop"
-
-mkdir_perms() {
- dir="$1"; user="$2"; group="$3"; mode="$4"
- @TEST@ -d $dir || @MKDIR@ $dir
- @CHOWN@ $user $dir
- @CHGRP@ $group $dir
- @CHMOD@ $mode $dir
-}
-
-courierldapaliasd_prestart()
-{
- @MKDIR@ @COURIER_STATEDIR@
- mkdir_perms @COURIER_STATEDIR@/tmp \
- @COURIER_USER@ @COURIER_GROUP@ 0770
-}
-
-courierldapaliasd_doit()
-{
- action=$1
-
- case $action in
- restart|start)
- for f in $required_files; do
- if [ ! -r "$f" ]; then
- @ECHO@ 1>&2 "$0: WARNING: $f is not readable"
- return 1
- fi
- done
- case $action in
- restart) @ECHO@ "Restarting ${name}." ;;
- start) @ECHO@ "Starting ${name}." ;;
- esac
- ;;
- stop)
- @ECHO@ "Stopping ${name}."
- ;;
- esac
-
- ${command} $action
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/courier-mta/files/mailer.conf b/mail/courier-mta/files/mailer.conf
deleted file mode 100644
index 3a1b6947c2d..00000000000
--- a/mail/courier-mta/files/mailer.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: mailer.conf,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-#
-# Use "courier-mta" as replacement for "sendmail".
-#
-sendmail @PREFIX@/bin/sendmail
-send-mail @PREFIX@/bin/sendmail
-mailq @PREFIX@/bin/mailq
-newaliases @PREFIX@/sbin/makealiases
diff --git a/mail/courier-mta/options.mk b/mail/courier-mta/options.mk
deleted file mode 100644
index 33c2c3bc99a..00000000000
--- a/mail/courier-mta/options.mk
+++ /dev/null
@@ -1,129 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2006/05/31 18:22:24 ghen Exp $
-
-# Global and legacy options
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.courier-mta
-PKG_SUPPORTED_OPTIONS= courier-dsn courier-esmtp courier-local \
- courier-uucp ldap
-PKG_SUGGESTED_OPTIONS= courier-dsn courier-esmtp courier-local \
- courier-uucp
-
-.include "../../mk/bsd.options.mk"
-
-######################################################################
-###
-### delivery sender notification mail transport
-###
-.if !empty(PKG_OPTIONS:Mcourier-dsn)
-COURIER_TRANSPORTS+= dsn
-PLIST_SRC+= ${PKGDIR}/PLIST.dsn
-
-. for _file_ in dsndelayed.txt dsndelivered.txt dsnfailed.txt \
- dsnfooter.txt dsnheader.txt dsnrelayed.txt \
- dsnsubjectnotice.txt dsnsubjectwarn.txt module.dsn
-CONF_FILES_PERMS+= ${EGDIR}/${_file_} \
- ${PKG_SYSCONFDIR}/${_file_:S/.dist$//} \
- ${COURIER_FILE_PERMS}
-. endfor
-.endif
-
-######################################################################
-###
-### ESMTP mail transport
-###
-.if !empty(PKG_OPTIONS:Mcourier-esmtp)
-COURIER_TRANSPORTS+= esmtp
-PLIST_SRC+= ${PKGDIR}/PLIST.esmtp
-
-RCD_SCRIPTS+= courieresmtp courieresmtpmsa courieresmtps
-
-OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/esmtpacceptmaildor.dir \
- ${COURIER_DIR_PERMS}
-OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/esmtppercentrelay.dir \
- ${COURIER_DIR_PERMS}
-
-. for _file_ in esmtp.authpam esmtpd-msa.dist esmtpd-ssl.dist \
- esmtpd.cnf esmtpd.dist module.esmtp
-CONF_FILES_PERMS+= ${EGDIR}/${_file_} \
- ${PKG_SYSCONFDIR}/${_file_:S/.dist$//} \
- ${COURIER_FILE_PERMS}
-. endfor
-CONF_FILES_PERMS+= ${EGDIR}/esmtpauthclient \
- ${PKG_SYSCONFDIR}/esmtpauthclient \
- ${COURIER_USER} ${COURIER_GROUP} 0600
-.endif
-
-######################################################################
-###
-### fax mail transport
-###
-### XXX This option should not be enabled until the dependencies for
-### XXX generating and receiving faxes have all been sorted out, e.g.
-### XXX mgetty+sendfax, netpbm, etc.
-###
-.if !empty(PKG_OPTIONS:Mcourier-fax)
-USE_TOOLS+= gs:run
-COURIER_TRANSPORTS+= fax
-PLIST_SRC+= ${PKGDIR}/PLIST.fax
-
-OWN_DIRS_PERMS+= ${COURIER_STATEDIR}/faxtmp \
- ${COURIER_USER} ${COURIER_GROUP} 0700
-
-. for _file_ in faxcoverpage.tr.dist faxnotifyrc.dist module.fax
-CONF_FILES_PERMS+= ${EGDIR}/${_file_} \
- ${PKG_SYSCONFDIR}/${_file_:S/.dist$//} \
- ${COURIER_FILE_PERMS}
-. endfor
-CONF_FILES_PERMS+= ${EGDIR}/faxrc.dist ${PKG_SYSCONFDIR}/faxrc \
- ${COURIER_USER} ${COURIER_GROUP} 0640
-.endif
-
-######################################################################
-###
-### local mail tranport
-###
-.if !empty(PKG_OPTIONS:Mcourier-local)
-COURIER_TRANSPORTS+= local
-PLIST_SRC+= ${PKGDIR}/PLIST.local
-
-CONF_FILES_PERMS+= ${EGDIR}/module.local \
- ${PKG_SYSCONFDIR}/module.local \
- ${COURIER_FILE_PERMS}
-.endif
-
-######################################################################
-###
-### UUCP mail transport
-###
-.if !empty(PKG_OPTIONS:Mcourier-uucp)
-COURIER_TRANSPORTS+= uucp
-UUCP_GROUP?= daemon
-PKG_GROUPS+= ${UUCP_GROUP}
-PKG_USERS+= uucp:${UUCP_GROUP}
-PLIST_SRC+= ${PKGDIR}/PLIST.uucp
-
-CONF_FILES_PERMS+= ${EGDIR}/module.uucp \
- ${PKG_SYSCONFDIR}/module.uucp \
- ${COURIER_FILE_PERMS}
-.endif
-
-.if empty(COURIER_TRANSPORTS)
-PKG_FAIL_REASON+= "[courier/options.mk] No mail transports specified."
-.endif
-
-######################################################################
-###
-### LDAP alias lookup support
-###
-.if !empty(PKG_OPTIONS:Mldap)
-. include "../../databases/openldap-client/buildlink3.mk"
-CONFIGURE_ARGS+= --with-ldapaliasd
-PLIST_SRC+= ${PKGDIR}/PLIST.ldap
-
-RCD_SCRIPTS+= courierldapaliasd
-CONF_FILES_PERMS+= ${EGDIR}/ldapaliasrc.dist \
- ${PKG_SYSCONFDIR}/ldapaliasrc \
- ${COURIER_USER} ${COURIER_GROUP} 0640
-.else
-CONFIGURE_ARGS+= --without-ldapaliasd
-.endif
diff --git a/mail/courier-mta/patches/patch-aa b/mail/courier-mta/patches/patch-aa
deleted file mode 100644
index 4e1245c71f3..00000000000
--- a/mail/courier-mta/patches/patch-aa
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/06/09 22:12:18 jlam Exp $
-
---- courier/Makefile.in.orig 2006-06-09 14:58:20.000000000 -0400
-+++ courier/Makefile.in
-@@ -52,17 +52,17 @@ build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
- pkglibexec_PROGRAMS = aliasexp$(EXEEXT) aliascombine$(EXEEXT) \
-- aliascreate$(EXEEXT) sqwebmaild$(EXEEXT) submit$(EXEEXT) \
-- @EXTRAPKGLIB@ $(am__empty)
--webmail_PROGRAMS = webmail$(EXEEXT)
-+ aliascreate$(EXEEXT) submit$(EXEEXT) \
-+ $(am__empty)
-+webmail_PROGRAMS =
- EXTRA_PROGRAMS = courierldapaliasd$(EXEEXT)
- bin_PROGRAMS = cancelmsg$(EXEEXT) mailq$(EXEEXT) sendmail$(EXEEXT) \
- testmxlookup$(EXEEXT) dotforward$(EXEEXT) couriermlm$(EXEEXT) \
-- courier-config$(EXEEXT) @couriertls@ @EXTRABIN@
-+ courier-config$(EXEEXT)
- sbin_PROGRAMS = courier$(EXEEXT) showconfig$(EXEEXT) \
- showmodules$(EXEEXT) aliaslookup$(EXEEXT) @COURIERLDAPALIASD@ \
-- @EXTRASBIN@ $(am__empty)
--cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@
-+ $(am__empty)
-+cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT)
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/courier.h.in $(srcdir)/courierctl.start.in \
-@@ -402,7 +402,7 @@ RFCERRTXTIN = rfcerrheader.txt
- RFCERRTXTNOIN = rfcerr2045.txt rfcerr2046.txt rfcerr2047.txt
- extrapkglib = makedatprog courierpop3login pcpd
- pkglibexecdir = $(libexecdir)/courier
--webmaildir = $(libexecdir)/courier/webmail
-+webmaildir = $(pkglibexecdir)/cgi-bin
- webmail_SOURCES =
- sqwebmaild_SOURCES =
-
-@@ -413,16 +413,14 @@ extrabin = maildrop lockmail reformail r
-
- extrasbin = couriertcpd$(EXEEXT)
- sbinscripts = sharedindexsplit sharedindexinstall webmaild
--sbin_SCRIPTS = @SBINSCRIPTS@
-+sbin_SCRIPTS =
- EXTRA_SCRIPTS =
--sysconf_DATA = pop3d.authpam imapd.authpam webmail.authpam imapd.cnf pop3d.cnf \
-+sysconf_DATA = \
- courierd.dist @LDAPALIASRC@ \
-- imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
-- quotawarnmsg.example $(RFCERRTXTNOIN) $(RFCERRTXTIN)
-+ $(RFCERRTXTNOIN) $(RFCERRTXTIN)
-
- databindir = $(datadir)
--databin_SCRIPTS = courierctl.start makedat makealiases makehosteddomains \
-- pop3d pop3d-ssl mkimapdcert mkpop3dcert
-+databin_SCRIPTS = courierctl.start makealiases makehosteddomains
-
- mlmdatadir = $(datadir)/couriermlm
- mlmdata_DATA = adminrequest.tmpl confsubj.tmpl digestsubj.tmpl fetch.tmpl \
-@@ -1673,27 +1671,10 @@ install-exec-hook:
- $(localstatedir)/track\
- $(localstatedir)/msgs $(localstatedir)/msgq ; do \
- $(mkinstalldirs) $(DESTDIR)$$d || :; done
-- $(INSTALL_SCRIPT) imapd.rc $(DESTDIR)$(datadir)/imapd
-- $(INSTALL_SCRIPT) imapd-ssl.rc $(DESTDIR)$(datadir)/imapd-ssl
-- rm -f $(DESTDIR)$(sbindir)/imapd
-- $(LN_S) $(datadir)/imapd $(DESTDIR)$(sbindir)/imapd
-- rm -f $(DESTDIR)$(sbindir)/imapd-ssl
-- $(LN_S) $(datadir)/imapd-ssl $(DESTDIR)$(sbindir)/imapd-ssl
-- rm -f $(DESTDIR)$(sbindir)/mkimapdcert
-- $(LN_S) $(datadir)/mkimapdcert $(DESTDIR)$(sbindir)/mkimapdcert
-- rm -f $(DESTDIR)$(sbindir)/mkpop3dcert
-- $(LN_S) $(datadir)/mkpop3dcert $(DESTDIR)$(sbindir)/mkpop3dcert
-- rm -f $(DESTDIR)$(bindir)/makedat
-- $(LN_S) $(datadir)/makedat $(DESTDIR)$(bindir)/makedat
-- for f in makealiases makehosteddomains pop3d pop3d-ssl \
-+ for f in makealiases makehosteddomains \
- ; do rm -f $(DESTDIR)$(sbindir)/$$f ; \
- $(LN_S) $(datadir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
-- rm -f $(DESTDIR)$(sbindir)/webgpg ; $(LN_S) $(datadir)/sqwebmail/webgpg $(DESTDIR)$(sbindir)/webgpg
-- $(INSTALL_PROGRAM) ../webadmin/webadmin $(DESTDIR)$(webmaildir)/webadmin
-- mkdir -p $(DESTDIR)$(sysconfdir)/shared
-- chmod 755 $(DESTDIR)$(sysconfdir)/shared
-- mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
-- chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
-+ $(INSTALL_PROGRAM) ../webadmin/webadmin $(DESTDIR)$(webmaildir)/courierwebadmin
-
- install-data-hook:
- -$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/aliases
-@@ -1711,10 +1692,6 @@ install-data-hook:
- rm -f $(DESTDIR)$(bindir)/rmail
- $(LN_S) sendmail $(DESTDIR)$(bindir)/rmail
- -$(mkinstalldirs) $(DESTDIR)@mandir@/man8
-- -$(mkinstalldirs) $(DESTDIR)$(webmailimagedir)
-- for f in `cat ../webmail/images/filelist` ; do \
-- $(INSTALL_DATA) $(srcdir)/../webmail/images/$$f \
-- $(DESTDIR)$(webmailimagedir) ; done
-
- install-permissions: perms.sh
- @chmod +x perms.sh setperms.sh
diff --git a/mail/courier-mta/patches/patch-ab b/mail/courier-mta/patches/patch-ab
deleted file mode 100644
index 82e2eb8d810..00000000000
--- a/mail/courier-mta/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-
---- courier/configure.orig 2006-02-25 12:28:52.000000000 -0500
-+++ courier/configure
-@@ -22684,9 +22684,9 @@ done
-
- if test "$testmode" = "0"
- then
-- INSTALL_PROGRAM='${INSTALL} -m 700'
-- INSTALL_SCRIPT='${INSTALL} -m 700'
-- INSTALL_DATA='${INSTALL} -m 600'
-+ INSTALL_PROGRAM='${BSD_INSTALL_PROGRAM}'
-+ INSTALL_SCRIPT='${BSD_INSTALL_SCRIPT}'
-+ INSTALL_DATA='${BSD_INSTALL_DATA}'
- fi
-
- ac_ext=cc
diff --git a/mail/courier-mta/patches/patch-ac b/mail/courier-mta/patches/patch-ac
deleted file mode 100644
index e8f2bf1e50e..00000000000
--- a/mail/courier-mta/patches/patch-ac
+++ /dev/null
@@ -1,108 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2006/06/09 22:12:18 jlam Exp $
-
---- courier/doc/Makefile.in.orig 2006-04-12 19:26:24.000000000 -0400
-+++ courier/doc/Makefile.in
-@@ -141,7 +141,7 @@ target_alias = @target_alias@
- version = @version@
- htmldocdir = @datadir@/htmldoc
- CLEANFILES = permissions.dat
--miscfiles = japanese_flag.png bg.gif icon.gif manpage.css \
-+miscfiles = japanese_flag.png bg.gif icon.gif \
- draft-varshavchik-exdata-smtpext.txt \
- draft-varshavchik-verp-smtpext.txt \
- draft-varshavchik-security-smtpext.txt \
-@@ -179,65 +179,37 @@ htmlin = \
- courier.html \
- courierldapaliasd.html \
- couriermlm.html \
-- courierpop3d.html \
-- couriertcpd.html \
-- couriertls.html \
-- deliverquota.html \
- dot-courier.html \
- dot-forward.html \
- esmtpd.html \
-- imapd.html \
- localmailfilter.html \
-- lockmail.html \
-- mailbot.html \
-- maildiracl.html \
-- maildir.html \
-- maildirkw.html \
-- maildirmake.html \
-- maildirquota.html \
-- maildropex.html \
-- maildropfilter.html \
-- maildropgdbm.html \
-- maildrop.html \
-- maildrop.README.html \
-- maildroptips.html \
- mailq.html \
- makeacceptmailfor.html \
- makealiases.html \
-- makedat.html \
- makehosteddomains.html \
-- makemime.html \
- makepercentrelay.html \
- makesmtpaccess.html \
-- mimegpg.html \
- mkesmtpdcert.html \
-- mkimapdcert.html \
-- mkpop3dcert.html \
-- pcp_README.html \
- pop3d.html \
- preline.html \
-- reformail.html \
-- reformime.html \
- sendmail.html \
- submit.html \
- testmxlookup.html
-
- htmldoc_DATA = $(nohtmlin) $(htmlin)
--man1 = sendmail.1 preline.1 maildirmake.1 cancelmsg.1 lockmail.1 maildrop.1 \
-- mailq.1 mailbot.1 makemime.1 mimegpg.1 maildiracl.1 \
-- makedat.1 reformail.1 reformime.1 couriermlm.1 testmxlookup.1 \
-- dot-forward.1 couriertls.1 couriertcpd.1 maildirkw.1
--
--man5 = dot-courier.5 maildir.5
--man7 = localmailfilter.7 maildirquota.7 maildropgdbm.7 maildropfilter.7 \
-- maildropex.7
-+man1 = sendmail.1 preline.1 cancelmsg.1 \
-+ mailq.1 \
-+ couriermlm.1 testmxlookup.1 \
-+ dot-forward.1
-
--man8 = aliaslookup.8 courier.8 courierldapaliasd.8 courierpop3d.8 \
-- deliverquota.8 \
-+man5 = dot-courier.5
-+man7 = localmailfilter.7
-+
-+man8 = aliaslookup.8 courier.8 courierldapaliasd.8 \
- esmtpd.8 makeacceptmailfor.8 makehosteddomains.8\
-- mkesmtpdcert.8 mkimapdcert.8 mkpop3dcert.8 \
-+ mkesmtpdcert.8 \
- makealiases.8 makepercentrelay.8 makesmtpaccess.8 \
-- pop3d.8 submit.8 imapd.8
-+ pop3d.8 submit.8
-
- BUILT_SOURCES = \
- aliaslookup.html aliaslookup.8 \
-@@ -263,7 +235,7 @@ BUILT_SOURCES = \
- testmxlookup.html testmxlookup.1
-
- EXTRA_DIST = $(nohtmlin) $(BUILT_SOURCES)
--man_LINKS = $(man8dir)/courierpop3login.8 \
-+man_LINKS = \
- $(man1dir)/rmail.1 $(man1dir)/dotforward.1 \
- $(man8dir)/makesmtpaccess-msa.8 \
- $(man8dir)/esmtpd-msa.8
-@@ -1125,8 +1097,7 @@ preline.1: preline.1.in
-
- install-man-extra:
- cd $(DESTDIR)$(man8dir) ; \
-- rm -f courierpop3login.8 makesmtpaccess-msa.8 esmtpd-msa.8; \
-- $(LN_S) courierpop3d.8 courierpop3login.8; \
-+ rm -f makesmtpaccess-msa.8 esmtpd-msa.8; \
- $(LN_S) makesmtpaccess.8 makesmtpaccess-msa.8 ; \
- $(LN_S) esmtpd.8 esmtpd-msa.8
- cd $(DESTDIR)$(man1dir) ; rm -f rmail.1 dotforward.1 \
diff --git a/mail/courier-mta/patches/patch-ad b/mail/courier-mta/patches/patch-ad
deleted file mode 100644
index d8fcaea4963..00000000000
--- a/mail/courier-mta/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-
---- courier/filters/Makefile.in.orig 2006-01-29 12:33:24.000000000 -0500
-+++ courier/filters/Makefile.in
-@@ -234,7 +234,7 @@ htmldocdir = @datadir@/htmldoc
- htmldoc_DATA = courierfilter.html courierperlfilter.html dupfilter.html
- databindir = $(datadir)
- databin_SCRIPTS = filterctl
--filterbindir = $(libexecdir)/filters
-+filterbindir = $(libexecdir)/courier/filters
- filtersocketdir = $(localstatedir)/filters
- allfiltersocketdir = $(localstatedir)/allfilters
- filterconfdir = $(sysconfdir)/filters
diff --git a/mail/courier-mta/patches/patch-ae b/mail/courier-mta/patches/patch-ae
deleted file mode 100644
index ea6fdda4c19..00000000000
--- a/mail/courier-mta/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-
---- courier/filters/filterctl.in.orig 2004-01-31 23:46:27.000000000 -0500
-+++ courier/filters/filterctl.in
-@@ -12,7 +12,7 @@ sysconfdir="@sysconfdir@"
- localstatedir="@localstatedir@"
- piddir="@piddir@"
-
--filterbindir="${libexecdir}/filters"
-+filterbindir="${libexecdir}/courier/filters"
- filteractivedir="${sysconfdir}/filters/active"
- pidfile="${piddir}/courierfilter.pid"
-
diff --git a/mail/courier-mta/patches/patch-af b/mail/courier-mta/patches/patch-af
deleted file mode 100644
index 295e5ba4117..00000000000
--- a/mail/courier-mta/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-
---- courier/filters/perlfilter/Makefile.in.orig 2006-02-05 19:35:20.000000000 -0500
-+++ courier/filters/perlfilter/Makefile.in
-@@ -206,7 +206,7 @@ target_alias = @target_alias@
- EXTRA_DIST = perlfilter-wrapper.pl perlfilter-example.pl
- BUILT_SOURCES = filtersocketdir.h wrapperpl.h xsinit.c
- CLEANFILES = $(BUILT_SOURCES) permissions.dat
--filterbindir = $(libexecdir)/filters
-+filterbindir = $(libexecdir)/courier/filters
- scriptdir = $(datadir)
- script_SCRIPTS = perlfilter-wrapper.pl perlfilter-example.pl
- filtersocketdir = $(localstatedir)/filters
diff --git a/mail/courier-mta/patches/patch-ag b/mail/courier-mta/patches/patch-ag
deleted file mode 100644
index fcd352e70fb..00000000000
--- a/mail/courier-mta/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-
---- courier/module.esmtp/mkesmtpdcert.in.orig 2000-09-18 13:24:01.000000000 -0400
-+++ courier/module.esmtp/mkesmtpdcert.in
-@@ -17,6 +17,7 @@ then
- exit 1
- fi
-
-+umask 077
- cp /dev/null @datadir@/esmtpd.pem
- chmod 600 @datadir@/esmtpd.pem
- chown @mailuser@ @datadir@/esmtpd.pem
diff --git a/mail/courier-mta/patches/patch-ah b/mail/courier-mta/patches/patch-ah
deleted file mode 100644
index 3b674239007..00000000000
--- a/mail/courier-mta/patches/patch-ah
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-
---- courier/module.local/deliver.c.orig 2005-02-03 21:44:59.000000000 -0500
-+++ courier/module.local/deliver.c
-@@ -633,7 +633,7 @@ static int docommand(const char *extensi
- const char *defaultmail,
- int recursion_level)
- {
--char *envs[19];
-+char *envs[20];
- const char *p;
- const char *hostp;
- pid_t pid;
-@@ -725,7 +725,9 @@ const char *shell=getenv("SHELL");
- envs[17]=courier_malloc(strlen(shell)
- +sizeof("SHELL="));
- strcat(strcpy(envs[17], "SHELL="), shell);
-- envs[18]=0;
-+ envs[18]=courier_malloc(sizeof("COURIER_MTA="));
-+ strcpy(envs[18], "COURIER_MTA=");
-+ envs[19]=0;
-
- if (*command == '|')
- {
diff --git a/mail/courier-mta/patches/patch-ai b/mail/courier-mta/patches/patch-ai
deleted file mode 100644
index d22b37c8744..00000000000
--- a/mail/courier-mta/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-
---- courier/module.local/local.c.orig 2004-10-23 22:02:38.000000000 -0400
-+++ courier/module.local/local.c
-@@ -731,6 +731,8 @@ const char *quota;
- strlen(argv[7])), "SENDER="),
- argv[7]));
-
-+ putenv(strcpy(courier_malloc(sizeof("COURIER_MTA=")),
-+ "COURIER_MTA="));
- putenv(strcat(strcpy(courier_malloc(sizeof("HOME=")+
- strlen(homedir)), "HOME="), homedir));
- putenv(strcat(strcpy(courier_malloc(sizeof("DEFAULT=")+
diff --git a/mail/courier-mta/patches/patch-aj b/mail/courier-mta/patches/patch-aj
deleted file mode 100644
index 1bd9627cab6..00000000000
--- a/mail/courier-mta/patches/patch-aj
+++ /dev/null
@@ -1,170 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2006/06/09 22:12:18 jlam Exp $
-
---- courier/perms.sh.in.orig 2006-04-12 20:21:48.000000000 -0400
-+++ courier/perms.sh.in
-@@ -10,115 +10,45 @@ prefix="@prefix@"
- exec_prefix="@exec_prefix@"
-
- PERMS="
--. 755
--
- @localstatedir@ 755 x bin bin
- @localstatedir@/tmp 770
- @localstatedir@/msgs 750
- @localstatedir@/msgq 750
- @localstatedir@/track 755
-
--@sysconfdir@ 755 x
--@sysconfdir@/aliasdir 755
--@sysconfdir@/aliases 750
--@sysconfdir@/enablefiltering 644 config
--@sysconfdir@/maildrop 644 config
--@sysconfdir@/smtpaccess 755
--@sysconfdir@/shared 755
--@sysconfdir@/shared.tmp 755
--@sysconfdir@/smtpaccess/default 644 config
--@sysconfdir@/courierd.dist 644 config
--@sysconfdir@/aliases/system 640 config
--@sysconfdir@/pop3d.dist 644 config
--@sysconfdir@/pop3d-ssl.dist 644 config
--@sysconfdir@/pop3d.authpam 644 config
--@sysconfdir@/pop3d.cnf 600 config
--@sysconfdir@/imapd.dist 644 config
--@sysconfdir@/imapd-ssl.dist 644 config
--@sysconfdir@/imapd.authpam 644 config
--@sysconfdir@/imapd.cnf 600 config
--@sysconfdir@/sqwebmaild.dist 644 config
--@sysconfdir@/webmail.authpam 644 config
--@sysconfdir@/quotawarnmsg.example 444
--@sysconfdir@/rfcerrheader.txt 444 config
--@sysconfdir@/rfcerr2045.txt 444 config
--@sysconfdir@/rfcerr2046.txt 444 config
--@sysconfdir@/rfcerr2047.txt 444 config
--
--@libexecdir@ 755 x bin bin
- @libexecdir@/courier 755 x bin bin
- @libexecdir@/courier/modules 755 x bin bin
- @libexecdir@/courier/submitmkdir 4550
- @libexecdir@/courier/courierd 550
--@libexecdir@/courier/courierpop3d 555
--@libexecdir@/courier/courierpop3login 555
- @libexecdir@/courier/aliasexp 550
- @libexecdir@/courier/aliascombine 550
- @libexecdir@/courier/aliascreate 550
- @libexecdir@/courier/submit 550
--@libexecdir@/courier/makedatprog 555
--@libexecdir@/courier/imaplogin 555 x bin bin
--@libexecdir@/courier/pcpd 555 x bin bin
--@libexecdir@/courier/webmail 700 x root bin
--@libexecdir@/courier/webmail/webmail 555 x root bin
--@libexecdir@/courier/sqwebmaild 555
--@libexecdir@/courier/sqwebpasswd 2755
--@libexecdir@/courier/webmail/webadmin 4555 x root bin
-+@libexecdir@/courier/cgi-bin 700 x root bin
-+@libexecdir@/courier/cgi-bin/courierwebadmin 4555 x root bin
-
--@sbindir@ 755 x bin bin
- @sbindir@/courier 555
- @sbindir@/showconfig 555
- @sbindir@/showmodules 550
--@sbindir@/couriertcpd 555
--@sbindir@/imapd 555
--@sbindir@/imapd-ssl 555
--@sbindir@/sharedindexsplit 555
--@sbindir@/sharedindexinstall 555
- @sbindir@/aliaslookup 555
--@sbindir@/webmaild 555
--@datadir@/imapd 555 x bin bin
--@datadir@/imapd-ssl 555 x bin bin
-
--@bindir@ 755 x bin bin
- @bindir@/cancelmsg 6555
- @bindir@/courier-config 555
- @bindir@/mailq 2555
--@bindir@/maildirmake 555
--@bindir@/maildiracl 555
--@bindir@/maildirkw 555
- @bindir@/sendmail 4511 x root
- @bindir@/rmail 4511 x root
--@bindir@/lockmail 555
--@bindir@/deliverquota 555
--@bindir@/mailbot 555
--@bindir@/makemime 555
--@bindir@/reformail 555
--@bindir@/reformime 555
--@bindir@/mimegpg 555
- @bindir@/couriermlm 555
- @bindir@/dotforward 555
-
--@datadir@/makedat 555 x bin bin
--@bindir@/makedat 555
- @bindir@/testmxlookup 555
--@bindir@/imapd 555
- @datadir@/makealiases 550
- @sbindir@/makealiases 550
- @datadir@/makehosteddomains 555
- @sbindir@/makehosteddomains 555
--@datadir@/pop3d 755
--@sbindir@/pop3d 755
--@datadir@/pop3d-ssl 755
--@sbindir@/pop3d-ssl 755
--@sbindir@/webgpg 555
-
- @datadir@ 755 x bin bin
- @datadir@/courierctl.start 555
-
--@datadir@/mkimapdcert 755
--@sbindir@/mkimapdcert 755
--@datadir@/mkpop3dcert 755
--@sbindir@/mkpop3dcert 755
- @datadir@/couriermlm 755
-
- @datadir@/couriermlm/adminrequest.tmpl 644
-@@ -168,11 +98,20 @@ do
- if test "$USER" = ""
- then
- USER="@mailuser@"
-+ elif test "$USER" = "root"
-+ then
-+ USER="@ROOT_USER@"
-+ elif test "$USER" = "bin"
-+ then
-+ USER="@ROOT_USER@"
- fi
-
- if test "$GROUP" = ""
- then
- GROUP="@mailgroup@"
-+ elif test "$GROUP" = "bin"
-+ then
-+ GROUP="@ROOT_GROUP@"
- fi
-
- case $FILE in
-@@ -193,26 +132,7 @@ do
- echo $FILE $MODE $USER $GROUP $SPECIAL
- done
-
--. ../tcpd/couriertls.config
--
--if test "$couriertls" != ""
--then
-- echo @bindir@/couriertls 555 bin bin
--fi
--
- if test "@HAVE_LDAP@" != 0
- then
-- echo @sysconfdir@/ldapaliasrc.dist 640 @mailuser@ @mailgroup@ config
- echo @sbindir@/courierldapaliasd 700 @mailuser@ @mailgroup@
- fi
--
--echo @datadir@/sqwebmail/images 755 @mailuser@ @mailgroup@
--
--for f in `cat ../webmail/images/filelist 2>/dev/null`
--do
-- echo @datadir@/sqwebmail/images/$f 444 @mailuser@ @mailgroup@
--done
--
--. ../maildrop/uidgid
--
--echo @bindir@/maildrop 4511 $uid @mailgroup@
diff --git a/mail/courier-mta/patches/patch-ak b/mail/courier-mta/patches/patch-ak
deleted file mode 100644
index 3d1525e5292..00000000000
--- a/mail/courier-mta/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-
---- courier/webadmin/admin-47webmail.pl.orig 2005-02-15 21:43:31.000000000 -0500
-+++ courier/webadmin/admin-47webmail.pl
-@@ -123,7 +123,7 @@ if ($cgi->param("submit"))
- {
- DeleteConfigFile("calendarmode");
- }
-- changed("test -x ${libexecdir}/courier/pcpd || exit 0; ${sbindir}/webmaild stop; ${sbindir}/webmaild start");
-+ changed("test -x ${libexecdir}/courier/pcpd || exit 0; ${sbindir}/sqwebmaild stop; ${sbindir}/sqwebmaild start");
- $errmsg="\@SAVED\@";
- }
-
diff --git a/mail/courier-mta/pkginstall.mk b/mail/courier-mta/pkginstall.mk
deleted file mode 100644
index e2766f06570..00000000000
--- a/mail/courier-mta/pkginstall.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-# $NetBSD: pkginstall.mk,v 1.2 2006/06/17 19:26:48 jlam Exp $
-
-# Convenience definition used below for a file or directory owned by the
-# courier user and group.
-#
-COURIER_OWNED= ${COURIER_USER} ${COURIER_GROUP}
-
-REQD_DIRS+= ${DATADIR} ${DOCDIR} ${EGDIR} \
- ${LIBEXECDIR} ${LIBEXECDIR}/modules
-REQD_DIRS_PERMS+= ${LIBEXECDIR}/cgi-bin ${ROOT_USER} ${ROOT_GROUP} 0700
-MAKE_DIRS+= ${VARBASE}/run ${COURIER_STATEDIR}
-
-###
-### Courier filter directories
-###
-OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/filters ${COURIER_OWNED} 0750
-OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/filters/active \
- ${COURIER_OWNED} 0750
-OWN_DIRS_PERMS+= ${COURIER_STATEDIR}/allfilters ${COURIER_OWNED} 0750
-OWN_DIRS_PERMS+= ${COURIER_STATEDIR}/filters ${COURIER_OWNED} 0750
-
-###
-### Courier mail submission directories
-###
-OWN_DIRS_PERMS+= ${COURIER_STATEDIR}/msgq ${COURIER_OWNED} 0750
-OWN_DIRS_PERMS+= ${COURIER_STATEDIR}/msgs ${COURIER_OWNED} 0750
-OWN_DIRS_PERMS+= ${COURIER_STATEDIR}/tmp ${COURIER_OWNED} 0770
-OWN_DIRS_PERMS+= ${COURIER_STATEDIR}/track ${COURIER_OWNED} 0755
-
-###
-### Courier webadmin directories
-###
-OWN_DIRS_PERMS+= ${COURIER_STATEDIR}/webadmin ${COURIER_OWNED} 0700
-OWN_DIRS_PERMS+= ${COURIER_STATEDIR}/webadmin/added \
- ${COURIER_OWNED} 0700
-OWN_DIRS_PERMS+= ${COURIER_STATEDIR}/webadmin/removed \
- ${COURIER_OWNED} 0700
-
-###
-### Courier setuid and setgid binaries
-###
-SPECIAL_PERMS+= bin/cancelmsg ${COURIER_OWNED} 6555
-SPECIAL_PERMS+= bin/mailq ${COURIER_OWNED} 2555
-SPECIAL_PERMS+= bin/sendmail ${SETUID_ROOT_PERMS}
-SPECIAL_PERMS+= libexec/courier/cgi-bin/courierwebadmin \
- ${SETUID_ROOT_PERMS}
-SPECIAL_PERMS+= libexec/courier/submitmkdir ${COURIER_OWNED} 4550
-
-###
-### Courier delivery configuration directories
-###
-OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/aliasdir ${COURIER_OWNED} 0755
-OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/aliases ${COURIER_OWNED} 0750
-OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/smtpaccess ${COURIER_OWNED} 0755
-
-.for _file_ in aliases/system
-CONF_FILES_PERMS+= ${EGDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \
- ${COURIER_OWNED} 0640
-.endfor
-.for _file_ in courierd.dist enablefiltering locallowercase \
- maildrop maildropfilter rfcerr2045.txt \
- rfcerr2046.txt rfcerr2047.txt rfcerrheader.txt \
- smtpaccess/default
-CONF_FILES_PERMS+= ${EGDIR}/${_file_} \
- ${PKG_SYSCONFDIR}/${_file_:S/.dist$//} \
- ${COURIER_FILE_PERMS}
-.endfor
-
-RCD_SCRIPTS+= courier courierd courierfilter
diff --git a/mail/cucipop/DESCR b/mail/cucipop/DESCR
deleted file mode 100644
index ed53b1817db..00000000000
--- a/mail/cucipop/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Cucipop, the Cubic Circle POP3 server, is a very small and fast server for
-POP3 mail clients--far faster than UW's ipop3d. It does not support POP2,
-but it does include support for the TOP extension to POP3, Content-Length:
-headers, and APOP. It can be run from inetd or standalone.
diff --git a/mail/cucipop/MESSAGE b/mail/cucipop/MESSAGE
deleted file mode 100644
index 7ae2e915b2b..00000000000
--- a/mail/cucipop/MESSAGE
+++ /dev/null
@@ -1,15 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/29 15:16:22 grant Exp $
-
-Please note that this package includes shareware software.
-
-In order to enable the POP service, you should add the following
-line to your /etc/inetd.conf:
-
- pop3 stream tcp nowait root ${LOCALBASE}/sbin/cucipop cucipop -Y
-
-And for IPv6:
-
- pop3 stream tcp6 nowait root ${LOCALBASE}/sbin/cucipop cucipop -Y
-
-===========================================================================
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
deleted file mode 100644
index 6afdef4de76..00000000000
--- a/mail/cucipop/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2007/01/07 09:13:57 rillig Exp $
-#
-
-DISTNAME= cucipop-1.31
-PKGREVISION= 2
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/
-
-PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES= cucipop-1.31-v6-20010223.diff.gz
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= The Cubic Circle POP3 mail server
-
-
-LICENSE= cucipop-license
-
-MAKE_ENV+= ROOT_USER=${ROOT_USER:Q}
-MAKE_ENV+= ROOT_GROUP=${ROOT_GROUP:Q}
-
-REQD_DIRS+= ${PREFIX}/share/cucipop/bulletins
-SPECIAL_PERMS+= ${PREFIX}/sbin/cucipop ${ROOT_USER} ${ROOT_GROUP} 2755
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.cucipop
-PKG_SUPPORTED_OPTIONS= db inet6
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mdb)
-BDB_ACCEPTED= db2
-CFLAGS+= -DUSE_DB
-MAKE_ENV+= LIBS=${BDB_LIBS:Q}
-. include "../../mk/bdb.buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Minet6)
-MAKE_ENV+= CFLAGS_INET6=-DINET6
-.endif
-
-LDFLAGS.SunOS+= -lnsl -lsocket
-
-INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin
-pre-configure:
- @(cd ${WRKSRC}; \
- for f in config.h cucipop.8 makevpopdb.8; do \
- ${SED} -e 's|@prefix@|${PREFIX}|g' $$f > $$f.fixed && \
- ${MV} $$f.fixed $$f; \
- done)
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/cucipop ${PREFIX}/sbin
- ${INSTALL_PROGRAM} ${WRKSRC}/makevpopdb ${PREFIX}/sbin
- ${INSTALL_MAN} ${WRKSRC}/cucipop.8 ${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_MAN} ${WRKSRC}/makevpopdb.8 ${PREFIX}/${PKGMANDIR}/man8
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/cucipop/PLIST b/mail/cucipop/PLIST
deleted file mode 100644
index daa9fbb8be2..00000000000
--- a/mail/cucipop/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2005/06/01 14:37:14 wiz Exp $
-man/man8/cucipop.8
-man/man8/makevpopdb.8
-sbin/cucipop
-sbin/makevpopdb
diff --git a/mail/cucipop/distinfo b/mail/cucipop/distinfo
deleted file mode 100644
index 2e1c151ae14..00000000000
--- a/mail/cucipop/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.8 2006/01/08 15:12:11 joerg Exp $
-
-SHA1 (cucipop-1.31.tar.gz) = d9b5dc2960e96ad1ee63f0a6f8879165f4477434
-RMD160 (cucipop-1.31.tar.gz) = dbca1b313a755544578f89586c200a0227858f92
-Size (cucipop-1.31.tar.gz) = 35508 bytes
-SHA1 (cucipop-1.31-v6-20010223.diff.gz) = 09dd955783237ea83b8b1052e464cf80bf6410e4
-RMD160 (cucipop-1.31-v6-20010223.diff.gz) = 3465094cb906ddec2a8780fdaf617dce51e6d6d5
-Size (cucipop-1.31-v6-20010223.diff.gz) = 1713 bytes
-SHA1 (patch-aa) = baf7a7a262d8d50d404bcc1eed9fe8da72a7b927
-SHA1 (patch-ab) = 3dcbfb7525bd59a1a5ede8cabe286f1bc3704cca
-SHA1 (patch-ac) = 5d768b6b0badf8357bdb6668efb144bc14f98318
-SHA1 (patch-ad) = 2acb395d031e5919cacbcf178d58fe8ec4a75e0b
-SHA1 (patch-ae) = 30715d0e00ed4862601ea0cb69fdb797a9eb234a
-SHA1 (patch-af) = 3521a623741f7dda8d8c837e9dd46e070b1719a4
-SHA1 (patch-ag) = 9c6bb228b5a00ef241cd3edd57a7d523f5474f42
diff --git a/mail/cucipop/patches/patch-aa b/mail/cucipop/patches/patch-aa
deleted file mode 100644
index 8733faa3504..00000000000
--- a/mail/cucipop/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:09:31 agc Exp $
-
---- authenticate.c.orig Wed May 13 17:57:39 1998
-+++ authenticate.c Tue Jul 21 11:04:20 1998
-@@ -22,7 +22,10 @@
- #else
- #include "config.h"
-
-+#include <sys/param.h>
-+#if !(defined(BSD) && BSD >= 199306)
- #define _XOPEN_SOURCE
-+#endif
-
- #include <sys/types.h>
- #include <unistd.h>
-@@ -44,7 +47,7 @@
- #define VIRTUALUSER "vpop"
-
- #ifndef MAILSPOOLDIR
--#define MAILSPOOLDIR "/var/spool/mail/" /* watch the trailing / */
-+#define MAILSPOOLDIR "/var/mail/" /* watch the trailing / */
- #endif
- #ifndef MAILSPOOLHASH
- #define MAILSPOOLHASH 0 /* 2 would deliver to /var/spool/mail/b/a/bar */
diff --git a/mail/cucipop/patches/patch-ab b/mail/cucipop/patches/patch-ab
deleted file mode 100644
index 032b9c84ea8..00000000000
--- a/mail/cucipop/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/01/08 15:12:11 joerg Exp $
-
---- xcreat.c.orig 1998-05-02 00:56:54.000000000 +0000
-+++ xcreat.c
-@@ -22,7 +22,10 @@
- /*#define NOuname /* uncomment if uname is not available */
- /*#define NOstrpbrk /* uncomment if strpbrk is not available */
- /*#define strchr(s,c) index(s,c) /* uncomment if strchr is not available */
-+#include <sys/param.h>
-+#if !(defined(BSD) && BSD >= 199306)
- #define const /* can be undefined for ANSI compilers */
-+#endif
-
- #include <unistd.h> /* open() close() link() unlink()
- getpid() */
-@@ -57,8 +60,6 @@
- #define irotbSERIAL (1L<<bitsSERIAL-rotbSERIAL)
- #define mrotbSERIAL ((maskSERIAL&irotbSERIAL-1)+irotbSERIAL)
-
--extern errno;
--
- #ifdef NOstrpbrk
- char*strpbrk(st,del)const char*const st,*del;
- { const char*f=0,*t;
diff --git a/mail/cucipop/patches/patch-ac b/mail/cucipop/patches/patch-ac
deleted file mode 100644
index b3ed3c1ec02..00000000000
--- a/mail/cucipop/patches/patch-ac
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2003/06/07 17:48:34 jmmv Exp $
-
---- cucipop.8.orig Mon May 11 17:35:19 1998
-+++ cucipop.8 Tue Jul 21 11:17:48 1998
-@@ -48,12 +48,12 @@
- .SH NAME
- cucipop \- Cubic Circle POP3 daemon
- .SH SYNOPSIS
--.B /usr/sbin/cucipop
-+.B cucipop
- .RB [ \-qaYdPUSDAT ]
- .RB [ "\-E \fIage\fP" ]
- .RB [ "\-p \fIport\fP" ]
- .br
--.B /usr/sbin/cucipop
-+.B cucipop
- .B \-v
- .ad
- .SH DESCRIPTION
-@@ -145,16 +145,16 @@
- .BR inetd.conf (5)
- would be suitable:
- .Sx 1
--pop-3 stream tcp nowait root /usr/sbin/cucipop cucipop -Y
-+pop-3 stream tcp nowait root @prefix@/sbin/cucipop cucipop -Y
- .Ex
- If your site gets many hits from popclients, it would be preferable
- to start cucipop standalone as in:
- .Sx 1
--/usr/sbin/cucipop -Y
-+@prefix@/sbin/cucipop -Y
- .Ex
- Your typical BOFH setting would be:
- .Sx 1
--/usr/sbin/cucipop -YaSE 6w
-+@prefix@/sbin/cucipop -YaSE 6w
- .Ex
- .SH FILES
- .TP 2.3i
-@@ -166,25 +166,25 @@
- .BR makevpopdb (8)
- man page on how this file is created
- .TP
--.B /var/lib/cucipop/state.db
-+.B @prefix@/share/cucipop/state.db
- AI state information and bulletin history
- .TP
--.B "/var/lib/cucipop/bulletins/\fInn\fP"
-+.B "@prefix@/share/cucipop/bulletins/\fInn\fP"
- .B 00
- through
- .B 63
- optional bulletin files in regular mailbox format
- .TP
--.B /var/spool/mail/$LOGNAME
-+.B /var/mail/$LOGNAME
- system mailbox
- .TP
--.B /var/spool/mail/virtual.dom.ain/$LOGNAME
-+.B /var/mail/virtual.dom.ain/$LOGNAME
- virtual host system mailbox
- .TP
--.B /var/spool/mail/$LOGNAME.lock
-+.B /var/mail/$LOGNAME.lock
- lockfile for the system mailbox
- .TP
--.B /var/spool/mail/virtual.dom.ain/$LOGNAME.lock
-+.B /var/mail/virtual.dom.ain/$LOGNAME.lock
- lockfile for the virtual host system mailbox
- .TP
- .B _????`hostname`
diff --git a/mail/cucipop/patches/patch-ad b/mail/cucipop/patches/patch-ad
deleted file mode 100644
index 208631d2ced..00000000000
--- a/mail/cucipop/patches/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2003/07/15 17:32:33 jmmv Exp $
-
---- Makefile.orig Tue May 12 17:09:14 1998
-+++ Makefile
-@@ -2,3 +2,3 @@
-
--BASENAME= /usr
-+BASENAME= ${PREFIX}
-
-@@ -12,7 +12,7 @@
-
--CFLAGS = -O -DUSE_DB #$(GCC_WARNINGS)
--LDFLAGS = -lcrypt -ldb2
-+CFLAGS += -O ${CFLAGS_INET6} #-DUSE_DB $(GCC_WARNINGS)
-+LDFLAGS += -lcrypt
-
- # If you change this, edit config.h as well
--CUCIPOPLIB=/var/lib/cucipop
-+CUCIPOPLIB=${PREFIX}/share/cucipop
- CUCIPOPBULLETINS=$(CUCIPOPLIB)/bulletins
-@@ -24,4 +24,4 @@
-
--INSTALL=install -o root -m
--BINPERM=02755 -s -g mail
-+INSTALL=install -c -o ${ROOT_USER} -m
-+BINPERM=02755 -s -g ${ROOT_GROUP}
- REGPERM=0644
diff --git a/mail/cucipop/patches/patch-ae b/mail/cucipop/patches/patch-ae
deleted file mode 100644
index 24ead21a6e0..00000000000
--- a/mail/cucipop/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:09:31 agc Exp $
-
---- makevpopdb.8 1998/07/21 10:21:31 1.1
-+++ makevpopdb.8 1998/07/21 10:21:04
-@@ -48,7 +48,7 @@
- .SH NAME
- makevpopdb \- Creates the vpop database for cucipop
- .SH SYNOPSIS
--.B /usr/sbin/makevpopdb
-+.B @prefix@/sbin/makevpopdb
- .I dbasefile
- .ad
- .SH DESCRIPTION
diff --git a/mail/cucipop/patches/patch-af b/mail/cucipop/patches/patch-af
deleted file mode 100644
index 53ef3ab76f5..00000000000
--- a/mail/cucipop/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/09/02 10:39:04 grant Exp $
-
---- dbops.c.orig 1998-05-14 02:57:39.000000000 +1000
-+++ dbops.c
-@@ -117,7 +117,7 @@ struct stateinfo*getstate(const char*key
- if(lastcheck!=curt)
- { lastcheck=curt;
- if(!cs)
-- { db->cursor(db,0,&cs);d.data="";d.size=1;
-+ { db->cursor(db,0,&cs,0);d.data="";d.size=1;
- if(!db->get(db,0,&d,&k,0))
- cs->c_get(cs,&k,&d,DB_SET);
- }
diff --git a/mail/cucipop/patches/patch-ag b/mail/cucipop/patches/patch-ag
deleted file mode 100644
index fc289b5d981..00000000000
--- a/mail/cucipop/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/09/02 10:39:04 grant Exp $
-
---- makevpopdb.c.orig 1998-05-12 10:50:53.000000000 +1000
-+++ makevpopdb.c
-@@ -49,7 +49,7 @@ main(int argc,const char*argv[])
- }
- dbname=argv[1];
- memset(&dbenv,0,sizeof dbenv);
-- if(!db_appinit(0,0,&dbenv,0))
-+ if(db_appinit(0,0,&dbenv,0))
- fprintf(stderr,"makedb2: Can't init db subsystem\n"),retval=EX_CANTCREAT;
- else
- { if(db_open(dbname,DB_HASH,DB_CREATE|DB_TRUNCATE,0666,&dbenv,(void*)0,&db))
diff --git a/mail/cue/DESCR b/mail/cue/DESCR
deleted file mode 100644
index c6aa7b26d91..00000000000
--- a/mail/cue/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-"Cue" is a small mail user agent (mail reader/writer).
-
-Features:
-- capable of handling Japanese and English (or ASCII) emails (no Latin1, sorry)
-- S/MIME, PGP/MIME, MIME Multipart handling
-- it looks just like mh-e or mew, but is much more lightweight. It is not
- an elisp program but an independent program that uses curses.
-
-Cue requires a couple of external programs, namely:
-- a program to grab emails into folders, like inc from MH
-- a program for sending emails, like sendmail
-- an editor like vi
diff --git a/mail/cue/Makefile b/mail/cue/Makefile
deleted file mode 100644
index 47849dafbc9..00000000000
--- a/mail/cue/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# $NetBSD: Makefile,v 1.53 2007/01/02 12:47:22 obache Exp $
-
-DISTNAME= cue-snap-20061225
-PKGNAME= ${DISTNAME:S/snap-//}
-CATEGORIES= mail
-MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/cue/snap/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= mh-e like mail user agent
-
-GNU_CONFIGURE= yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${PKGSRC_COMPILER} == "ido"
-CPPFLAGS+= -DNO_ATTRIBUTE
-.endif
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.cue
-PKG_SUPPORTED_OPTIONS= canna idea inet6
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6) && (${OPSYS} != "SunOS")
-CONFIGURE_ARGS+= --enable-ipv6
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
-.if !empty(PKG_OPTIONS:Mcanna)
-. include "../../inputmethod/canna-lib/buildlink3.mk"
-CONFIGURE_ARGS+= --with-canna=${BUILDLINK_PREFIX.canna}
-.else
-CONFIGURE_ARGS+= --without-canna
-.endif
-
-.if !empty(PKG_OPTIONS:Midea)
-CONFIGURE_ARGS+= --enable-idea
-.endif
-
-CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
-CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
-
-INSTALLATION_DIRS= bin
-
-.include "../../security/openssl/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/cue ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cue
- ${INSTALL_DATA} ${WRKSRC}/sample.cuerc ${PREFIX}/share/examples/cue
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cue
- ${INSTALL_DATA} ${WRKSRC}/cue.hlp ${PREFIX}/share/doc/cue
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/cue/PLIST b/mail/cue/PLIST
deleted file mode 100644
index 6da8c7d4fb7..00000000000
--- a/mail/cue/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/05/02 17:25:15 xtraeme Exp $
-bin/cue
-share/doc/cue/cue.hlp
-share/examples/cue/sample.cuerc
-@dirrm share/examples/cue
-@dirrm share/doc/cue
diff --git a/mail/cue/distinfo b/mail/cue/distinfo
deleted file mode 100644
index 20e59cf07d6..00000000000
--- a/mail/cue/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.28 2007/01/02 12:47:22 obache Exp $
-
-SHA1 (cue-snap-20061225.tar.gz) = 969312a638076dfc345a703e28e58ddc744815f9
-RMD160 (cue-snap-20061225.tar.gz) = 108f514086631e8b6c2990ac34459c120a798add
-Size (cue-snap-20061225.tar.gz) = 176955 bytes
-SHA1 (patch-aa) = c1ed53b1333b58dd8f794b2f028ed4c71a294c04
-SHA1 (patch-ab) = a94ec3a565bbde8e8ca064821867f7a978450687
-SHA1 (patch-ac) = 105da5dc78a6a493d3863de74ba91891653cc936
-SHA1 (patch-ad) = 0d3ce51529e2b0d7fcc051719bbd4ad008bd1b65
diff --git a/mail/cue/patches/patch-aa b/mail/cue/patches/patch-aa
deleted file mode 100644
index b7437bab496..00000000000
--- a/mail/cue/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/10/22 20:59:01 schwarz Exp $
-
---- configure.orig 2005-04-27 13:54:13.000000000 +0200
-+++ configure 2006-10-22 22:53:47.000000000 +0200
-@@ -675,7 +675,7 @@
- ;;
- esac
-
--OPTS="-O"
-+OPTS=""
-
-
-
-@@ -1127,7 +1127,7 @@
- rm -fr conftest*
- fi
-
--
-+if test ${OPSYS} != "DragonFly"; then
- if test "$buggygetaddrinfo" = "yes"; then
- if test "$ipv6" = "yes"; then
- echo 'Fatal: You must get working getaddrinfo() function.'
-@@ -1135,6 +1135,7 @@
- exit 1
- fi
- fi
-+fi
-
- echo $ac_n "checking if --enable-idea option is specified""... $ac_c" 1>&6
- echo "configure:1141: checking if --enable-idea option is specified" >&5
diff --git a/mail/cue/patches/patch-ab b/mail/cue/patches/patch-ab
deleted file mode 100644
index d3984fe37bc..00000000000
--- a/mail/cue/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2006/10/07 08:19:08 obache Exp $
-
---- pgp.c.orig 2006-03-27 16:24:40.000000000 +0900
-+++ pgp.c
-@@ -37,6 +37,7 @@
-
- #ifdef OPENSSL
- #include <openssl/bn.h>
-+#include <openssl/dsa.h>
- #include <openssl/rsa.h>
- #include <openssl/evp.h>
- #include <openssl/rand.h>
diff --git a/mail/cue/patches/patch-ac b/mail/cue/patches/patch-ac
deleted file mode 100644
index fd8b3f248be..00000000000
--- a/mail/cue/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/10/22 20:59:01 schwarz Exp $
-
---- proc.c.orig 2006-10-22 22:37:56.000000000 +0200
-+++ proc.c 2006-10-22 22:39:04.000000000 +0200
-@@ -41,6 +41,10 @@
-
- #include "cue.h"
-
-+#ifdef __sgi
-+#define vfork() fork()
-+#endif
-+
- struct procs {
- struct procs *pr_next;
- int pr_pid;
diff --git a/mail/cue/patches/patch-ad b/mail/cue/patches/patch-ad
deleted file mode 100644
index ac9553e42b6..00000000000
--- a/mail/cue/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/10/22 20:59:01 schwarz Exp $
-
---- zip.h.orig 2006-10-22 22:42:35.000000000 +0200
-+++ zip.h 2006-10-22 22:43:58.000000000 +0200
-@@ -30,6 +30,11 @@
- #ifndef _ZIP_H
- #define _ZIP_H
-
-+#ifdef NO_ATTRIBUTE
-+/* some compilers don't like it */
-+#define __attribute__(x)
-+#endif
-+
- /*
- * Definition of ZIP
- */
diff --git a/mail/cyrus-imapd/DEINSTALL b/mail/cyrus-imapd/DEINSTALL
deleted file mode 100644
index 3c275cc0a14..00000000000
--- a/mail/cyrus-imapd/DEINSTALL
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.4 2005/03/02 21:42:48 wiz Exp $
-
-IMAPDCONF=@IMAPDCONF@
-
-case ${STAGE} in
-DEINSTALL)
- if [ -f ${IMAPDCONF} ]; then
- IMAPDIRS=`
- ${AWK} '/configdirectory:/ { print $2 }; \
- /partition-.*:/ { print $2 }; \
- /sievedir:/ { print $2 }' \
- ${IMAPDCONF} | ${SORT} -ur`
- _IMAPDIRS=
- for dir in ${IMAPDIRS}; do
- ${RMDIR} -p ${dir} 2>/dev/null || ${TRUE}
- if [ -d ${dir} ]; then
- _IMAPDIRS="${_IMAPDIRS} ${dir}"
- fi
- done
- if [ -n "${_IMAPDIRS}" ]; then
- ${CAT} << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove
-the following directories:
-
-EOF
- for dir in ${_IMAPDIRS}; do
- if [ -d "${dir}" ]; then
- ${ECHO} " ${dir}"
- fi
- done
- ${CAT} << EOF
-===========================================================================
-EOF
- fi
- fi
- ;;
-esac
diff --git a/mail/cyrus-imapd/DESCR b/mail/cyrus-imapd/DESCR
deleted file mode 100644
index e742d558a95..00000000000
--- a/mail/cyrus-imapd/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-IMAP (Internet Message Access Protocol) is an Internet standards-track
-protocol for accessing messages (mail, bboards, news, etc). The Cyrus
-IMAP server differs from other IMAP server implementations in that it
-is generally intended to be run on "sealed" servers, where normal users
-are not permitted to log in. The mailbox database is stored in parts of
-the filesystem that are private to the Cyrus IMAP system. All user
-access to mail is through the IMAP, POP3, or KPOP protocols.
diff --git a/mail/cyrus-imapd/MESSAGE b/mail/cyrus-imapd/MESSAGE
deleted file mode 100644
index 4536075fb96..00000000000
--- a/mail/cyrus-imapd/MESSAGE
+++ /dev/null
@@ -1,17 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2005/03/02 21:42:48 wiz Exp $
-
-Please refer to:
-
- ${PREFIX}/share/doc/html/cyrus-imapd/install.html
-
-for more detailed instructions on setting up the environment before
-starting the Cyrus IMAP server. In particular, several services may
-need to be added to /etc/services.
-
-Anyone upgrading from an earlier version of the Cyrus IMAP server should
-read:
-
- ${PREFIX}/share/doc/html/cyrus-imapd/install-upgrade.html
-
-===========================================================================
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
deleted file mode 100644
index 7e107d68e46..00000000000
--- a/mail/cyrus-imapd/Makefile
+++ /dev/null
@@ -1,175 +0,0 @@
-# $NetBSD: Makefile,v 1.70 2007/03/09 14:46:08 obache Exp $
-
-DISTNAME= cyrus-imapd-2.2.13
-PKGREVISION= 3
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
-
-MAINTAINER= recht@NetBSD.org
-HOMEPAGE= http://cyrusimap.web.cmu.edu/imapd/
-COMMENT= Cyrus IMAP server
-
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-PERL5_CONFIGURE= no
-BDB_ACCEPTED= db4 db3
-
-.include "../../mk/bsd.prefs.mk"
-
-# CYRUS_USER username of the Cyrus administrator
-# CYRUS_GROUP group of the Cyrus administrator
-#
-CYRUS_USER?= cyrus
-CYRUS_GROUP?= mail
-
-BUILD_DEFS+= CYRUS_USER CYRUS_GROUP
-FILES_SUBST+= CYRUS_USER=${CYRUS_USER:Q}
-FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP:Q}
-
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --with-cyrus-user=${CYRUS_USER:Q}
-CONFIGURE_ARGS+= --with-cyrus-group=${CYRUS_GROUP:Q}
-CONFIGURE_ARGS+= --with-cyrus-prefix=${PREFIX}/cyrus
-CONFIGURE_ARGS+= --with-statedir=${VARBASE}/run
-CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
-CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
-CONFIGURE_ARGS+= --with-perl=${PERL5:Q}
-CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
-CONFIGURE_ENV+= ac_cv_lib_wrap_request_init=yes
-
-CONFIGURE_ARGS+= --enable-listext
-CONFIGURE_ARGS+= --enable-murder
-CONFIGURE_ARGS+= --enable-nntp
-CONFIGURE_ARGS+= --without-zephyr
-CONFIGURE_ARGS+= --without-ucdsnmp
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-imapd
-PKG_SUPPORTED_OPTIONS= gssapi kerberos kerberos4
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mkerberos)
-. if empty(PKG_OPTIONS:Mgssapi)
-PKG_OPTIONS+= gssapi
-. endif
-.endif
-
-.if !empty(PKG_OPTIONS:Mkerberos4)
-. if exists(/usr/include/kerberosIV/krb.h)
-CRYPTO+= uses Kerberos encryption code
-CONFIGURE_ARGS+= --with-krb=/usr
-. endif
-.elif !empty(PKG_OPTIONS:Mgssapi)
-. include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE:Q}
-CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
-GSSIMPL.heimdal= heimdal
-GSSIMPL.mit-krb5= mit
-CONFIGURE_ENV+= COMPILE_ET=${KRB5BASE}/bin/compile_et
-COMERRBASE= ${KRB5BASE}
-.else
-CONFIGURE_ARGS+= --without-krb
-CONFIGURE_ARGS+= --disable-gssapi
-.endif
-
-.if exists(/usr/bin/compile_et)
-COMERRBASE?= /usr
-.endif
-.if defined(COMERRBASE)
-. if exists(${COMERRBASE}/include/krb5/com_err.h)
-CPPFLAGS+= -I${COMERRBASE}/include/krb5
-. endif
-CONFIGURE_ENV+= COMPILE_ET=${COMERRBASE}/bin/compile_et
-.else
-CONFIGURE_ARGS+= --with-com-err=yes
-.endif
-
-# CYRUS_IDLE selects the method used to implement IMAP IDLE. Valid values
-# are "poll", "idled" or "no". The default is "poll".
-#
-CYRUS_IDLE?= poll
-BUILD_DEFS+= CYRUS_IDLE
-.if (${CYRUS_IDLE} != "poll") && (${CYRUS_IDLE} != "idled") && \
- (${CYRUS_IDLE} != "no")
-PKG_FAIL_REASON+= "CYRUS_IDLE must be poll, idled or no"
-.endif
-CONFIGURE_ARGS+= --with-idle=${CYRUS_IDLE:Q}
-.if ${CYRUS_IDLE} == "idled"
-PLIST_SUBST+= IDLED=
-.else
-PLIST_SUBST+= IDLED="@comment "
-.endif
-
-MAKE_ENV+= PERL=${PERL5:Q}
-
-HTMLDIR= ${PREFIX}/share/doc/html/cyrus-imapd
-EGDIR= ${PREFIX}/share/examples/cyrus-imapd
-CONF_FILES= ${EGDIR}/imapd.conf ${PKG_SYSCONFDIR}/imapd.conf
-CONF_FILES+= ${EGDIR}/normal.conf ${PKG_SYSCONFDIR}/cyrus.conf
-RCD_SCRIPTS= cyrus
-FILES_SUBST+= IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf
-
-PERL5_PACKLIST= \
- auto/Cyrus/IMAP/.packlist \
- auto/Cyrus/SIEVE/managesieve/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../security/cyrus-sasl/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../security/tcp_wrappers/buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
-
-CONFIGURE_ENV+= BDB_TYPE=${BDB_TYPE:Q}
-
-# Only imap/mupdate needs to be build with pthreads support, so selectively
-# enable it via patches for just that one program.
-#
-.include "../../mk/pthread.buildlink3.mk"
-
-# Change references of some manpages from foo.8 to cyrus-foo.8 to avoid
-# manpage conflicts with other packages. Also change references to
-# "/etc/{cyrus,imapd}.conf" into "${PKG_SYSCONFDIR}/{cyrus,imapd}.conf".
-#
-post-patch:
- cd ${WRKSRC}/man; \
- set -- deliver 8 fetchnews 8 idled 8 imapd 8 lmtpd 8 master 8 \
- nntpd 8 notifyd 8 pop3d 8 quota 8; \
- while [ $$# -gt 0 ]; do \
- man=$$1.$$2; \
- for file in Makefile.in *.[0-9]; do \
- ${SED} -e "s|\(\$$(srcdir)/\)\($$man\)|\1cyrus-\2|g" \
- -e "s|\(\\\fB\)\($$1($$2)\\\fR\)|\1cyrus-\2|g" \
- $$file > $$file.fixed; \
- ${MV} -f $$file.fixed $$file; \
- done; \
- if [ -f $$man ]; then \
- ${MV} $$man cyrus-$$man; \
- fi; \
- shift 2; \
- done
- ${FIND} ${WRKSRC} -type f -print | \
- ${XARGS} -n 1 ${GREP} -l -e /etc/imapd\.conf -e /etc/cyrus\.conf | \
- while read file; do \
- ${SED} -e "s|/etc/\(cyrus\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
- -e "s|/etc/\(imapd\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
- $$file > $$file.fixed; \
- ${MV} -f $$file.fixed $$file; \
- done
-
-post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec ${PREFIX}/cyrus/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${PREFIX}/cyrus/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/tools/mknewsgroups ${PREFIX}/cyrus/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/tools/translatesieve ${PREFIX}/cyrus/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/tools/rehash ${PREFIX}/cyrus/bin
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EGDIR}
- cd ${WRKSRC}/master/conf; for file in *.conf; do \
- ${INSTALL_DATA} $$file ${EGDIR}; \
- done
- ${INSTALL_DATA_DIR} ${HTMLDIR}
- cd ${WRKSRC}/doc; for file in *.html cyrusv2.mc; do \
- ${INSTALL_DATA} $$file ${HTMLDIR}; \
- done
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/cyrus-imapd/PLIST b/mail/cyrus-imapd/PLIST
deleted file mode 100644
index d362c65769c..00000000000
--- a/mail/cyrus-imapd/PLIST
+++ /dev/null
@@ -1,168 +0,0 @@
-@comment $NetBSD: PLIST,v 1.9 2006/10/04 12:18:14 obache Exp $
-bin/imtest
-bin/installsieve
-bin/lmtptest
-bin/mupdatetest
-bin/nntptest
-bin/pop3test
-bin/sieveshell
-bin/sivtest
-bin/smtptest
-cyrus/bin/arbitron
-cyrus/bin/chk_cyrus
-cyrus/bin/ctl_cyrusdb
-cyrus/bin/ctl_deliver
-cyrus/bin/ctl_mboxlist
-cyrus/bin/cvt_cyrusdb
-cyrus/bin/cyr_expire
-cyrus/bin/cyrdump
-cyrus/bin/deliver
-cyrus/bin/fetchnews
-cyrus/bin/fud
-${IDLED}cyrus/bin/idled
-cyrus/bin/imapd
-cyrus/bin/ipurge
-cyrus/bin/lmtpd
-cyrus/bin/lmtpproxyd
-cyrus/bin/masssievec
-cyrus/bin/master
-cyrus/bin/mbexamine
-cyrus/bin/mbpath
-cyrus/bin/mkimap
-cyrus/bin/mknewsgroups
-cyrus/bin/mupdate
-cyrus/bin/nntpd
-cyrus/bin/notifyd
-cyrus/bin/pop3d
-cyrus/bin/pop3proxyd
-cyrus/bin/proxyd
-cyrus/bin/quota
-cyrus/bin/reconstruct
-cyrus/bin/rehash
-cyrus/bin/sievec
-cyrus/bin/smmapd
-cyrus/bin/squatter
-cyrus/bin/timsieved
-cyrus/bin/tls_prune
-cyrus/bin/translatesieve
-include/cyrus/acl.h
-include/cyrus/assert.h
-include/cyrus/auth.h
-include/cyrus/bsearch.h
-include/cyrus/charset.h
-include/cyrus/cyrusdb.h
-include/cyrus/glob.h
-include/cyrus/gmtoff.h
-include/cyrus/hash.h
-include/cyrus/imapopts.h
-include/cyrus/imapurl.h
-include/cyrus/imclient.h
-include/cyrus/imparse.h
-include/cyrus/iptostring.h
-include/cyrus/libconfig.h
-include/cyrus/libcyr_cfg.h
-include/cyrus/lock.h
-include/cyrus/lsort.h
-include/cyrus/map.h
-include/cyrus/mkgmtime.h
-include/cyrus/mpool.h
-include/cyrus/nonblock.h
-include/cyrus/parseaddr.h
-include/cyrus/prot.h
-include/cyrus/retry.h
-include/cyrus/rfc822date.h
-include/cyrus/strhash.h
-include/cyrus/strhash.o
-include/cyrus/stristr.h
-include/cyrus/sysexits.h
-include/cyrus/util.h
-include/cyrus/xmalloc.h
-include/cyrus/xstrlcat.h
-include/cyrus/xstrlcpy.h
-lib/libcyrus.a
-lib/libcyrus_min.a
-man/man1/imtest.1
-man/man1/installsieve.1
-man/man1/lmtptest.1
-man/man1/mupdatetest.1
-man/man1/nntptest.1
-man/man1/pop3test.1
-man/man1/sieveshell.1
-man/man1/sivtest.1
-man/man1/smtptest.1
-man/man3/imclient.3
-man/man5/cyrus.conf.5
-man/man5/imapd.conf.5
-man/man5/krb.equiv.5
-man/man8/arbitron.8
-man/man8/chk_cyrus.8
-man/man8/ctl_cyrusdb.8
-man/man8/ctl_deliver.8
-man/man8/ctl_mboxlist.8
-man/man8/cvt_cyrusdb.8
-man/man8/cyr_expire.8
-man/man8/cyrus-deliver.8
-man/man8/cyrus-fetchnews.8
-man/man8/cyrus-idled.8
-man/man8/cyrus-imapd.8
-man/man8/cyrus-lmtpd.8
-man/man8/cyrus-master.8
-man/man8/cyrus-nntpd.8
-man/man8/cyrus-notifyd.8
-man/man8/cyrus-pop3d.8
-man/man8/cyrus-quota.8
-man/man8/fud.8
-man/man8/ipurge.8
-man/man8/mbexamine.8
-man/man8/mbpath.8
-man/man8/reconstruct.8
-man/man8/rmnews.8
-man/man8/smmapd.8
-man/man8/squatter.8
-man/man8/syncnews.8
-man/man8/timsieved.8
-man/man8/tls_prune.8
-share/doc/html/cyrus-imapd/altnamespace.html
-share/doc/html/cyrus-imapd/anoncvs.html
-share/doc/html/cyrus-imapd/bugs.html
-share/doc/html/cyrus-imapd/changes.html
-share/doc/html/cyrus-imapd/cyrusv2.mc
-share/doc/html/cyrus-imapd/faq.html
-share/doc/html/cyrus-imapd/feedback.html
-share/doc/html/cyrus-imapd/index.html
-share/doc/html/cyrus-imapd/install-admin-mb.html
-share/doc/html/cyrus-imapd/install-auth.html
-share/doc/html/cyrus-imapd/install-compile.html
-share/doc/html/cyrus-imapd/install-configure.html
-share/doc/html/cyrus-imapd/install-murder.html
-share/doc/html/cyrus-imapd/install-netnews.html
-share/doc/html/cyrus-imapd/install-perf.html
-share/doc/html/cyrus-imapd/install-prereq.html
-share/doc/html/cyrus-imapd/install-sieve.html
-share/doc/html/cyrus-imapd/install-snmpmon.html
-share/doc/html/cyrus-imapd/install-testing.html
-share/doc/html/cyrus-imapd/install-upgrade.html
-share/doc/html/cyrus-imapd/install-virtdomains.html
-share/doc/html/cyrus-imapd/install.html
-share/doc/html/cyrus-imapd/mailing-list.html
-share/doc/html/cyrus-imapd/man.html
-share/doc/html/cyrus-imapd/notes.html
-share/doc/html/cyrus-imapd/os.html
-share/doc/html/cyrus-imapd/overview.html
-share/doc/html/cyrus-imapd/questions.html
-share/doc/html/cyrus-imapd/readme.html
-share/doc/html/cyrus-imapd/sieve-protocol.html
-share/doc/html/cyrus-imapd/sieve.html
-share/doc/html/cyrus-imapd/specs.html
-share/examples/cyrus-imapd/cmu-backend.conf
-share/examples/cyrus-imapd/cmu-frontend.conf
-share/examples/cyrus-imapd/imapd.conf
-share/examples/cyrus-imapd/normal.conf
-share/examples/cyrus-imapd/prefork.conf
-share/examples/cyrus-imapd/small.conf
-share/examples/rc.d/cyrus
-@dirrm share/examples/cyrus-imapd
-@dirrm share/doc/html/cyrus-imapd
-@dirrm include/cyrus
-@dirrm cyrus/bin
-@dirrm cyrus
diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo
deleted file mode 100644
index 26c93165280..00000000000
--- a/mail/cyrus-imapd/distinfo
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: distinfo,v 1.27 2007/03/09 14:46:08 obache Exp $
-
-SHA1 (cyrus-imapd-2.2.13.tar.gz) = ba84b67a1cae4c15d5a588d010764031167970c4
-RMD160 (cyrus-imapd-2.2.13.tar.gz) = 7e8ac84b5ddd9f1206e71d5b659d07d8400f9ac2
-Size (cyrus-imapd-2.2.13.tar.gz) = 2109770 bytes
-SHA1 (patch-aa) = 379da5df874f3514d654d895e8b8e56a6f26c63d
-SHA1 (patch-ab) = 986fa32dd6acc088779791b7bdabde5981b61bc1
-SHA1 (patch-ac) = 48557e05ef0d82413da18dd46d9c4baf802a771d
-SHA1 (patch-ad) = e99638a062b2695514c6859788eac3fd02cf5c1d
-SHA1 (patch-ae) = b1865b68a8f798a3766e53e60e9e68099df9bd54
-SHA1 (patch-af) = 2aaf1be5fcb102b047a57fe0a908b3e8f95037ea
-SHA1 (patch-al) = d28a0e604f0ddcf22c6753be333216780558e05c
-SHA1 (patch-am) = 0804e6fa6694ed820861b740ac1bead29b3eeb4b
-SHA1 (patch-ap) = 95b987e83ddd53065f7ffe503d0f07694f9bcd6b
-SHA1 (patch-aq) = 0d764585dc2af05964b03723c29ff127ebe3c25d
-SHA1 (patch-ba) = 98bea064fa4d97b0bb1ba2d1fcb4d30611ac706e
-SHA1 (patch-bb) = 8725d9008617acb392b904d76a353b8829fdfb33
-SHA1 (patch-bc) = 3266d52067aef8f4835670cba1be6c190ff94f15
-SHA1 (patch-ca) = cc3e9cb9c56e8d51062bf9d691454ea90ce25b09
-SHA1 (patch-cb) = a8281c11f93f8f91d6c80d43ca9e20bc658d8813
-SHA1 (patch-cc) = 3ee1d64fe5f228aab4fceca3cbd45839d3659dd0
diff --git a/mail/cyrus-imapd/files/cyrus.sh b/mail/cyrus-imapd/files/cyrus.sh
deleted file mode 100644
index 775a8bb648a..00000000000
--- a/mail/cyrus-imapd/files/cyrus.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: cyrus.sh,v 1.3 2005/03/02 21:42:48 wiz Exp $
-#
-# PROVIDE: cyrus
-# REQUIRE: DAEMON
-# BEFORE: mail
-#
-# To start cyrus-imapd at startup, copy this script to /etc/rc.d and set
-# cyrus=YES in /etc/rc.conf.
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-rcd_dir=`@DIRNAME@ $0`
-
-name="cyrus"
-rcvar=$name
-command="@PREFIX@/cyrus/bin/master"
-command_args="-d"
-pidfile="/var/run/cyrus-master.pid"
-required_files="@PKG_SYSCONFDIR@/cyrus.conf @IMAPDCONF@"
-extra_commands="mkimap reload"
-
-mkimap_cmd="cyrus_mkimap"
-start_precmd="cyrus_prestart"
-
-cyrus_prestart()
-{
- # Check to see if "configdirectory" is present before we start
- # the Cyrus IMAP server. Otherwise, we run mkimap to generate
- # the necessary directories.
- #
- if [ -f @IMAPDCONF@ ]; then
- configdir=` \
- @AWK@ '/^configdirectory:/ { print $2; exit };' \
- @IMAPDCONF@ \
- `
- if [ -z "$configdir" ]; then
- @ECHO@ "@IMAPDCONF@ missing 'configdirectory' setting"
- exit 1
- fi
- if [ ! -d "$configdir" ]; then
- $rcd_dir/cyrus mkimap
- fi
- fi
-}
-
-cyrus_mkimap()
-{
- # Generate the prerequisite directory structure for Cyrus IMAP.
- if [ -f @IMAPDCONF@ ]; then
- @AWK@ '/^configdirectory:/ { print $2 }; \
- /^partition-.*:/ { print $2 }; \
- /^sievedir:/ { print $2 }' \
- @IMAPDCONF@ | \
- while read dir; do
- if [ ! -d "$dir" ]; then
- @MKDIR@ "$dir"
- @CHMOD@ 750 "$dir"
- @CHOWN@ @CYRUS_USER@ "$dir"
- @CHGRP@ @CYRUS_GROUP@ "$dir"
- fi
- done
- @SU@ -m @CYRUS_USER@ -c "@PREFIX@/cyrus/bin/mkimap"
- fi
-}
-
-if [ -f /etc/rc.subr -a -f /etc/rc.conf \
- -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- @ECHO@ -n " ${name}"
- eval ${start_precmd}
- ${command} ${cyrus_flags} ${command_args}
-fi
diff --git a/mail/cyrus-imapd/files/imapd.conf b/mail/cyrus-imapd/files/imapd.conf
deleted file mode 100644
index 66ca8cb4e0c..00000000000
--- a/mail/cyrus-imapd/files/imapd.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: imapd.conf,v 1.5 2005/03/02 21:42:48 wiz Exp $
-#
-# Cyrus IMAP server configuration file. Refer to imapd.conf(5) for
-# more options.
-
-configdirectory: /var/imap
-partition-default: /var/spool/imap
-sieveusehomedir: true
-hashimapspool: false
-
-admins: cyrus
-
-# Use the saslauthd daemon to verify plaintext passwords. Please ensure that
-# the saslauthd daemon is running before trying to authenticate.
-#
-sasl_pwcheck_method: saslauthd
-
-# The server certificate and key files must be specified for the
-# server to repond to IMAPS or POP3S requests. See imapd.conf(5) for
-# a complete listing of tls_* options.
-#
-#tls_cert_file: /var/imap/server.pem
-#tls_key_file: /var/imap/server.pem
diff --git a/mail/cyrus-imapd/patches/patch-aa b/mail/cyrus-imapd/patches/patch-aa
deleted file mode 100644
index bdd2f9cef9f..00000000000
--- a/mail/cyrus-imapd/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2006/10/04 12:18:14 obache Exp $
-
---- tools/config2header.orig 2005-04-19 20:54:32.000000000 +0200
-+++ tools/config2header
-@@ -77,6 +77,14 @@ while ($#ARGV >= 0) {
-
- my $use_gcc_extension = ($CC and $CC eq 'gcc');
-
-+#
-+# Skip any CC options such as -pipe
-+# The last two parameters are the .c and .h files
-+#
-+while ($#ARGV > 1) {
-+ shift @ARGV;
-+}
-+
- die "wrong number of arguments" if ($#ARGV != 1);
- my ($cfile, $hfile) = @ARGV;
-
diff --git a/mail/cyrus-imapd/patches/patch-ab b/mail/cyrus-imapd/patches/patch-ab
deleted file mode 100644
index 5ac87069254..00000000000
--- a/mail/cyrus-imapd/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2005/05/21 03:31:26 rh Exp $
-
---- sieve/sievec.c.orig 2004-03-12 01:23:20.000000000 +1000
-+++ sieve/sievec.c
-@@ -63,6 +63,10 @@
- #include <sys/stat.h>
- #include <fcntl.h>
-
-+#ifdef __APPLE__
-+struct et_list *_et_list = NULL;
-+#endif
-+
- /* config.c stuff */
- const int config_need_data = 0;
-
diff --git a/mail/cyrus-imapd/patches/patch-ac b/mail/cyrus-imapd/patches/patch-ac
deleted file mode 100644
index 08272ca1995..00000000000
--- a/mail/cyrus-imapd/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2005/05/21 03:31:26 rh Exp $
-
---- sieve/sieved.c.orig 2004-06-30 06:05:32.000000000 +1000
-+++ sieve/sieved.c
-@@ -42,6 +42,10 @@ OF OR IN CONNECTION WITH THE USE OR PERF
-
- #include "map.h"
-
-+#ifdef __APPLE__
-+struct et_list *_et_list = NULL;
-+#endif
-+
- void dump2(bytecode_input_t *d, int len);
- int dump2_test(bytecode_input_t * d, int i);
-
diff --git a/mail/cyrus-imapd/patches/patch-ad b/mail/cyrus-imapd/patches/patch-ad
deleted file mode 100644
index aaaa52a32b2..00000000000
--- a/mail/cyrus-imapd/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2005/05/21 06:58:03 rh Exp $
-
---- imap/message.c.orig 2004-09-17 03:58:54.000000000 +1000
-+++ imap/message.c
-@@ -72,6 +72,10 @@
- #include "global.h"
- #include "retry.h"
-
-+#ifdef __APPLE__
-+struct et_list *_et_list = NULL;
-+#endif
-+
- /* Message being parsed */
- struct msg {
- const char *base;
diff --git a/mail/cyrus-imapd/patches/patch-ae b/mail/cyrus-imapd/patches/patch-ae
deleted file mode 100644
index 02384394cec..00000000000
--- a/mail/cyrus-imapd/patches/patch-ae
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2006/10/09 12:46:01 obache Exp $
-
---- imap/backend.c.orig 2006-02-08 05:57:27.000000000 +0900
-+++ imap/backend.c
-@@ -264,25 +264,28 @@ static void timed_out(int sig)
- }
- }
-
--struct backend *backend_connect(struct backend *ret, const char *server,
-+struct backend *backend_connect(struct backend *ret_backend, const char *server,
- struct protocol_t *prot, const char *userid,
- const char **auth_status)
- {
- /* need to (re)establish connection to server or create one */
- int sock = -1;
- int r;
-- int err = 0;
-+ int err = -1;
- struct addrinfo hints, *res0 = NULL, *res1 = NULL, *res;
- struct sockaddr_un sunsock;
- char buf[2048], *mechlist = NULL;
- struct sigaction action;
-+ struct backend *ret;
-
-- if (!ret) {
-+ if (!ret_backend) {
- ret = xmalloc(sizeof(struct backend));
- memset(ret, 0, sizeof(struct backend));
- strlcpy(ret->hostname, server, sizeof(ret->hostname));
- ret->timeout = NULL;
- }
-+ else
-+ ret = ret_backend;
-
- if (server[0] == '/') { /* unix socket */
- res0 = &hints;
-@@ -312,7 +315,7 @@ struct backend *backend_connect(struct b
- if (err) {
- syslog(LOG_ERR, "getaddrinfo(%s) failed: %s",
- server, gai_strerror(err));
-- free(ret);
-+ if (!ret_backend) free(ret);
- return NULL;
- }
- /* Get addrinfo struct for local interface. */
-@@ -363,7 +366,7 @@ struct backend *backend_connect(struct b
- if (res0 != &hints)
- freeaddrinfo(res0);
- syslog(LOG_ERR, "connect(%s) failed: %m", server);
-- free(ret);
-+ if (!ret_backend) free(ret);
- return NULL;
- }
- memcpy(&ret->addr, res->ai_addr, res->ai_addrlen);
-@@ -381,7 +384,7 @@ struct backend *backend_connect(struct b
- syslog(LOG_ERR,
- "backend_connect(): couldn't read initial greeting: %s",
- ret->in->error ? ret->in->error : "(null)");
-- free(ret);
-+ if (!ret_backend) free(ret);
- close(sock);
- return NULL;
- }
-@@ -396,13 +399,15 @@ struct backend *backend_connect(struct b
- if ((r = backend_authenticate(ret, prot, &mechlist, userid, auth_status))) {
- syslog(LOG_ERR, "couldn't authenticate to backend server: %s",
- sasl_errstring(r, NULL, NULL));
-- free(ret);
-+ if (!ret_backend) free(ret);
- close(sock);
- ret = NULL;
- }
- }
-
- if (mechlist) free(mechlist);
-+
-+ if (!ret_backend) ret_backend = ret;
-
- return ret;
- }
diff --git a/mail/cyrus-imapd/patches/patch-af b/mail/cyrus-imapd/patches/patch-af
deleted file mode 100644
index fd7df2f3a45..00000000000
--- a/mail/cyrus-imapd/patches/patch-af
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-af,v 1.9 2006/11/03 05:06:54 obache Exp $
-
---- configure.orig 2006-04-01 00:25:50.000000000 +0900
-+++ configure
-@@ -7701,7 +7701,7 @@ if test $ac_cv_header_db_h = yes; then
- fi
-
- saved_LIBS=$LIBS
-- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+ for dbname in ${BDB_TYPE} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
- do
- LIBS="$saved_LIBS -l$dbname"
- cat >conftest.$ac_ext <<_ACEOF
-@@ -13460,7 +13460,11 @@ echo "${ECHO_T}$ac_cv_header_gssapi_gssa
-
- fi
- if test $ac_cv_header_gssapi_gssapi_h = yes; then
-- :
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GSSAPI_H
-+_ACEOF
-+
- else
- { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - no include files found" >&5
- echo "$as_me: WARNING: Disabling GSSAPI - no include files found" >&2;}; gssapi=no
-@@ -15337,6 +15341,7 @@ elif test "${with_perl}" != "no"; then
- EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
- PERL_SUBDIRS="imap"
- PERL="${with_perl}"
-+ eval `${PERL} -V:cccdlflags`
- PERL_CCCDLFLAGS="$cccdlflags"
-
- fi
diff --git a/mail/cyrus-imapd/patches/patch-al b/mail/cyrus-imapd/patches/patch-al
deleted file mode 100644
index 642918e523c..00000000000
--- a/mail/cyrus-imapd/patches/patch-al
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-al,v 1.3 2007/03/09 14:46:08 obache Exp $
-
---- imtest/imtest.c.orig 2006-01-21 05:31:23.000000000 +0900
-+++ imtest/imtest.c
-@@ -47,7 +47,9 @@
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/ipc.h>
-+#if !defined(__APPLE__)
- #include <sys/msg.h>
-+#endif
- #include <sys/stat.h>
- #include <fcntl.h>
-
-@@ -72,6 +74,10 @@
- #include <netinet/in.h>
- #include <netdb.h>
-
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
-+
- #include <sasl/sasl.h>
- #include <sasl/saslutil.h>
-
-@@ -886,6 +892,12 @@ imt_stat getauthline(struct sasl_cmd_t *
- }
-
- if (*str != '\r') {
-+ /* trim CRLF */
-+ char *p = str + strlen(str) - 1;
-+ if (p >= str && *p == '\n') *p-- = '\0';
-+ if (p >= str && *p == '\r') *p-- = '\0';
-+
-+ /* alloc space for decoded response */
- len = strlen(str) + 1;
- *line = malloc(len);
- if ((*line) == NULL) {
diff --git a/mail/cyrus-imapd/patches/patch-am b/mail/cyrus-imapd/patches/patch-am
deleted file mode 100644
index 555047a2f62..00000000000
--- a/mail/cyrus-imapd/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.2 2005/03/02 21:42:48 wiz Exp $
-
---- configure.in.orig Mon Nov 22 22:27:07 2004
-+++ configure.in Sun Nov 28 14:36:32 2004
-@@ -944,7 +944,7 @@
- dnl add perl cccdlflags when building libraries -- this ensures that the
- dnl libraries will be compiled as PIC if perl requires PIC objects
- dnl -- this is needed on NetBSD, but seems to cause problems on atleast Solaris --
--dnl eval `${PERL} -V:cccdlflags`
-+ eval `${PERL} -V:cccdlflags`
- PERL_CCCDLFLAGS="$cccdlflags"
- AC_SUBST(PERL_CCCDLFLAGS)
- fi
diff --git a/mail/cyrus-imapd/patches/patch-ap b/mail/cyrus-imapd/patches/patch-ap
deleted file mode 100644
index 688c004d7df..00000000000
--- a/mail/cyrus-imapd/patches/patch-ap
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2005/03/02 21:42:48 wiz Exp $
-
---- imap/Makefile.in.orig 2004-05-28 14:03:02.000000000 -0400
-+++ imap/Makefile.in
-@@ -185,6 +185,9 @@ mupdate_err.c: mupdate_err.et
-
- mupdate_err.h: mupdate_err.c
-
-+mutex_pthread.o: mutex_pthread.c
-+ $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $(PTHREAD_CFLAGS) $<
-+
- ### Services
- idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
- $(CC) $(LDFLAGS) -o idled \
-@@ -241,16 +244,16 @@ proxyd.pure: $(PROXYDOBJS) mutex_fake.o
-
- mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
- libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o mupdate \
-+ $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -o mupdate \
- $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- mutex_pthread.o tls.o libimap.a \
-- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
-
- mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
- libimap.a $(DEPLIBS)
-- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
-+ $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -o mupdate.pure \
- $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
-- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+ mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
-
- pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- $(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \
diff --git a/mail/cyrus-imapd/patches/patch-aq b/mail/cyrus-imapd/patches/patch-aq
deleted file mode 100644
index efd5a002d73..00000000000
--- a/mail/cyrus-imapd/patches/patch-aq
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-aq,v 1.3 2006/12/01 13:36:59 joerg Exp $
-
---- imap/fetchnews.c.orig 2005-03-23 00:40:11.000000000 +0000
-+++ imap/fetchnews.c
-@@ -371,7 +371,8 @@ int main(int argc, char *argv[])
- prot_fgets(buf, sizeof(buf), pin);
-
- if (newnews) {
-- struct tm ctime, *ptime;
-+ struct tm ctime, ptime, ltime;
-+ time_t l_time, l_gmt;
-
- /* fetch the server's current time */
- prot_printf(pout, "DATE\r\n");
-@@ -416,8 +417,11 @@ int main(int argc, char *argv[])
-
- /* ask for new articles */
- if (stamp) stamp -= 180; /* adjust back 3 minutes */
-- ptime = gmtime(&stamp);
-- strftime(buf, sizeof(buf), datefmt, ptime);
-+ gmtime_r(&stamp, &ptime);
-+ localtime_r(&stamp, &ltime);
-+ l_gmt = mktime(&ptime);
-+ l_time = mktime(&ltime);;
-+ strftime(buf, sizeof(buf), datefmt, &ptime);
- prot_printf(pout, "NEWNEWS %s %s GMT\r\n", wildmat, buf);
-
- if (!prot_fgets(buf, sizeof(buf), pin) || strncmp("230", buf, 3)) {
-@@ -433,7 +437,9 @@ int main(int argc, char *argv[])
- We can't change this, otherwise we'd be incompatible
- with an old localtime timestamp.
- */
-- stamp -= timezone;
-+ stamp += l_time - l_gmt;
-+ if (ltime.tm_isdst)
-+ stamp += 3600;
- }
-
- if (!newnews) {
diff --git a/mail/cyrus-imapd/patches/patch-ba b/mail/cyrus-imapd/patches/patch-ba
deleted file mode 100644
index c186b7f9453..00000000000
--- a/mail/cyrus-imapd/patches/patch-ba
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2005/03/02 21:42:48 wiz Exp $
-
---- imap/mboxlist.c.orig Sun Nov 28 15:04:44 2004
-+++ imap/mboxlist.c Sun Nov 28 15:05:06 2004
-@@ -60,7 +60,9 @@
- #include <syslog.h>
-
- #include <sys/ipc.h>
-+#if !defined(__APPLE__)
- #include <sys/msg.h>
-+#endif
-
- #include "acl.h"
- #include "annotate.h"
diff --git a/mail/cyrus-imapd/patches/patch-bb b/mail/cyrus-imapd/patches/patch-bb
deleted file mode 100644
index f584833af94..00000000000
--- a/mail/cyrus-imapd/patches/patch-bb
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2005/03/02 21:42:48 wiz Exp $
-
---- imap/cvt_cyrusdb.c.orig Sun Nov 28 15:09:29 2004
-+++ imap/cvt_cyrusdb.c Sun Nov 28 15:10:33 2004
-@@ -60,7 +60,9 @@
- #include <syslog.h>
-
- #include <sys/ipc.h>
-+#if !defined(__APPLE__)
- #include <sys/msg.h>
-+#endif
-
- #include "acl.h"
- #include "assert.h"
diff --git a/mail/cyrus-imapd/patches/patch-bc b/mail/cyrus-imapd/patches/patch-bc
deleted file mode 100644
index b940c725d53..00000000000
--- a/mail/cyrus-imapd/patches/patch-bc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2005/03/02 21:42:48 wiz Exp $
-
---- perl/sieve/lib/request.c.orig Sun Nov 28 15:14:46 2004
-+++ perl/sieve/lib/request.c Sun Nov 28 15:14:47 2004
-@@ -51,7 +51,9 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/ipc.h>
-+#if !defined(__APPLE__)
- #include <sys/msg.h>
-+#endif
-
- #include <stdlib.h>
- #include <stdio.h>
diff --git a/mail/cyrus-imapd/patches/patch-ca b/mail/cyrus-imapd/patches/patch-ca
deleted file mode 100644
index d0706ebc169..00000000000
--- a/mail/cyrus-imapd/patches/patch-ca
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2005/08/08 16:50:59 jlam Exp $
-
---- perl/Makefile.in.orig 2003-10-22 14:50:17.000000000 -0400
-+++ perl/Makefile.in
-@@ -82,7 +82,7 @@ all::
- BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
- OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
- SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
-- $(PERL) Makefile.PL PREFIX=$(prefix); \
-+ $(PERL) Makefile.PL INSTALLDIRS=vendor PREFIX=$(prefix); \
- fi; \
- $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
- done
diff --git a/mail/cyrus-imapd/patches/patch-cb b/mail/cyrus-imapd/patches/patch-cb
deleted file mode 100644
index a3b31554f1f..00000000000
--- a/mail/cyrus-imapd/patches/patch-cb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2005/08/08 16:50:59 jlam Exp $
-
---- perl/sieve/Makefile.in.orig 2003-10-22 14:50:24.000000000 -0400
-+++ perl/sieve/Makefile.in
-@@ -84,7 +84,7 @@ all::
- BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
- OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
- SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
-- $(PERL) Makefile.PL PREFIX=$(prefix); \
-+ $(PERL) Makefile.PL INSTALLDIRS=vendor PREFIX=$(prefix); \
- fi; \
- $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
- done
diff --git a/mail/cyrus-imapd/patches/patch-cc b/mail/cyrus-imapd/patches/patch-cc
deleted file mode 100644
index 90f8bca9f50..00000000000
--- a/mail/cyrus-imapd/patches/patch-cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2005/11/19 11:50:56 rillig Exp $
-
-The SunPro compiler does not like non-static inline functions.
-
---- sieve/bc_emit.c.orig Wed Oct 22 20:03:24 2003
-+++ sieve/bc_emit.c Sat Nov 19 12:48:06 2005
-@@ -45,7 +45,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF
- void dump(bytecode_info_t *d);
- #endif
-
--inline int write_int (int fd, int x)
-+static inline int write_int (int fd, int x)
- {
- int y=htonl(x);
- return (write(fd, &y, sizeof(int)));
diff --git a/mail/cyrus-imapd21/DEINSTALL b/mail/cyrus-imapd21/DEINSTALL
deleted file mode 100644
index 8bddff0e61b..00000000000
--- a/mail/cyrus-imapd21/DEINSTALL
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.3 2004/07/31 03:28:32 jlam Exp $
-
-IMAPDCONF=@IMAPDCONF@
-
-case ${STAGE} in
-DEINSTALL)
- if [ -f ${IMAPDCONF} ]; then
- IMAPDIRS=`
- ${AWK} '/configdirectory:/ { print $2 }; \
- /partition-.*:/ { print $2 }; \
- /sievedir:/ { print $2 }' \
- ${IMAPDCONF} | ${SORT} -ur`
- _IMAPDIRS=
- for dir in ${IMAPDIRS}; do
- ${RMDIR} -p ${dir} 2>/dev/null || ${TRUE}
- if [ -d ${dir} ]; then
- _IMAPDIRS="${_IMAPDIRS} ${dir}"
- fi
- done
- if [ -n "${_IMAPDIRS}" ]; then
- ${CAT} << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove
-the following directories:
-
-EOF
- for dir in ${_IMAPDIRS}; do
- if [ -d "${dir}" ]; then
- ${ECHO} " ${dir}"
- fi
- done
- ${CAT} << EOF
-===========================================================================
-EOF
- fi
- fi
- ;;
-esac
diff --git a/mail/cyrus-imapd21/DESCR b/mail/cyrus-imapd21/DESCR
deleted file mode 100644
index e742d558a95..00000000000
--- a/mail/cyrus-imapd21/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-IMAP (Internet Message Access Protocol) is an Internet standards-track
-protocol for accessing messages (mail, bboards, news, etc). The Cyrus
-IMAP server differs from other IMAP server implementations in that it
-is generally intended to be run on "sealed" servers, where normal users
-are not permitted to log in. The mailbox database is stored in parts of
-the filesystem that are private to the Cyrus IMAP system. All user
-access to mail is through the IMAP, POP3, or KPOP protocols.
diff --git a/mail/cyrus-imapd21/MESSAGE b/mail/cyrus-imapd21/MESSAGE
deleted file mode 100644
index 95aa36e98fc..00000000000
--- a/mail/cyrus-imapd21/MESSAGE
+++ /dev/null
@@ -1,19 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/02/14 18:28:25 snj Exp $
-
-Please also refer to:
-
- ${PREFIX}/share/doc/html/cyrus-imapd/install.html
-
-for more detailed instructions on setting up the environment before
-starting the Cyrus IMAP server. In particular, several services will
-probably need to be added to /etc/services.
-
-Note anyone upgrading from an earlier version of cyrus should read:
-
- ${PREFIX}/share/doc/html/cyrus-imapd/install-upgrade.html
-
-Also note that cyrus-imapd now uses saslauthd rather then pwcheck by
-default.
-
-===========================================================================
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
deleted file mode 100644
index 79375eb2fd9..00000000000
--- a/mail/cyrus-imapd21/Makefile
+++ /dev/null
@@ -1,181 +0,0 @@
-# $NetBSD: Makefile,v 1.42 2006/10/04 21:47:16 wiz Exp $
-
-DISTNAME= cyrus-imapd-2.1.18
-PKGREVISION= 3
-SVR4_PKGNAME= cimap
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
-
-MAINTAINER= chris@NetBSD.org
-HOMEPAGE= http://cyrusimap.web.cmu.edu/imapd/
-COMMENT= Cyrus IMAP server
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-GNU_CONFIGURE= yes
-PERL5_CONFIGURE= no
-USE_TOOLS+= autoconf213
-
-.include "../../mk/bsd.prefs.mk"
-
-# CYRUS_USER username of the Cyrus administrator
-# CYRUS_GROUP group of the Cyrus administrator
-#
-CYRUS_USER?= cyrus
-CYRUS_GROUP?= mail
-
-BUILD_DEFS+= CYRUS_USER CYRUS_GROUP
-FILES_SUBST+= CYRUS_USER=${CYRUS_USER:Q}
-FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP:Q}
-
-CONFIGURE_ARGS+= --with-cyrus-user=${CYRUS_USER:Q}
-CONFIGURE_ARGS+= --with-cyrus-group=${CYRUS_GROUP:Q}
-CONFIGURE_ARGS+= --with-cyrus-prefix=${PREFIX}/cyrus
-CONFIGURE_ARGS+= --with-statedir=${VARBASE}/run
-CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
-CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
-CONFIGURE_ARGS+= --with-perl=${PERL5:Q}
-CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
-CONFIGURE_ENV+= ac_cv_lib_wrap_request_init=yes
-
-CONFIGURE_ARGS+= --enable-netscapehack
-CONFIGURE_ARGS+= --without-notify
-CONFIGURE_ARGS+= --without-ucdsnmp
-CONFIGURE_ARGS+= --without-zephyr
-
-# Ensure that we use the db3 library, even if the db4 one gets pulled in
-# as an indirect dependency.
-#
-.include "../../databases/db3/buildlink3.mk"
-CONFIGURE_ARGS+= --with-bdb-libdir=${BUILDLINK_PREFIX.db3}/lib
-CONFIGURE_ARGS+= --with-bdb-incdir=${BUILDLINK_PREFIX.db3}/include/db3
-.for _var_ in db_4_1 db4_1 db41 db_4_0 db4_0 db_4 db40 db4
-CONFIGURE_ENV+= ac_cv_lib_${_var_}_db_create=no
-.endfor
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-imapd
-PKG_SUPPORTED_OPTIONS= gssapi inet6 kerberos kerberos4 recommended-db
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-PATCH_SITES= http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES= cyrus-imapd-2.1.16-ipv6-20031121.diff.gz
-.endif
-
-.if !empty(PKG_OPTIONS:Mrecommended-db)
-#
-# Follow the recommended methods for database types to use. I'm not
-# 100% ready to override the defaults till I've checked any side effects
-# - chris@nb.org
-#
-CONFIGURE_ARGS+= --with-duplicate-db=db3_nosync
-CONFIGURE_ARGS+= --with-mboxlist-db=skiplist
-CONFIGURE_ARGS+= --with-seen-db=skiplist
-CONFIGURE_ARGS+= --with-subs-db=flat
-CONFIGURE_ARGS+= --with-tls-db=db3_nosync
-.endif
-
-.if !empty(PKG_OPTIONS:Mkerberos)
-. if empty(PKG_OPTIONS:Mgssapi)
-PKG_OPTIONS+= gssapi
-. endif
-.endif
-
-.if !empty(PKG_OPTIONS:Mkerberos4)
-. if exists(/usr/include/kerberosIV/krb.h)
-CRYPTO+= uses Kerberos encryption code
-CONFIGURE_ARGS+= --with-auth=krb
-CONFIGURE_ARGS+= --with-krb=/usr
-. endif
-.elif !empty(PKG_OPTIONS:Mgssapi)
-. include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+= --with-auth=unix
-CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE:Q}
-CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
-GSSIMPL.heimdal= heimdal
-GSSIMPL.mit-krb5= mit
-CONFIGURE_ENV+= COMPILE_ET=${KRB5BASE}/bin/compile_et
-COMERRBASE= ${KRB5BASE}
-.else
-CONFIGURE_ARGS+= --with-auth=unix
-CONFIGURE_ARGS+= --without-krb
-CONFIGURE_ARGS+= --disable-gssapi
-.endif
-
-.if exists(/usr/bin/compile_et)
-COMERRBASE?= /usr
-.endif
-.if defined(COMERRBASE)
-. if exists(${COMERRBASE}/include/krb5/com_err.h)
-CPPFLAGS+= -I${COMERRBASE}/include/krb5
-. endif
-CONFIGURE_ENV+= COMPILE_ET=${COMERRBASE}/bin/compile_et
-.else
-CONFIGURE_ARGS+= --with-com-err=yes
-.endif
-
-HTMLDIR= ${PREFIX}/share/doc/html/cyrus-imapd
-EGDIR= ${PREFIX}/share/examples/cyrus-imapd
-CONF_FILES= ${EGDIR}/imapd.conf ${PKG_SYSCONFDIR}/imapd.conf
-CONF_FILES+= ${EGDIR}/normal.conf ${PKG_SYSCONFDIR}/cyrus.conf
-RCD_SCRIPTS= cyrus
-FILES_SUBST+= IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf
-
-PERL5_PACKLIST= \
- auto/Cyrus/IMAP/.packlist \
- auto/Cyrus/SIEVE/managesieve/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../security/cyrus-sasl/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../security/tcp_wrappers/buildlink3.mk"
-
-# Change references of some manpages from foo.8 to cyrus-foo.8 to avoid
-# manpage conflicts with other packages. Also change references to
-# "/etc/{cyrus,imapd}.conf" into "${PKG_SYSCONFDIR}/{cyrus,imapd}.conf".
-#
-post-patch:
- cd ${WRKSRC}/man; \
- set -- deliver 8 imapd 8 master 8 pop3d 8; \
- while [ $$# -gt 0 ]; do \
- man=$$1.$$2; \
- for file in Makefile.in *.[0-9]; do \
- ${SED} -e "s|\(\$$(srcdir)/\)\($$man\)|\1cyrus-\2|g" \
- -e "s|\(\\\fB\)\($$1($$2)\\\fR\)|\1cyrus-\2|g" \
- $$file > $$file.fixed; \
- ${MV} -f $$file.fixed $$file; \
- done; \
- if [ -f $$man ]; then \
- ${MV} $$man cyrus-$$man; \
- fi; \
- shift 2; \
- done
- ${FIND} ${WRKSRC} -type f -print | \
- ${XARGS} -n 1 ${GREP} -l -e /etc/imapd\.conf -e /etc/cyrus\.conf | \
- while read file; do \
- ${SED} -e "s|/etc/\(cyrus\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
- -e "s|/etc/\(imapd\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
- $${file} > $${file}.fixed; \
- ${MV} -f $${file}.fixed $${file}; \
- done
-
-pre-configure:
- cd ${WRKSRC} && autoheader && autoconf
-
-post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${PREFIX}/cyrus/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/tools/translatesieve ${PREFIX}/cyrus/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/tools/rehash ${PREFIX}/cyrus/bin
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EGDIR}
- cd ${WRKSRC}/master/conf; for file in *.conf; do \
- ${INSTALL_DATA} $$file ${EGDIR}; \
- done
- ${INSTALL_DATA_DIR} ${HTMLDIR}
- cd ${WRKSRC}/doc; for file in *.html cyrusv2.mc; do \
- ${INSTALL_DATA} $$file ${HTMLDIR}; \
- done
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/cyrus-imapd21/PLIST b/mail/cyrus-imapd21/PLIST
deleted file mode 100644
index 975528be8af..00000000000
--- a/mail/cyrus-imapd21/PLIST
+++ /dev/null
@@ -1,144 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2005/05/02 20:33:59 reed Exp $
-bin/imtest
-bin/installsieve
-bin/lmtptest
-bin/mupdatetest
-bin/pop3test
-bin/sieveshell
-bin/sivtest
-bin/smtptest
-cyrus/bin/arbitron
-cyrus/bin/chk_cyrus
-cyrus/bin/ctl_cyrusdb
-cyrus/bin/ctl_deliver
-cyrus/bin/ctl_mboxlist
-cyrus/bin/cvt_cyrusdb
-cyrus/bin/cyrdump
-cyrus/bin/deliver
-cyrus/bin/feedcyrus
-cyrus/bin/fud
-cyrus/bin/imapd
-cyrus/bin/ipurge
-cyrus/bin/lmtpd
-cyrus/bin/master
-cyrus/bin/mbexamine
-cyrus/bin/mbpath
-cyrus/bin/mkimap
-cyrus/bin/notifyd
-cyrus/bin/pop3d
-cyrus/bin/quota
-cyrus/bin/reconstruct
-cyrus/bin/rehash
-cyrus/bin/squatter
-cyrus/bin/timsieved
-cyrus/bin/tls_prune
-cyrus/bin/translatesieve
-include/cyrus/acap.h
-include/cyrus/acl.h
-include/cyrus/assert.h
-include/cyrus/auth.h
-include/cyrus/bsearch.h
-include/cyrus/charset.h
-include/cyrus/cyrusdb.h
-include/cyrus/glob.h
-include/cyrus/gmtoff.h
-include/cyrus/hash.h
-include/cyrus/imapurl.h
-include/cyrus/imclient.h
-include/cyrus/imparse.h
-include/cyrus/iptostring.h
-include/cyrus/lock.h
-include/cyrus/lsort.h
-include/cyrus/map.h
-include/cyrus/mkgmtime.h
-include/cyrus/mpool.h
-include/cyrus/nonblock.h
-include/cyrus/parseaddr.h
-include/cyrus/prot.h
-include/cyrus/retry.h
-include/cyrus/rfc822date.h
-include/cyrus/stristr.h
-include/cyrus/sysexits.h
-include/cyrus/util.h
-include/cyrus/xmalloc.h
-lib/libacap.a
-lib/libcyrus.a
-man/man1/imtest.1
-man/man1/installsieve.1
-man/man1/lmtptest.1
-man/man1/mupdatetest.1
-man/man1/pop3test.1
-man/man1/sieveshell.1
-man/man1/sivtest.1
-man/man1/smtptest.1
-man/man3/imclient.3
-man/man5/cyrus.conf.5
-man/man5/imapd.conf.5
-man/man5/krb.equiv.5
-man/man8/arbitron.8
-man/man8/chk_cyrus.8
-man/man8/collectnews.8
-man/man8/ctl_cyrusdb.8
-man/man8/ctl_deliver.8
-man/man8/ctl_mboxlist.8
-man/man8/cvt_cyrusdb.8
-man/man8/cyrus-deliver.8
-man/man8/cyrus-imapd.8
-man/man8/cyrus-master.8
-man/man8/cyrus-pop3d.8
-man/man8/fud.8
-man/man8/idled.8
-man/man8/ipurge.8
-man/man8/lmtpd.8
-man/man8/mbexamine.8
-man/man8/mbpath.8
-man/man8/notifyd.8
-man/man8/quota.8
-man/man8/reconstruct.8
-man/man8/rmnews.8
-man/man8/squatter.8
-man/man8/syncnews.8
-man/man8/timsieved.8
-man/man8/tls_prune.8
-share/doc/html/cyrus-imapd/altnamespace.html
-share/doc/html/cyrus-imapd/anoncvs.html
-share/doc/html/cyrus-imapd/bugs.html
-share/doc/html/cyrus-imapd/changes.html
-share/doc/html/cyrus-imapd/cyrusv2.mc
-share/doc/html/cyrus-imapd/faq.html
-share/doc/html/cyrus-imapd/feedback.html
-share/doc/html/cyrus-imapd/index.html
-share/doc/html/cyrus-imapd/install-admin-mb.html
-share/doc/html/cyrus-imapd/install-auth.html
-share/doc/html/cyrus-imapd/install-compile.html
-share/doc/html/cyrus-imapd/install-configure.html
-share/doc/html/cyrus-imapd/install-murder.html
-share/doc/html/cyrus-imapd/install-perf.html
-share/doc/html/cyrus-imapd/install-prereq.html
-share/doc/html/cyrus-imapd/install-sieve.html
-share/doc/html/cyrus-imapd/install-snmpmon.html
-share/doc/html/cyrus-imapd/install-testing.html
-share/doc/html/cyrus-imapd/install-upgrade.html
-share/doc/html/cyrus-imapd/install.html
-share/doc/html/cyrus-imapd/mailing-list.html
-share/doc/html/cyrus-imapd/man.html
-share/doc/html/cyrus-imapd/notes.html
-share/doc/html/cyrus-imapd/os.html
-share/doc/html/cyrus-imapd/overview.html
-share/doc/html/cyrus-imapd/questions.html
-share/doc/html/cyrus-imapd/readme.html
-share/doc/html/cyrus-imapd/sieve-protocol.html
-share/doc/html/cyrus-imapd/sieve.html
-share/doc/html/cyrus-imapd/specs.html
-share/examples/cyrus-imapd/cmu-backend.conf
-share/examples/cyrus-imapd/cmu-frontend.conf
-share/examples/cyrus-imapd/imapd.conf
-share/examples/cyrus-imapd/normal.conf
-share/examples/cyrus-imapd/prefork.conf
-share/examples/cyrus-imapd/small.conf
-share/examples/rc.d/cyrus
-@dirrm share/examples/cyrus-imapd
-@dirrm share/doc/html/cyrus-imapd
-@dirrm include/cyrus
-@dirrm cyrus/bin
-@dirrm cyrus
diff --git a/mail/cyrus-imapd21/distinfo b/mail/cyrus-imapd21/distinfo
deleted file mode 100644
index bcc00d6dfdb..00000000000
--- a/mail/cyrus-imapd21/distinfo
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: distinfo,v 1.13 2006/07/07 01:57:43 minskim Exp $
-
-SHA1 (cyrus-imapd-2.1.18.tar.gz) = 2f587645d8589fb876bb6633ae4a7a93f451b89c
-RMD160 (cyrus-imapd-2.1.18.tar.gz) = 87e521c9fc01e42c4e54b4e2ffb1492abb9f9130
-Size (cyrus-imapd-2.1.18.tar.gz) = 1711522 bytes
-SHA1 (cyrus-imapd-2.1.16-ipv6-20031121.diff.gz) = 390aeae9306fcd3bed1e96a6b2bb82775b347f66
-RMD160 (cyrus-imapd-2.1.16-ipv6-20031121.diff.gz) = e32d5f4f146f83db5b2ff966ae145b54e8dea390
-Size (cyrus-imapd-2.1.16-ipv6-20031121.diff.gz) = 33500 bytes
-SHA1 (patch-aa) = c474ede286e7976b3dfa7fcb3a5a7e308842239f
-SHA1 (patch-ab) = c1c5cfa6b43d206224fa6107be9b4eae3302bb7f
-SHA1 (patch-ac) = 44ec55f4811af1942872b4d276a0a2f57a803ef2
-SHA1 (patch-ad) = 80329b5a72cb7aa6890304cd89912096f3a66df3
-SHA1 (patch-ae) = 003d6ecc2caf0bf2985a871691ba970c6a6f4755
-SHA1 (patch-af) = 0441995df180d9b20ffee88bf880fc711afa2558
-SHA1 (patch-ag) = 55e7bbd00f8fe4b47d48fad3a06e3ad0aa835a4a
-SHA1 (patch-ah) = 99e25634852897f8df72b9af5f35789a0ef4b892
-SHA1 (patch-ai) = df0551cd295d660dcd12601cb1aa2d930f85d2f1
-SHA1 (patch-aj) = fcf0ce2c630459ea27c3d950a31ed907f5884de6
-SHA1 (patch-ak) = b0c8916d8e427c06625013595c06842544ef2125
-SHA1 (patch-ca) = 953c17733c8802cf965871a11c53e25185aa5935
-SHA1 (patch-cb) = 86a34c56e6494e59b8d9f27a95e435e5e1e62d26
diff --git a/mail/cyrus-imapd21/files/cyrus.sh b/mail/cyrus-imapd21/files/cyrus.sh
deleted file mode 100644
index e556f55ca48..00000000000
--- a/mail/cyrus-imapd21/files/cyrus.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: cyrus.sh,v 1.3 2004/07/31 03:29:38 jlam Exp $
-#
-# PROVIDE: cyrus
-# REQUIRE: DAEMON
-#
-# To start cyrus-imapd at startup, copy this script to /etc/rc.d and set
-# cyrus=YES in /etc/rc.conf.
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-rcd_dir=`@DIRNAME@ $0`
-
-name="cyrus"
-rcvar=$name
-command="@PREFIX@/cyrus/bin/master"
-command_args="-d"
-pidfile="/var/run/cyrus-master.pid"
-required_files="@PKG_SYSCONFDIR@/cyrus.conf @IMAPDCONF@"
-extra_commands="mkimap reload"
-
-mkimap_cmd="cyrus_mkimap"
-start_precmd="cyrus_prestart"
-
-cyrus_prestart()
-{
- # Check to see if "configdirectory" is present before we start
- # the Cyrus IMAP server. Otherwise, we run mkimap to generate
- # the necessary directories.
- #
- if [ -f @IMAPDCONF@ ]; then
- configdir=` \
- @AWK@ '/^configdirectory:/ { print $2; exit };' \
- @IMAPDCONF@ \
- `
- if [ -z "$configdir" ]; then
- @ECHO@ "@IMAPDCONF@ missing 'configdirectory' setting"
- exit 1
- fi
- if [ ! -d "$configdir" ]; then
- $rcd_dir/cyrus mkimap
- fi
- fi
-}
-
-cyrus_mkimap()
-{
- # Generate the prerequisite directory structure for Cyrus IMAP.
- if [ -f @IMAPDCONF@ ]; then
- @AWK@ '/^configdirectory:/ { print $2 }; \
- /^partition-.*:/ { print $2 }; \
- /^sievedir:/ { print $2 }' \
- @IMAPDCONF@ | \
- while read dir; do
- if [ ! -d "$dir" ]; then
- @MKDIR@ "$dir"
- @CHMOD@ 750 "$dir"
- @CHOWN@ @CYRUS_USER@ "$dir"
- @CHGRP@ @CYRUS_GROUP@ "$dir"
- fi
- done
- @SU@ -m @CYRUS_USER@ -c "@PREFIX@/cyrus/bin/mkimap"
- fi
-}
-
-if [ -f /etc/rc.subr -a -f /etc/rc.conf \
- -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- @ECHO@ -n " ${name}"
- eval ${start_precmd}
- ${command} ${cyrus_flags} ${command_args}
-fi
diff --git a/mail/cyrus-imapd21/files/imapd.conf b/mail/cyrus-imapd21/files/imapd.conf
deleted file mode 100644
index cad17e45a2c..00000000000
--- a/mail/cyrus-imapd21/files/imapd.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: imapd.conf,v 1.2 2003/09/15 09:01:18 jlam Exp $
-#
-# Cyrus IMAP server configuration file. Refer to imapd.conf(5) for
-# more options.
-
-configdirectory: /var/imap
-partition-default: /var/spool/imap
-sieveusehomedir: true
-hashimapspool: false
-
-admins: cyrus
-
-# Use the saslauthd daemon to verify plaintext passwords. Please ensure that
-# the saslauthd daemon is running before trying to authenticate.
-#
-sasl_pwcheck_method: saslauthd
-
-# The server certificate and key files must be specified for the
-# server to repond to IMAPS or POP3S requests. See imapd.conf(5) for
-# a complete listing of tls_* options.
-#
-#tls_cert_file: /var/imap/server.pem
-#tls_key_file: /var/imap/server.pem
diff --git a/mail/cyrus-imapd21/patches/patch-aa b/mail/cyrus-imapd21/patches/patch-aa
deleted file mode 100644
index c6a61b60aea..00000000000
--- a/mail/cyrus-imapd21/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/07/07 01:57:43 minskim Exp $
-
---- imap/imapd.h.orig 2003-02-13 20:15:25.000000000 +0000
-+++ imap/imapd.h
-@@ -54,18 +54,9 @@ extern char *imapd_userid;
- /* Authorization state for logged in userid */
- extern struct auth_state *imapd_authstate;
-
--/* True if user is an admin */
--extern int imapd_userisadmin;
--
--/* Currently open mailbox */
--extern struct mailbox *imapd_mailbox;
--
- /* Number of messages in currently open mailbox */
- extern int imapd_exists;
-
--/* Name of client host */
--extern char imapd_clienthost[];
--
- /* List of strings, for fetch and search argument blocks */
- struct strlist {
- char *s; /* String */
diff --git a/mail/cyrus-imapd21/patches/patch-ab b/mail/cyrus-imapd21/patches/patch-ab
deleted file mode 100644
index 2dc4ec2bb11..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/09/13 23:03:18 jlam Exp $
-
---- acconfig.h.orig Sat Sep 13 16:49:05 2003
-+++ acconfig.h Sat Sep 13 17:01:59 2003
-@@ -270,8 +270,16 @@
- #define shutdown(fd, mode) 0
- #endif
-
-+#ifdef HAVE_PATHS_H
-+#include <paths.h>
-+#endif
-+
- /* sendmail configuration parameters */
-+#if defined(_PATH_SENDMAIL)
-+#define DEFAULT_SENDMAIL (_PATH_SENDMAIL)
-+#else
- #define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
-+#endif
- #define DEFAULT_POSTMASTER ("postmaster")
-
- #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd21/patches/patch-ac b/mail/cyrus-imapd21/patches/patch-ac
deleted file mode 100644
index 1b73ceca1e0..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2003/09/13 23:03:18 jlam Exp $
-
---- imap/imapd.c.orig Sat Sep 13 16:49:05 2003
-+++ imap/imapd.c Sat Sep 13 16:49:22 2003
-@@ -5838,7 +5838,7 @@
- {
- int i=0, j=0;
- char tagbuf[128];
-- char c;
-+ int c;
- struct buf tag, cmd, tmp, user;
- int r = 0;
-
-@@ -5953,7 +5953,7 @@
- char *mailbox, char *acl_in)
- {
- int r = 0;
-- char c;
-+ int c;
- char tag[128];
- int tagnum = 1;
- char *rights, *nextid;
diff --git a/mail/cyrus-imapd21/patches/patch-ad b/mail/cyrus-imapd21/patches/patch-ad
deleted file mode 100644
index acb26f2a2c6..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/05/26 06:53:07 martti Exp $
-
---- imap/mbpath.c.orig 2003-02-13 22:15:28.000000000 +0200
-+++ imap/mbpath.c 2003-05-21 10:20:05.000000000 +0300
-@@ -96,7 +96,7 @@
- {
- char *path;
- int rc, i, quiet = 0, stop_on_error=0;
-- char opt;
-+ int opt;
- char *alt_config = NULL;
-
- while ((opt = getopt(argc, argv, "C:qs")) != EOF) {
diff --git a/mail/cyrus-imapd21/patches/patch-ae b/mail/cyrus-imapd21/patches/patch-ae
deleted file mode 100644
index 9b9596a0a46..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2003/05/26 06:53:08 martti Exp $
-
---- imap/ipurge.c.orig 2003-04-22 20:39:41.000000000 +0300
-+++ imap/ipurge.c 2003-05-21 10:20:46.000000000 +0300
-@@ -105,7 +105,7 @@
- void print_stats(mbox_stats_t *stats);
-
- int main (int argc, char *argv[]) {
-- char option;
-+ int option;
- char buf[MAX_MAILBOX_PATH+1];
- char *alt_config = NULL;
- int r;
diff --git a/mail/cyrus-imapd21/patches/patch-af b/mail/cyrus-imapd21/patches/patch-af
deleted file mode 100644
index 62e98ccbc3e..00000000000
--- a/mail/cyrus-imapd21/patches/patch-af
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-af,v 1.5 2003/09/13 23:03:18 jlam Exp $
-
---- configure.in.orig Sat Sep 13 16:49:05 2003
-+++ configure.in Sat Sep 13 16:59:11 2003
-@@ -260,6 +260,9 @@
- dnl for et routines
- AC_FUNC_CHECK(strerror,AC_DEFINE(HAS_STRERROR),AC_DEFINE(NEED_SYS_ERRLIST))
-
-+dnl for path to sendmail
-+AC_CHECK_HEADERS(paths.h)
-+
- dnl for master fd limits
- AC_CHECK_HEADERS(sys/resource.h)
- AC_CHECK_FUNCS(setrlimit)
-@@ -898,6 +901,10 @@
- dnl and compile perl/cyradm
- PERL_SUBDIRS="imap"
- PERL="${with_perl}"
-+dnl add perl cccdlflags when building libraries
-+ eval `${PERL} -V:cccdlflags`
-+ PERL_CCCDLFLAGS="$cccdlflags"
-+ AC_SUBST(PERL_CCCDLFLAGS)
- fi
-
- dnl for timsieved
diff --git a/mail/cyrus-imapd21/patches/patch-ag b/mail/cyrus-imapd21/patches/patch-ag
deleted file mode 100644
index 8758d40fb84..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2002/11/15 11:49:08 seb Exp $
-
---- sieve/Makefile.in.orig Tue Feb 19 19:09:45 2002
-+++ sieve/Makefile.in
-@@ -35,7 +35,7 @@ COMPILE_ET = @COMPILE_ET@
-
- DEFS = @DEFS@
- CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
- LDFLAGS = @LDFLAGS@
-
- MAKEDEPEND = @MAKEDEPEND@
diff --git a/mail/cyrus-imapd21/patches/patch-ah b/mail/cyrus-imapd21/patches/patch-ah
deleted file mode 100644
index 6fd3ef09e59..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2002/11/15 11:49:08 seb Exp $
-
---- perl/sieve/lib/Makefile.in.orig Sat May 25 21:57:50 2002
-+++ perl/sieve/lib/Makefile.in
-@@ -55,8 +55,8 @@ LIBS = ../../../lib/libcyrus.a @LIB_DYN_
- IMAP_LIBS = @IMAP_LIBS@
- DEPLIBS = ../../../lib/libcyrus.a @DEPLIBS@
-
--CFLAGS = -g
--LDFLAGS = -g @LDFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
-+LDFLAGS = @LDFLAGS@
-
- SHELL = /bin/sh
- MAKEDEPEND = @MAKEDEPEND@
diff --git a/mail/cyrus-imapd21/patches/patch-ai b/mail/cyrus-imapd21/patches/patch-ai
deleted file mode 100644
index db3646508b0..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2002/11/15 11:49:08 seb Exp $
-
---- lib/Makefile.in.orig Sat May 25 21:57:47 2002
-+++ lib/Makefile.in
-@@ -60,7 +60,7 @@ DEFS = @DEFS@
- CPPFLAGS = -I.. @CPPFLAGS@ @SASLFLAGS@
- LIBS = @LIBS@
-
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
- LDFLAGS = @LDFLAGS@
-
- SHELL = /bin/sh
diff --git a/mail/cyrus-imapd21/patches/patch-aj b/mail/cyrus-imapd21/patches/patch-aj
deleted file mode 100644
index 94e5b5271e0..00000000000
--- a/mail/cyrus-imapd21/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2003/02/27 13:21:52 seb Exp $
-
---- acap/Makefile.in.orig Tue Dec 10 00:52:37 2002
-+++ acap/Makefile.in
-@@ -54,7 +54,7 @@ DEFS = @DEFS@
- CPPFLAGS = @CPPFLAGS@ @SASLFLAGS@ -I. -I.. -I$(srcdir) -I$(srcdir)/../lib
- LIBS = @LIBS@
-
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
- LDFLAGS = @LDFLAGS@
-
- SHELL = /bin/sh
diff --git a/mail/cyrus-imapd21/patches/patch-ak b/mail/cyrus-imapd21/patches/patch-ak
deleted file mode 100644
index 38b68019077..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ak
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2003/08/16 09:23:59 recht Exp $
-
---- imap/ctl_cyrusdb.c.orig 2003-05-02 17:23:05.000000000 +0200
-+++ imap/ctl_cyrusdb.c 2003-07-26 14:21:45.000000000 +0200
-@@ -231,9 +231,9 @@
-
- /* create the names of the backup directories */
- strcpy(backup1, dirname);
-- strcat(backup1, ".backup1/");
-+ strcat(backup1, ".backup1");
- strcpy(backup2, dirname);
-- strcat(backup2, ".backup2/");
-+ strcat(backup2, ".backup2");
-
- syslog(LOG_NOTICE, "%s", msg);
-
-@@ -289,6 +289,7 @@
- struct dirent *dirent;
-
- tail = backup2 + strlen(backup2);
-+ *tail++ = '/';
-
- /* remove db.backup2 */
- dirp = opendir(backup2);
-@@ -302,7 +303,7 @@
-
- closedir(dirp);
- }
-- *tail = '\0';
-+ tail[-1] = '\0';
- r2 = rmdir(backup2);
-
- /* move db.backup1 to db.backup2 */
diff --git a/mail/cyrus-imapd21/patches/patch-ca b/mail/cyrus-imapd21/patches/patch-ca
deleted file mode 100644
index aaa648a9df7..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ca
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2005/08/08 16:50:59 jlam Exp $
-
---- perl/Makefile.in.orig 2003-01-02 12:27:35.000000000 -0500
-+++ perl/Makefile.in
-@@ -80,7 +80,7 @@ imap/Makefile: imap/Makefile.PL
- (cd imap; \
- OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
- SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
-- $(PERL) Makefile.PL PREFIX=$(prefix))
-+ $(PERL) Makefile.PL INSTALLDIRS=vendor PREFIX=$(prefix))
-
- install::
- @for d in $(SUBDIRS); \
diff --git a/mail/cyrus-imapd21/patches/patch-cb b/mail/cyrus-imapd21/patches/patch-cb
deleted file mode 100644
index f0778922f60..00000000000
--- a/mail/cyrus-imapd21/patches/patch-cb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2005/08/08 16:50:59 jlam Exp $
-
---- perl/sieve/Makefile.in.orig 2002-07-22 12:16:09.000000000 -0400
-+++ perl/sieve/Makefile.in
-@@ -78,7 +78,7 @@ all::
- if [ -f Makefile.PL ]; then \
- OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
- SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
-- $(PERL) Makefile.PL PREFIX=$(prefix); \
-+ $(PERL) Makefile.PL INSTALLDIRS=vendor PREFIX=$(prefix); \
- fi; \
- $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
- done
diff --git a/mail/dbmail/DESCR b/mail/dbmail/DESCR
deleted file mode 100644
index 3142ce39496..00000000000
--- a/mail/dbmail/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-Dbmail is the name of a group of programs that enable the possibility
-of storing and retrieving mail messages from a database. Currently
-MySQL and PostgreSQL can be used as database backends.
-
-DBMail is made up of several components. A normal MTA (Postfix,
-SendMail, QMail, Exim) is used for accepting messages. The MTA
-hands the messages over to dbmail-smtp, using a pipe interface, or
-dbmail-lmtpd, using LMTP (Local Mail Transport Protocol). These
-programs take care of delivering the message into the database.
-Messages can be retrieved from the database using dbmail-pop3d,
-using the POP3 protocol, and dbmail-imapd, using the IMAP4Rev1
-protocol.
-
-The whole email is stored in the database. That includes attachments.
-The DBMail programs do not have to touch the filesystem to retrieve
-or insert emails. User information is also stored in the database,
-so users do not need an account on the machines DBMail is running
-on.
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
deleted file mode 100644
index 88ae3547c36..00000000000
--- a/mail/dbmail/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2007/03/19 12:51:56 ghen Exp $
-#
-
-DISTNAME= dbmail-2.0.11
-CATEGORIES= mail
-MASTER_SITES= http://www.dbmail.org/download/2.0/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.dbmail.org/
-COMMENT= Store and retrieve mail messages in a database
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-${SQLDB}
-USE_TOOLS+= gmake
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-
-EGDIR= ${PREFIX}/share/examples/dbmail
-CONF_FILES= ${EGDIR}/dbmail.conf ${PKG_SYSCONFDIR}/dbmail.conf
-RCD_SCRIPTS= dbmail dbmailimapd dbmaillmtpd dbmailpop3d
-
-PLIST_SUBST+= SQLDB=${SQLDB:Q}
-
-SUBST_CLASSES+= sysconf
-SUBST_STAGE.sysconf= do-configure
-SUBST_FILES.sysconf= man/dbmail-imapd.8 man/dbmail-lmtpd.8 man/dbmail-pop3d.8
-SUBST_FILES.sysconf+= man/dbmail-smtp.1 man/dbmail-users.8 man/dbmail-util.8
-SUBST_FILES.sysconf+= dbmail.h
-SUBST_SED.sysconf= -e 's|/etc/dbmail\.conf|${PKG_SYSCONFDIR}/dbmail.conf|g'
-SUBST_MESSAGE.sysconf= Fixing sysconf paths.
-
-INSTALLATION_DIRS= lib man ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 sbin share/examples/dbmail
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${EGDIR}
-
-.include "options.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/dbmail/PLIST b/mail/dbmail/PLIST
deleted file mode 100644
index 1811e9f5118..00000000000
--- a/mail/dbmail/PLIST
+++ /dev/null
@@ -1,24 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2005/05/03 15:36:38 wiz Exp $
-lib/dbmail/lib${SQLDB}dbmail.la
-lib/dbmail/libauthdbmail.la
-lib/dbmail/libsortdbmail.la
-lib/libdbmail.la
-man/man1/dbmail-smtp.1
-man/man8/dbmail-imapd.8
-man/man8/dbmail-lmtpd.8
-man/man8/dbmail-pop3d.8
-man/man8/dbmail-users.8
-man/man8/dbmail-util.8
-sbin/dbmail-imapd
-sbin/dbmail-lmtpd
-sbin/dbmail-pop3d
-sbin/dbmail-smtp
-sbin/dbmail-users
-sbin/dbmail-util
-share/examples/dbmail/dbmail.conf
-share/examples/rc.d/dbmail
-share/examples/rc.d/dbmailimapd
-share/examples/rc.d/dbmaillmtpd
-share/examples/rc.d/dbmailpop3d
-@dirrm share/examples/dbmail
-@dirrm lib/dbmail
diff --git a/mail/dbmail/distinfo b/mail/dbmail/distinfo
deleted file mode 100644
index 13461bb369e..00000000000
--- a/mail/dbmail/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2007/03/19 12:51:56 ghen Exp $
-
-SHA1 (dbmail-2.0.11.tgz) = fc7c4a2f800f77cca95df99a46265daa5b1935ec
-RMD160 (dbmail-2.0.11.tgz) = 74a7dbb06a53b42d3afc37bfebfbb36d3db014ac
-Size (dbmail-2.0.11.tgz) = 649830 bytes
diff --git a/mail/dbmail/files/dbmail.sh b/mail/dbmail/files/dbmail.sh
deleted file mode 100644
index 2c35fde03d5..00000000000
--- a/mail/dbmail/files/dbmail.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: dbmail.sh,v 1.1 2005/01/09 04:17:39 schmonz 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
-}
-
-dbmailrcd()
-{
- for service in $@; do
- $rcd_dir/dbmail${service} $rc_arg
- done
-}
-
-COMMAND_LIST="dbmailimapd dbmailpop3d dbmaillmtpd"
-
-name="dbmail"
-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
- _arg="$1"
- ${start_cmd}
-fi
diff --git a/mail/dbmail/files/dbmailimapd.sh b/mail/dbmail/files/dbmailimapd.sh
deleted file mode 100644
index a460a2c0886..00000000000
--- a/mail/dbmail/files/dbmailimapd.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: dbmailimapd.sh,v 1.1 2005/01/09 04:17:39 schmonz Exp $
-#
-
-# PROVIDE: dbmailimap mail
-# REQUIRE:
-
-. /etc/rc.subr
-
-name="dbmailimapd"
-rcvar=${name}
-required_files="@PKG_SYSCONFDIR@/dbmail.conf"
-command="@PREFIX@/sbin/dbmail-imapd"
-pidfile="/var/run/dbmail-imapd.pid"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/dbmail/files/dbmaillmtpd.sh b/mail/dbmail/files/dbmaillmtpd.sh
deleted file mode 100644
index e3b0d7e3e93..00000000000
--- a/mail/dbmail/files/dbmaillmtpd.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: dbmaillmtpd.sh,v 1.1 2005/01/09 04:17:39 schmonz Exp $
-#
-
-# PROVIDE: dbmaillmtp mail
-# REQUIRE:
-
-. /etc/rc.subr
-
-name="dbmaillmtpd"
-rcvar=${name}
-required_files="@PKG_SYSCONFDIR@/dbmail.conf"
-command="@PREFIX@/sbin/dbmail-lmtpd"
-pidfile="/var/run/dbmail-lmtpd.pid"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/dbmail/files/dbmailpop3d.sh b/mail/dbmail/files/dbmailpop3d.sh
deleted file mode 100644
index c53b2985024..00000000000
--- a/mail/dbmail/files/dbmailpop3d.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: dbmailpop3d.sh,v 1.1 2005/01/09 04:17:39 schmonz Exp $
-#
-
-# PROVIDE: dbmailpop3 mail
-# REQUIRE:
-
-. /etc/rc.subr
-
-name="dbmailpop3d"
-rcvar=${name}
-required_files="@PKG_SYSCONFDIR@/dbmail.conf"
-command="@PREFIX@/sbin/dbmail-pop3d"
-pidfile="/var/run/dbmail-pop3d.pid"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/dbmail/options.mk b/mail/dbmail/options.mk
deleted file mode 100644
index 5f037f4f214..00000000000
--- a/mail/dbmail/options.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: options.mk,v 1.4 2006/01/13 21:43:54 schmonz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.dbmail
-PKG_OPTIONS_REQUIRED_GROUPS= sql
-PKG_OPTIONS_GROUP.sql= mysql pgsql
-PKG_SUGGESTED_OPTIONS= mysql
-
-.include "../../mk/bsd.options.mk"
-
-###
-### MySQL database support
-###
-.if !empty(PKG_OPTIONS:Mmysql)
-.include "../../mk/mysql.buildlink3.mk"
-SQLDB= mysql
-.endif
-
-###
-### PostgreSQL database support
-###
-.if !empty(PKG_OPTIONS:Mpgsql)
-.include "../../mk/pgsql.buildlink3.mk"
-SQLDB= pgsql
-.endif
diff --git a/mail/deliver/DESCR b/mail/deliver/DESCR
deleted file mode 100644
index 501ee590224..00000000000
--- a/mail/deliver/DESCR
+++ /dev/null
@@ -1,20 +0,0 @@
-Deliver delivers E-Mail on the local system.
-
-Deliver allows any user to write a shell script that processes all
-incoming mail messages for that user. The system administrator may
-also install scripts that process all messages.
-
-The output of a script is a list of mail addresses, files and programs
-that should receive the message. It has access to each message as it
-is processed, so the action can be content dependent. The script may
-also generate automatic replies, like the "vacation" program, or pass
-along a modified version of the original message.
-
-Deliver can be used to construct mail-based services (e.g. automatic
-mailing list maintenance). It can also be used to filter mail
-automatically in prearranged ways (e.g. encryption and decryption,
-tossing junk mail, or vacation notices).
-
-Although deliver works best when installed set-user-id root, it can
-perform many of its functions even when installed in the private bin
-directory of a regular user.
diff --git a/mail/deliver/Makefile b/mail/deliver/Makefile
deleted file mode 100644
index e35dd6bec57..00000000000
--- a/mail/deliver/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:57 rillig Exp $
-
-DISTNAME= deliver-2.1.14
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=deliver/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://deliver.sourceforge.net/
-COMMENT= Local mail delivery agent with shell-script control
-
-USE_TOOLS+= yacc
-
-PKG_SYSCONFSUBDIR= deliver
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.deliver
-PKG_SUPPORTED_OPTIONS= deliver-suid
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(LOWER_OPSYS:Mirix5*)
-CPPFLAGS+= -DNO_SYS_TIMEB_H
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-pre-configure:
- cd ${WRKSRC}; \
- for FILE in config.h deliver.8 conf/os-netbsd.h; do \
- ${MV} $${FILE} $${FILE}.bak; \
- ${SED} -e 's#@DELIVER_CONF_PREFIX@#${PKG_SYSCONFDIR}#g' \
- -e 's#@PREFIX@#${PREFIX}#g' \
- < $${FILE}.bak > $${FILE}; \
- done; \
- ${MV} deliver.8 deliver.1
-
-post-install:
- cd ${WRKSRC}; \
- for FILE in deliver.1 header.1; do \
- CATFILE=`${BASENAME} $${FILE} .1`.0; \
- nroff -man $${FILE} > $${CATFILE}; \
- ${INSTALL_MAN} $${FILE} ${PREFIX}/${PKGMANDIR}/man1; \
- ${INSTALL_MAN} $${CATFILE} ${PREFIX}/${PKGMANDIR}/cat1; \
- done
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/deliver \
- ${PREFIX}/share/examples/deliver
- cd ${WRKSRC}; \
- ${INSTALL_DATA} INSTALL MMDF README SENDMAIL \
- ${PREFIX}/share/doc/deliver
- cd ${WRKSRC}/samples; \
- ${INSTALL_DATA} README p-aliases s-aliases u-chip u-notify u-vacation \
- ${PREFIX}/share/examples/deliver
-.if !empty(PKG_OPTIONS:Mdeliver-suid)
- ${CHOWN} root ${PREFIX}/bin/deliver
- ${CHMOD} u+s ${PREFIX}/bin/deliver
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/deliver/PLIST b/mail/deliver/PLIST
deleted file mode 100644
index e936fc56e6e..00000000000
--- a/mail/deliver/PLIST
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:59:47 zuntum Exp $
-bin/deliver
-bin/header
-man/cat1/deliver.0
-man/cat1/header.0
-man/man1/deliver.1
-man/man1/header.1
-share/doc/deliver/INSTALL
-share/doc/deliver/MMDF
-share/doc/deliver/README
-share/doc/deliver/SENDMAIL
-share/examples/deliver/README
-share/examples/deliver/p-aliases
-share/examples/deliver/s-aliases
-share/examples/deliver/u-chip
-share/examples/deliver/u-notify
-share/examples/deliver/u-vacation
-@dirrm share/examples/deliver
-@dirrm share/doc/deliver
diff --git a/mail/deliver/distinfo b/mail/deliver/distinfo
deleted file mode 100644
index e4a25715e29..00000000000
--- a/mail/deliver/distinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: distinfo,v 1.9 2006/10/28 15:17:17 schwarz Exp $
-
-SHA1 (deliver-2.1.14.tar.gz) = 77d591f29b8829b3c347eb107a427ad826ffca99
-RMD160 (deliver-2.1.14.tar.gz) = fb3857e952ea7b4b20f3e77b38a4f633434ce533
-Size (deliver-2.1.14.tar.gz) = 80892 bytes
-SHA1 (patch-aa) = 53e640ea5e5e5c92a29ffa4d49ac9d8c91e60b16
-SHA1 (patch-ab) = 719d400005844fe824bab7106c97f66e4c8867b3
-SHA1 (patch-ac) = 2f47891e3bc46aec12c93a647fbd751397b7d9fe
-SHA1 (patch-ad) = b497c475867bce9d9b9246aac14b5794b43b5877
-SHA1 (patch-ae) = a4e478765a240a2099c101ddd2d6abf3ddcf0ba2
-SHA1 (patch-af) = bc14f87956fde8f08146c79b9435cb753d5f5a2a
-SHA1 (patch-ag) = 1ea8ca73ce2f930444cdcb3a09f49a11926bf3da
-SHA1 (patch-ah) = 86941685feaf22dac4f6de3d50c7d35affb4776e
-SHA1 (patch-ai) = 63e86f1dc5353bfa8519746b48e743614ce6ca46
-SHA1 (patch-aj) = 7ccbe4c2420d097608eec6dccf75fcbc7a47247e
-SHA1 (patch-ak) = d99847ed1cf65c244440fc7b6cb9a3cc4315f832
-SHA1 (patch-al) = 5263f4369110e693cfd603cb7e00fa8333589c2b
-SHA1 (patch-am) = 31dfa1ba8ae5db753134c3be6ecc78e43aaf3b43
diff --git a/mail/deliver/patches/patch-aa b/mail/deliver/patches/patch-aa
deleted file mode 100644
index 70fae8ca7b9..00000000000
--- a/mail/deliver/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/04/27 14:06:05 wiz Exp $
-
---- Makefile.orig Wed Dec 1 20:53:49 1999
-+++ Makefile Sat Jan 29 15:21:49 2000
-@@ -74,13 +74,12 @@
- #DELHOME = /usr/deliver
- #HDEFS = -DDELHOME=\"$(DELHOME)\"
- UDEFS =
--OSHEADER = os-dummy.h
-+OSHEADER = os-netbsd.h
- DEFS = -Iconf -DOSINCLUDE=\"$(OSHEADER)\" $(HDEFS) $(UDEFS)
--CFLAGS = -O $(DEFS)
--LDFLAGS =
-+CFLAGS += $(DEFS)
- LIBS =
- LINT = lint -x
--BIN = /usr/bin
-+BIN = ${PREFIX}/bin
- #BIN = $(DELHOME)/bin
- GROUP = root
-
-@@ -154,16 +153,8 @@
- chmod 755 $$d ) || exit 1; \
- done ;; \
- esac
-- rm -f $(BIN)/deliver.O
-- -mv $(BIN)/deliver $(BIN)/deliver.O
-- $(COPY) deliver $(BIN)/deliver
-- chgrp $(GROUP) $(BIN)/deliver
-- chown root $(BIN)/deliver
-- chmod 4711 $(BIN)/deliver
-- rm -f $(BIN)/header.O
-- -mv $(BIN)/header $(BIN)/header.O
-- $(COPY) header $(BIN)/header
-- chmod 755 $(BIN)/header
-+ ${BSD_INSTALL_PROGRAM} -m 0511 deliver ${BIN}
-+ ${BSD_INSTALL_PROGRAM} header ${BIN}
-
- #
- # How to compile and link the program.
diff --git a/mail/deliver/patches/patch-ab b/mail/deliver/patches/patch-ab
deleted file mode 100644
index 88267a1c3d5..00000000000
--- a/mail/deliver/patches/patch-ab
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/04/27 14:06:05 wiz Exp $
-
---- config.h.orig Wed Dec 1 19:16:21 1999
-+++ config.h Sat Jan 29 16:52:37 2000
-@@ -62,7 +62,7 @@
- * Define it here, or edit Makefile thus: "UDEFS = -DHAS_NFS".
- */
-
--/* #define HAS_NFS */
-+#define HAS_NFS
-
- /*----------------------------------------------------------------------
- * Get operating system configuration.
-@@ -122,7 +122,7 @@
- #define UUX_ARGCOUNT 16
- #define UUX_ARGSIZE 512
- #define UUX_OPTS "-r"
--#define UUX_DASH_A
-+#undef UUX_DASH_A
-
- /*----------------------------------------------------------------------
- * Default shell for executing delivery files and pipes.
-@@ -197,9 +197,9 @@
- #define POST_DELIVER "lib/post"
- #define ERR_DELIVER "lib/err"
- #else
--#define SYS_DELIVER "/usr/local/lib/deliver.sys"
--#define POST_DELIVER "/usr/local/lib/deliver.post"
--#define ERR_DELIVER "/usr/local/lib/deliver.err"
-+#define SYS_DELIVER "@DELIVER_CONF_PREFIX@sys"
-+#define POST_DELIVER "@DELIVER_CONF_PREFIX@post"
-+#define ERR_DELIVER "@DELIVER_CONF_PREFIX@err"
- #endif
-
- #define USER_DELIVER ".deliver"
-@@ -228,8 +228,8 @@
- #define LOG "log/logfile"
- #define ERRLOG "log/errlog"
- #else
--#define LOG "/usr/adm/deliver.log"
--#define ERRLOG "/usr/adm/deliver.errlog"
-+#define LOG "/var/log/deliver.log"
-+#define ERRLOG "/var/log/deliver.errlog"
- #endif
-
- #define LOGLOCK "/tmp/dl.loglock"
diff --git a/mail/deliver/patches/patch-ac b/mail/deliver/patches/patch-ac
deleted file mode 100644
index 87365fc6a27..00000000000
--- a/mail/deliver/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/04/27 14:06:05 wiz Exp $
-
---- misc.h.orig Wed Dec 1 19:16:21 1999
-+++ misc.h Sat Jan 22 14:50:17 2000
-@@ -86,16 +86,6 @@
- * Declare library functions.
- */
-
--extern char *ctime();
--extern char *asctime();
--extern char *getenv();
--extern char *getlogin();
--extern char *mktemp();
--extern int putenv();
--extern long lseek();
--extern long time();
--extern void exit();
--
- #ifdef DECLARE_SIGNAL
- extern SIGTYPE(*signal()) ();
- #endif
diff --git a/mail/deliver/patches/patch-ad b/mail/deliver/patches/patch-ad
deleted file mode 100644
index 879610d1ec8..00000000000
--- a/mail/deliver/patches/patch-ad
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/10/28 15:17:17 schwarz Exp $
-
---- unctime.y.orig 1999-12-02 03:16:21.000000000 +0100
-+++ unctime.y 2006-10-28 13:10:57.000000000 +0200
-@@ -80,12 +80,15 @@
- # define USE_FTIME
- # endif
- #endif
-+#ifdef HAS_MKTIME
-+# define USE_MKTIME
-+#endif
-
- #ifdef USE_GETTOD
- # include <sys/time.h>
- #else
- # include <time.h>
--# ifdef USE_FTIME
-+# if defined(USE_FTIME) && !defined(NO_SYS_TIMEB_H)
- # include <sys/timeb.h>
- # endif
- #endif
-@@ -331,6 +334,7 @@
- /* Is y a leap year? */
- #define leap(y) (((y) % 4 == 0 && (y) % 100 != 0) || (y) % 400 == 0)
-
-+#ifndef USE_MKTIME
- /* Number of leap years from 1970 to y (not including y itself) */
- #define nleap(y) (((y) - 1969) / 4 - ((y) - 1901) / 100 + ((y) - 1601) / 400)
-
-@@ -484,6 +488,7 @@
- }
-
- #endif /* not USE_GETTOD */
-+#endif /* not USE_MKTIME */
-
- static short monthlens[] =
- {
-@@ -563,6 +568,15 @@
- return -1;
- }
-
-+#ifdef USE_MKTIME
-+ tm->tm_year = year - 1900;
-+ tm->tm_mon = month - 1;
-+ tm->tm_mday = day;
-+ tm->tm_hour = hour;
-+ tm->tm_min = minute;
-+ tm->tm_sec = second;
-+ return mktime(tm);
-+#else /* not USE_MKTIME */
- /* Mostly for convenience in sunday() macro, we use zero-origin days. */
- dayofyear = day - 1;
- if (month > 2 && leap(year))
-@@ -581,4 +595,5 @@
- - correction()
- #endif
- ;
-+#endif /* not USE_MKTIME */
- }
diff --git a/mail/deliver/patches/patch-ae b/mail/deliver/patches/patch-ae
deleted file mode 100644
index 55dd52c18d5..00000000000
--- a/mail/deliver/patches/patch-ae
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/04/27 14:06:05 wiz Exp $
-
---- conf/finish-os.h.orig Wed Dec 1 19:16:36 1999
-+++ conf/finish-os.h Sat Jan 29 20:43:18 2000
-@@ -87,8 +87,8 @@
- * Validate time configuration.
- */
-
--#if !defined(HAS_TIMEZONE) && !defined(HAS_GETTOD) && !defined(HAS_FTIME)
--ACK! "Define either HAS_TIMEZONE, HAS_GETTOD or HAS_FTIME.";
-+#if !defined(HAS_TIMEZONE) && !defined(HAS_GETTOD) && !defined(HAS_MKTIME)
-+ACK! "Define one of HAS_TIMEZONE, HAS_GETTOD or HAS_MKTIME.";
- #endif
-
- /*----------------------------------------------------------------------
-@@ -328,6 +328,10 @@
- #define MBX_GROUP "mail"
- #else
- /* #define MBX_NAME "mbox" */
-+#ifndef MBX_DIR
- #define MBX_DIR "/usr/spool/mail"
-+#endif
-+#ifndef MBX_MODE
- #define MBX_MODE 0600
-+#endif
- #endif
diff --git a/mail/deliver/patches/patch-af b/mail/deliver/patches/patch-af
deleted file mode 100644
index f6654334d77..00000000000
--- a/mail/deliver/patches/patch-af
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-af,v 1.3 2004/05/28 01:09:01 wiz Exp $
-
---- /dev/null 2003-03-15 16:33:11.000000000 -0700
-+++ conf/os-netbsd.h
-@@ -0,0 +1,33 @@
-+/*
-+ * Deliver configuration for NetBSD.
-+ *
-+ */
-+
-+/* Mostly it's POSIX. */
-+
-+#include <base-posix.h>
-+
-+/* Then again... */
-+
-+#undef SAFEPATH
-+#define SAFEPATH "/bin:/usr/bin:@PREFIX@/bin" /* Safe dirs for PATH */
-+
-+#undef SYSV_USRMAIL /* Mailboxes in /usr/mail, as per SysV */
-+#define MBX_DIR "/var/mail"
-+
-+#undef HAS_TIMEZONE /* Has global variable timezone (SVID) */
-+#define HAS_MKTIME /* Has mktime() */
-+
-+/* We avoid defining HAS_BASENAME because NetBSD's basename(3), as of
-+ * revision 1.5 of basename.c (October 17, 2002), returns a pointer to
-+ * a copy of the base name in static storage, and uses of basename in
-+ * the code are incompatible with that behavior. So we rely instead on
-+ * the basename replacement included here.
-+ */
-+#undef HAS_BASENAME /* Has basename() */
-+#define HAS_LONGNAMES /* Long filenames (>14) supported */
-+
-+/* Note that we don't define HAS_USLEEP, since deliver wants to use it
-+ * for sleeping for more than one second, but the implementation limits
-+ * the sleep time to strictly less than one second.
-+ */
diff --git a/mail/deliver/patches/patch-ag b/mail/deliver/patches/patch-ag
deleted file mode 100644
index a106790079d..00000000000
--- a/mail/deliver/patches/patch-ag
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/04/27 14:06:06 wiz Exp $
-
---- deliver.8.orig Wed Dec 1 20:54:02 1999
-+++ deliver.8 Sat Jan 29 16:42:59 2000
-@@ -98,15 +98,15 @@
- .TP
- .BI \-s " system delivery file"
- Specify an alternate system delivery file. The default is
--.I /usr/local/lib/deliver.sys.
-+.I @DELIVER_CONF_PREFIX@sys.
- .TP
- .BI \-p " post-user delivery file"
- Specify an alternate post-user delivery file. The default is
--.I /usr/local/lib/deliver.post.
-+.I @DELIVER_CONF_PREFIX@post.
- .TP
- .BI \-e " error delivery file"
- Specify an alternate error delivery file. The default is
--.I /usr/local/lib/deliver.err.
-+.I @DELIVER_CONF_PREFIX@err.
- .TP
- .BI \-u " user delivery file"
- Specify an alternate user delivery file. The default is
-@@ -229,7 +229,7 @@
- .TP
- .I "system delivery file"
- The system delivery file, if it exists, is created by the postmaster.
--By default, it is named ``/usr/local/lib/deliver.sys''. It controls
-+By default, it is named ``@DELIVER_CONF_PREFIX@sys''. It controls
- the delivery of all messages on the system where it is installed. It
- is executed with arguments of the name(s) specified on the
- .I Deliver
-@@ -245,7 +245,7 @@
- .TP
- .I "post-user delivery file"
- The post-user delivery file, if it exists, is created by the
--postmaster. By default, it is named ``/usr/local/lib/deliver.post''.
-+postmaster. By default, it is named ``@DELIVER_CONF_PREFIX@post''.
- It is executed after the system and user delivery files, but before
- any attempt at message delivery. Its arguments are those addresses
- which are about to receive the message, whether those addresses
-@@ -258,7 +258,7 @@
- .TP
- .I "error delivery file"
- The error delivery file, if it exists, is created by the postmaster.
--By default, it is named ``/usr/local/lib/deliver.err''. After
-+By default, it is named ``@DELIVER_CONF_PREFIX@err''. After
- .I Deliver
- has attempted delivery to all requested destinations, and if delivery
- to one or more of those destinations failed,
-@@ -467,9 +467,9 @@
- .SH LOGGING
- .I Deliver
- records its activity in two files: the ``delivery log'', named
--.IR /usr/adm/deliver.log,
-+.IR /var/log/deliver.log,
- and the ``error log'', named
--.IR /usr/adm/deliver.errlog.
-+.IR /var/log/deliver.errlog.
- .PP
- The deliver log is a record of activity of each
- .I Deliver
-@@ -534,17 +534,17 @@
- Neither, one or both of ML_DOTLOCK and ML_DOTMLK may be specified.
- None or one of ML_LOCKF, ML_FCNTL or ML_LOCKING may be specified.
- .SH FILES
--/usr/local/lib/deliver.sys system delivery file
-+@DELIVER_CONF_PREFIX@sys system delivery file
- .br
--/usr/local/lib/deliver.post post-user delivery file
-+@DELIVER_CONF_PREFIX@post post-user delivery file
- .br
--/usr/local/lib/deliver.err error delivery file
-+@DELIVER_CONF_PREFIX@err error delivery file
- .br
- ~user/.deliver user delivery file(s)
- .br
--/usr/adm/deliver.log delivery log
-+/var/log/deliver.log delivery log
- .br
--/usr/adm/deliver.errlog error log
-+/var/log/deliver.errlog error log
- .br
- /etc/systemid system name (Xenix only)
- .SH SUPPORT
diff --git a/mail/deliver/patches/patch-ah b/mail/deliver/patches/patch-ah
deleted file mode 100644
index 3badf094d73..00000000000
--- a/mail/deliver/patches/patch-ah
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2006/06/21 15:18:42 minskim Exp $
-
---- header.c.orig 1999-12-02 02:16:21.000000000 +0000
-+++ header.c
-@@ -36,7 +36,9 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <ctype.h>
-+#include <string.h>
-
- /*
- * Manifest constants
-@@ -80,14 +82,6 @@ extern int optind, opterr;
- extern char *optarg;
-
- /*
-- * Library functions.
-- */
--
--extern char *malloc();
--extern char *realloc();
--extern void free();
--
--/*
- * Global data
- */
-
diff --git a/mail/deliver/patches/patch-ai b/mail/deliver/patches/patch-ai
deleted file mode 100644
index 25347c93f44..00000000000
--- a/mail/deliver/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2004/05/28 01:09:01 wiz Exp $
-
---- deliver.h.orig 1999-12-01 19:16:21.000000000 -0700
-+++ deliver.h 2004-05-27 10:47:11.000000000 -0600
-@@ -97,7 +97,7 @@
- extern char *eff_group; /* Name of effective gid */
- extern char *real_group; /* Name of real gid */
-
--extern FILE *log; /* File to log deliveries */
-+extern FILE *logfile; /* File to log deliveries */
- extern char *t_logfile; /* Temporary file for log */
- extern char *f_logfile; /* Final file for log */
-
diff --git a/mail/deliver/patches/patch-aj b/mail/deliver/patches/patch-aj
deleted file mode 100644
index dc3274a455c..00000000000
--- a/mail/deliver/patches/patch-aj
+++ /dev/null
@@ -1,92 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2004/05/28 01:09:01 wiz Exp $
-
---- log.c.orig 1999-12-01 19:16:21.000000000 -0700
-+++ log.c 2004-05-27 10:54:45.000000000 -0600
-@@ -58,7 +58,7 @@
- if (!dryrun && exists(f_logfile))
- {
- t_logfile = tempfile();
-- if ((log = ftcreate(t_logfile)) == NULL)
-+ if ((logfile = ftcreate(t_logfile)) == NULL)
- syserr("can't create %s", t_logfile);
- }
- #endif
-@@ -85,17 +85,17 @@
- void
- savelogs()
- {
-- if (!log && !errlog)
-+ if (!logfile && !errlog)
- return;
-
- /* If temporary logs contain anything, append them to real logs. */
-
-- if (logsize(log) || logsize(errlog))
-+ if (logsize(logfile) || logsize(errlog))
- {
- if (log_lock() == 0)
- {
- if (t_logfile)
-- applog(&log, f_logfile);
-+ applog(&logfile, f_logfile);
- errdone();
- if (t_errlogfile)
- applog(&errlog, f_errlogfile);
-@@ -201,27 +201,27 @@
- {
- int a;
-
-- if (!log)
-+ if (!logfile)
- return;
-
-- logstart(log);
-+ logstart(logfile);
-
- if (local_sender)
-- (void) fprintf(log, "local sender: %s\n", local_sender);
-+ (void) fprintf(logfile, "local sender: %s\n", local_sender);
- if (orig_sender)
-- (void) fprintf(log, "original sender: %s\n", orig_sender);
-+ (void) fprintf(logfile, "original sender: %s\n", orig_sender);
- if (boxdelivery)
-- (void) fprintf(log, "mailbox%s:", (ac > 1) ? "es" : "");
-+ (void) fprintf(logfile, "mailbox%s:", (ac > 1) ? "es" : "");
- else
-- (void) fprintf(log, "destination%s:", (ac > 1) ? "s" : "");
-+ (void) fprintf(logfile, "destination%s:", (ac > 1) ? "s" : "");
- for (a = 0; a < ac; ++a)
-- (void) fprintf(log, " \"%s\"", av[a]);
-- (void) fputc('\n', log);
-+ (void) fprintf(logfile, " \"%s\"", av[a]);
-+ (void) fputc('\n', logfile);
-
- logstate("delivered", ST_DONE);
- logstate("failed", ST_ERROR);
-
-- logdone(log);
-+ logdone(logfile);
- }
-
- /*----------------------------------------------------------------------
-@@ -244,15 +244,15 @@
- continue;
-
- if (++dcount == 1)
-- (void) fprintf(log, "%s:", desc);
-- (void) fprintf(log, " %s", d->d_name);
-+ (void) fprintf(logfile, "%s:", desc);
-+ (void) fprintf(logfile, " %s", d->d_name);
- if (d->d_class == CL_MBOX)
-- (void) fprintf(log, ":%s", d->d_param);
-+ (void) fprintf(logfile, ":%s", d->d_param);
- else if (d->d_class == CL_PROG)
-- (void) fprintf(log, "|\"%s\"", d->d_param);
-+ (void) fprintf(logfile, "|\"%s\"", d->d_param);
- }
- if (dcount)
-- (void) fputc('\n', log);
-+ (void) fputc('\n', logfile);
- }
-
- /*----------------------------------------------------------------------
diff --git a/mail/deliver/patches/patch-ak b/mail/deliver/patches/patch-ak
deleted file mode 100644
index 4b1395f7d96..00000000000
--- a/mail/deliver/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2004/05/28 01:09:01 wiz Exp $
-
---- main.c.orig 1999-12-01 19:49:22.000000000 -0700
-+++ main.c 2004-05-27 10:58:17.000000000 -0600
-@@ -123,7 +123,7 @@
- char *eff_group = NULL;
- char *real_group = NULL;
-
--FILE *log = NULL;
-+FILE *logfile = NULL;
- char *t_logfile = NULL;
- char *f_logfile = NULL;
-
diff --git a/mail/deliver/patches/patch-al b/mail/deliver/patches/patch-al
deleted file mode 100644
index 987768d9620..00000000000
--- a/mail/deliver/patches/patch-al
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-al,v 1.1 2004/05/28 01:09:01 wiz Exp $
-
---- procs.c.orig 1999-12-01 19:16:21.000000000 -0700
-+++ procs.c 2004-05-27 11:00:23.000000000 -0600
-@@ -173,8 +173,8 @@
-
- (void) fflush(stdout);
- (void) fflush(stderr);
-- if (log)
-- (void) fflush(log);
-+ if (logfile)
-+ (void) fflush(logfile);
- if (errlog)
- (void) fflush(errlog);
-
-@@ -396,8 +396,8 @@
- (void) await_child();
- (void) fflush(stdout);
- (void) fflush(stderr);
-- if (log)
-- (void) fflush(log);
-+ if (logfile)
-+ (void) fflush(logfile);
- if (errlog)
- (void) fflush(errlog);
-
diff --git a/mail/deliver/patches/patch-am b/mail/deliver/patches/patch-am
deleted file mode 100644
index 7860d809dbb..00000000000
--- a/mail/deliver/patches/patch-am
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-am,v 1.1 2006/01/08 13:45:45 joerg Exp $
-
---- context.c.orig 2006-01-08 13:44:15.000000000 +0000
-+++ context.c
-@@ -20,14 +20,6 @@
- #include <pwd.h>
- #include <grp.h>
-
--extern struct passwd *getpwnam();
--extern struct passwd *getpwuid();
--
--extern void setgrent();
--extern struct group *getgrent();
--extern struct group *getgrnam();
--extern struct group *getgrgid();
--
- /*
- * Local functions.
- */
diff --git a/mail/demime/DESCR b/mail/demime/DESCR
deleted file mode 100644
index 6fbf465d67c..00000000000
--- a/mail/demime/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-A perl script to flatten some mime types to make mailing lists and
-archives more readable. This tool is designed to run with the
-Majordomo list manager, but can most likely be adapted to different
-list software.
diff --git a/mail/demime/Makefile b/mail/demime/Makefile
deleted file mode 100644
index df0bd46b68d..00000000000
--- a/mail/demime/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:40 wiz Exp $
-#
-
-DISTNAME= demime-1.1d
-CATEGORIES= mail textproc
-MASTER_SITES= ${MASTER_SITE_LOCAL:=${PKGNAME_NOREV}/} \
- http://majordomo.squawk.com/njs/demime/ \
- http://scifi.squawk.com/
-DISTFILES= ${DISTNAME:S/-/./} \
- demime_junkmail.cf
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://scifi.squawk.com/demime.html
-COMMENT= Tool to scrub mime from mailing lists
-
-DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
-DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
-DEPENDS+= p5-HTML-Format-[0-9]*:../../www/p5-HTML-Format
-DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
-
-DIST_SUBDIR= ${PKGNAME_NOREV}
-USE_TOOLS+= perl:run pod2man
-
-EGDIR= ${PREFIX}/share/examples
-CONF_FILES= ${EGDIR}/demime_junkmail.cf ${PKG_SYSCONFDIR}/demime_junkmail.cf
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-extract:
- @${MKDIR} ${WRKSRC}
- @${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME:S/-/./} ${WRKSRC}/demime.stable
-
-do-build:
- ${SED} -e 's|/usr/lib/majordomo/demime_junkmail.cf|${PKG_SYSCONFDIR}/demime_junkmail.cf|g' \
- -e 's|/usr/bin/perl|${PERL5}|g' \
- ${WRKSRC}/demime.stable >${WRKSRC}/demime
- ${POD2MAN} ${WRKSRC}/demime > ${WRKSRC}/demime.1
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/demime ${PREFIX}/bin/demime
- ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/demime_junkmail.cf ${EGDIR}
- ${INSTALL_MAN} ${WRKSRC}/demime.1 ${PREFIX}/${PKGMANDIR}/man1/demime.1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/demime/PLIST b/mail/demime/PLIST
deleted file mode 100644
index 73d957bfa12..00000000000
--- a/mail/demime/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/07/06 19:37:01 tv Exp $
-bin/demime
-man/man1/demime.1
-share/examples/demime_junkmail.cf
diff --git a/mail/demime/distinfo b/mail/demime/distinfo
deleted file mode 100644
index 0cceebe0eeb..00000000000
--- a/mail/demime/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 09:59:21 agc Exp $
-
-SHA1 (demime-1.1d/demime.1.1d) = bb525a0060723853a7adfeea3c001570ccce7697
-RMD160 (demime-1.1d/demime.1.1d) = 494fab7b21ae20175610c28b416321457bf83b05
-Size (demime-1.1d/demime.1.1d) = 93746 bytes
-SHA1 (demime-1.1d/demime_junkmail.cf) = 9bfcdf203111a7eb7135ac4d38d405d9b41448a9
-RMD160 (demime-1.1d/demime_junkmail.cf) = 0fbc1f960f1835698906631058f937a743d75901
-Size (demime-1.1d/demime_junkmail.cf) = 15234 bytes
-SHA1 (patch-aa) = fd399750d676983f6c843e92dfec654443cb33d3
diff --git a/mail/demime/patches/patch-aa b/mail/demime/patches/patch-aa
deleted file mode 100644
index 9ef1c8db102..00000000000
--- a/mail/demime/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/07 12:21:09 tron Exp $
-
---- demime.stable.orig Wed Apr 17 17:08:40 2002
-+++ demime.stable
-@@ -21,7 +21,7 @@
-
- # Following controls whether only 7 bit output
- # from message body sections should be done.
--$::SEVEN_BIT_ONLY = 1;
-+$::SEVEN_BIT_ONLY = 0;
-
- # Following configuration variable controls whether a message/rfc822
- # in a multipart/mixed main segment is rendered or elided.
diff --git a/mail/distribute/DESCR b/mail/distribute/DESCR
deleted file mode 100644
index 4736767ea5c..00000000000
--- a/mail/distribute/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-distribute - reforward incoming messages to a mailing list
-
-Distribute takes as its standard input a mail message, modifies
-the header (and optionally the body) of that message, then invokes
-sendmail to send the message to the specified recipients. It is
-primarily useful for those who run large mailing lists.
-
-Distribute does not include membership management. It only does the
-rewrite and dispatch of the mailng list emails.
-Use majordomo (ports/mail/majordomo) for membership management.
-
-Facilities include:
- Article numbering
- Subject rewrite to Subject: (mailing-list 1234)
- Proper handling of error related headers
- Reply-to rewrite/insertion if necessery
- Archiving
- membership file from Majordomo's configuration directory
diff --git a/mail/distribute/Makefile b/mail/distribute/Makefile
deleted file mode 100644
index 17ec7f2433f..00000000000
--- a/mail/distribute/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2006/10/04 21:47:16 wiz Exp $
-
-DISTNAME= distribute-2.1-pl19
-PKGNAME= distribute-2.1.26
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.foretune.co.jp/pub/network/mail/distribute/
-# AWOL
-
-PATCH_SITES= ftp://ftp.foretune.co.jp/pub/network/mail/distribute/BETA/
-PATCHFILES= patch.20.gz patch.21e.gz patch.22e.gz patch.23e.gz \
- patch.24e.gz patch.25e.gz patch.26e.gz
-
-MAINTAINER= itojun@itojun.org
-# in japanese
-# HOMEPAGE= http://www.foretune.co.jp/people/shigeya/distribute/
-# AWOL
-COMMENT= Mail dispatcher for mailing list. Fits nicely with majordomo
-
-WRKSRC= ${WRKDIR}/distribute-pl19
-USE_TOOLS+= perl:run
-
-MAN1= distribute.1
-DIST_SUBDIR= distribute
-PATCH_DIST_STRIP= -p1
-
-# customize below if you would like to
-# mail/majordomo likes this
-MAJORDOMO_DIR= /home/majordom
-MAJORDOMO_LIST_DIR= ${MAJORDOMO_DIR}/lists
-# just as example, you may disagree with these
-MAILINGLIST_DIR= /var/mail-list
-ARCHIVE_DIR= /var/spool/mail-list
-DEF_DOMAINNAME?= your.domain.here
-
-MAKE_ENV+= DEFAULTCONFIG='-DDEF_SEQ_PATH="\"${MAILINGLIST_DIR}\"" \
- -DDEF_RECIPIENT_PATH="\"${MAILINGLIST_DIR}\"" \
- -DDEF_MAJORDOMO_RECIPIENT_PATH="\"${MAJORDOMO_LIST_DIR}\"" \
- -DDEF_DOMAINNAME="\"${DEF_DOMAINNAME}\"" \
- -DDEF_ARCHIVE_PATH="\"${ARCHIVE_DIR}\""' \
- INSTALL=${INSTALL:Q} \
- INSTALL_MAN=${INSTALL_MAN:Q}
-
-pre-build:
- ${TOUCH} ${WRKSRC}/logging.h ${WRKSRC}/strsep.c
-
-post-build: mmessage
-post-install: mmessage
-mmessage::
- @${ECHO} "===> distribute was compiled with the following configuration:"
- @${ECHO} " membership file directory: ${MAILINGLIST_DIR}"
- @${ECHO} " membership file directory: ${MAJORDOMO_LIST_DIR} (for majordomo)"
- @${ECHO} " archiving directory: ${ARCHIVE_DIR}"
- @${ECHO} " if necessary, override them and perform compilation again."
- @${ECHO} " there's no way to override them at runtime."
-
-.include "../../devel/sysexits/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/distribute/PLIST b/mail/distribute/PLIST
deleted file mode 100644
index d017b11f952..00000000000
--- a/mail/distribute/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:59:48 zuntum Exp $
-libexec/distribute
-libexec/archive
-man/man1/distribute.1
diff --git a/mail/distribute/distinfo b/mail/distribute/distinfo
deleted file mode 100644
index cca1005ab6c..00000000000
--- a/mail/distribute/distinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/01/08 15:44:06 joerg Exp $
-
-SHA1 (distribute/distribute-2.1-pl19.tar.gz) = f33f63d42d0233eceec759dc0378a914087c0344
-RMD160 (distribute/distribute-2.1-pl19.tar.gz) = 5ffb23682176a86291eb5374ea98c9c5d002947d
-Size (distribute/distribute-2.1-pl19.tar.gz) = 45002 bytes
-SHA1 (distribute/patch.20.gz) = 0eb8add5f34f6e7cf88c140bbcfb61a0620d20de
-RMD160 (distribute/patch.20.gz) = c4b488a9070d27ffa83738400e9c48d53eb8a9a3
-Size (distribute/patch.20.gz) = 5664 bytes
-SHA1 (distribute/patch.21e.gz) = ac5c073c09ba157a84b23fd729b0e34ec2988f05
-RMD160 (distribute/patch.21e.gz) = bf5637551ce688e6d054e5e13e036b9377165d51
-Size (distribute/patch.21e.gz) = 8356 bytes
-SHA1 (distribute/patch.22e.gz) = d6b3f58ec7998374f4c022d2bfe53a655c2853c9
-RMD160 (distribute/patch.22e.gz) = 1e40e3e111671d2d4d74f2a08f972f012a865396
-Size (distribute/patch.22e.gz) = 9842 bytes
-SHA1 (distribute/patch.23e.gz) = 323733c0c83c452fcf940ee1b862edbed49887b7
-RMD160 (distribute/patch.23e.gz) = 21de37c8c34d40607cc2e9d9f27cb03985accdff
-Size (distribute/patch.23e.gz) = 2570 bytes
-SHA1 (distribute/patch.24e.gz) = 54a098e9806e7bc1351722760d443a6b97877ef5
-RMD160 (distribute/patch.24e.gz) = 378445e45a521cdb3bcc73ced1120714326723c1
-Size (distribute/patch.24e.gz) = 1564 bytes
-SHA1 (distribute/patch.25e.gz) = 942cab4cf4f69de2a84eb7f3f73da758ddb84cc0
-RMD160 (distribute/patch.25e.gz) = cfbfb48d827dec7a8e79ce0eb142e64c4b50fa41
-Size (distribute/patch.25e.gz) = 7374 bytes
-SHA1 (distribute/patch.26e.gz) = e52ac9428e438610b9dd8182212fe78ded909f0a
-RMD160 (distribute/patch.26e.gz) = 2d4c7d0f4bed7c420a32ae7d2ffe999906d3f5cc
-Size (distribute/patch.26e.gz) = 12560 bytes
-SHA1 (patch-aa) = 7f5ead56594cb1bb4186c6c3b7cad59bd210cf45
-SHA1 (patch-ab) = 4c07a6ae9bb1e9dacd33db96624d2c2fefbb9240
-SHA1 (patch-ac) = 75a3956d6e7b53473eb0a3ad62b4ce261ccc8bf6
diff --git a/mail/distribute/patches/patch-aa b/mail/distribute/patches/patch-aa
deleted file mode 100644
index b6a44696cdb..00000000000
--- a/mail/distribute/patches/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/12/26 17:20:33 itojun Exp $
-
---- Makefile.orig Mon Dec 27 00:23:29 1999
-+++ Makefile Mon Dec 27 00:24:57 1999
-@@ -28,7 +28,8 @@
- # -DLOGDEBUG LOGGING DEBUG
- #
- OPTIONS= -DSYSLOG -DISSUE -DSUBJALIAS -DADDVERSION \
-- -DSYSLOG_FACILITY=LOG_LOCAL4 -DCCMAIL -DUSEMIMEKIT
-+ -DSYSLOG_FACILITY=LOG_LOCAL4 -DCCMAIL
-+#OPTIONS+= -DMIMEKIT
-
- #
- # DEFAULT parameters -- YOU SHOULD EDIT THESE
-@@ -71,7 +72,7 @@
- #
- # External Library -- you should change this if mimekit is in different loc.
- #
--MIMELIB = -L/usr/local/lib -lmimekit
-+#MIMELIB = -L/usr/local/lib -lmimekit
-
- #
- DESTDIR=
-@@ -84,7 +85,7 @@
- CC= ${PURIFY} ${PURIFYOPTS} gcc
- #-D__USE_FIXED_PROTOTYPES__
-
--PREFIX= /usr/local
-+PREFIX?= /usr/pkg
- WHERE= ${PREFIX}/libexec
- MANDIR= ${PREFIX}/man
- MANSEC= 1
diff --git a/mail/distribute/patches/patch-ab b/mail/distribute/patches/patch-ab
deleted file mode 100644
index 18776a43b10..00000000000
--- a/mail/distribute/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2000/02/13 19:39:51 fredb Exp $
-
---- config.h.orig Sun Sep 14 09:25:53 1997
-+++ config.h Sun Sep 14 09:26:01 1997
-@@ -97,8 +97,10 @@
- * this default should be set to 'goold-old-time' default value.
- */
-
-+#if 0
- #ifndef _PATH_SENDMAIL
- # define _PATH_SENDMAIL "/usr/lib/sendmail" /* default */
-+#endif
- #endif
-
- #endif
diff --git a/mail/distribute/patches/patch-ac b/mail/distribute/patches/patch-ac
deleted file mode 100644
index 4aa3591587d..00000000000
--- a/mail/distribute/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2006/01/08 15:44:06 joerg Exp $
-
---- distribute.c.orig 2006-01-08 15:39:24.000000000 +0000
-+++ distribute.c
-@@ -49,7 +49,8 @@
- #define index strchr
- #endif
-
--#if defined(__bsdi__) /* may be wrong -- we need to use NET/2 def.*/
-+/* may be wrong -- we need to use NET/2 def.*/
-+#if defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
- # include <paths.h> /* for sendmail path */
- #endif
-
diff --git a/mail/dk-milter/DESCR b/mail/dk-milter/DESCR
deleted file mode 100644
index a0bf6dfb6c6..00000000000
--- a/mail/dk-milter/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-The dk-milter package is an open source implementation of the DomainKeys
-sender authentication system proposed by Yahoo!, Inc. It consists of a
-library that implements the DomainKeys service, and a milter-based filter
-application that can plug in to the sendmail MTA to provide that service
-to sufficiently recent sendmail MTAs.
-
-An optional asynchronous resolver library is also provided to work around
-limitations of the basic BIND resolver which comes installed on most
-systems.
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
deleted file mode 100644
index 88ae1426cee..00000000000
--- a/mail/dk-milter/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2007/03/19 16:40:27 tv Exp $
-
-DISTNAME= dk-milter-0.3.0
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dk-milter/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/dk-milter/
-COMMENT= Open source implementation of DomainKeys for sendmail
-
-BUILDLINK_API_DEPENDS.libmilter+= libmilter>=8.13.0
-
-LICENSE= no-profit
-MAKE_ENV+= M4=${M4:Q}
-RCD_SCRIPTS= dk-milter
-USE_BUILTIN.libmilter= no
-USE_TOOLS+= gm4
-
-SUBST_CLASSES+= libs
-SUBST_STAGE.libs= pre-configure
-SUBST_FILES.libs= dk-filter/Makefile.m4 libdk/Makefile.m4
-SUBST_SED.libs= -e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g' \
- -e 's|@LMBASE@|${BUILDLINK_PREFIX.libmilter}|g' \
- -e 's|@PTHREAD@|${BUILDLINK_PREFIX.pthread}|g' \
- -e 's|@PTHREAD_LDFLAGS@|${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}|g'
-SUBST_MESSAGE.libs= Fixing makefile references.
-
-post-extract:
- ${LN} -s FreeBSD ${WRKSRC}/devtools/OS/DragonFly
-
-do-build:
- @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./Build)
-
-post-build:
- ${SED} -e 's|dk-filter|dk-milter|g' \
- ${WRKSRC}/dk-filter/dk-filter.8 \
- >${WRKSRC}/dk-filter/dk-milter.8
-
-do-install:
- cd ${WRKSRC}/obj.`${UNAME} -srm | ${TR} \ . | ${TR} \/ -` && \
- ${INSTALL_PROGRAM} dk-filter/dk-filter ${PREFIX}/sbin/dk-milter
- ${INSTALL_MAN} ${WRKSRC}/dk-filter/dk-milter.8 ${PREFIX}/${PKGMANDIR}/man8/
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dk-milter
- ${INSTALL_DATA} ${WRKSRC}/FEATURES ${PREFIX}/share/doc/dk-milter
- ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/dk-milter
- ${INSTALL_DATA} ${WRKSRC}/KNOWNBUGS ${PREFIX}/share/doc/dk-milter
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dk-milter
- ${INSTALL_DATA} ${WRKSRC}/RELEASE_NOTES ${PREFIX}/share/doc/dk-milter
-
-.include "options.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mail/libmilter/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/dk-milter/PLIST b/mail/dk-milter/PLIST
deleted file mode 100644
index 60d2a14fda8..00000000000
--- a/mail/dk-milter/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/07/20 19:42:50 tv Exp $
-man/man8/dk-milter.8
-sbin/dk-milter
-share/doc/dk-milter/FEATURES
-share/doc/dk-milter/INSTALL
-share/doc/dk-milter/KNOWNBUGS
-share/doc/dk-milter/README
-share/doc/dk-milter/RELEASE_NOTES
-share/examples/rc.d/dk-milter
-@dirrm share/doc/dk-milter
diff --git a/mail/dk-milter/distinfo b/mail/dk-milter/distinfo
deleted file mode 100644
index 760e27f0547..00000000000
--- a/mail/dk-milter/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/01/08 18:13:08 joerg Exp $
-
-SHA1 (dk-milter-0.3.0.tar.gz) = bc7a4f9e1a3d9d751bf84e261e4cbe45198671b9
-RMD160 (dk-milter-0.3.0.tar.gz) = 1b1de285dab602bdc0b21e55080f2964924ab646
-Size (dk-milter-0.3.0.tar.gz) = 304023 bytes
-SHA1 (patch-aa) = 9f74c271c1f9eb60080864c9ed386f450a40596a
-SHA1 (patch-ab) = 357e250bb17fd9680c033ac392cea17957b71997
-SHA1 (patch-ac) = 403e565640e3a67f26f04d9df5bb0833305d308a
diff --git a/mail/dk-milter/files/dk-milter.sh b/mail/dk-milter/files/dk-milter.sh
deleted file mode 100644
index 96c9c3bf193..00000000000
--- a/mail/dk-milter/files/dk-milter.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: dk-milter.sh,v 1.5 2005/07/21 16:22:04 tv Exp $
-#
-# PROVIDE: dkmilter
-# REQUIRE: DAEMON
-# BEFORE: mail
-
-dkmilter_flags="-h -l -p /var/run/dkmilter.sock"
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="dkmilter"
-rcvar=$name
-command="@PREFIX@/sbin/dk-milter"
-pidfile="/var/run/${name}.pid"
-command_args="-P ${pidfile}"
-
-if [ -f /etc/rc.subr ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- echo -n " ${name}"
- ${command} ${dkmilter_flags} ${command_args}
-fi
diff --git a/mail/dk-milter/options.mk b/mail/dk-milter/options.mk
deleted file mode 100644
index 235a8b7f760..00000000000
--- a/mail/dk-milter/options.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: options.mk,v 1.1.1.1 2005/07/20 19:42:50 tv Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.dk-milter
-PKG_SUPPORTED_OPTIONS= inet6
-
-.include "../../mk/bsd.options.mk"
-
-###
-### IPv6 support.
-###
-.if !empty(PKG_OPTIONS:Minet6)
-SUBST_SED.libs+= -e 's|@INET6@||'
-.else
-SUBST_SED.libs+= -e 's|@INET6@|dnl|'
-.endif
diff --git a/mail/dk-milter/patches/patch-aa b/mail/dk-milter/patches/patch-aa
deleted file mode 100644
index d5bcf5a5ef5..00000000000
--- a/mail/dk-milter/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/07/20 19:42:50 tv Exp $
-
---- dk-filter/Makefile.m4.orig 2005-07-20 14:55:01.000000000 -0400
-+++ dk-filter/Makefile.m4
-@@ -4,10 +4,10 @@ include(confBUILDTOOLSDIR`/M4/switch.m4'
- define(`confMT', `TRUE')
- define(`confREQUIRE_LIBSM', `true')
-
--APPENDDEF(`confLIBS', `-lssl -lcrypto')
-+APPENDDEF(`confLIBS', `-lssl -lcrypto @PTHREAD_LDFLAGS@ ')
- dnl Enable and edit these paths as needed:
--dnl APPENDDEF(`confINCDIRS', `-I/usr/local/ssl/include ')
--dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/ssl/lib ')
-+APPENDDEF(`confINCDIRS', `-I@SSLBASE@/include -I@PTHREAD@/include ')
-+APPENDDEF(`confLIBDIRS', `-L@SSLBASE@/lib -L@PTHREAD@/lib ')
-
- dnl To use the asynchronous resolver library provided, enable this line:
- dnl bldPUSH_SMLIB(`ar')
-@@ -19,12 +19,12 @@ bldPUSH_SMLIB(`sm')
-
- dnl Enable these next line if needed to specify the locations of libmilter.a
- dnl and the libmilter include files:
--dnl APPENDDEF(`confINCDIRS', `-I/usr/local/sendmail/include')
--dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/sendmail/lib')
-+APPENDDEF(`confINCDIRS', `-I@LMBASE@/include ')
-+APPENDDEF(`confLIBDIRS', `-L@LMBASE@/lib')
-
-
- dnl Enable for IPv6 support:
--dnl APPENDDEF(`confENVDEF', `-DNETINET6 ')
-+@INET6@ APPENDDEF(`confENVDEF', `-DNETINET6 ')
-
- dnl Compile time options, especially FFRs:
- dnl APPENDDEF(`confENVDEF', `-D_FFR_EXTERNAL_IGNORE_LIST ')
diff --git a/mail/dk-milter/patches/patch-ab b/mail/dk-milter/patches/patch-ab
deleted file mode 100644
index 88b11aefae0..00000000000
--- a/mail/dk-milter/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/07/20 19:42:50 tv Exp $
-
---- libdk/Makefile.m4.orig 2004-09-03 16:39:01.000000000 -0400
-+++ libdk/Makefile.m4
-@@ -9,7 +9,7 @@ dnl APPENDDEF(`confENVDEF', `-DUSE_ARLIB
- dnl APPENDDEF(`confINCDIRS', `-I../libar/ ')
-
- dnl Enable and edit this as appropriate for your system:
--dnl APPENDDEF(`confINCDIRS', `-I/usr/local/ssl/include ')
-+APPENDDEF(`confINCDIRS', `-I@SSLBASE@/include ')
-
-
- define(`confMT', `true')
diff --git a/mail/dk-milter/patches/patch-ac b/mail/dk-milter/patches/patch-ac
deleted file mode 100644
index 9a6b4b625e8..00000000000
--- a/mail/dk-milter/patches/patch-ac
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/01/08 18:13:08 joerg Exp $
-
---- include/sm/os/sm_os_freebsd.h.orig 2006-01-08 18:09:08.000000000 +0000
-+++ include/sm/os/sm_os_freebsd.h
-@@ -13,10 +13,18 @@
- ** Platform definitions for FreeBSD
- */
-
--#define SM_OS_NAME "freebsd"
--
- #define SM_CONF_SYS_CDEFS_H 1
-
-+#ifdef __DragonFly__)
-+#define SM_OS_NAME "dragonfly"
-+#define MI_SOMAXCONN -1
-+#ifndef SM_CONF_STRL
-+# define SM_CONF_STRL 1
-+#endif
-+
-+#else
-+#define SM_OS_NAME "freebsd"
-+
- #if __FreeBSD__ >= 2
- # include <osreldate.h> /* defines __FreeBSD_version */
- # if __FreeBSD_version >= 199512 /* 2.2-current when it appeared */
-@@ -29,6 +37,7 @@
- # endif
- # endif
- #endif
-+#endif
-
- #ifndef SM_CONF_SHM
- # define SM_CONF_SHM 1
diff --git a/mail/dkim-milter/DESCR b/mail/dkim-milter/DESCR
deleted file mode 100644
index 32f753b0c3e..00000000000
--- a/mail/dkim-milter/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-dkim-milter consists of two parts: A milter-based application
-(dkim-filter) which plugs in to Sendmail to provide DomainKeys
-Identified Mail service, and a library (libdkim) which can be used to
-build DKIM-compliant applications or MTAs.
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
deleted file mode 100644
index 22674527792..00000000000
--- a/mail/dkim-milter/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:57 rillig Exp $
-
-DISTNAME= dkim-milter-0.1.1
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dkim-milter/}
-
-MAINTAINER= imil@gcu.info
-HOMEPAGE= http://sourceforge.net/projects/dkim-milter/
-COMMENT= Open source DKIM filter software from Sendmail, Inc
-
-BUILDLINK_API_DEPENDS.libmilter+= libmilter>=8.13.0
-
-LICENSE= no-profit
-MAKE_ENV+= M4=${M4:Q}
-RCD_SCRIPTS= dkim-milter
-USE_BUILTIN.libmilter= no
-USE_TOOLS+= gm4
-
-SUBST_CLASSES+= libs
-SUBST_STAGE.libs= pre-configure
-SUBST_FILES.libs= dkim-filter/Makefile.m4 libdk/Makefile.m4
-SUBST_SED.libs= -e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g' \
- -e 's|@LMBASE@|${BUILDLINK_PREFIX.libmilter}|g' \
- -e 's|@PTHREAD@|${BUILDLINK_PREFIX.pthread}|g' \
- -e 's|@PTHREAD_LDFLAGS@|${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}|g'
-SUBST_MESSAGE.libs= Fixing makefile references.
-
-post-extract:
- ${LN} -s FreeBSD ${WRKSRC}/devtools/OS/DragonFly
-
-do-build:
- @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./Build)
-
-post-build:
- ${SED} -e 's|dkim-filter|dkim-milter|g' \
- ${WRKSRC}/dkim-filter/dkim-filter.8 \
- >${WRKSRC}/dkim-filter/dkim-milter.8
-
-do-install:
- cd ${WRKSRC}/obj.`${UNAME} -srm | ${TR} \ . | ${TR} \/ -` && \
- ${INSTALL_PROGRAM} dkim-filter/dkim-filter ${PREFIX}/sbin/dkim-milter
- ${INSTALL_MAN} ${WRKSRC}/dkim-filter/dkim-milter.8 ${PREFIX}/${PKGMANDIR}/man8/
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dkim-milter
- ${INSTALL_DATA} ${WRKSRC}/FEATURES ${PREFIX}/share/doc/dkim-milter
- ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/dkim-milter
- ${INSTALL_DATA} ${WRKSRC}/KNOWNBUGS ${PREFIX}/share/doc/dkim-milter
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dkim-milter
- ${INSTALL_DATA} ${WRKSRC}/RELEASE_NOTES ${PREFIX}/share/doc/dkim-milter
-
-.include "options.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mail/libmilter/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/dkim-milter/PLIST b/mail/dkim-milter/PLIST
deleted file mode 100644
index 2bdaf1e7435..00000000000
--- a/mail/dkim-milter/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/27 19:49:07 minskim Exp $
-man/man8/dkim-milter.8
-sbin/dkim-milter
-share/doc/dkim-milter/FEATURES
-share/doc/dkim-milter/INSTALL
-share/doc/dkim-milter/KNOWNBUGS
-share/doc/dkim-milter/README
-share/doc/dkim-milter/RELEASE_NOTES
-share/examples/rc.d/dkim-milter
-@dirrm share/doc/dkim-milter
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
deleted file mode 100644
index 94a2e8812b3..00000000000
--- a/mail/dkim-milter/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/01/08 18:20:30 joerg Exp $
-
-SHA1 (dkim-milter-0.1.1.tar.gz) = 6bfb5a3b7530864e09ed55b343fd747c78ddb2fa
-RMD160 (dkim-milter-0.1.1.tar.gz) = c8fae0456b8418ebeafdf6a5be22a86415b74578
-Size (dkim-milter-0.1.1.tar.gz) = 312318 bytes
-SHA1 (patch-aa) = 1d20c660bba8f6a754ca343434daf021559b41bd
-SHA1 (patch-ab) = f254cbee630fb18fc7f18daffd689753eb9dd467
-SHA1 (patch-ac) = 403e565640e3a67f26f04d9df5bb0833305d308a
diff --git a/mail/dkim-milter/files/dkim-milter.sh b/mail/dkim-milter/files/dkim-milter.sh
deleted file mode 100644
index 98b8e5322a3..00000000000
--- a/mail/dkim-milter/files/dkim-milter.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: dkim-milter.sh,v 1.1.1.1 2005/10/27 19:49:07 minskim Exp $
-#
-# PROVIDE: dkimmilter
-# REQUIRE: DAEMON
-# BEFORE: mail
-
-dkimmilter_flags="-h -l -p /var/run/dkimmilter.sock"
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="dkimmilter"
-rcvar=$name
-command="@PREFIX@/sbin/dkim-milter"
-pidfile="/var/run/${name}.pid"
-command_args="-P ${pidfile}"
-
-if [ -f /etc/rc.subr ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- echo -n " ${name}"
- ${command} ${dkimmilter_flags} ${command_args}
-fi
diff --git a/mail/dkim-milter/options.mk b/mail/dkim-milter/options.mk
deleted file mode 100644
index 46f5bf2061a..00000000000
--- a/mail/dkim-milter/options.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: options.mk,v 1.1.1.1 2005/10/27 19:49:07 minskim Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.dk-milter
-PKG_SUPPORTED_OPTIONS= inet6
-
-.include "../../mk/bsd.options.mk"
-
-###
-### IPv6 support.
-###
-.if !empty(PKG_OPTIONS:Minet6)
-SUBST_SED.libs+= -e 's|@INET6@||'
-.else
-SUBST_SED.libs+= -e 's|@INET6@|dnl|'
-.endif
diff --git a/mail/dkim-milter/patches/patch-aa b/mail/dkim-milter/patches/patch-aa
deleted file mode 100644
index 926adf97c20..00000000000
--- a/mail/dkim-milter/patches/patch-aa
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/10/27 19:49:07 minskim Exp $
-
---- dkim-filter/Makefile.m4.orig 2005-09-28 13:27:11.000000000 +0200
-+++ dkim-filter/Makefile.m4
-@@ -4,10 +4,10 @@ include(confBUILDTOOLSDIR`/M4/switch.m4'
- define(`confMT', `TRUE')
- define(`confREQUIRE_LIBSM', `true')
-
--APPENDDEF(`confLIBS', `-lssl -lcrypto')
-+APPENDDEF(`confLIBS', `-lssl -lcrypto @PTHREAD_LDFLAGS@ ')
- dnl Enable and edit these paths as needed:
--dnl APPENDDEF(`confINCDIRS', `-I/usr/local/ssl/include ')
--dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/ssl/lib ')
-+APPENDDEF(`confINCDIRS', `-I@SSLBASE@/include -I@PTHREAD@/include ')
-+APPENDDEF(`confLIBDIRS', `-L@SSLBASE@/lib -L@PTHREAD@/lib ')
-
- dnl To use the asynchronous resolver library provided, enable this line:
- dnl bldPUSH_SMLIB(`ar')
-@@ -19,15 +19,15 @@ bldPUSH_SMLIB(`sm')
-
- dnl Enable these next line if needed to specify the locations of libmilter.a
- dnl and the libmilter include files:
--dnl APPENDDEF(`confINCDIRS', `-I/usr/local/sendmail/include')
--dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/sendmail/lib')
-+APPENDDEF(`confINCDIRS', `-I@LMBASE@/include ')
-+APPENDDEF(`confLIBDIRS', `-L@LMBASE@/lib')
-
-
- dnl Enable for IPv6 support:
- dnl APPENDDEF(`confENVDEF', `-DNETINET6 ')
-
- dnl Compile time options, especially FFRs:
--dnl APPENDDEF(`confENVDEF', `-DNO_SMFI_INSHEADER ')
-+@INET6@ APPENDDEF(`confENVDEF', `-DNETINET6 ')
-
- dnl APPENDDEF(`confENVDEF', `-D_FFR_EXTERNAL_IGNORE_LIST ')
- dnl APPENDDEF(`confENVDEF', `-D_FFR_FLUSH_HEADERS ')
diff --git a/mail/dkim-milter/patches/patch-ab b/mail/dkim-milter/patches/patch-ab
deleted file mode 100644
index 7093123a5c4..00000000000
--- a/mail/dkim-milter/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/10/27 19:49:07 minskim Exp $
-
---- libdkim/Makefile.m4.orig 2005-09-28 13:29:30.000000000 +0200
-+++ libdkim/Makefile.m4
-@@ -9,8 +9,7 @@ dnl APPENDDEF(`confENVDEF', `-DUSE_ARLIB
- dnl APPENDDEF(`confINCDIRS', `-I../libar/ ')
-
- dnl Enable and edit this as appropriate for your system:
--dnl APPENDDEF(`confINCDIRS', `-I/usr/local/ssl/include ')
--
-+APPENDDEF(`confINCDIRS', `-I@SSLBASE@/include ')
-
- define(`confMT', `true')
-
diff --git a/mail/dkim-milter/patches/patch-ac b/mail/dkim-milter/patches/patch-ac
deleted file mode 100644
index 851334121d2..00000000000
--- a/mail/dkim-milter/patches/patch-ac
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/01/08 18:20:30 joerg Exp $
-
---- include/sm/os/sm_os_freebsd.h.orig 2006-01-08 18:09:08.000000000 +0000
-+++ include/sm/os/sm_os_freebsd.h
-@@ -13,10 +13,18 @@
- ** Platform definitions for FreeBSD
- */
-
--#define SM_OS_NAME "freebsd"
--
- #define SM_CONF_SYS_CDEFS_H 1
-
-+#ifdef __DragonFly__)
-+#define SM_OS_NAME "dragonfly"
-+#define MI_SOMAXCONN -1
-+#ifndef SM_CONF_STRL
-+# define SM_CONF_STRL 1
-+#endif
-+
-+#else
-+#define SM_OS_NAME "freebsd"
-+
- #if __FreeBSD__ >= 2
- # include <osreldate.h> /* defines __FreeBSD_version */
- # if __FreeBSD_version >= 199512 /* 2.2-current when it appeared */
-@@ -29,6 +37,7 @@
- # endif
- # endif
- #endif
-+#endif
-
- #ifndef SM_CONF_SHM
- # define SM_CONF_SHM 1
diff --git a/mail/dot-forward/DESCR b/mail/dot-forward/DESCR
deleted file mode 100644
index 004924ae349..00000000000
--- a/mail/dot-forward/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-dot-forward reads sendmail's .forward files under qmail. You can run it in the
-qmail startup script to support all your existing .forward files automatically.
-Individual users can switch to the .qmail mechanism at their leisure.
-
-dot-forward supports forwarding, program deliveries, and comments. It does not
-support file deliveries or :include:. (However, it recognizes file delivery
-attempts, and defers delivery to give you a chance to set up a .qmail file.)
diff --git a/mail/dot-forward/Makefile b/mail/dot-forward/Makefile
deleted file mode 100644
index 3384ab7a657..00000000000
--- a/mail/dot-forward/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2006/01/05 02:57:10 schmonz Exp $
-#
-
-DISTNAME= dot-forward-0.71
-PKGREVISION= 2
-CATEGORIES= mail
-MASTER_SITES= http://cr.yp.to/software/
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://cr.yp.to/dot-forward.html
-COMMENT= Reads sendmail's .forward files under qmail
-
-DEPENDS+= qmail>=1.03nb7:../../mail/qmail
-
-USE_TOOLS+= nroff
-
-DJB_BUILD_TARGETS= install instcheck
-
-DJB_RESTRICTED= YES
-
-.include "../../mk/djbware.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/dot-forward/PLIST b/mail/dot-forward/PLIST
deleted file mode 100644
index 2363dd8d2b1..00000000000
--- a/mail/dot-forward/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/07/21 23:06:10 schmonz Exp $
-bin/dot-forward
-man/man1/dot-forward.1
-man/cat1/dot-forward.0
diff --git a/mail/dot-forward/distinfo b/mail/dot-forward/distinfo
deleted file mode 100644
index 57ae0ed54c1..00000000000
--- a/mail/dot-forward/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:21 agc Exp $
-
-SHA1 (dot-forward-0.71.tar.gz) = 2adacc13bb43fcf7ae13d3fbeaadd2649ff91137
-RMD160 (dot-forward-0.71.tar.gz) = 1e5fd7558296cf213274e6e80944ba26fed74c79
-Size (dot-forward-0.71.tar.gz) = 26352 bytes
diff --git a/mail/dovecot/DESCR b/mail/dovecot/DESCR
deleted file mode 100644
index 4a9dd6b91b4..00000000000
--- a/mail/dovecot/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Dovecot is an open source IMAP and POP3 server, written with security
-primarily in mind. It supports Maildirs and mbox formats, and has
-complete IMAP4rev1 support, TLS/SSL support, and is IPv6 ready.
diff --git a/mail/dovecot/MESSAGE b/mail/dovecot/MESSAGE
deleted file mode 100644
index 813aab10cb9..00000000000
--- a/mail/dovecot/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2006/02/06 15:54:37 ghen Exp $
-
-The Dovecot configuration file format has changed between 0.99.x
-and 1.0. If you are upgrading from 0.99.x, be sure to read
-http://wiki.dovecot.org/UpgradingDovecot to avoid any issues.
-
-===========================================================================
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
deleted file mode 100644
index 0f8792a10ef..00000000000
--- a/mail/dovecot/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# $NetBSD: Makefile,v 1.89 2007/03/14 14:14:52 ghen Exp $
-
-DISTNAME= dovecot-1.0.rc27
-PKGNAME= ${DISTNAME:S/.rc/rc/}
-CATEGORIES= mail
-MASTER_SITES= http://www.dovecot.org/releases/
-
-MAINTAINER= ghen@NetBSD.org
-HOMEPAGE= http://www.dovecot.org/
-COMMENT= Secure IMAP and POP3 server
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
-
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config
-
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+= --with-ssldir=${SSLDIR:Q}
-
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-
-RCD_SCRIPTS= dovecot
-
-DOVECOT_USER?= dovecot
-DOVECOT_GROUP?= dovecot
-PKG_GROUPS= ${DOVECOT_GROUP}
-PKG_USERS= ${DOVECOT_USER}:${DOVECOT_GROUP}
-
-PKG_GECOS.${DOVECOT_USER}= Dovecot IMAP/POP3 user
-
-EGDIR= ${PREFIX}/share/examples/dovecot
-CONF_FILES= ${EGDIR}/dovecot.conf.default ${PKG_SYSCONFDIR}/dovecot.conf
-
-INSTALLATION_DIRS= libexec/dovecot sbin share/doc/dovecot \
- share/examples/dovecot
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= dovecot-example.conf
-SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
-SUBST_STAGE.paths= pre-configure
-
-post-build:
- ${SED} "s|/etc/ssl/|${SSLDIR}/|" ${WRKSRC}/dovecot-example.conf \
- > ${WRKDIR}/dovecot-example.conf
- ${SED} "s|/etc/ssl|${SSLDIR}|" ${WRKSRC}/doc/mkcert.sh \
- > ${WRKDIR}/mkcert.sh
-
-post-install:
- ${INSTALL_DATA} ${WRKDIR}/dovecot-example.conf \
- ${DESTDIR}${EGDIR}/dovecot.conf.default
- ${INSTALL_DATA} ${WRKSRC}/doc/dovecot-* ${DESTDIR}${EGDIR}
- ${INSTALL_SCRIPT} ${WRKDIR}/mkcert.sh ${DESTDIR}${EGDIR}
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/dovecot/PLIST b/mail/dovecot/PLIST
deleted file mode 100644
index 946f00e25a3..00000000000
--- a/mail/dovecot/PLIST
+++ /dev/null
@@ -1,54 +0,0 @@
-@comment $NetBSD: PLIST,v 1.14 2007/02/21 09:53:05 ghen Exp $
-lib/dovecot/imap/lib01_acl_plugin.so
-lib/dovecot/imap/lib02_lazy_expunge_plugin.so
-lib/dovecot/imap/lib10_quota_plugin.so
-lib/dovecot/imap/lib11_imap_quota_plugin.la
-lib/dovecot/imap/lib11_trash_plugin.so
-lib/dovecot/imap/lib20_convert_plugin.so
-lib/dovecot/imap/lib20_mail_log_plugin.so
-lib/dovecot/imap/lib20_zlib_plugin.la
-lib/dovecot/lda/lib01_acl_plugin.so
-lib/dovecot/lda/lib10_quota_plugin.so
-lib/dovecot/lda/lib11_trash_plugin.so
-lib/dovecot/lda/lib20_convert_plugin.so
-lib/dovecot/lda/lib20_mail_log_plugin.so
-lib/dovecot/lib01_acl_plugin.la
-lib/dovecot/lib02_lazy_expunge_plugin.la
-lib/dovecot/lib10_quota_plugin.la
-lib/dovecot/lib11_trash_plugin.la
-lib/dovecot/lib20_convert_plugin.la
-lib/dovecot/lib20_mail_log_plugin.la
-lib/dovecot/pop3/lib02_lazy_expunge_plugin.so
-lib/dovecot/pop3/lib10_quota_plugin.so
-lib/dovecot/pop3/lib20_convert_plugin.so
-lib/dovecot/pop3/lib20_mail_log_plugin.so
-libexec/dovecot/checkpassword-reply
-libexec/dovecot/deliver
-libexec/dovecot/dict
-libexec/dovecot/dovecot-auth
-libexec/dovecot/gdbhelper
-libexec/dovecot/imap
-libexec/dovecot/imap-login
-libexec/dovecot/pop3
-libexec/dovecot/pop3-login
-libexec/dovecot/rawlog
-libexec/dovecot/ssl-build-param
-sbin/dovecot
-sbin/dovecotpw
-share/doc/dovecot/USE-WIKI-INSTEAD
-share/doc/dovecot/auth-protocol.txt
-share/doc/dovecot/securecoding.txt
-share/doc/dovecot/variables.txt
-share/examples/dovecot/dovecot-ldap.conf
-share/examples/dovecot/dovecot-openssl.cnf
-share/examples/dovecot/dovecot-sql.conf
-share/examples/dovecot/dovecot.conf.default
-share/examples/dovecot/mkcert.sh
-share/examples/rc.d/dovecot
-@dirrm share/examples/dovecot
-@dirrm share/doc/dovecot
-@dirrm libexec/dovecot
-@dirrm lib/dovecot/pop3
-@dirrm lib/dovecot/lda
-@dirrm lib/dovecot/imap
-@dirrm lib/dovecot
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
deleted file mode 100644
index 96fac16c54f..00000000000
--- a/mail/dovecot/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.61 2007/03/14 14:14:52 ghen Exp $
-
-SHA1 (dovecot-1.0.rc27.tar.gz) = 7f026bd63234ae39658bde87a547b8c5001d892c
-RMD160 (dovecot-1.0.rc27.tar.gz) = b13d0ac5c6760d7646d0c5924943be0d7ce0e480
-Size (dovecot-1.0.rc27.tar.gz) = 1521452 bytes
-SHA1 (patch-aa) = 6258057d49add91f06d4dd51ded72e42f6774354
-SHA1 (patch-ab) = d67be516e7b5071550b6e762841b235dda1fa324
-SHA1 (patch-ag) = bd180441a0983ceccc898024370a3bdefdc11b1f
diff --git a/mail/dovecot/files/dovecot.sh b/mail/dovecot/files/dovecot.sh
deleted file mode 100755
index 058dff9ce00..00000000000
--- a/mail/dovecot/files/dovecot.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: dovecot.sh,v 1.1.1.1 2003/05/14 04:17:31 salo Exp $
-#
-
-# PROVIDE: dovecot
-# REQUIRE: DAEMON LOGIN
-
-. /etc/rc.subr
-
-name="dovecot"
-rcvar=$name
-command="@PREFIX@/sbin/${name}"
-required_files="@PKG_SYSCONFDIR@/$name.conf"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/dovecot/hacks.mk b/mail/dovecot/hacks.mk
deleted file mode 100644
index f397b35e85f..00000000000
--- a/mail/dovecot/hacks.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:50:29 rillig Exp $
-
-.include "../../mk/compiler.mk"
-
-# Avoid an ICE in gcc2 on sparc64
-.if !empty(CC_VERSION:Mgcc-*)
-PKG_HACKS+= sparc64-gcc2-ice
-CONFIGURE_ENV+= F77=${FALSE:Q}
-.endif
diff --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk
deleted file mode 100644
index 56b8780280b..00000000000
--- a/mail/dovecot/options.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-# $NetBSD: options.mk,v 1.19 2007/02/22 19:26:40 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot
-PKG_SUPPORTED_OPTIONS= gssapi inet6 kqueue ldap mysql pam pgsql sasl sqlite
-PKG_OPTIONS_OPTIONAL_GROUPS= ssl
-PKG_OPTIONS_GROUP.ssl= gnutls ssl
-PKG_SUGGESTED_OPTIONS= ssl
-
-.ifdef PKG_HAVE_KQUEUE
-PKG_SUGGESTED_OPTIONS+= kqueue
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Build with OpenSSL or GNU TLS as the underlying crypto library.
-###
-.if !empty(PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+= --with-ssl=openssl
-CONFIGURE_ENV+= SSL_CFLAGS="-I${BUILDLINK_PREFIX.openssl}/include"
-CONFIGURE_ENV+= SSL_LIBS="-lssl -lcrypto"
-. include "../../security/openssl/buildlink3.mk"
-.elif !empty(PKG_OPTIONS:Mgnutls)
-CONFIGURE_ARGS+= --with-ssl=gnutls
-. include "../../security/gnutls/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-ssl
-.endif
-
-###
-### MySQL support.
-###
-.if !empty(PKG_OPTIONS:Mmysql)
-CONFIGURE_ARGS+= --with-mysql
-. include "../../mk/mysql.buildlink3.mk"
-.endif
-
-###
-### PostgreSQL support.
-###
-.if !empty(PKG_OPTIONS:Mpgsql)
-CONFIGURE_ARGS+= --with-pgsql
-CPPFLAGS+= -I${BUILDLINK_DIR}/include/pgsql
-. include "../../mk/pgsql.buildlink3.mk"
-.endif
-
-###
-### IPv6 support.
-###
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-ipv6
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
-###
-### LDAP directory support.
-###
-.if !empty(PKG_OPTIONS:Mldap)
-CONFIGURE_ARGS+= --with-ldap
-. include "../../databases/openldap-client/buildlink3.mk"
-.endif
-
-###
-### PAM support.
-###
-.if !empty(PKG_OPTIONS:Mpam)
-CONFIGURE_ARGS+= --with-pam
-. include "../../mk/pam.buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-pam
-.endif
-
-###
-### SQLite support.
-###
-.if !empty(PKG_OPTIONS:Msqlite)
-CONFIGURE_ARGS+= --with-sqlite
-. include "../../databases/sqlite3/buildlink3.mk"
-.endif
-
-###
-### kqueue support.
-###
-.if !empty(PKG_OPTIONS:Mkqueue)
-CONFIGURE_ARGS+= --with-ioloop=kqueue
-CONFIGURE_ARGS+= --with-notify=kqueue
-.else
-# use the defaults
-.endif
-
-###
-### GSSAPI support.
-###
-.if !empty(PKG_OPTIONS:Mgssapi)
-CONFIGURE_ARGS+= --with-gssapi
-. include "../../mk/krb5.buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-gssapi
-.endif
diff --git a/mail/dovecot/patches/patch-aa b/mail/dovecot/patches/patch-aa
deleted file mode 100644
index 046a6b08b54..00000000000
--- a/mail/dovecot/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2006/10/09 19:06:57 ghen Exp $
-
---- Makefile.in.orig 2006-10-09 20:53:16.000000000 +0200
-+++ Makefile.in
-@@ -220,7 +220,7 @@ SUBDIRS = \
- $(DOCS)
-
- confdir = $(sysconfdir)
--conf_DATA = dovecot-example.conf
-+conf_DATA =
- EXTRA_DIST = \
- COPYING.LGPL \
- COPYING.MIT \
diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab
deleted file mode 100644
index 0888b88a433..00000000000
--- a/mail/dovecot/patches/patch-ab
+++ /dev/null
@@ -1,142 +0,0 @@
-$NetBSD: patch-ab,v 1.19 2007/02/21 09:53:05 ghen Exp $
-
---- dovecot-example.conf.orig 2007-02-19 21:17:46.000000000 +0100
-+++ dovecot-example.conf
-@@ -7,17 +7,14 @@
- # value inside quotes, eg.: key = "# char and trailing whitespace "
-
- # Default values are shown for each setting, it's not required to uncomment
--# any of the lines. Exception to this are paths, they're just examples with
--# the real defaults being based on configure options. The paths listed here
--# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
--# --with-ssldir=/etc/ssl
-+# any of the lines.
-
- # Base directory where to store runtime data.
- #base_dir = /var/run/dovecot/
-
- # Protocols we want to be serving: imap imaps pop3 pop3s
- # If you only want to use dovecot-auth, you can set this to "none".
--#protocols = imap imaps
-+protocols = imap pop3
-
- # IP or host address where to listen in for connections. It's not currently
- # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
-@@ -82,7 +79,7 @@
- #ssl_listen =
-
- # Disable SSL/TLS support.
--#ssl_disable = no
-+ssl_disable = yes
-
- # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
- # dropping root privileges, so keep the key file unreadable by anyone but
-@@ -487,19 +484,19 @@
-
- protocol imap {
- # Login executable location.
-- #login_executable = /usr/libexec/dovecot/imap-login
-+ #login_executable = @PREFIX@/libexec/dovecot/imap-login
-
- # IMAP executable location. Changing this allows you to execute other
- # binaries before the imap process is executed.
- #
- # This would write rawlogs into ~/dovecot.rawlog/ directory:
-- # mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
-+ # mail_executable = @PREFIX@/libexec/dovecot/rawlog @PREFIX@/libexec/dovecot/imap
- #
- # This would attach gdb into the imap process and write backtraces into
- # /tmp/gdbhelper.* files:
-- # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap
-+ # mail_executable = @PREFIX@/libexec/dovecot/gdbhelper @PREFIX@/libexec/dovecot/imap
- #
-- #mail_executable = /usr/libexec/dovecot/imap
-+ #mail_executable = @PREFIX@/libexec/dovecot/imap
-
- # Maximum IMAP command line length in bytes. Some clients generate very long
- # command lines with huge mailboxes, so you may need to raise this if you get
-@@ -509,7 +506,7 @@ protocol imap {
- # Support for dynamically loadable plugins. mail_plugins is a space separated
- # list of plugins to load.
- #mail_plugins =
-- #mail_plugin_dir = /usr/lib/dovecot/imap
-+ #mail_plugin_dir = @PREFIX@/lib/dovecot/imap
-
- # Send IMAP capabilities in greeting message. This makes it unnecessary for
- # clients to request it with CAPABILITY command, so it saves one round-trip.
-@@ -552,11 +549,11 @@ protocol imap {
-
- protocol pop3 {
- # Login executable location.
-- #login_executable = /usr/libexec/dovecot/pop3-login
-+ #login_executable = @PREFIX@/libexec/dovecot/pop3-login
-
- # POP3 executable location. See IMAP's mail_executable above for examples
- # how this could be changed.
-- #mail_executable = /usr/libexec/dovecot/pop3
-+ #mail_executable = @PREFIX@/libexec/dovecot/pop3
-
- # Don't try to set mails non-recent or seen with POP3 sessions. This is
- # mostly intended to reduce disk I/O. With maildir it doesn't move files
-@@ -616,7 +613,7 @@ protocol pop3 {
- # Support for dynamically loadable plugins. mail_plugins is a space separated
- # list of plugins to load.
- #mail_plugins =
-- #mail_plugin_dir = /usr/lib/dovecot/pop3
-+ #mail_plugin_dir = @PREFIX@/lib/dovecot/pop3
-
- # Workarounds for various client bugs:
- # outlook-no-nuls:
-@@ -644,10 +641,10 @@ protocol lda {
- # Support for dynamically loadable plugins. mail_plugins is a space separated
- # list of plugins to load.
- #mail_plugins =
-- #mail_plugin_dir = /usr/lib/dovecot/lda
-+ #mail_plugin_dir = @PREFIX@/lib/dovecot/lda
-
- # Binary to use for sending mails.
-- #sendmail_path = /usr/lib/sendmail
-+ #sendmail_path = /usr/sbin/sendmail
-
- # UNIX socket path to master authentication server to find users.
- #auth_socket_path = /var/run/dovecot/auth-master
-@@ -658,7 +655,7 @@ protocol lda {
- ##
-
- # Executable location
--#auth_executable = /usr/libexec/dovecot/dovecot-auth
-+#auth_executable = @PREFIX@/libexec/dovecot/dovecot-auth
-
- # Set max. process size in megabytes.
- #auth_process_size = 256
-@@ -772,7 +769,7 @@ auth default {
- # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
- # authentication to actually work.
- # http://wiki.dovecot.org/PasswordDatabase/PAM
-- passdb pam {
-+ #passdb pam {
- # [blocking=yes] [session=yes] [setcred=yes]
- # [cache_key=<key>] [<service name>]
- #
-@@ -805,18 +802,18 @@ auth default {
- # args = session=yes *
- # args = cache_key=%u dovecot
- #args = dovecot
-- }
-+ #}
-
- # /etc/passwd or similar, using getpwnam()
- # In many systems nowadays this uses Name Service Switch, which is
- # configured in /etc/nsswitch.conf.
- # http://wiki.dovecot.org/AuthDatabase/Passwd
-- #passdb passwd {
-+ passdb passwd {
- # [blocking=yes] - By default the lookups are done in the main dovecot-auth
- # process. This setting causes the lookups to be done in auth worker
- # proceses. Useful with remote NSS lookups that may block.
- #args =
-- #}
-+ }
-
- # /etc/shadow or similiar, using getspnam(). Deprecated by PAM nowadays.
- # http://wiki.dovecot.org/PasswordDatabase/Shadow
diff --git a/mail/dovecot/patches/patch-ag b/mail/dovecot/patches/patch-ag
deleted file mode 100644
index a365b51afc6..00000000000
--- a/mail/dovecot/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2006/11/04 21:44:03 ghen Exp $
-
---- src/deliver/deliver.c.orig 2006-11-02 21:03:30.000000000 +0100
-+++ src/deliver/deliver.c
-@@ -30,7 +30,7 @@
-
- #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf"
- #define DEFAULT_AUTH_SOCKET_PATH PKG_RUNDIR"/auth-master"
--#define DEFAULT_SENDMAIL_PATH "/usr/lib/sendmail"
-+#define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail"
- #define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON"
-
- /* After buffer grows larger than this, create a temporary file to /tmp
diff --git a/mail/drac/DESCR b/mail/drac/DESCR
deleted file mode 100644
index 3f22f2f5858..00000000000
--- a/mail/drac/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-DRAC is a daemon that dynamically updates a relay authorization map for
-sendmail. It provides a way to allow legitimate users to relay mail through an
-SMTP server, while still preventing others from using it as a spam relay.
-User's IP addresses are added to the map immediately after they have
-authenticated to the POP or IMAP server. By default, map entries expire after
-30 minutes, but can be renewed by additional authentication. Periodically
-checking mail on a POP server is sufficient to do this. The POP and SMTP
-servers can be on different hosts.
diff --git a/mail/drac/MESSAGE b/mail/drac/MESSAGE
deleted file mode 100644
index c49574013fc..00000000000
--- a/mail/drac/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:10 wiz Exp $
-
-You will need to modify a POP or IMAP server for this software to
-work. Please see ${PREFIX}/share/examples/drac/INSTALL for details.
-
-===========================================================================
diff --git a/mail/drac/Makefile b/mail/drac/Makefile
deleted file mode 100644
index da6e33e6085..00000000000
--- a/mail/drac/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:41 wiz Exp $
-#
-
-DISTNAME= drac
-PKGNAME= drac-1.12
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.cc.umanitoba.ca/src/
-EXTRACT_SUFX= .tar.Z
-
-MAINTAINER= groo@NetBSD.org
-HOMEPAGE= http://mail.cc.umanitoba.ca/drac/
-COMMENT= Dynamic Relay Authorization Control
-
-WRKSRC= ${WRKDIR}
-DIST_SUBDIR= ${PKGNAME_NOREV}
-
-MAKE_ENV+= MKDIR=${MKDIR:Q}
-MAKE_ENV+= INSTALL=${INSTALL:Q}
-MAKE_ENV+= RANLIB=${RANLIB:Q}
-MAKE_ENV+= EBIN="${LOCALBASE}/libexec"
-MAKE_ENV+= MAN="${LOCALBASE}/man/man"
-MAKE_ENV+= EXAMPLES="${LOCALBASE}/share/examples/drac"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/drac/PLIST b/mail/drac/PLIST
deleted file mode 100644
index b14e80e2355..00000000000
--- a/mail/drac/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/09 12:25:53 jmmv Exp $
-include/drac.h
-lib/libdrac.a
-libexec/rpc.dracd
-man/man3/dracauth.3
-man/man8/rpc.dracd.8
-share/examples/drac/INSTALL
-share/examples/drac/README
-share/examples/drac/dracd-setup
-share/examples/drac/dracd.allow-sample
-share/examples/drac/testing.c
-@dirrm share/examples/drac
diff --git a/mail/drac/buildlink3.mk b/mail/drac/buildlink3.mk
deleted file mode 100644
index c09b4e9abc4..00000000000
--- a/mail/drac/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:57 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-DRAC_BUILDLINK3_MK:= ${DRAC_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= drac
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndrac}
-BUILDLINK_PACKAGES+= drac
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}drac
-
-.if !empty(DRAC_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.drac+= drac>=1.10
-BUILDLINK_PKGSRCDIR.drac?= ../../mail/drac
-BUILDLINK_DEPMETHOD.drac?= build
-.endif # DRAC_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/drac/distinfo b/mail/drac/distinfo
deleted file mode 100644
index e159c39e1c3..00000000000
--- a/mail/drac/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:59:21 agc Exp $
-
-SHA1 (drac-1.12/drac.tar.Z) = 2434e7f238ee1212c742705d3653dedec64266f5
-RMD160 (drac-1.12/drac.tar.Z) = b2a485c554e8d97a6defe0046bb9c485c6014a54
-Size (drac-1.12/drac.tar.Z) = 20705 bytes
-SHA1 (patch-aa) = fb56b4681f131a379f42f449bccbd826a0e97e6f
diff --git a/mail/drac/patches/patch-aa b/mail/drac/patches/patch-aa
deleted file mode 100644
index b2566e6cc33..00000000000
--- a/mail/drac/patches/patch-aa
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/03/09 12:25:53 jmmv Exp $
-
---- Makefile.orig 2003-01-12 20:45:12.000000000 +0000
-+++ Makefile
-@@ -5,10 +5,6 @@
-
- # Paths
-
--INSTALL = /usr/ucb/install
--EBIN = /usr/local/sbin
--MAN = /usr/local/man/man
--
- # OS-Dependant settings
-
- # Choose one of this pair...
-@@ -33,26 +29,22 @@ MAN = /usr/local/man/man
- # -DCIDR_KEY # keys in CIDR format
- # -DTERM_KD # keys and data nul-terminated
-
--DEFS = -DTI_RPC -DFCNTL_LOCK -DSYSINFO
-+DEFS = -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDASH_C
-
- # Compiler flags
--CC = cc
--RANLIB = :
--CFLAGS = $(DEFS) -g -I/usr/local/src/db/db-4.1.25/build_unix
-+CFLAGS += $(DEFS)
- #CFLAGS = $(DEFS) -g -I/usr/local/src/db/db-3.1.17/build_unix
- #CFLAGS = $(DEFS) -g -I/usr/local/src/db/db-2.4.14/Unix
- #CFLAGS = $(DEFS) -g -I/usr/local/src/db/db.1.85/PORT/sunos.5.2/include
--LDLIBS = -L/usr/local/src/db/db-4.1.25/build_unix -lnsl -ldb-4.1
- #LDLIBS = -L/usr/local/src/db/db-3.1.17/build_unix -lnsl -ldb
- #LDLIBS = -L/usr/local/src/db/db-2.4.14/Unix -lnsl -ldb
- #LDLIBS = -L/usr/local/src/db/db.1.85/PORT/sunos.5.2 -lnsl -ldb
--TSTLIBS = -L. -ldrac -lnsl
--RPCGENFLAGS =
--#RPCGENFLAGS = -C
-+TSTLIBS = -L. -ldrac
-+RPCGENFLAGS = -I -C
-
- # Man sections
- MANLIB = 3
--MANADM = 1m
-+MANADM = 8
-
- ## Nothing to change after this point
-
-@@ -119,10 +111,15 @@ clean:
- tar: $(PACKAGE)
- tar cf drac.tar $(PACKAGE)
-
--install: $(SERVER)
-+install: $(SERVER) $(SERVER).1m dracauth.3
- $(INSTALL) -c -o bin -g bin -m 0755 $(SERVER) $(EBIN)
--
--install-man: $(SERVER).1m dracauth.3
- $(INSTALL) -c -m 0444 $(SERVER).1m $(MAN)$(MANADM)/$(SERVER).$(MANADM)
- $(INSTALL) -c -m 0444 dracauth.3 $(MAN)$(MANLIB)/dracauth.$(MANLIB)
--
-+ $(MKDIR) -p $(EXAMPLES)
-+ $(INSTALL) -c -m 0444 README $(EXAMPLES)/README
-+ $(INSTALL) -c -m 0444 INSTALL $(EXAMPLES)/INSTALL
-+ $(INSTALL) -c -m 0444 testing.c $(EXAMPLES)/testing.c
-+ $(INSTALL) -c -m 0444 dracd-setup $(EXAMPLES)/dracd-setup
-+ $(INSTALL) -c -m 0444 dracd.allow-sample $(EXAMPLES)/dracd.allow-sample
-+ $(INSTALL) -c -m 0444 drac.h $(LOCALBASE)/include/drac.h
-+ $(INSTALL) -c -m 0444 libdrac.a $(LOCALBASE)/lib/libdrac.a
diff --git a/mail/dspam/DESCR b/mail/dspam/DESCR
deleted file mode 100644
index 351e3acaa43..00000000000
--- a/mail/dspam/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-DSPAM (as in De-Spam) is an extremely scalable, open-source statistical hybrid
-anti-spam filter. While most commercial solutions only provide a mere 95%
-accuracy (1 error in 20), a majority of DSPAM users frequently see between
-99.95% (1 error in 2000) all the way up to 99.991% (2 errors in 22,786).
-
-DSPAM is currently effective as both a server-side agent for UNIX email servers
-and a developer's library for mail clients, other anti-spam tools, and similar
-projects requiring drop-in spam filtering. DSPAM has been implemented on many
-large and small scale systems with the largest systems being reported at about
-125,000 mailboxes.
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
deleted file mode 100644
index f2e8b7e111a..00000000000
--- a/mail/dspam/Makefile
+++ /dev/null
@@ -1,152 +0,0 @@
-# $NetBSD: Makefile,v 1.55 2006/12/10 04:36:30 obache Exp $
-
-DISTNAME= dspam-3.6.8
-PKGREVISION= 2
-CATEGORIES= mail
-MASTER_SITES= http://www.nuclearelephant.com/projects/dspam/sources/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://dspam.nuclearelephant.com/
-COMMENT= Extremely scalable, statistical-hybrid anti-spam filter
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-
-USE_TOOLS+= perl:run pkg-config
-REPLACE_PERL= src/tools/dspam_train.in \
- src/tools/dspam_logrotate \
- webui/cgi-bin/*.cgi webui/cgi-bin/configure.pl.in
-
-PKGCONFIG_OVERRIDE+= src/dspam.pc.in
-
-SUBST_CLASSES+= cgi
-SUBST_STAGE.cgi= post-patch
-SUBST_FILES.cgi= webui/cgi-bin/templates/nav_performance.html \
- webui/cgi-bin/configure.pl.in \
- webui/cgi-bin/dspam.cgi webui/cgi-bin/admin.cgi \
- webui/cgi-bin/graph.cgi webui/cgi-bin/admingraph.cgi
-SUBST_SED.cgi= -e "s|auxw|${DSPAM_PSFLAGS}|g" \
- -e "s|yourdomain.com|${DSPAM_DOMAIN}|g" \
- -e "s|./admins|${PKG_SYSCONFDIR}/cgi-admins|" \
- -e "s|configure.pl|${PKG_SYSCONFDIR}/configure.pl|" \
- -e "s|\"\/\";|\"${DSPAM_WWWHOME}\";|" \
- -e "s|\$$FILE = \"./default.prefs\";|\$$FILE = \"${PKG_SYSCONFDIR}/cgi-default.prefs\";|"
-SUBST_MESSAGE.cgi= Fixing paths and default options.
-
-BUILD_DEFS+= DSPAM_HOME
-BUILD_DEFS+= DSPAM_SIGNATURE_LIFE
-BUILD_DEFS+= DSPAM_USER DSPAM_GROUP
-BUILD_DEFS+= DSPAM_BINMODE
-BUILD_DEFS+= DSPAM_LOGDIR
-BUILD_DEFS+= DSPAM_LOGFILE
-BUILD_DEFS+= DSPAM_DOMAIN
-BUILD_DEFS+= DSPAM_WWWHOME
-BUILD_DEFS+= DSPAM_PIDDIR
-BUILD_DEFS+= DSPAM_WWWUSER DSPAM_WWWGROUP
-
-.include "../../mk/bsd.prefs.mk"
-
-DSPAM_HOME?= ${VARBASE}/dspam
-DSPAM_SIGNATURE_LIFE?= 14
-
-DSPAM_BINMODE?= 4511
-DSPAM_USER?= dspam
-DSPAM_GROUP?= dspam
-DSPAM_LOGDIR?= ${DSPAM_HOME}/log
-DSPAM_LOGFILE?= ${DSPAM_LOGDIR}/dspam.log
-DSPAM_DOMAIN?= yourdomain.com
-DSPAM_WWWHOME?= /dspam
-DSPAM_PIDDIR?= ${VARBASE}/run/dspam
-DSPAM_WWWUSER?= ${APACHE_USER}
-DSPAM_WWWGROUP?= ${APACHE_GROUP}
-
-CONFIGURE_ARGS+= --with-signature-life=${DSPAM_SIGNATURE_LIFE:Q}
-CONFIGURE_ARGS+= --with-dspam-home=${DSPAM_HOME:Q} \
- --with-dspam-home-owner=${DSPAM_USER:Q} \
- --with-dspam-home-group=${DSPAM_GROUP:Q} \
- --with-dspam-owner=${DSPAM_USER:Q} \
- --with-dspam-group=${DSPAM_GROUP:Q} \
- --with-dspam-mode=${DSPAM_BINMODE:Q} \
- --with-logdir=${DSPAM_LOGDIR:Q} \
- --sysconfdir=${PKG_SYSCONFDIR:Q}
-
-.include "options.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-DOCDIR= ${PREFIX}/share/doc/dspam
-DATADIR= ${PREFIX}/share/dspam
-EGDIR= ${PREFIX}/share/examples/dspam
-
-RCD_SCRIPTS= dspam
-
-PKG_SYSCONFSUBDIR= dspam
-
-CONF_FILES_PERMS= ${EGDIR}/dspam.conf ${PKG_SYSCONFDIR}/dspam.conf \
- ${DSPAM_USER} ${DSPAM_WWWGROUP} 0640
-CONF_FILES_PERMS+= ${EGDIR}/cgi-admins ${PKG_SYSCONFDIR}/cgi-admins \
- ${DSPAM_WWWUSER} ${DSPAM_WWWGROUP} 0640
-CONF_FILES_PERMS+= ${EGDIR}/cgi-default.prefs \
- ${PKG_SYSCONFDIR}/cgi-default.prefs \
- ${DSPAM_WWWUSER} ${DSPAM_WWWGROUP} 0640
-CONF_FILES_PERMS+= ${EGDIR}/configure.pl ${PKG_SYSCONFDIR}/configure.pl \
- ${DSPAM_WWWUSER} ${DSPAM_WWWGROUP} 0640
-
-PKG_GROUPS= ${DSPAM_GROUP}
-PKG_USERS= ${DSPAM_USER}:${DSPAM_GROUP}
-SPECIAL_PERMS= ${PREFIX}/bin/dspam ${DSPAM_USER} ${DSPAM_GROUP} \
- ${DSPAM_BINMODE}
-OWN_DIRS_PERMS= ${DSPAM_HOME} ${DSPAM_USER} ${DSPAM_WWWGROUP} 0775
-OWN_DIRS_PERMS+= ${DSPAM_LOGDIR} ${DSPAM_USER} ${DSPAM_GROUP} 0775
-OWN_DIRS_PERMS+= ${DSPAM_PIDDIR} ${DSPAM_USER} ${DSPAM_GROUP} 0770
-
-FILES_SUBST+= DSPAM_USER=${DSPAM_USER:Q}
-FILES_SUBST+= DSPAM_GROUP=${DSPAM_GROUP:Q}
-FILES_SUBST+= DSPAM_PIDDIR=${DSPAM_PIDDIR:Q}
-
-SUBST_CLASSES+= conf
-SUBST_STAGE.conf= pre-install
-SUBST_FILES.conf= src/dspam.conf.in
-SUBST_SED.conf= -e "s,@dspam_home@,${DSPAM_HOME},g" \
- -e "s,@delivery_agent@,${DSPAM_DELIVERY_AGENT_BIN},g" \
- -e "s|@PREFIX@|${PREFIX}|g" \
- -e "s|@VARBASE@|${VARBASE}|g" \
- -e "s|@DSPAM_PIDDIR@|${DSPAM_PIDDIR}|g"
-SUBST_MESSAGE.conf= Fixing configuration file.
-
-post-install:
- ${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/RELEASE.NOTES ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/UPGRADING ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCDIR}
- ${INSTALL_DATA_DIR} ${DATADIR}
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/src/dspam.conf.in ${EGDIR}/dspam.conf
- ${INSTALL_DATA} ${WRKSRC}/webui/cgi-bin/admins ${EGDIR}/cgi-admins
- ${INSTALL_DATA} ${WRKSRC}/webui/cgi-bin/default.prefs \
- ${EGDIR}/cgi-default.prefs
- ${INSTALL_DATA} ${WRKSRC}/webui/cgi-bin/configure.pl \
- ${EGDIR}/configure.pl
-
-.for d in txt webui/cgi-bin webui/htdocs
- ${INSTALL_DATA_DIR} ${DATADIR}/${d}
- cd ${WRKSRC}/${d} && ${PAX} -rwppm '-s|.*/Makefile.*$$||' \
- '-s|./admins.*$$||' '-s|./default.prefs.*$$||' \
- '-s|./configure.pl.*$$||' . ${DATADIR}/${d}
-.endfor
-
-.for drv in mysql pgsql
-. if !empty(DSPAM_STORAGE_DRIVER:M${drv})
- ${INSTALL_DATA_DIR} ${DATADIR}/${drv}
- cd ${WRKSRC}/src/tools.${drv}_drv && \
- ${PAX} -rwppm ./*.sql ${DATADIR}/${drv}
-. endif
-.endfor
-
-.if !empty(DSPAM_STORAGE_DRIVER:Msqlite*)
- ${INSTALL_DATA_DIR} ${DATADIR}/sqlite
- cd ${WRKSRC}/src/tools.sqlite_drv && \
- ${PAX} -rwppm '-s|.*/Makefile.*$$||' . ${DATADIR}/sqlite
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/dspam/PLIST b/mail/dspam/PLIST
deleted file mode 100644
index 2a4e68aa42a..00000000000
--- a/mail/dspam/PLIST
+++ /dev/null
@@ -1,115 +0,0 @@
-@comment $NetBSD: PLIST,v 1.16 2006/12/10 04:36:30 obache Exp $
-${HASH}bin/cssstat
-${HASH}bin/csscompress
-${HASH}bin/cssclean
-${HASH}bin/cssconvert
-bin/dspam
-bin/dspam_2sql
-bin/dspam_admin
-bin/dspam_clean
-bin/dspam_crc
-bin/dspam_dump
-bin/dspam_logrotate
-bin/dspam_merge
-bin/dspam_stats
-bin/dspam_train
-bin/dspamc
-${PGSQL}bin/dspam_pg2int8
-include/dspam/buffer.h
-include/dspam/config.h
-include/dspam/config_shared.h
-include/dspam/decode.h
-include/dspam/diction.h
-include/dspam/error.h
-include/dspam/heap.h
-include/dspam/ldap_client.h
-include/dspam/libdspam.h
-include/dspam/libdspam_objects.h
-include/dspam/nodetree.h
-include/dspam/storage_driver.h
-include/dspam/tokenizer.h
-lib/libdspam.la
-lib/pkgconfig/dspam.pc
-man/man1/dspam.1
-man/man1/dspam_clean.1
-man/man1/dspam_dump.1
-man/man1/dspam_merge.1
-man/man1/dspam_stats.1
-man/man1/dspam_train.1
-man/man3/dspam_addattribute.3
-man/man3/dspam_attach.3
-man/man3/dspam_create.3
-man/man3/dspam_destroy.3
-man/man3/dspam_detach.3
-man/man3/dspam_getsource.3
-man/man3/dspam_init.3
-man/man3/dspam_process.3
-man/man3/libdspam.3
-share/doc/dspam/README
-share/doc/dspam/RELEASE.NOTES
-share/doc/dspam/UPGRADING
-share/doc/dspam/courier.txt
-share/doc/dspam/exim.txt
-share/doc/dspam/markov.txt
-share/doc/dspam/mysql_drv.txt
-share/doc/dspam/ora_drv.txt
-share/doc/dspam/osx.txt
-share/doc/dspam/pgsql_drv.txt
-share/doc/dspam/pop3filter.txt
-share/doc/dspam/postfix.txt
-share/doc/dspam/qmail.txt
-share/doc/dspam/relay.txt
-share/doc/dspam/sendmail.txt
-share/doc/dspam/sqlite_drv.txt
-share/dspam/txt/firstrun.txt
-share/dspam/txt/firstspam.txt
-share/dspam/txt/quarantinefull.txt
-share/dspam/webui/cgi-bin/admin.cgi
-share/dspam/webui/cgi-bin/admingraph.cgi
-share/dspam/webui/cgi-bin/dspam.cgi
-share/dspam/webui/cgi-bin/graph.cgi
-share/dspam/webui/cgi-bin/rgb.txt
-share/dspam/webui/cgi-bin/templates/nav_admin_error.html
-share/dspam/webui/cgi-bin/templates/nav_admin_preferences.html
-share/dspam/webui/cgi-bin/templates/nav_admin_status.html
-share/dspam/webui/cgi-bin/templates/nav_admin_user.html
-share/dspam/webui/cgi-bin/templates/nav_alerts.html
-share/dspam/webui/cgi-bin/templates/nav_analysis.html
-share/dspam/webui/cgi-bin/templates/nav_error.html
-share/dspam/webui/cgi-bin/templates/nav_fragment.html
-share/dspam/webui/cgi-bin/templates/nav_history.html
-share/dspam/webui/cgi-bin/templates/nav_performance.html
-share/dspam/webui/cgi-bin/templates/nav_preferences.html
-share/dspam/webui/cgi-bin/templates/nav_quarantine.html
-share/dspam/webui/cgi-bin/templates/nav_viewmessage.html
-share/dspam/webui/htdocs/base.css
-share/dspam/webui/htdocs/dspam-logo-small.gif
-${MYSQL}share/dspam/mysql/mysql_objects-4.1.sql
-${MYSQL}share/dspam/mysql/mysql_objects-space.sql
-${MYSQL}share/dspam/mysql/mysql_objects-speed.sql
-${MYSQL}share/dspam/mysql/purge.sql
-${MYSQL}share/dspam/mysql/purge-4.1.sql
-${MYSQL}share/dspam/mysql/virtual_users.sql
-${MYSQL}share/dspam/mysql/virtual_user_aliases.sql
-${PGSQL}share/dspam/pgsql/pgsql_objects.sql
-${PGSQL}share/dspam/pgsql/purge.sql
-${PGSQL}share/dspam/pgsql/virtual_users.sql
-${SQLITE}share/dspam/sqlite/purge-2.sql
-${SQLITE}share/dspam/sqlite/purge-3.sql
-share/examples/dspam/cgi-admins
-share/examples/dspam/cgi-default.prefs
-share/examples/dspam/configure.pl
-share/examples/dspam/dspam.conf
-share/examples/rc.d/dspam
-@dirrm share/examples/dspam
-${PGSQL}@dirrm share/dspam/pgsql
-${MYSQL}@dirrm share/dspam/mysql
-${SQLITE}@dirrm share/dspam/sqlite
-@dirrm share/dspam/webui/htdocs
-@dirrm share/dspam/webui/cgi-bin/templates
-@dirrm share/dspam/webui/cgi-bin
-@dirrm share/dspam/webui
-@dirrm share/dspam/txt
-@dirrm share/dspam
-@dirrm share/doc/dspam
-@dirrm include/dspam
diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo
deleted file mode 100644
index 9df9d8bb3a3..00000000000
--- a/mail/dspam/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.29 2006/06/18 08:29:00 xtraeme Exp $
-
-SHA1 (dspam-3.6.8.tar.gz) = e8c413882eadf1e02837e4a2ffcfc98b801eded1
-RMD160 (dspam-3.6.8.tar.gz) = 93a70db14070cb61bd2ef1b0ca55a18be1dbfd7b
-Size (dspam-3.6.8.tar.gz) = 743275 bytes
-SHA1 (patch-aa) = 04e94e3da9de06c15863425d0a827858b5dd4a6c
-SHA1 (patch-ad) = cfa68c01cb3f5ce0556c7a3b008dc214bdfbbd95
diff --git a/mail/dspam/files/dspam.sh b/mail/dspam/files/dspam.sh
deleted file mode 100644
index 1e59b280ab0..00000000000
--- a/mail/dspam/files/dspam.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: dspam.sh,v 1.5 2005/11/12 16:53:19 adrianp Exp $
-#
-
-# PROVIDE: dspam
-# REQUIRE: SERVERS
-# BEFORE: DAEMON
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="dspam"
-rcvar="${name}"
-command="@PREFIX@/bin/${name}"
-pidfile="@DSPAM_PIDDIR@/${name}.pid"
-command_args="--daemon > /dev/null 2>&1 &"
-start_precmd="dspam_precmd"
-
-dspam_precmd()
-{
- if [ ! -d @DSPAM_PIDDIR@ ]; then
- @MKDIR@ @DSPAM_PIDDIR@
- @CHMOD@ 0770 @DSPAM_PIDDIR@
- @CHOWN@ @DSPAM_USER@ @DSPAM_PIDDIR@
- @CHGRP@ @DSPAM_GROUP@ @DSPAM_PIDDIR@
- fi
-}
-
-if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -f /etc/rc.d/DAEMON ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- case ${1:-start} in
- start)
- dspam_precmd
- if [ -x ${command} ]; then
- echo "Starting ${name}."
- eval ${command} ${dspam_flags} ${command_args}
- fi
- ;;
- stop)
- if [ -f ${pidfile} ]; then
- pid=`/bin/head -1 ${pidfile}`
- echo "Stopping ${name}."
- kill -TERM ${pid}
- else
- echo "${name} not running?"
- fi
- ;;
- restart)
- ( $0 stop )
- sleep 1
- $0 start
- ;;
- status)
- if [ -f ${pidfile} ]; then
- pid=`/bin/head -1 ${pidfile}`
- echo "${name} is running as pid ${pid}."
- else
- echo "${name} is not running."
- fi
- ;;
- esac
-fi
diff --git a/mail/dspam/options.mk b/mail/dspam/options.mk
deleted file mode 100644
index b313446f22c..00000000000
--- a/mail/dspam/options.mk
+++ /dev/null
@@ -1,217 +0,0 @@
-# $NetBSD: options.mk,v 1.19 2007/02/22 19:26:41 wiz Exp $
-
-.if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom)
-DSPAM_DELIVERY_AGENT:= ${DSPAM_DELIVERY_AGENT_ARGS}
-.endif
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.dspam
-PKG_SUPPORTED_OPTIONS= largescale homedir long-usernames graphs \
- domainscale \
- clamav syslog debug verbose-debug
-
-###
-### DSPAM_DELIVERY_AGENT is the tool called to to deliver messages.
-### It can either be "procmail", "maildrop" or the path to a
-### command (and arguments) used for local mail delivery. Set this
-### to the path to the sendmail binary to reinject mail back into
-### the MTA instead of doing local delivery.
-### Possible: procmail, maildrop or custom (e.g, /usr/sbin/sendmail)
-### Default: procmail
-###
-DSPAM_DELIVERY_AGENT?= procmail
-BUILD_DEFS+= DSPAM_DELIVERY_AGENT
-.if !empty(DSPAM_DELIVERY_AGENT:Mprocmail)
-DSPAM_DELIVERY_AGENT_BIN?= ${LOCALBASE}/bin/procmail
-BUILD_DEPENDS+= procmail-[0-9]*:../../mail/procmail
-CONFIGURE_ARGS+= --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q}
-.elif !empty(DSPAM_DELIVERY_AGENT:Mmaildrop)
-DSPAM_DELIVERY_AGENT_BIN?= ${LOCALBASE}/bin/maildrop
-BUILD_DEPENDS+= maildrop-[0-9]*:../../mail/maildrop
-CONFIGURE_ARGS+= --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q}
-.elif !empty(DSPAM_DELIVERY_AGENT)
-DSPAM_DELIVERY_AGENT_BIN?= ${DSPAM_DELIVERY_AGENT}
-CONFIGURE_ARGS+= --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q}
-.else
-PKG_FAIL_REASON+= "${PKGBASE}: unknown delivery agent \`${DSPAM_DELIVERY_AGENT}'"
-.endif
-
-###
-### This is the backend database used to store the DSPAM signatures as
-### well as other state information. The recommended storage driver is
-### "mysql", even for small installations.
-### Possible: mysql, pgsql, bdb, sqlite, sqlite3 or hash
-### Default: hash
-###
-DSPAM_STORAGE_DRIVER?= hash
-BUILD_DEFS+= DSPAM_STORAGE_DRIVER
-.if empty(DSPAM_STORAGE_DRIVER:Mmysql) && empty(DSPAM_STORAGE_DRIVER:Mpgsql)
-PKG_OPTIONS:= ${PKG_OPTIONS:Nvirtualusers}
-PKG_OPTIONS:= ${PKG_OPTIONS:Npreferences-extension}
-PKG_OPTIONS:= ${PKG_OPTIONS:Nldap}
-.endif
-.if !empty(DSPAM_STORAGE_DRIVER:Mhash)
-CONFIGURE_ARGS+= --with-storage-driver=hash_drv
-HASH_PLIST_SUBST+= HASH=
-.elif !empty(DSPAM_STORAGE_DRIVER:Mmysql)
-. include "../../mk/mysql.buildlink3.mk"
-CONFIGURE_ARGS+= --enable-mysql4-initialization
-CONFIGURE_ARGS+= --with-storage-driver=mysql_drv
-CONFIGURE_ARGS+= \
- --with-mysql-includes=${BUILDLINK_PREFIX.mysql-client}/include/mysql \
- --with-mysql-libraries=${BUILDLINK_PREFIX.mysql-client}/lib
-MYSQL_PLIST_SUBST= MYSQL=
-.elif !empty(DSPAM_STORAGE_DRIVER:Mpgsql)
-. include "../../mk/pgsql.buildlink3.mk"
-CONFIGURE_ARGS+= --with-storage-driver=pgsql_drv
-CONFIGURE_ARGS+= \
- --with-pgsql-includes=${PGSQL_PREFIX}/include/postgresql \
- --with-pgsql-libraries=${PGSQL_PREFIX}/lib
-PGSQL_PLIST_SUBST= PGSQL=
-.elif !empty(DSPAM_STORAGE_DRIVER:Mbdb)
-PKG_FAIL_REASON+= "Berkeley DB3/4 is deprecated (not recommended). Please migrate to a different storage driver."
-.elif !empty(DSPAM_STORAGE_DRIVER:Msqlite)
-. include "../../databases/sqlite/buildlink3.mk"
-CONFIGURE_ARGS+= --with-storage-driver=sqlite_drv
-SQLITE_PLIST_SUBST= SQLITE=
-.elif !empty(DSPAM_STORAGE_DRIVER:Msqlite3)
-. include "../../databases/sqlite3/buildlink3.mk"
-CONFIGURE_ARGS+= --with-storage-driver=sqlite3_drv
-SQLITE_PLIST_SUBST+= SQLITE=
-.else
-PKG_FAIL_REASON+= "${PKGBASE}: unknown storage driver \`${DSPAM_STORAGE_DRIVER}\'"
-.endif
-
-# daemon mode only supports MySQL, PostgreSQL or hash
-.if !empty(DSPAM_STORAGE_DRIVER:Mmysql) || \
- !empty(DSPAM_STORAGE_DRIVER:Mpgsql) || \
- !empty(DSPAM_STORAGE_DRIVER:Mhash)
-. if empty(MACHINE_PLATFORM:MNetBSD-1.*)
-CONFIGURE_ARGS+= --enable-daemon
-. endif
-.endif
-
-MYSQL_PLIST_SUBST?= MYSQL="@comment "
-PGSQL_PLIST_SUBST?= PGSQL="@comment "
-SQLITE_PLIST_SUBST?= SQLITE="@comment "
-HASH_PLIST_SUBST?= HASH="@comment "
-
-PLIST_SUBST+= ${MYSQL_PLIST_SUBST}
-PLIST_SUBST+= ${PGSQL_PLIST_SUBST}
-PLIST_SUBST+= ${SQLITE_PLIST_SUBST}
-PLIST_SUBST+= ${HASH_PLIST_SUBST}
-
-###
-### The following are only available for mysql and pgsql backends.
-###
-.if !empty(DSPAM_STORAGE_DRIVER:Mmysql) || !empty(DSPAM_STORAGE_DRIVER:Mpgsql)
-PKG_SUPPORTED_OPTIONS+= preferences-extension virtualusers ldap
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Used to store user preferences in the backend instead of flat files
-### (built-in method).
-###
-.if !empty(PKG_OPTIONS:Mpreferences-extension)
-CONFIGURE_ARGS+= --enable-preferences-extension
-.endif
-
-###
-### Tells DSPAM to create virtual user ids. Use this if your users are
-### not system users.
-###
-.if !empty(PKG_OPTIONS:Mvirtualusers)
-CONFIGURE_ARGS+= --enable-virtual-users
-.endif
-
-###
-### Enable LDAP support via libldap
-###
-.if !empty(PKG_OPTIONS:Mldap)
-CONFIGURE_ARGS+= --enable-ldap
-.endif
-
-###
-### Use of home directory dot file for opt-in/opt-out
-###
-.if !empty(PKG_OPTIONS:Mhomedir)
-CONFIGURE_ARGS+= --enable-homedir
-.endif
-
-###
-### Enable DSPAM's graph.cgi to produce graphs of spam statistics.
-###
-.if !empty(PKG_OPTIONS:Mgraphs)
-DEPENDS+= p5-GDGraph3d-[0-9]*:../../graphics/p5-GDGraph3d
-.endif
-
-###
-### Switch for large-scale implementation. User data will be stored as
-### $DSPAM_HOME/data/u/s/user instead of $DSPAM_HOME/data/user
-###
-.if !empty(PKG_OPTIONS:Mlargescale)
-CONFIGURE_ARGS+= --enable-large-scale
-.endif
-
-###
-### Support long usernames.
-###
-.if !empty(PKG_OPTIONS:Mlong-usernames)
-CONFIGURE_ARGS+= --enable-long-usernames
-.endif
-
-###
-### Support for a domain scale implementation.
-###
-.if !empty(PKG_OPTIONS:Mdomainscale)
-CONFIGURE_ARGS+= --enable-domain-scale
-.endif
-
-###
-### These are the flags used when invoking ps(1) to list all processes.
-###
-BUILD_DEFS+= DSPAM_PSFLAGS
-.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
-DSPAM_PSFLAGS?= -deaf
-.else
-DSPAM_PSFLAGS?= aux
-.endif
-
-###
-### Enables support for Clam Antivirus. DSPAM can interface directly with
-### clamd to perform virus scanning and can be configured to react in
-### different ways to viruses.
-###
-.if !empty(PKG_OPTIONS:Mclamav)
-CONFIGURE_ARGS+= --enable-clamav
-.include "../../mail/clamav/buildlink3.mk"
-.endif
-
-###
-### Enable syslog support, otherwise
-### set flat logfile pathname for logging
-###
-.if !empty(PKG_OPTIONS:Msyslog)
-CONFIGURE_ARGS+= --enable-syslog
-.else
-CONFIGURE_ARGS+= --disable-syslog
-CONFIGURE_ARGS+= --with-logfile=${DSPAM_LOGFILE}
-.endif
-
-###
-### Enable debugging support for DSPAM.
-### Don't enable this unless something needs testing!
-###
-.if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+= --enable-debug
-.endif
-
-###
-### Cause DSPAM produce verbose debug output and write them into
-### LOGDIR/dspam.debug file. Implies '--enable-debug'.
-### Never enable this for production builds !
-###
-.if !empty(PKG_OPTIONS:Mverbose-debug)
-CONFIGURE_ARGS+= --enable-verbose-debug
-.endif
diff --git a/mail/dspam/patches/patch-aa b/mail/dspam/patches/patch-aa
deleted file mode 100644
index bed1d6e5fb0..00000000000
--- a/mail/dspam/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/10/20 08:33:13 adrianp Exp $
-
---- src/Makefile.in.orig 2005-10-17 14:07:30.000000000 +0100
-+++ src/Makefile.in
-@@ -373,7 +373,7 @@ DIST_SUBDIRS = . \
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = dspam.pc
- etcdir = $(sysconfdir)
--etc_SCRIPTS = dspam_conf
-+etc_SCRIPTS =
- libversion = 7:0:0
-
- # Defaults from dspam.conf
diff --git a/mail/dspam/patches/patch-ad b/mail/dspam/patches/patch-ad
deleted file mode 100644
index 892051bdaba..00000000000
--- a/mail/dspam/patches/patch-ad
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/05/06 08:36:10 xtraeme Exp $
-
---- src/dspam.conf.in.orig 2006-02-15 22:06:35.000000000 +0200
-+++ src/dspam.conf.in 2006-05-05 23:44:16.000000000 +0300
-@@ -24,7 +24,7 @@
- # this option. If you do not wish to lose all of your data, you will need to
- # migrate it to the new backend before making this change.
- #
--StorageDriver @libdir@/@storage_driver@
-+#StorageDriver @libdir@/@storage_driver@
-
- #
- # Trusted Delivery Agent: Specifies the local delivery agent DSPAM should call
-@@ -53,7 +53,7 @@
- # the user DSPAM is processing mail for. This configuration parameter is only
- # necessary if you plan on allowing untrusted processing.
- #
--#UntrustedDeliveryAgent "/usr/bin/procmail -d %u"
-+#UntrustedDeliveryAgent "@PREFIX@/bin/procmail -d %u"
-
- #
- # SMTP or LMTP Delivery: Alternatively, you may wish to use SMTP or LMTP
-@@ -76,7 +76,7 @@
- # a quarantine agent which will be called with all messages DSPAM thinks is
- # spam. Use %u to specify the user DSPAM is processing mail for.
- #
--#QuarantineAgent "/usr/bin/procmail -d spam"
-+#QuarantineAgent "@PREFIX@/bin/procmail -d spam"
-
- #
- # DSPAM can optionally process "plused users" (addresses in the user+detail
-@@ -264,7 +264,7 @@
- # Storage driver settings: Specific to a particular storage driver. Uncomment
- # the configuration specific to your installation, if applicable.
- #
--#MySQLServer /var/lib/mysql/mysql.sock
-+#MySQLServer /tmp/mysql.sock
- #MySQLPort
- #MySQLUser dspam
- #MySQLPass changeme
-@@ -633,9 +633,9 @@
- # specified. If you want the client machine to perform delivery, use
- # the --stdout option in conjunction with a local setup.
- #
--#ServerPort 24
-+#ServerPort 2400
- #ServerQueueSize 32
--#ServerPID /var/run/dspam.pid
-+#ServerPID @DSPAM_PIDDIR@/dspam.pid
-
- #
- # ServerMode specifies the type of LMTP server to start. This can be one of:
-@@ -689,7 +689,7 @@
- # If you are a reporting streamlined blackhole list participant, you can
- # touch ip addresses within the directory the rabl_client process is watching.
- #
--#RABLQueue /var/spool/rabl
-+#RABLQueue @VARBASE@/spool/rabl
-
- # DataSource: If you are using any type of data source that does not include
- # email-like headers (such as documents), uncomment the line below. This
diff --git a/mail/elm-me/DESCR b/mail/elm-me/DESCR
deleted file mode 100644
index 218865f58e5..00000000000
--- a/mail/elm-me/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
- Elm is an interactive screen-oriented mailer program that
- supersedes mail and mailx.
-
- It is itself superseeded by mutt, in the view of many people.
-
- This is the ME extended version which deals with MIME messages
- a lot better than the regular elm. The regular elm can be found
- in the mail/elm package.
diff --git a/mail/elm-me/Makefile b/mail/elm-me/Makefile
deleted file mode 100644
index 31106ca56f2..00000000000
--- a/mail/elm-me/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2007/03/17 20:43:24 rillig Exp $
-
-DISTNAME= elm-2.4ME+93
-PKGNAME= elm-me-2.4.93
-PKGREVISION= 4
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.ozone.fmi.fi/KEH/ \
- ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
- ftp://ftp.ibp.fr/pub/unix/mail/elm-me/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.instinct.org/elm/
-COMMENT= ELM Mail User Agent with ME extensions
-
-CONFLICTS= elm-[0-9]*
-
-WRKSRC= ${WRKDIR}/elm2.4.ME+.93
-HAS_CONFIGURE= YES
-CONFIGURE_ENV+= PREFIX=${PREFIX:Q} RUN_AS_BATCH=yes
-CONFIG_SHELL= ksh
-CONFIGURE_SCRIPT= ./Configure
-CONFIGURE_ARGS+= -S
-
-INSTALL_DIRS= ${WRKSRC} ${WRKSRC}/nls
-
-CONF_FILES= ${PREFIX}/lib/elm.mimetypes-dist \
- ${PREFIX}/lib/elm.mimetypes
-
-USE_TOOLS+= ksh
-
-pre-configure:
- ${CP} ${FILESDIR}/config.sh ${WRKSRC}/
- ${MV} ${WRKSRC}/nls/LANGS ${WRKSRC}/nls/LANGS.tmpl
- ${SED} -e 's:__PREFIX:'${PREFIX}':g'< ${WRKSRC}/nls/LANGS.tmpl > ${WRKSRC}/nls/LANGS
-
-post-install:
- ${INSTALL_DATA} ${FILESDIR}/elm.mimetypes \
- ${PREFIX}/lib/elm.mimetypes-dist
-
-post-configure:
- ${TOUCH} ${WRKSRC}/config.sh
- ${TOUCH} ${WRKSRC}/config.h
- ${TOUCH} ${WRKSRC}/Makefile
- ${TOUCH} ${WRKSRC}/*/Makefile
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/elm-me/PLIST b/mail/elm-me/PLIST
deleted file mode 100644
index 8e57cdf9138..00000000000
--- a/mail/elm-me/PLIST
+++ /dev/null
@@ -1,61 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/08/20 19:13:58 kristerw Exp $
-bin/answer
-bin/checkalias
-bin/elm
-bin/elmalias
-bin/fastmail
-bin/frm
-bin/listalias
-bin/messages
-bin/newalias
-bin/newmail
-bin/nfrm
-bin/printmail
-bin/readmsg
-bin/wnewmail
-lib/elm.map.bin/unidata.bin
-lib/elm-help.0
-lib/elm-help.1
-lib/elm-help.2
-lib/elm-help.3
-lib/elm.mimecharsets
-lib/elm.mimetypes-dist
-lib/elmcharset
-lib/elmrc-info
-lib/elmterminal
-lib/elmunidata
-lib/prlong
-man/cat1/answer.0
-man/cat1/checkalias.0
-man/cat1/elm.0
-man/cat1/elmalias.0
-man/cat1/elmcharset.0
-man/cat1/elmterminal.0
-man/cat1/elmunidata.0
-man/cat1/fastmail.0
-man/cat1/frm.0
-man/cat1/listalias.0
-man/cat1/messages.0
-man/cat1/newalias.0
-man/cat1/newmail.0
-man/cat1/printmail.0
-man/cat1/readmsg.0
-man/cat1/wnewmail.0
-man/man1/answer.1
-man/man1/checkalias.1
-man/man1/elm.1
-man/man1/elmalias.1
-man/man1/elmcharset.1
-man/man1/elmterminal.1
-man/man1/elmunidata.1
-man/man1/fastmail.1
-man/man1/frm.1
-man/man1/listalias.1
-man/man1/messages.1
-man/man1/newalias.1
-man/man1/newmail.1
-man/man1/printmail.1
-man/man1/readmsg.1
-man/man1/wnewmail.1
-share/nls/C/elm2.4me+.cat
-@dirrm lib/elm.map.bin
diff --git a/mail/elm-me/distinfo b/mail/elm-me/distinfo
deleted file mode 100644
index d21a5df8124..00000000000
--- a/mail/elm-me/distinfo
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/01/24 19:01:45 joerg Exp $
-
-SHA1 (elm-2.4ME+93.tar.gz) = 2ce3cee8eb7af9b73e11fb99b901357b1bd5cd4d
-RMD160 (elm-2.4ME+93.tar.gz) = 46b36b2fdc78924ffbbced66c93defa431508e29
-Size (elm-2.4ME+93.tar.gz) = 1569204 bytes
-SHA1 (patch-aa) = 22f5b0219ada56c90cd26b47e9f5beac3af00c4a
-SHA1 (patch-ab) = 288893a202522d3197cd5092273c1dfbcd31f3da
-SHA1 (patch-ac) = c76cbb5adc548bdc68fc860063e5280ff90d7e59
-SHA1 (patch-ad) = 98ee3d32f14b3bd8709137a25c598d6799973fbf
-SHA1 (patch-ae) = 600dbb380442dcbaef51c69d81847b400538bf0f
-SHA1 (patch-af) = 151dff5495f622431d288da0e9b7aa0f1ae5a241
-SHA1 (patch-ag) = 316a97abe0ee2d49fd5e776c3db59caca4057b41
-SHA1 (patch-ah) = 97c196e30e3136d72c832bacc517610cc242c685
-SHA1 (patch-ai) = edfd73e58d16496ab4ffd49d04db629406c78e82
-SHA1 (patch-aj) = 5acad9a35bb82dfea4ee344004c7b554e5badeba
-SHA1 (patch-ak) = 18895f7cae925d582799f87d3bcab36d9a6f4f84
-SHA1 (patch-al) = 819b52ce87a85cc99139bce38376b2812438514c
-SHA1 (patch-am) = 0e368c7ec8f51d1847199691d97f3d29b7568937
-SHA1 (patch-an) = 6b01f3b01fc041adcc8b7d3a81f5b9a60cc58c6a
-SHA1 (patch-ao) = 95d5825723593af0612a012879daca3d54a9ac2b
-SHA1 (patch-ap) = 2b5b25795a9c223d59ede31eeae77baccee9f6cf
-SHA1 (patch-aq) = ff2b66985c4bacbccd6141a85f8321cac0ce33b0
-SHA1 (patch-ar) = fe4f39fc8d5833f202cc1cee59cccd6a39f5f8e1
-SHA1 (patch-as) = 25c5d00d4cb82c317c7c13f5132774a1cf1b41d8
-SHA1 (patch-at) = 0b3356cde820c45a7f2e3381b44b84459ff7e719
-SHA1 (patch-au) = 0b42703ed5d2aa1984e3ea37c0e65ac5b0a78a57
-SHA1 (patch-av) = 7aa7e486dbc8cdf030af84f96f58357154bdc41b
-SHA1 (patch-aw) = 52995929a717075e85b8950f9a7731d43744dd19
-SHA1 (patch-ax) = 47d3ecfc7e17e53fe7f6d7a1638381bf613939ca
-SHA1 (patch-ay) = 549b87f8f524f4ab5a743f17f70f5fa9b8ec309a
-SHA1 (patch-az) = 0f046bccf49c33121bf5e838df8115dfba3f5206
-SHA1 (patch-ba) = 86c300c228dcf8a60c3fae86a8118809ad9185ae
-SHA1 (patch-bb) = ba9a5645f5dbc66723e8a6b21666b4009fe31f66
-SHA1 (patch-bc) = f59e857f03ed61f7f8f0eca25ab510d21acc8765
-SHA1 (patch-bd) = d9c0b19336d3363f6ce1a840b7c10f86ad45b753
-SHA1 (patch-be) = 3d0ae68383c0e538d658dc67276d930468d614b7
-SHA1 (patch-bf) = 667192bee7105820fc046502e19da0fbac2a3b8f
-SHA1 (patch-bg) = 2cad34e20f4a38a9835f241c7aac82d5b320e566
-SHA1 (patch-bh) = 4586113e27241df73c1acf834da54a41bc865f3d
-SHA1 (patch-bi) = 47412cc55ba2d606df33695c14a5b19320e09d62
-SHA1 (patch-bj) = 443893dcd5a8cec17113006be1370d83bf1701a9
-SHA1 (patch-bk) = f1c742b8ce22b4d6b70e480fb18b15fb08fb4c0d
-SHA1 (patch-bl) = af5354cf321016ce71a553ad4c654934085290a7
-SHA1 (patch-bm) = cf1c3728221b710c8d2b59c113688da92834554c
-SHA1 (patch-bn) = a9b834397937f3f019df6a910a8605ae7524c5d3
-SHA1 (patch-bo) = 05c76ccee71e5ef1dc5fe605f1482a05c0764031
-SHA1 (patch-bp) = 7ed6e52d0da61a373a4c8b112ad68fb7e2ce744e
-SHA1 (patch-bq) = 66eaab4619f41f40e97b5a314516a8432488c3b2
-SHA1 (patch-br) = da014af91c9aec10f0316e5b0356399cec095c07
-SHA1 (patch-bs) = 575dc1b1f0129dfe259e41c3cfa8f67cfaf53cd9
-SHA1 (patch-bt) = 3ea76a3f45fa1f829456b5ef4538a8c3bafa29de
-SHA1 (patch-bu) = a8994b51e0f38f764b8fae680b7b7c216af1220e
-SHA1 (patch-bv) = dc11b6ef449d041ff63055924686d2da2138088f
-SHA1 (patch-bw) = 6c8137077208222b8bc7d2bf82263f97b9c3174f
-SHA1 (patch-bx) = d27f3d8751b6eb1c1df5407da321f73d629d316b
-SHA1 (patch-by) = 0baf2c89ebb8117b989a8e5e2f96df4e9e2c0d6c
-SHA1 (patch-bz) = 68063c8a1e11844ec917d56b5e614ed8a357a212
-SHA1 (patch-ca) = df5ea5f20ffc2c26f8ba2cd5d3a341fbd0ec6f54
-SHA1 (patch-cb) = 2f9dde23fbe375be32d91b6df60c81427c7bf3d0
-SHA1 (patch-cc) = 59cae75adfd90c2a14f6c55e83b36bc701cbed97
-SHA1 (patch-cd) = 63f9d58211888d9383e0b2b3d62c0d08ff94d78b
-SHA1 (patch-ce) = 3b692fb3814ceca41c3ba192398468166b46d64b
diff --git a/mail/elm-me/files/config.sh b/mail/elm-me/files/config.sh
deleted file mode 100644
index dc2e90174e2..00000000000
--- a/mail/elm-me/files/config.sh
+++ /dev/null
@@ -1,323 +0,0 @@
-#!/bin/sh
-# config.sh
-# This file was produced by running the Configure script.
-
-Log='$Log'
-Header='$Header'
-intstall_prefix="${PREFIX}/"
-bin="${PREFIX}/bin"
-contains='grep'
-cppstdin='/usr/bin/cpp'
-cppminus=''
-d_getopt='define'
-d_memcpy='define'
-d_symlink='define'
-d_whoami='undef'
-d_poll='define'
-d_select='define'
-i_sys_select='define'
-d_mmap='define'
-d_socket='define'
-d_connect_reopen='undef'
-d_netdb='define'
-d_netinet_in='define'
-d_use_aton='undef'
-d_inttypes='define'
-d_nointtypes='undef'
-n='-n'
-c=''
-orderlib='false'
-ranlib=':'
-package='elm2.4me+'
-pager='builtin++'
-startsh='#!/bin/sh'
-define='define'
-loclist='
-cat
-chgrp
-chmod
-cp
-dirname
-echo
-expr
-egrep
-grep
-fgrep
-head
-ln
-ls
-make
-mv
-rm
-sed
-sleep
-touch
-tr
-cut
-'
-expr='/bin/expr'
-sed='/usr/bin/sed'
-echo='/bin/echo'
-cat='/bin/cat'
-rm='/bin/rm'
-mv='/bin/mv'
-cp='/bin/cp'
-tail=''
-tr='/usr/bin/tr'
-sort=''
-uniq=''
-grep='/usr/bin/grep'
-fgrep='/usr/bin/fgrep'
-head='/usr/bin/head'
-trylist='
-Mcc
-compress
-cpp
-date
-emacs
-execmail
-finger
-gpg
-ispell
-line
-lint
-lp
-locale
-lpr
-mailx
-metamail
-mips
-more
-nroff
-pack
-pg
-pgp
-pmake
-pr
-rmail
-sendmail
-shar
-smail
-submit
-tar
-tbl
-test
-troff
-gtroff
-uname
-uuname
-vi
-'
-test='test'
-inews=''
-ispell='ispell'
-egrep='/usr/bin/egrep'
-more='/usr/bin/more'
-pg='pg'
-Mcc='Mcc'
-vi='/usr/bin/vi'
-mailx='/usr/bin/mailx'
-mail=''
-cpp='/usr/bin/cpp'
-perl=''
-emacs='emacs'
-ls='/bin/ls'
-rmail='/bin/rmail'
-sendmail='/usr/sbin/sendmail'
-shar='/usr/bin/shar'
-smail='smail'
-submit=''
-tbl='/usr/bin/tbl'
-troff='/usr/bin/troff'
-nroff='/usr/bin/nroff'
-uname='/usr/bin/uname'
-uuname='/usr/bin/uuname'
-line='line'
-chgrp='/usr/bin/chgrp'
-chmod='/bin/chmod'
-lint='/usr/bin/lint'
-sleep='/bin/sleep'
-pr='/usr/bin/pr'
-tar='/usr/bin/tar'
-ln='/bin/ln'
-lpr='/usr/bin/lpr'
-lp='/usr/bin/lp'
-touch='/usr/bin/touch'
-make='/usr/bin/make'
-date='/bin/date'
-csh=''
-pmake='pmake'
-mips='false'
-col=''
-pack='pack'
-compress='/usr/bin/compress'
-execmail=''
-libswanted='sun intl nls c_s'
-c_date='Wed Jul 18 20:10:50 MEST 2001'
-d_ascii='undef'
-d_broke_ctype='undef'
-d_calendar='define'
-calendar='calendar'
-d_chown_neg1='define'
-d_content='undef'
-d_crypt='define'
-cryptlib='-lcrypt'
-d_cuserid='undef'
-d_disphost='undef'
-d_domname='define'
-d_usegetdom='define'
-d_errlst='undef'
-d_flock='define'
-d_dotlock='define'
-d_fcntlock='undef'
-has_flock='define'
-has_fcntl='define'
-d_ftruncate='define'
-d_gethname='define'
-d_douname='undef'
-d_host_comp='undef'
-ign_hname='n'
-d_havetlib='define'
-termlib='-ltermlib'
-i_curses='undef'
-i_term='undef'
-d_index='define'
-d_internet=''
-d_ispell='define'
-ispell_path='ispell'
-ispell_options='-x'
-d_locale='define'
-d_nl_types='define'
-d_msgcat='define'
-d_usenls='define'
-d_mallocvoid='define'
-d_mboxedit='undef'
-metamail_path='none'
-defencoding=''
-d_8bitmime='undef'
-d_binarymime='undef'
-d_dsn='define'
-defsystemcharset='ISO-8859-1'
-d_mmdf='undef'
-d_newauto='define'
-d_noaddfrom='define'
-d_usedomain='undef'
-d_noxheader='undef'
-d_pidcheck='define'
-d_ptem='undef'
-d_putenv='define'
-maxattempts='6'
-d_setgid='undef'
-d_savegrpmboxid='undef'
-mailermode='755'
-d_sigvec='undef'
-d_sigvectr='undef'
-d_sigset='undef'
-d_sighold='undef'
-d_sigprocmask='define'
-d_sigblock='undef'
-d_waitpid='define'
-d_sigaction='define'
-d_strcspn='define'
-d_strspn='define'
-d_strpbrk='define'
-d_strerror='define'
-d_strftime='define'
-d_strings='undef'
-d_pwdinsys='undef'
-strings='/usr/include/string.h'
-includepath=''
-d_strstr='define'
-d_strtok='define'
-d_subshell='define'
-d_tempnam='define'
-d_setlinebuf='define'
-d_shared='undef'
-d_shared_rev=''
-d_dlopen_libs='undef'
-shared_list=''
-d_dynamic_main='define'
-dynamic_opt='-rdynamic'
-dlopen_lib=""
-rpath_opt='-Xlinker -rpath -Xlinker '
-soname_opt='-shared -Xlinker -soname='
-tempnamo=''
-tempnamc=''
-d_termio='undef'
-d_termios='define'
-d_utimbuf='define'
-d_vfork='define'
-d_directory='define'
-d_directyry_type='USE_DIRENT'
-defbatsub='no subject (file transmission)'
-defeditor='/usr/bin/vi'
-editoropts=''
-hostname="${Hostname}"
-phostname='hostname'
-mydomain="${Domain}"
-autohostname='define'
-i_memory='define'
-i_time='define'
-i_systime='define'
-d_systimekernel='undef'
-i_unistd='define'
-i_utime='define'
-i_sysutime='undef'
-lib="${PREFIX}/lib"
-shlib='/usr/local/lib'
-libdirname='lib'
-libc='/usr/lib/libc.so.12.40'
-linepr='/usr/bin/lp'
-maildir='/var/mail'
-mailer='/usr/sbin/sendmail'
-mailgrp='wheel'
-mansrc="${PREFIX}/man/man1"
-catmansrc="${PREFIX}/man/cat1"
-manext='.1'
-manext_choice='.1'
-catmanext='.0'
-catmanext_choice='.0'
-packed='n'
-manroff='/usr/bin/nroff'
-manroffopts=''
-suffix=''
-packer=''
-optimize='-O'
-ccflags=''
-cppflags=''
-ldflags='-s ${LDFLAGS}'
-cc='cc'
-libs='-lintl'
-nametype='bsd'
-d_passnames='define'
-d_berknames='define'
-d_usgnames='undef'
-# passcat=''
-rmttape='unknown-remote-tape-unit'
-roff='/usr/bin/troff'
-roffopts=''
-sigtype='void'
-spitshell='cat'
-shsharp='true'
-sharpbang='#!'
-tmpdir='/tmp'
-tzname_handling='TM_ZONE'
-use_pmake='n'
-xencf=''
-xenlf=''
-d_xenix='undef'
-d_bsd='define'
-locale='locale'
-d_pgp='define'
-pgp='pgp'
-pgp2_path='pgp5'
-pgp5_dir="${PREFIX}/bin/"
-gpg_path='gpg'
-special_path="${PREFIX}/bin"
-locale_dir='/usr/share/locale'
-CONFIG=true
-# Support for TLS
-tls_ok='undef'
-tls_dir='none'
-tls_include_dir=''
-tls_lib_dir=''
diff --git a/mail/elm-me/files/elm.mimetypes b/mail/elm-me/files/elm.mimetypes
deleted file mode 100644
index f121812d6ec..00000000000
--- a/mail/elm-me/files/elm.mimetypes
+++ /dev/null
@@ -1,98 +0,0 @@
-# application/activemessage
-# application/andrew-inset
-# application/applefile
-# application/atomicmail
-# application/dca-rft
-# application/dec-dx
-# application/mac-binhex40
-# application/macwriteii
-doc application/msword
-# application/news-message-id
-# application/news-transmission
-bin application/octet-stream
-exe application/octet-stream
-oda application/oda
-pdf application/pdf
-ai application/postscript
-eps application/postscript
-ps application/postscript
-# application/remote-printing
-rtf application/rtf
-# application/slate
-mif application/x-mif
-# application/wita
-# application/wordperfect5.1
-csh application/x-csh
-dvi application/x-dvi
-gz application/x-gzip
-hdf application/x-hdf
-latex application/x-latex
-nc application/x-netcdf
-cdf application/x-netcdf
-sh application/x-sh
-tcl application/x-tcl
-tex application/x-tex
-texi application/x-texinfo
-texinfo application/x-texinfo
-t application/x-troff
-tr application/x-troff
-roff application/x-troff
-man application/x-troff-man
-me application/x-troff-me
-ms application/x-troff-ms
-src application/x-wais-source
-zip application/zip
-bcpio application/x-bcpio
-cpio application/x-cpio
-tgz application/x-gtar
-shar application/x-shar
-# application/x-sv4cpio
-# application/x-sv4crc
-tar application/x-tar
-ustar application/x-ustar
-au audio/basic
-snd audio/basic
-aif audio/x-aiff
-aiff audio/x-aiff
-aifc audio/x-aiff
-wav audio/x-wav
-gif image/gif
-ief image/ief
-jpeg image/jpeg
-jpg image/jpeg
-jpe image/jpeg
-tiff image/tiff
-tif image/tiff
-ras image/x-cmu-raster
-pnm image/x-portable-anymap
-pbm image/x-portable-bitmap
-pgm image/x-portable-graymap
-ppm image/x-portable-pixmap
-rgb image/x-rgb
-xbm image/x-xbitmap
-xpm image/x-xpixmap
-xwd image/x-xwindowdump
-# message/external-body
-# message/news
-# message/partial
-# message/rfc822
-# multipart/alternative
-# multipart/appledouble
-# multipart/digest
-# multipart/mixed
-# multipart/parallel
-html text/html
-htm text/html
-txt text/plain
-rtx text/richtext
-tsv text/tab-separated-values
-etx text/x-setext
-mpeg video/mpeg
-mpg video/mpeg
-mpe video/mpeg
-qt video/quicktime
-mov video/quicktime
-avi video/x-msvideo
-movie video/x-sgi-movie
-dl video/x-dl
-fli video/x-fli
diff --git a/mail/elm-me/patches/patch-aa b/mail/elm-me/patches/patch-aa
deleted file mode 100644
index 8f50f0ee293..00000000000
--- a/mail/elm-me/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/07/18 19:59:14 martin Exp $
-
-*** nls/LANGS.old Sun Jun 28 04:32:25 1992
---- nls/LANGS Fri Jul 28 06:48:31 1995
-***************
-*** 1,5 ****
- # LANGS file
-
-! C/C/C /usr/local/nls/msg/C
-! english/us/ascii /usr/local/nls/msg/english
-! french/canada/8859 /usr/local/nls/msg/french
---- 1,5 ----
- # LANGS file
-
-! C/C/C __PREFIX/share/nls/C
-! english/us/ascii __PREFIX/share/nls/en_US.ISO_8859-1
-! french/canada/8859 __PREFIX/share/nls/fr_FR.ISO_8859-1
diff --git a/mail/elm-me/patches/patch-ab b/mail/elm-me/patches/patch-ab
deleted file mode 100644
index 68039ccf894..00000000000
--- a/mail/elm-me/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/07/18 19:59:14 martin Exp $
-
---- nls/Makefile.orig Thu Nov 18 14:41:07 1999
-+++ nls/Makefile Thu Nov 18 14:46:27 1999
-@@ -3,7 +3,7 @@
- #
- LANGFILE=LANGS
- CATNAME=elm2.4me+.cat
--GENCAT= nls/gencat
-+GENCAT= gencat
-
- HDIR= ../hdrs
- SDIR= C/C/C
diff --git a/mail/elm-me/patches/patch-ac b/mail/elm-me/patches/patch-ac
deleted file mode 100644
index bfbd6da78ad..00000000000
--- a/mail/elm-me/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/07/18 19:59:14 martin Exp $
-
---- Configure.orig Sun Jun 4 17:21:26 2000
-+++ Configure Sun Jun 4 17:22:17 2000
-@@ -15,7 +15,7 @@
- PATH=".:$PATH:/bin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin"
- export PATH || (echo "OOPS, this isn't sh. Desperation time. I will feed myself to sh."; sh $0; kill $$)
-
--if test ! -t 0; then
-+if test "X$RUN_AS_BATCH" = "X" -a ! -t 0; then
- echo "Say 'sh Configure', not 'sh <Configure'"
- exit 1
- fi
diff --git a/mail/elm-me/patches/patch-ad b/mail/elm-me/patches/patch-ad
deleted file mode 100644
index 492a180f859..00000000000
--- a/mail/elm-me/patches/patch-ad
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/01/24 19:01:45 joerg Exp $
-
---- src/pgp.c.orig Tue Jun 19 19:03:47 2001
-+++ src/pgp.c Wed Jul 18 19:22:05 2001
-@@ -19,8 +19,6 @@ DEBUG_VAR(Debug,__FILE__,"pgp");
- #include <errno.h>
- #include "menu.h"
-
--extern int errno;
--
- /* the column in which the userid begins in the 'pgp -kv' command output */
- #define PGP2_USERID_OFFSET 30
- #define PGP5_USERID_OFFSET 5
-@@ -161,7 +159,7 @@ static int GetPGPKey (name, target, targ
- char *path;
- case pgp2:
-
-- execl(pgp2_path,
-+ execlp(pgp2_path,
- pgp2_path,"+verbose=0", "+language=en", "-kv", c,
- (char *)0);
- tmp = errno;
-@@ -169,14 +167,14 @@ static int GetPGPKey (name, target, targ
- break;
- case pgp5:
- path = elm_message(FRM("%s/pgpk"),pgp5_dir);
-- execl(path,
-+ execlp(path,
- path, "+verbose=0","+language=en",
- "-l", c, (char *)0);
- tmp = errno;
- perror(path);
- break;
- case gpg:
-- execl(gpg_path,
-+ execlp(gpg_path,
- gpg_path,"--list-public-keys",c,(char *)0);
- tmp = errno;
- perror(gpg_path);
diff --git a/mail/elm-me/patches/patch-ae b/mail/elm-me/patches/patch-ae
deleted file mode 100644
index 3f59ad3dd44..00000000000
--- a/mail/elm-me/patches/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/07/18 19:59:14 martin Exp $
-
---- Makefile.SH.orig Tue Jun 19 19:03:16 2001
-+++ Makefile.SH Wed Jul 18 19:29:21 2001
-@@ -54,12 +54,12 @@
-
- # Targets that are simply executed in each subordinate makefile as is
- all install uninstall lint clean: config.h config.sh Makefile
-- cd lib; $(MAKE) $(MJ) -$(MAKEFLAGS) $@
-- cd melib; $(MAKE) $(MJ) -$(MAKEFLAGS) $@
-- cd shared_libs; $(MAKE) $(MJ) -$(MAKEFLAGS) $@
-- cd src; $(MAKE) $(MJ) -$(MAKEFLAGS) $@
-- cd utils; $(MAKE) $(MJ) -$(MAKEFLAGS) $@
-- cd doc; $(MAKE) $(MJ) -$(MAKEFLAGS) $@
-+ cd lib; $(MAKE) $(MJ) $@
-+ cd melib; $(MAKE) $(MJ) $@
-+ cd shared_libs; $(MAKE) $(MJ) $@
-+ cd src; $(MAKE) $(MJ) $@
-+ cd utils; $(MAKE) $(MJ) $@
-+ cd doc; $(MAKE) $(MJ) $@
-
- # Check that config.h is up of date
- config.h: config.h.SH config.sh
diff --git a/mail/elm-me/patches/patch-af b/mail/elm-me/patches/patch-af
deleted file mode 100644
index e807f56c7da..00000000000
--- a/mail/elm-me/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- lib/can_access.c.orig 2006-01-20 03:26:03.000000000 +0000
-+++ lib/can_access.c
-@@ -29,8 +29,6 @@ static char rcsid[] = "@(#)$Id: can_acce
- void _exit();
- #endif
-
--extern int errno; /* system error number */
--
- int can_access(file, mode)
- char *file;
- int mode;
diff --git a/mail/elm-me/patches/patch-ag b/mail/elm-me/patches/patch-ag
deleted file mode 100644
index e7bc23a3b1d..00000000000
--- a/mail/elm-me/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- lib/can_open.c.orig 2006-01-24 15:09:07.000000000 +0000
-+++ lib/can_open.c
-@@ -24,8 +24,6 @@ DEBUG_VAR(Debug,__FILE__,"file");
- void _exit();
- #endif
-
--extern int errno; /* system error number */
--
- int can_open(file, mode)
- CONST char *file, *mode;
- {
diff --git a/mail/elm-me/patches/patch-ah b/mail/elm-me/patches/patch-ah
deleted file mode 100644
index 1cf8d20279a..00000000000
--- a/mail/elm-me/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- lib/cs_binary.c.orig 2006-01-24 15:20:56.000000000 +0000
-+++ lib/cs_binary.c
-@@ -27,7 +27,6 @@ static char rcsid[] = "@(#)$Id: cs_binar
- DEBUG_VAR(Debug,__FILE__,"charset");
-
- #include <errno.h>
--extern int errno;
-
- static unsigned char *s2us P_((char *str));
- static unsigned char *s2us(str)
diff --git a/mail/elm-me/patches/patch-ai b/mail/elm-me/patches/patch-ai
deleted file mode 100644
index cf94b603d23..00000000000
--- a/mail/elm-me/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- lib/imap.c.orig 2006-01-24 15:23:12.000000000 +0000
-+++ lib/imap.c
-@@ -44,8 +44,6 @@ static CONST unsigned char *cs2us(str)
-
- #include <errno.h>
-
--extern int errno;
--
- static void cache_zero_imap P_((struct connection_cache *c));
- static void cache_free_imap P_((struct connection_cache *c));
- static int cache_open_imap P_((struct connection_cache *c));
diff --git a/mail/elm-me/patches/patch-aj b/mail/elm-me/patches/patch-aj
deleted file mode 100644
index ffa8f748a8a..00000000000
--- a/mail/elm-me/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- lib/localmbx.c.orig 2006-01-24 15:24:32.000000000 +0000
-+++ lib/localmbx.c
-@@ -52,7 +52,6 @@ static char *us2s(str)
- #endif
-
- #include <errno.h>
--extern int errno;
-
- static int GrabRead_the_file P_((int flock_fd));
-
diff --git a/mail/elm-me/patches/patch-ak b/mail/elm-me/patches/patch-ak
deleted file mode 100644
index 563058213a3..00000000000
--- a/mail/elm-me/patches/patch-ak
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- lib/mbox.c.orig 2006-01-24 15:25:06.000000000 +0000
-+++ lib/mbox.c
-@@ -23,7 +23,6 @@ static char rcsid[] = "@(#)$Id: mbox.c,v
- DEBUG_VAR(Debug,__FILE__,"mbox");
-
- #include <errno.h>
--extern int errno;
-
- static unsigned char *s2us P_((char *str));
- static unsigned char *s2us(str)
diff --git a/mail/elm-me/patches/patch-al b/mail/elm-me/patches/patch-al
deleted file mode 100644
index 006d873cc73..00000000000
--- a/mail/elm-me/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- lib/pop.c.orig 2006-01-24 15:29:13.000000000 +0000
-+++ lib/pop.c
-@@ -22,7 +22,6 @@ extern int h_errno;
- #endif
-
- #include <errno.h>
--extern int errno;
-
- #define POP_TIMEOUT 25
-
diff --git a/mail/elm-me/patches/patch-am b/mail/elm-me/patches/patch-am
deleted file mode 100644
index 7412f221e2d..00000000000
--- a/mail/elm-me/patches/patch-am
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-am,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- lib/remote_mbx.c.orig 2006-01-24 15:29:50.000000000 +0000
-+++ lib/remote_mbx.c
-@@ -171,7 +171,6 @@ extern int h_errno;
- #endif
-
- #include <errno.h>
--extern int errno;
-
- void zero_remote_account(ra)
- struct remote_account *ra;
diff --git a/mail/elm-me/patches/patch-an b/mail/elm-me/patches/patch-an
deleted file mode 100644
index bea2f2125ec..00000000000
--- a/mail/elm-me/patches/patch-an
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-an,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- lib/savefolder.c.orig 2006-01-24 15:32:41.000000000 +0000
-+++ lib/savefolder.c
-@@ -45,7 +45,6 @@ static int change_type P_((struct folder
- /* Dummy browser */
-
- #include <errno.h>
--extern int errno;
-
- static void browser_zero_dummy P_((struct folder_browser *dir));
- static void browser_zero_dummy(dir)
diff --git a/mail/elm-me/patches/patch-ao b/mail/elm-me/patches/patch-ao
deleted file mode 100644
index 529af6c4755..00000000000
--- a/mail/elm-me/patches/patch-ao
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- lib/sb_file.c.orig 2006-01-24 15:55:42.000000000 +0000
-+++ lib/sb_file.c
-@@ -11,7 +11,6 @@ static char rcsid[] = "@(#)$Id: sb_file.
- #include "sb_imp.h"
-
- #include <errno.h>
--extern int errno;
-
- DEBUG_VAR(Debug,__FILE__,"charset");
-
diff --git a/mail/elm-me/patches/patch-ap b/mail/elm-me/patches/patch-ap
deleted file mode 100644
index 6ebc20971ab..00000000000
--- a/mail/elm-me/patches/patch-ap
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- lib/schedule.c.orig 2006-01-24 15:57:40.000000000 +0000
-+++ lib/schedule.c
-@@ -11,7 +11,6 @@ static char rcsid[] = "@(#)$Id: schedule
- DEBUG_VAR(Debug,__FILE__,"net");
-
- #include <errno.h>
--extern int errno;
-
- VOLATILE int wait_can_signal = 0;
-
diff --git a/mail/elm-me/patches/patch-aq b/mail/elm-me/patches/patch-aq
deleted file mode 100644
index 363c6dc1518..00000000000
--- a/mail/elm-me/patches/patch-aq
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- lib/service_list.c.orig 2006-01-24 15:58:10.000000000 +0000
-+++ lib/service_list.c
-@@ -23,7 +23,6 @@ extern int h_errno;
- #endif
-
- #include <errno.h>
--extern int errno;
-
- static int valid_option_type P_((struct SE_option_type *t));
- static int valid_option_type(t)
diff --git a/mail/elm-me/patches/patch-ar b/mail/elm-me/patches/patch-ar
deleted file mode 100644
index ed625e640a2..00000000000
--- a/mail/elm-me/patches/patch-ar
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- lib/streamsched.c.orig 2006-01-24 15:58:37.000000000 +0000
-+++ lib/streamsched.c
-@@ -15,7 +15,6 @@ static char rcsid[] = "@(#)$Id: streamsc
- DEBUG_VAR(Debug,__FILE__,"net");
-
- #include <errno.h>
--extern int errno;
-
- #ifdef POLL_METHOD
-
diff --git a/mail/elm-me/patches/patch-as b/mail/elm-me/patches/patch-as
deleted file mode 100644
index ab4377aefe7..00000000000
--- a/mail/elm-me/patches/patch-as
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-as,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- lib/stringbuffer.c.orig 2006-01-24 15:59:05.000000000 +0000
-+++ lib/stringbuffer.c
-@@ -13,7 +13,6 @@ static char rcsid[] = "@(#)$Id: stringbu
- DEBUG_VAR(Debug,__FILE__,"charset");
-
- #include <errno.h>
--extern int errno;
-
- static int valid_magic P_((struct sb_type *magic));
-
diff --git a/mail/elm-me/patches/patch-at b/mail/elm-me/patches/patch-at
deleted file mode 100644
index 306aa22be65..00000000000
--- a/mail/elm-me/patches/patch-at
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-at,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- lib/terminal.c.orig 2006-01-24 15:59:30.000000000 +0000
-+++ lib/terminal.c
-@@ -13,7 +13,6 @@ static char rcsid[] = "@(#)$Id: terminal
- DEBUG_VAR(Debug,__FILE__,"charset");
-
- #include <errno.h>
--extern int errno;
-
- static enum terminal_map_keyword get_keyword P_((const char *word));
-
diff --git a/mail/elm-me/patches/patch-au b/mail/elm-me/patches/patch-au
deleted file mode 100644
index fa2b7a5b9b6..00000000000
--- a/mail/elm-me/patches/patch-au
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- melib/pgp_decode.c.orig 2006-01-24 17:07:43.000000000 +0000
-+++ melib/pgp_decode.c
-@@ -19,8 +19,6 @@ DEBUG_VAR(Debug,__FILE__,"pgp");
- #include <sys/time.h>
- #include <errno.h>
-
--extern int errno;
--
- extern int pgp_keeppassfor; /* 5 minutes */
- char pgp_passphrase[PGP_NUM][STRING];
- int pgp_expires;
diff --git a/mail/elm-me/patches/patch-av b/mail/elm-me/patches/patch-av
deleted file mode 100644
index fd44919fed9..00000000000
--- a/mail/elm-me/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/alias.c.orig 2006-01-24 17:08:31.000000000 +0000
-+++ src/alias.c
-@@ -67,8 +67,6 @@ static int get_one_alias P_((DBZ *db, in
-
- extern int is_system; /* system file updating? */
-
--extern int errno;
--
- int current_mail_message;
- int num_duplicates;
- DBZ *system_hash = NULL, *user_hash = NULL;
diff --git a/mail/elm-me/patches/patch-aw b/mail/elm-me/patches/patch-aw
deleted file mode 100644
index 3f8e17b3978..00000000000
--- a/mail/elm-me/patches/patch-aw
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/attach_menu.c.orig 2006-01-24 17:09:31.000000000 +0000
-+++ src/attach_menu.c
-@@ -17,7 +17,6 @@ DEBUG_VAR(Debug,__FILE__,"mime");
-
- #include <sys/errno.h>
-
--extern int errno;
- extern int elm_COLUMNS;
-
- static unsigned char *s2us P_((char *str));
diff --git a/mail/elm-me/patches/patch-ax b/mail/elm-me/patches/patch-ax
deleted file mode 100644
index f145951e5f7..00000000000
--- a/mail/elm-me/patches/patch-ax
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/a_quit.c.orig 2006-01-24 17:10:04.000000000 +0000
-+++ src/a_quit.c
-@@ -23,8 +23,6 @@ static char rcsid[] = "@(#)$Id: a_quit.c
- DEBUG_VAR(Debug,__FILE__,"alias");
-
-
--extern int errno; /* system error number on failure */
--
- int delete_aliases(newaliases, prompt)
- int newaliases, prompt;
- {
diff --git a/mail/elm-me/patches/patch-ay b/mail/elm-me/patches/patch-ay
deleted file mode 100644
index aab188d4875..00000000000
--- a/mail/elm-me/patches/patch-ay
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/calendar.c.orig 2006-01-24 17:10:37.000000000 +0000
-+++ src/calendar.c
-@@ -34,8 +34,6 @@ DEBUG_VAR(Debug,__FILE__,"misc");
- #include <errno.h>
- #include <s_error.h>
-
--extern int errno;
--
- char *error_description();
-
- static int extract_info P_((FILE *save_to_fd));
diff --git a/mail/elm-me/patches/patch-az b/mail/elm-me/patches/patch-az
deleted file mode 100644
index 52302b9b31d..00000000000
--- a/mail/elm-me/patches/patch-az
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-az,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/edit.c.orig 2006-01-24 17:17:56.000000000 +0000
-+++ src/edit.c
-@@ -21,8 +21,6 @@ static char rcsid[] = "@(#)$Id: edit.c,v
- #include <errno.h>
- #include "me.h"
-
--extern int errno;
--
- char *error_description();
- long bytes();
-
diff --git a/mail/elm-me/patches/patch-ba b/mail/elm-me/patches/patch-ba
deleted file mode 100644
index fb046e21da6..00000000000
--- a/mail/elm-me/patches/patch-ba
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/editmsg.c.orig 2006-01-24 17:18:32.000000000 +0000
-+++ src/editmsg.c
-@@ -28,7 +28,6 @@ long fsize();
- /* The built-in editor is not re-entrant! */
- static int builtin_editor_active = FALSE;
- static char *simple_continue = NULL;
--extern int errno;
-
- int interrupts_while_editing; /* keep track 'o dis stuff */
- JMP_BUF edit_location; /* for getting back from interrupt */
diff --git a/mail/elm-me/patches/patch-bb b/mail/elm-me/patches/patch-bb
deleted file mode 100644
index e6c49892cf3..00000000000
--- a/mail/elm-me/patches/patch-bb
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/elm.c.orig 2006-01-24 17:18:55.000000000 +0000
-+++ src/elm.c
-@@ -15,6 +15,7 @@ static char rcsid[] = "@(#)$Id: elm.c,v
- /* Main program of the ELM mail system!
- */
-
-+#include <errno.h>
- #include "patchlevel.h"
- #include "elm.h"
- #include "s_elm.h"
-@@ -90,7 +91,6 @@ int main(argc, argv)
- char **to_whom = NULL;
- int bytes;
- int i,j; /** Random counting variables (etc) **/
-- extern int errno;
-
- set_panic_prepare(elm_panic_prepare);
- set_panic_exit(elm_panic_exit);
diff --git a/mail/elm-me/patches/patch-bc b/mail/elm-me/patches/patch-bc
deleted file mode 100644
index 957299636ce..00000000000
--- a/mail/elm-me/patches/patch-bc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/file.c.orig 2006-01-24 17:19:36.000000000 +0000
-+++ src/file.c
-@@ -28,8 +28,6 @@ static char rcsid[] = "@(#)$Id: file.c,v
-
- DEBUG_VAR(Debug,__FILE__,"mbox");
-
--extern int errno;
--
- static int save_message P_((int number,
- struct folder_browser * XXX,
- struct string * name,
diff --git a/mail/elm-me/patches/patch-bd b/mail/elm-me/patches/patch-bd
deleted file mode 100644
index e4baef96ed4..00000000000
--- a/mail/elm-me/patches/patch-bd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/file_util.c.orig 2006-01-24 17:20:01.000000000 +0000
-+++ src/file_util.c
-@@ -22,8 +22,6 @@ static char rcsid[] = "@(#)$Id: file_uti
-
- DEBUG_VAR(Debug,__FILE__,"mbox");
-
--extern int errno; /* system error number */
--
- char *error_description(), *getlogin();
- long fsize();
-
diff --git a/mail/elm-me/patches/patch-be b/mail/elm-me/patches/patch-be
deleted file mode 100644
index fbf19e1e2cc..00000000000
--- a/mail/elm-me/patches/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-be,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/fileio.c.orig 2006-01-24 17:22:00.000000000 +0000
-+++ src/fileio.c
-@@ -25,8 +25,6 @@ DEBUG_VAR(Debug,__FILE__,"mbox");
- DEBUG_VAR(PgpDebug,__FILE__,"pgp");
- DEBUG_VAR(MimeDebug,__FILE__,"mime");
-
--extern int errno;
--
- char *error_description();
-
- #ifdef USE_PGP
diff --git a/mail/elm-me/patches/patch-bf b/mail/elm-me/patches/patch-bf
deleted file mode 100644
index 7b5c18a3e0e..00000000000
--- a/mail/elm-me/patches/patch-bf
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/forms.c.orig 2006-01-24 17:26:00.000000000 +0000
-+++ src/forms.c
-@@ -44,8 +44,6 @@ static char rcsid[] = "@(#)$Id: forms.c,
-
- DEBUG_VAR(Debug,__FILE__,"misc");
-
--extern int errno;
--
- char *error_description();
-
- static void prompt_for_sized_entry P_((char *prompt, char *buffer,
diff --git a/mail/elm-me/patches/patch-bg b/mail/elm-me/patches/patch-bg
deleted file mode 100644
index a2af8c7db25..00000000000
--- a/mail/elm-me/patches/patch-bg
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bg,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/in_utils.c.orig 2006-01-24 17:27:11.000000000 +0000
-+++ src/in_utils.c
-@@ -35,7 +35,6 @@ static char *us2s(str)
- return (char *)str;
- }
-
--extern int errno; /* system error number */
- extern int tabspacing;
-
- unsigned alarm();
diff --git a/mail/elm-me/patches/patch-bh b/mail/elm-me/patches/patch-bh
deleted file mode 100644
index 40e28f473df..00000000000
--- a/mail/elm-me/patches/patch-bh
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bh,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/init.c.orig 2006-01-24 17:29:29.000000000 +0000
-+++ src/init.c
-@@ -62,7 +62,6 @@ static int tcgetattr P_((int,term_buff *
-
- #include <errno.h>
-
--extern int errno; /* system error number on failure */
- extern char version_buff[];
-
- char *error_description();
diff --git a/mail/elm-me/patches/patch-bi b/mail/elm-me/patches/patch-bi
deleted file mode 100644
index a702484bd60..00000000000
--- a/mail/elm-me/patches/patch-bi
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bi,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/leavembox.c.orig 2006-01-24 17:29:55.000000000 +0000
-+++ src/leavembox.c
-@@ -34,8 +34,6 @@ DEBUG_VAR(Debug,__FILE__,"mbox");
- #endif
- #include <errno.h>
-
--extern int errno;
--
- char *error_description();
-
- static void block_signals P_((void));
diff --git a/mail/elm-me/patches/patch-bj b/mail/elm-me/patches/patch-bj
deleted file mode 100644
index c9165d5366c..00000000000
--- a/mail/elm-me/patches/patch-bj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bj,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/lock.c.orig 2006-01-24 17:30:18.000000000 +0000
-+++ src/lock.c
-@@ -27,8 +27,6 @@ static char rcsid[] = "@(#)$Id: lock.c,v
- #endif
- #include <errno.h>
-
--extern int errno;
--
- char *error_description();
-
- extern char *mk_lockname();
diff --git a/mail/elm-me/patches/patch-bk b/mail/elm-me/patches/patch-bk
deleted file mode 100644
index ca592a7e2ab..00000000000
--- a/mail/elm-me/patches/patch-bk
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bk,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/mailmsg2.c.orig 2006-01-24 17:30:38.000000000 +0000
-+++ src/mailmsg2.c
-@@ -38,7 +38,6 @@ static unsigned char *s2us(str)
- }
-
-
--extern int errno;
- extern char version_buff[];
-
- char *error_description();
diff --git a/mail/elm-me/patches/patch-bl b/mail/elm-me/patches/patch-bl
deleted file mode 100644
index fd4bd93efc1..00000000000
--- a/mail/elm-me/patches/patch-bl
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bl,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/metapager.c.orig 2006-01-24 17:31:10.000000000 +0000
-+++ src/metapager.c
-@@ -15,8 +15,6 @@ static char rcsid[] = "@(#)$Id: metapage
-
- DEBUG_VAR(Debug,__FILE__,"ui");
-
--extern int errno;
--
- static unsigned char *s2us P_((char *str));
- static unsigned char *s2us(str)
- char *str;
diff --git a/mail/elm-me/patches/patch-bm b/mail/elm-me/patches/patch-bm
deleted file mode 100644
index 8113cbea62d..00000000000
--- a/mail/elm-me/patches/patch-bm
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bm,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/newmbox.c.orig 2006-01-24 17:31:39.000000000 +0000
-+++ src/newmbox.c
-@@ -21,7 +21,6 @@ DEBUG_VAR(Debug,__FILE__,"mbox");
- #include <errno.h>
-
- #include "me.h" /* for defination of null_decode and text_decode */
--extern int errno;
-
- char *error_description();
- long bytes();
diff --git a/mail/elm-me/patches/patch-bn b/mail/elm-me/patches/patch-bn
deleted file mode 100644
index f3100713da8..00000000000
--- a/mail/elm-me/patches/patch-bn
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bn,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/pattern.c.orig 2006-01-24 17:32:44.000000000 +0000
-+++ src/pattern.c
-@@ -31,8 +31,6 @@ static unsigned char *s2us(str)
- static char pattern[SLEN] = { "" };
- static char alt_pattern[SLEN] = { "" };
-
--extern int errno;
--
- char *error_description(), *shift_lower();
- static char *tag_word = NULL;
- static char *tagged_word = NULL;
diff --git a/mail/elm-me/patches/patch-bo b/mail/elm-me/patches/patch-bo
deleted file mode 100644
index 6ef1f9a16b8..00000000000
--- a/mail/elm-me/patches/patch-bo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bo,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/quit.c.orig 2006-01-24 17:33:28.000000000 +0000
-+++ src/quit.c
-@@ -29,8 +29,6 @@ static char *us2s(str)
- return (char *)str;
- }
-
--extern int errno; /* system error number on failure */
--
- long bytes();
- char *error_description();
-
diff --git a/mail/elm-me/patches/patch-bp b/mail/elm-me/patches/patch-bp
deleted file mode 100644
index 8a9540b5711..00000000000
--- a/mail/elm-me/patches/patch-bp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bp,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/read_rc.c.orig 2006-01-24 17:34:34.000000000 +0000
-+++ src/read_rc.c
-@@ -96,7 +96,6 @@ OR:
- DEBUG_VAR(Debug,__FILE__,"config");
-
- extern opts_menu *find_cfg_opts();
--extern int errno;
-
- char *error_description(), *shift_lower(), *mode_to_str();
-
diff --git a/mail/elm-me/patches/patch-bq b/mail/elm-me/patches/patch-bq
deleted file mode 100644
index 93746576ada..00000000000
--- a/mail/elm-me/patches/patch-bq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bq,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/remail.c.orig 2006-01-24 17:35:37.000000000 +0000
-+++ src/remail.c
-@@ -24,8 +24,6 @@ static char rcsid[] = "@(#)$Id: remail.c
-
- DEBUG_VAR(Debug,__FILE__,"mail");
-
--extern int errno;
--
- char *error_description();
- extern void display_to();
-
diff --git a/mail/elm-me/patches/patch-br b/mail/elm-me/patches/patch-br
deleted file mode 100644
index 278f382c975..00000000000
--- a/mail/elm-me/patches/patch-br
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-br,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/reply.c.orig 2006-01-24 17:36:10.000000000 +0000
-+++ src/reply.c
-@@ -37,8 +37,6 @@ static char *us2s(str)
-
- char *get_token();
-
--extern int errno;
--
- char *error_description();
-
- /* Prototype */
diff --git a/mail/elm-me/patches/patch-bs b/mail/elm-me/patches/patch-bs
deleted file mode 100644
index 4fa39cb5e3b..00000000000
--- a/mail/elm-me/patches/patch-bs
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bs,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/save_opts.c.orig 2006-01-24 17:36:31.000000000 +0000
-+++ src/save_opts.c
-@@ -30,7 +30,6 @@ DEBUG_VAR(Debug,__FILE__,"config");
-
- #define absolute(x) ((x) < 0? -(x) : (x))
-
--extern int errno;
- extern char version_buff[];
-
- char *error_description(), *sort_name(), *alias_sort_name(), *level_name();
diff --git a/mail/elm-me/patches/patch-bt b/mail/elm-me/patches/patch-bt
deleted file mode 100644
index 2a88be78806..00000000000
--- a/mail/elm-me/patches/patch-bt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bt,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/savecopy.c.orig 2006-01-24 17:36:52.000000000 +0000
-+++ src/savecopy.c
-@@ -26,8 +26,6 @@ DEBUG_VAR(Debug,__FILE__,"mbox");
-
- char *error_description(), *ctime();
-
--extern int errno;
--
- static unsigned char * s2us P_((char *str));
- static unsigned char * s2us(str)
- char *str;
diff --git a/mail/elm-me/patches/patch-bu b/mail/elm-me/patches/patch-bu
deleted file mode 100644
index 9295cc729ca..00000000000
--- a/mail/elm-me/patches/patch-bu
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bu,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/showmsg.c.orig 2006-01-24 17:37:17.000000000 +0000
-+++ src/showmsg.c
-@@ -22,8 +22,6 @@ static char rcsid[] = "@(#)$Id: showmsg.
-
- DEBUG_VAR(Debug,__FILE__,"ui");
-
--extern int errno;
--
- int pipe_abort = FALSE; /* not used anymore, but won't compile without it */
-
- static int need_meta (hdr)
diff --git a/mail/elm-me/patches/patch-bv b/mail/elm-me/patches/patch-bv
deleted file mode 100644
index 4fd19c85e66..00000000000
--- a/mail/elm-me/patches/patch-bv
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bv,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/syscall.c.orig 2006-01-24 17:39:48.000000000 +0000
-+++ src/syscall.c
-@@ -164,7 +164,6 @@ int system_call(string, options)
- #ifdef SIGTSTP
- register SIGHAND_TYPE (*oldstop)(), (*oldstart)();
- #endif
-- extern int errno;
-
- /* flush any pending output */
- FlushBuffer();
diff --git a/mail/elm-me/patches/patch-bw b/mail/elm-me/patches/patch-bw
deleted file mode 100644
index 89c8cca3b46..00000000000
--- a/mail/elm-me/patches/patch-bw
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bw,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/utils.c.orig 2006-01-24 17:40:08.000000000 +0000
-+++ src/utils.c
-@@ -22,8 +22,6 @@ static char rcsid[] = "@(#)$Id: utils.c,
-
- DEBUG_VAR(Debug,__FILE__,"ELM");
-
--extern int errno;
--
- void create_new_folders()
- {
- /* this creates a new folders directory */
diff --git a/mail/elm-me/patches/patch-bx b/mail/elm-me/patches/patch-bx
deleted file mode 100644
index aeaf7bd1684..00000000000
--- a/mail/elm-me/patches/patch-bx
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-bx,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/mime.c.orig 2006-01-24 17:41:13.000000000 +0000
-+++ src/mime.c
-@@ -11,15 +11,13 @@ static char rcsid[] = "@(#)$Id: mime.c,v
- * Copyright (c) 1986,1987 Dave Taylor
- *****************************************************************************/
-
--
-+#include <errno.h>
- #include "headers.h"
- #include "s_elm.h"
- #include "me.h"
-
- DEBUG_VAR(Debug,__FILE__,"mime");
-
--extern int errno;
--
- static unsigned char *s2us P_((char *str));
- static unsigned char *s2us(str)
- char *str;
diff --git a/mail/elm-me/patches/patch-by b/mail/elm-me/patches/patch-by
deleted file mode 100644
index 207d8a90574..00000000000
--- a/mail/elm-me/patches/patch-by
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-by,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/builtin++.c.orig 2006-01-24 17:40:58.000000000 +0000
-+++ src/builtin++.c
-@@ -8,13 +8,13 @@ static char rcsid[] = "@(#)$Id: builtin+
- * Initially written by: Michael Elkins <elkins@aero.org>, 1995
- *****************************************************************************/
-
-+#include <errno.h>
- #include "headers.h"
- #include "me.h"
- #include "s_elm.h"
-
- DEBUG_VAR(Debug,__FILE__,"ui");
-
--extern int errno;
- extern int tabspacing;
-
- static void builtin_help P_((void));
diff --git a/mail/elm-me/patches/patch-bz b/mail/elm-me/patches/patch-bz
deleted file mode 100644
index bc5f81a2e0b..00000000000
--- a/mail/elm-me/patches/patch-bz
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-bz,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- lib/posixsig.c.orig 2006-01-24 17:44:47.000000000 +0000
-+++ lib/posixsig.c
-@@ -15,6 +15,7 @@ static char rcsid[] = "@(#)$Id: posixsig
-
- **/
-
-+#include <errno.h>
- #include "headers.h"
-
- DEBUG_VAR(Debug,__FILE__,"signal");
-@@ -67,8 +68,6 @@ SIGHAND_TYPE
- }
- #endif /* POSIX_SIGNALS */
-
--extern int errno;
--
- #ifdef BACKGROUD_PROCESSES /* We assume POSIX in here */
-
- int my_wait (pid,statptr)
diff --git a/mail/elm-me/patches/patch-ca b/mail/elm-me/patches/patch-ca
deleted file mode 100644
index d7f8847d20d..00000000000
--- a/mail/elm-me/patches/patch-ca
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- utils/newmail.c.orig 2006-01-24 17:45:56.000000000 +0000
-+++ utils/newmail.c
-@@ -61,6 +61,7 @@ static char rcsid[] = "@(#)$Id: newmail.
-
- DEBUG_VAR(Debug,__FILE__,"util");
-
-+#include <errno.h>
- #ifdef PWDINSYS
- # include <sys/pwd.h>
- #else
-@@ -141,8 +142,6 @@ int interval_time, /* how long to slee
- int parent_pid; /* See if sucide should be attempt */
- #endif /* PIDCHECK */
-
--extern int errno;
--
- #if defined(BSD_TYPE) && !defined(UTIMBUF)
- time_t utime_buffer[2]; /* utime command */
-
-@@ -780,7 +779,6 @@ static void save_acc(name)
- /** return the number of bytes in the specified file. This
- is to check to see if new mail has arrived.... **/
-
-- extern int errno; /* system error number! */
- struct stat buffer;
-
- if (stat(name, &buffer) != 0)
diff --git a/mail/elm-me/patches/patch-cb b/mail/elm-me/patches/patch-cb
deleted file mode 100644
index 27885b921cb..00000000000
--- a/mail/elm-me/patches/patch-cb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- lib/Makefile.SH.orig 2006-01-24 18:04:57.000000000 +0000
-+++ lib/Makefile.SH
-@@ -121,7 +121,7 @@ fi
- $cat >>Makefile <<'!NO!SUBS!'
-
- # Other general variables
--CFLAGS = -I$(INCLDIR) $(CCFLAGS) $(OPTIMIZE)
-+CFLAGS += -I$(INCLDIR) $(CCFLAGS)
- INCLDIR = ../hdrs
- LINTFLAGS = -I$(INCLDIR)
- SHELL = /bin/sh
diff --git a/mail/elm-me/patches/patch-cc b/mail/elm-me/patches/patch-cc
deleted file mode 100644
index 390b32bd01e..00000000000
--- a/mail/elm-me/patches/patch-cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- melib/Makefile.SH.orig 2006-01-24 18:05:16.000000000 +0000
-+++ melib/Makefile.SH
-@@ -35,7 +35,7 @@ TAGS = ctags
-
- cat >>Makefile <<'!NO!SUBS!'
- # Other general variables
--CFLAGS = -I$(INCLDIR) $(CCFLAGS) $(OPTIMIZE) $(DEBUG)
-+CFLAGS += -I$(INCLDIR) $(CCFLAGS) $(DEBUG)
- INCLDIR = ../hdrs
- LINTFLAGS = -I$(INCLDIR)
- SHELL = /bin/sh
diff --git a/mail/elm-me/patches/patch-cd b/mail/elm-me/patches/patch-cd
deleted file mode 100644
index 846b2fdfd88..00000000000
--- a/mail/elm-me/patches/patch-cd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cd,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- src/Makefile.SH.orig 2006-01-24 18:05:41.000000000 +0000
-+++ src/Makefile.SH
-@@ -83,7 +83,7 @@ cat >>Makefile <<'!NO!SUBS!'
-
- # Other general variables
- BIN = ../bin
--CFLAGS = -I$(INCLDIR) $(CCFLAGS) $(OPTIMIZE)
-+CFLAGS += -I$(INCLDIR) $(CCFLAGS)
- INCLDIR = ../hdrs
- LINTFLAGS = -I$(INCLDIR)
- SHELL = /bin/sh
diff --git a/mail/elm-me/patches/patch-ce b/mail/elm-me/patches/patch-ce
deleted file mode 100644
index 70af08b7da4..00000000000
--- a/mail/elm-me/patches/patch-ce
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ce,v 1.1 2006/01/24 19:01:45 joerg Exp $
-
---- utils/Makefile.SH.orig 2006-01-24 18:05:58.000000000 +0000
-+++ utils/Makefile.SH
-@@ -74,7 +74,7 @@ fi
- cat >>Makefile <<'!NO!SUBS!'
- # Other general variables
- BIN = ../bin
--CFLAGS = -I$(INCLDIR) $(CCFLAGS) $(OPTIMIZE)
-+CFLAGS += -I$(INCLDIR) $(CCFLAGS)
- INCLDIR = ../hdrs
- LINTFLAGS = -I$(INCLDIR)
- SHELL = /bin/sh
diff --git a/mail/elm/DESCR b/mail/elm/DESCR
deleted file mode 100644
index ef9672d68df..00000000000
--- a/mail/elm/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-Elm is an interactive screen-oriented mailer program that
-needed no documentation for the casual user, but was still
-powerful enough and sophisticated enough for a mail expert.
-
-It is superseeded by mutt, in the view of many people.
-
-This package is the standard version of elm. Older versions
-of this package installed the ME extended version of elm, but
-this extensions are not available for the latest elm versions.
-There is another package now providing this extended, but older
-version in mail/elm-me.
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
deleted file mode 100644
index 81023d66d6e..00000000000
--- a/mail/elm/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.41 2006/03/04 21:29:59 jlam Exp $
-
-DISTNAME= elm2.5.8
-PKGNAME= elm-2.5.8
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.virginia.edu/pub/elm/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.instinct.org/elm/
-COMMENT= ELM Mail User Agent (without ME extensions)
-
-DEPENDS+= metamail>=2.7:../../mail/metamail
-
-CONFLICTS+= mm-[0-9]*
-CONFLICTS+= elm-me-[0-9]*
-
-HAS_CONFIGURE= YES
-CONFIGURE_SCRIPT= ./Configure
-CONFIGURE_ARGS+= -d
-USE_TOOLS= nroff
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == Darwin)
-LIBC= /usr/lib/libSystem.dylib
-.else
-LIBC= /usr/lib/libc.so
-.endif
-
-pre-configure:
- ${CP} ${FILESDIR}/config.sh ${WRKSRC}/config.sh.orig
- ${SED} -e 's:PREFIX:${PREFIX}:g' \
- -e 's:LOCALBASE:${LOCALBASE}:g' \
- -e 's:LIBC:${LIBC}:g' \
- ${WRKSRC}/config.sh.orig > ${WRKSRC}/config.sh
- ${MV} ${WRKSRC}/nls/LANGS ${WRKSRC}/nls/LANGS.tmpl
- ${SED} -e 's:__PREFIX:'${PREFIX}':g' < ${WRKSRC}/nls/LANGS.tmpl > ${WRKSRC}/nls/LANGS
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/elm/PLIST b/mail/elm/PLIST
deleted file mode 100644
index 5df78c4deed..00000000000
--- a/mail/elm/PLIST
+++ /dev/null
@@ -1,55 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2005/08/22 13:15:05 salo Exp $
-bin/answer
-bin/checkalias
-bin/elm
-bin/elmalias
-bin/fastmail
-bin/frm
-bin/listalias
-bin/messages
-bin/newalias
-bin/newmail
-bin/nfrm
-bin/printmail
-bin/prlong
-bin/readmsg
-bin/wnewmail
-lib/elm/elmrc-info
-lib/elm/help-alias
-lib/elm/help-attach
-lib/elm/help-fbrowser
-lib/elm/help-main
-lib/elm/help-options
-lib/elm/help-pager
-lib/elm/help-selfolder
-lib/elm/help-status
-lib/elm/mime-types
-lib/elm/mlists.eg
-man/cat1/answer.1
-man/cat1/checkalias.1
-man/cat1/elm.1
-man/cat1/elmalias.1
-man/cat1/fastmail.1
-man/cat1/frm.1
-man/cat1/listalias.1
-man/cat1/messages.1
-man/cat1/newalias.1
-man/cat1/newmail.1
-man/cat1/printmail.1
-man/cat1/readmsg.1
-man/cat1/wnewmail.1
-man/man1/answer.1
-man/man1/checkalias.1
-man/man1/elm.1
-man/man1/elmalias.1
-man/man1/fastmail.1
-man/man1/frm.1
-man/man1/listalias.1
-man/man1/messages.1
-man/man1/newalias.1
-man/man1/newmail.1
-man/man1/printmail.1
-man/man1/readmsg.1
-man/man1/wnewmail.1
-share/nls/C/elm2.5.cat
-@dirrm lib/elm
diff --git a/mail/elm/distinfo b/mail/elm/distinfo
deleted file mode 100644
index 42dee01b793..00000000000
--- a/mail/elm/distinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: distinfo,v 1.12 2006/07/17 17:41:00 wiz Exp $
-
-SHA1 (elm2.5.8.tar.gz) = bf09df75d0dc9097a1e69591bfb4872f860e00c7
-RMD160 (elm2.5.8.tar.gz) = c12dbefd0bf9d47ee4438673507a4693c4a6808c
-Size (elm2.5.8.tar.gz) = 607078 bytes
-SHA1 (patch-aa) = d84d99098d567135db05cc67899cf1df5c1780b0
-SHA1 (patch-ab) = 0d3a39f6fb0179bf75095ed7aa1910d94506fbe8
-SHA1 (patch-ac) = 3216e1f8a00200efd93ada37c8250c5277abfbfe
-SHA1 (patch-ad) = de6e99072ad6379126bb1e6d798bc2cd851a92ed
-SHA1 (patch-ae) = 1d3fa90fbe037cc8f81202b6a1ad779b74298c4d
-SHA1 (patch-af) = 7e08a1595ff31bcb1f45433d20693b4e0c5bf824
-SHA1 (patch-ag) = e7bb5d94736a7a1dd8616a7e8f88c4c5c64059d1
-SHA1 (patch-ah) = 142735922d6d58f08823dbc68540e6c9faf1eac9
-SHA1 (patch-ai) = 0564267f91fa54405c900f0d51f0f64ecc9e0277
-SHA1 (patch-aj) = e129e633f8def8cd529b03014d6818b1eb59d220
-SHA1 (patch-ak) = 7e3fe79d140cd205a910b8a9a56327dc19e3359e
-SHA1 (patch-al) = fe79a8d235c815728398e8052005755ea44c257a
-SHA1 (patch-am) = d406ae06488b85b33b03d860b37398849dce7832
diff --git a/mail/elm/files/config.sh b/mail/elm/files/config.sh
deleted file mode 100644
index 6236e50a9c3..00000000000
--- a/mail/elm/files/config.sh
+++ /dev/null
@@ -1,285 +0,0 @@
-#!/bin/sh
-# config.sh
-# This file was produced by running the Configure script.
-
-Log='$Log'
-Header='$Header'
-contains='grep'
-cppstdin='/usr/bin/cpp'
-cppminus=''
-d_getopt='define'
-d_memcpy='define'
-d_mkdir='define'
-d_rename='define'
-d_symlink='define'
-d_whoami='undef'
-n='-n'
-c=''
-orderlib='false'
-ranlib=':'
-package='elm2.5'
-pager='builtin+'
-prefshell='/bin/ksh'
-startsh='#!/bin/sh'
-d_eunice='undef'
-define='define'
-eunicefix=':'
-build_dir=''
-source_dir=''
-loclist='
-cat
-chgrp
-chmod
-cp
-echo
-expr
-grep
-ln
-ls
-mv
-rm
-sed
-sleep
-touch
-tr
-'
-expr='/bin/expr'
-sed='/usr/bin/sed'
-echo='/bin/echo'
-cat='/bin/cat'
-rm='/bin/rm'
-mv='/bin/mv'
-cp='/bin/cp'
-tail=''
-tr='/usr/bin/tr'
-mkdir=''
-sort=''
-uniq=''
-grep='/usr/bin/grep'
-trylist='
-Mcc
-compress
-cpp
-date
-emacs
-execmail
-ispell
-line
-lint
-lp
-lpr
-mips
-more
-nroff
-pack
-pg
-pr
-rmail
-sendmail
-shar
-smail
-submit
-tar
-tbl
-test
-troff
-uname
-uuname
-vi
-'
-test='test'
-inews=''
-ispell='ispell'
-egrep=''
-more='/usr/bin/more'
-pg='pg'
-Mcc='Mcc'
-vi='/usr/bin/vi'
-mailx=''
-mail=''
-cpp='/usr/bin/cpp'
-perl=''
-emacs='emacs'
-ls='/bin/ls'
-rmail='/bin/rmail'
-sendmail='/usr/sbin/sendmail'
-shar='/usr/bin/shar'
-smail=''
-submit=''
-tbl='/usr/bin/tbl'
-troff='/usr/bin/troff'
-nroff='/usr/bin/nroff'
-uname='/usr/bin/uname'
-uuname='/usr/bin/uuname'
-line='line'
-chgrp='/usr/bin/chgrp'
-chmod='/bin/chmod'
-lint='/usr/bin/lint'
-sleep='/bin/sleep'
-pr='/usr/bin/pr'
-tar='/usr/bin/tar'
-ln='/bin/ln'
-lpr='/usr/bin/lpr'
-lp='/usr/bin/lp'
-touch='/usr/bin/touch'
-make=''
-date='/bin/date'
-csh=''
-pmake=''
-mips='false'
-col=''
-pack='pack'
-bld=''
-compress='/usr/bin/compress'
-execmail=''
-libswanted='intl nls'
-bin='PREFIX/bin'
-installbin='PREFIX/bin'
-c_date='Sun Jul 1 03:59:18 JST 2001'
-d_ascii='undef'
-d_broke_ctype='define'
-d_broke_fflush='undef'
-d_calendar='define'
-calendar='calendar'
-d_chown_neg1='define'
-d_content='undef'
-d_crypt='define'
-cryptlib='/usr/lib/libcrypt.a'
-d_cuserid='undef'
-d_disphost='undef'
-d_domname='define'
-d_usegetdom='undef'
-d_errlst='define'
-d_flock='undef'
-d_dotlock='define'
-d_fcntlock='define'
-lock_dir='/var/spool/lock'
-has_flock='undef'
-has_fcntl='define'
-d_fsync='define'
-d_ftruncate='define'
-d_gethname='define'
-d_douname='undef'
-d_host_comp='undef'
-ign_hname='n'
-d_index='define'
-d_internet='define'
-d_ispell='define'
-ispell_path='LOCALBASE/bin/ispell'
-ispell_options=''
-d_locale='define'
-d_nl_types='define'
-d_msgcat='define'
-d_usenls='define'
-d_mboxedit='undef'
-d_mime='define'
-defcharset='iso-8859-1'
-defdispcharset='iso-8859-1'
-d_mmdf='undef'
-d_newauto='define'
-d_noaddfrom='define'
-d_usedomain='undef'
-d_noxheader='undef'
-d_pidcheck='define'
-d_ptem='undef'
-d_putenv='define'
-d_remlock='undef'
-maxattempts='6'
-d_setegid='define'
-d_setgid='define'
-d_savegrpmboxid='define'
-mailermode='2755'
-d_sigvec='undef'
-d_sigvectr='undef'
-d_sigset='undef'
-d_sighold='undef'
-d_sigprocmask='define'
-d_sigblock='undef'
-d_sigaction='define'
-d_statuschg='define'
-d_strcspn='define'
-d_strspn='define'
-d_strpbrk='define'
-d_strerror='define'
-d_strftime='define'
-d_strings='undef'
-d_pwdinsys='undef'
-strings='/usr/include/string.h'
-includepath=''
-d_strstr='define'
-d_strtok='define'
-d_subshell='define'
-d_tempnam='define'
-tempnamo=''
-tempnamc=''
-d_termio='undef'
-d_termios='define'
-d_useembed='define'
-d_utimbuf='define'
-d_vfork='define'
-defbatsub='no subject (file transmission)'
-defeditor='/usr/bin/vi'
-editoropts=''
-hostname=''
-phostname='hostname'
-mydomain=''
-autohostname='define'
-i_memory='define'
-i_stdarg='define'
-i_stdlib='define'
-i_time='define'
-i_systime='define'
-d_systimekernel='undef'
-i_unistd='define'
-i_utime='define'
-i_sysutime='undef'
-lib='PREFIX/lib/elm'
-installlib='PREFIX/lib/elm'
-libc='LIBC'
-linepr='/usr/bin/lp'
-maildir='/var/mail'
-mailer='/usr/sbin/sendmail'
-mailgrp='wheel'
-mansrc='PREFIX/man/man1'
-catmansrc='PREFIX/man/cat1'
-manext='.1'
-manext_choice='.1'
-catmanext='.1'
-catmanext_choice='.1'
-packed='n'
-manroff='/usr/bin/nroff'
-manroffopts=''
-suffix=''
-packer=''
-models='none'
-split=''
-small=''
-medium=''
-large=''
-huge=''
-optimize='-O2'
-ccflags='-ILOCALBASE/include'
-cppflags=' -ILOCALBASE/include'
-ldflags='-Wl,-RLOCALBASE/lib -LLOCALBASE/lib'
-cc='cc -MD'
-libs='-lintl'
-nametype='bsd'
-d_passnames='define'
-d_berknames='define'
-d_usgnames='undef'
-passcat='cat /etc/passwd'
-rmttape='unknown-remote-tape-unit'
-roff='/usr/bin/troff'
-roffopts=''
-sigtype='void'
-spitshell='cat'
-shsharp='true'
-sharpbang='#!'
-termlib=''
-tmpdir='/tmp'
-tzname_handling='UNKNOWN'
-xencf=''
-xenlf=''
-d_xenix='undef'
-d_bsd='define'
-CONFIG=true
diff --git a/mail/elm/patches/patch-aa b/mail/elm/patches/patch-aa
deleted file mode 100644
index 5a82db032aa..00000000000
--- a/mail/elm/patches/patch-aa
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/06/20 15:39:06 joerg Exp $
-
---- Configure.orig 2005-08-18 12:49:24.000000000 +0000
-+++ Configure
-@@ -18,11 +18,6 @@
- PATH=".:/bin:/usr/bin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin:$PATH"
- export PATH || (echo "OOPS, this isn't sh. Desperation time. I will feed myself to sh."; sh $0; kill $$)
-
--if test ! -t 0; then
-- echo "Say 'sh Configure', not 'sh <Configure'"
-- exit 1
--fi
--
- (alias) >/dev/null 2>&1 && \
- echo "(I see you are using the Korn shell. Some ksh's blow up on Configure," && \
- echo "especially on exotic machines. If yours does, try the Bourne shell instead.)"
-@@ -490,8 +485,8 @@ EOM
- n=''
- c='\c'
- fi
--echo $n "Type carriage return to continue. Your cursor should be here-->$c"
--read ans
-+#echo $n "Type carriage return to continue. Your cursor should be here-->$c"
-+#read ans
- rm -f .echotmp
-
- : now set up to do reads with possible shell escape and default assignment
-@@ -1997,6 +1992,8 @@ case "$nm_opts" in
-
- elif $test "$uname_os" = "Linux" ; then
- nm_opts='-p'
-+ elif $test "$uname_os" = "DragonFly" ; then
-+ nm_opts='-D'
- elif $test "$uname_os" = "AIX" ; then
- uname_ver=`$uname -v`
- if $test "$uname_ver" = "4" ; then
-@@ -5499,7 +5496,7 @@ fastread=''
- echo "If you didn't make any mistakes, then just type a carriage return here."
- rp="If you need to edit config.sh, do it as a shell escape here:"
- $echo $n "$rp $c"
--. UU/myread
-+ans=''
- case "$ans" in
- '') ;;
- *) : in case they cannot read
diff --git a/mail/elm/patches/patch-ab b/mail/elm/patches/patch-ab
deleted file mode 100644
index dddac841182..00000000000
--- a/mail/elm/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2001/07/18 20:04:13 martin Exp $
---- nls/LANGS.orig Thu Apr 20 05:38:33 1995
-+++ nls/LANGS Wed Jul 18 06:58:32 2001
-@@ -1,5 +1,3 @@
- # LANGS file
-
--C/C/C /usr/local/nls/msg/C
--english/us/ascii /usr/local/nls/msg/english
--french/canada/8859 /usr/local/nls/msg/french
-+C/C/C __PREFIX/share/nls/C
diff --git a/mail/elm/patches/patch-ac b/mail/elm/patches/patch-ac
deleted file mode 100644
index 1870eb34eb6..00000000000
--- a/mail/elm/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2001/07/18 20:04:13 martin Exp $
---- nls/Makefile.orig Mon Jul 16 00:30:02 2001
-+++ nls/Makefile Wed Jul 18 06:56:10 2001
-@@ -1,6 +1,6 @@
- LANGFILE=LANGS
- CATNAME=elm2.5.cat
--GENCAT= gencat/gencat
-+GENCAT= ./gencat/gencat
-
- HDIR= ../hdrs
- SDIR= C/C/C
-@@ -35,8 +35,11 @@
- # same basename, so wait until install to put them somewhere.
- all:
-
--install:
-+install: $(GENCAT)
- ./Install $(LANGFILE) $(GENCAT) $(CATNAME)
-+
-+$(GENCAT):
-+ cd gencat && $(MAKE) $(MFLAGS) $(MJ)
-
- $(HFILES): $(MFILES)
- gencat/gencat $(MSGCAT) "$(SDIR)/`basename $@ .h`".m -h $@
diff --git a/mail/elm/patches/patch-ad b/mail/elm/patches/patch-ad
deleted file mode 100644
index 945a085d970..00000000000
--- a/mail/elm/patches/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2001/07/18 20:04:13 martin Exp $
---- Make.defs.SH.orig Mon Jul 16 01:59:07 2001
-+++ Make.defs.SH Mon Jul 16 02:02:02 2001
-@@ -113,6 +113,7 @@
- RM = $rm
- TEST = $test
- TOUCH = $touch
-+MKDIR = mkdir
-
- DESTBIN = $installbin
- DESTLIB = $installlib
-@@ -143,6 +144,7 @@
- $(RM) -f $@.old ; \
- $(TEST) ! -f $@ || $(MV) $@ $@.old ; \
- $(RM) -f $@.old ; \
-+ $(MKDIR) -p `dirname $@` ; \
- $(CP) $? $@ ; \
- $(TEST) $(MAILERMODE) -lt 999 || $(CHGRP) $(MAILGRP) $@ ; \
- $(CHMOD) $(MAILERMODE) $@
diff --git a/mail/elm/patches/patch-ae b/mail/elm/patches/patch-ae
deleted file mode 100644
index f7c27887b1c..00000000000
--- a/mail/elm/patches/patch-ae
+++ /dev/null
@@ -1,82 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2003/04/23 14:36:37 jschauma Exp $
-
---- doc/Makefile.SH.orig Wed Mar 24 09:13:56 1999
-+++ doc/Makefile.SH
-@@ -101,6 +101,7 @@ TEST = $test
- SUFFIX = $suffix
- PACKED = $packed
- PACKER = $packer
-+MKDIR = mkdir
-
- !GROK!THIS!
-
-@@ -118,7 +119,6 @@ MAN_LIST = $(MAN)/answer$(MANEXT) \
- $(MAN)/frm$(MANEXT) \
- $(MAN)/listalias$(MANEXT) \
- $(MAN)/messages$(MANEXT) \
-- $(MAN)/mmencode$(MANEXT) \
- $(MAN)/newalias$(MANEXT) \
- $(MAN)/newmail$(MANEXT) \
- $(MAN)/printmail$(MANEXT) \
-@@ -133,7 +133,6 @@ CATMAN_LIST = $(CATMAN)/answer$(CATMANEX
- $(CATMAN)/frm$(CATMANEXT)$(SUFFIX) \
- $(CATMAN)/listalias$(CATMANEXT)$(SUFFIX) \
- $(CATMAN)/messages$(CATMANEXT)$(SUFFIX) \
-- $(CATMAN)/mmencode$(CATMANEXT)$(SUFFIX) \
- $(CATMAN)/newalias$(CATMANEXT)$(SUFFIX) \
- $(CATMAN)/newmail$(CATMANEXT)$(SUFFIX) \
- $(CATMAN)/printmail$(CATMANEXT)$(SUFFIX) \
-@@ -148,7 +147,6 @@ FORMATTED_PAGES_LIST = catman/answer$(CA
- catman/frm$(CATMANEXT)$(SUFFIX) \
- catman/listalias$(CATMANEXT)$(SUFFIX) \
- catman/messages$(CATMANEXT)$(SUFFIX) \
-- catman/mmencode$(CATMANEXT)$(SUFFIX) \
- catman/newalias$(CATMANEXT)$(SUFFIX) \
- catman/newmail$(CATMANEXT)$(SUFFIX) \
- catman/printmail$(CATMANEXT)$(SUFFIX) \
-@@ -164,7 +162,6 @@ REMOTE_MAN_LIST = $(REMOTE)$(MAN)/answer
- $(REMOTE)$(MAN)/frm$(MANEXT) \
- $(REMOTE)$(MAN)/listalias$(MANEXT) \
- $(REMOTE)$(MAN)/messages$(MANEXT) \
-- $(REMOTE)$(MAN)/mmencode$(MANEXT) \
- $(REMOTE)$(MAN)/newalias$(MANEXT) \
- $(REMOTE)$(MAN)/newmail$(MANEXT) \
- $(REMOTE)$(MAN)/printmail$(MANEXT) \
-@@ -277,8 +274,8 @@ I_CHECK = if $(TEST) ! -f $@ ; then : ;
- fi
-
- I_DELETE = $(TEST) ! -f $@ || $(RM) $@
--INST_444 = $(I_DELETE) ; $(CP) $? $@ ; $(CHMOD) 444 $@
--INST_644 = $(I_DELETE) ; $(CP) $? $@ ; $(CHMOD) 644 $@
-+INST_444 = $(I_DELETE) ; $(MKDIR) -p `dirname $@` ; $(CP) $? $@ ; $(CHMOD) 444 $@
-+INST_644 = $(I_DELETE) ; $(MKDIR) -p `dirname $@` ; $(CP) $? $@ ; $(CHMOD) 644 $@
- INST_LINK = $(I_DELETE) ; $(LN) $? $@
-
- # Dependencies and rules for installing man pages and lib files
-@@ -291,7 +288,6 @@ $(MAN)/fastmail$(MANEXT): fastmail.1 ;
- $(MAN)/frm$(MANEXT): frm.1 ; $(INST_444)
- $(MAN)/listalias$(MANEXT): listalias.1 ; $(INST_444)
- $(MAN)/messages$(MANEXT): messages.1 ; $(INST_444)
--$(MAN)/mmencode$(MANEXT): mmencode.1 ; $(INST_444)
- $(MAN)/newalias$(MANEXT): newalias.1 ; $(INST_444)
- $(MAN)/newmail$(MANEXT): newmail.1 ; $(INST_444)
- $(MAN)/printmail$(MANEXT): printmail.1 ; $(INST_444)
-@@ -326,7 +322,6 @@ $(CATMAN)/fastmail$(CES): catman/fastmai
- $(CATMAN)/frm$(CES): catman/frm$(CES) ; $(INST_644)
- $(CATMAN)/listalias$(CES): catman/listalias$(CES) ; $(INST_644)
- $(CATMAN)/messages$(CES): catman/messages$(CES) ; $(INST_644)
--$(CATMAN)/mmencode$(CES): catman/mmencode$(CES) ; $(INST_644)
- $(CATMAN)/newalias$(CES): catman/newalias$(CES) ; $(INST_644)
- $(CATMAN)/newmail$(CES): catman/newmail$(CES) ; $(INST_644)
- $(CATMAN)/printmail$(CES): catman/printmail$(CES) ; $(INST_644)
-@@ -370,10 +365,6 @@ catman/listalias$(CATMANEXT)$(SUFFIX):
- @ $(DO_PACK)
-
- catman/messages$(CATMANEXT)$(SUFFIX): messages.1
-- $(DO_ROFF)
-- @ $(DO_PACK)
--
--catman/mmencode$(CATMANEXT)$(SUFFIX): mmencode.1
- $(DO_ROFF)
- @ $(DO_PACK)
-
diff --git a/mail/elm/patches/patch-af b/mail/elm/patches/patch-af
deleted file mode 100644
index 5a12b1d1640..00000000000
--- a/mail/elm/patches/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/07/18 20:04:14 martin Exp $
---- Makefile.SH.orig Fri Mar 15 02:27:09 1996
-+++ Makefile.SH Mon Jul 16 02:25:23 2001
-@@ -87,6 +87,7 @@
- cd src && $(MAKE) $(MFLAGS) $(MJ) $@
- cd utils && $(MAKE) $(MFLAGS) $(MJ) $@
- cd doc && $(MAKE) $(MFLAGS) $(MJ) $@
-+ cd nls && $(MAKE) $(MFLAGS) $(MJ) $@
-
- #
- # Ensure required subdirectories and their Makefiles exist.
diff --git a/mail/elm/patches/patch-ag b/mail/elm/patches/patch-ag
deleted file mode 100644
index ecc48ce0cd6..00000000000
--- a/mail/elm/patches/patch-ag
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/04/23 14:36:37 jschauma Exp $
-
---- utils/Makefile.SH.orig Fri Apr 4 14:20:02 2003
-+++ utils/Makefile.SH
-@@ -86,17 +86,12 @@ cat >Makefile <<'!NO!SUBS!'
-
- SUBDIR = utils
-
--# mmencode installation is optional
--INSTALL_MMENCODE = $(DESTBIN)/mmencode
--REMOTE_MMENCODE = $(REMOTE)/$(DESTBIN)/mmencode
--
- ALL = $(BINDIR)/answer \
- $(BINDIR)/checkalias \
- $(BINDIR)/elmalias \
- $(BINDIR)/fastmail \
- $(BINDIR)/frm \
- $(BINDIR)/listalias \
-- $(BINDIR)/mmencode \
- $(BINDIR)/messages \
- $(BINDIR)/newalias \
- $(BINDIR)/newmail \
-@@ -124,7 +119,6 @@ SRCS = answer.c \
- elmalias.c \
- fastmail.c \
- from.c \
-- mmencode.c \
- newalias.c \
- newmail.c \
- readmsg.c \
-@@ -134,7 +128,6 @@ OBJS = answer.o \
- elmalias.o \
- fastmail.o \
- from.o \
-- mmencode.o \
- newalias.o \
- newmail.o \
- readmsg.o \
-@@ -158,7 +151,6 @@ LINT_LIST = answer_lint \
- elmalias_lint \
- fastmail_lint \
- frm_lint \
-- mmencode_lint \
- newalias_lint \
- newmail_lint \
- readmsg_lint \
-@@ -179,8 +171,6 @@ FASTMAIL_SRC = fastmail.c
- FASTMAIL_OBJ = fastmail.o
- FRM_SRC = from.c
- FRM_OBJ = from.o
--MMENCODE_SRC = mmencode.c
--MMENCODE_OBJ = mmencode.o
- NEWALIAS_SRC = newalias.c
- NEWALIAS_OBJ = newalias.o
- NEWMAIL_SRC = newmail.c
-@@ -216,9 +206,6 @@ $(BINDIR)/fastmail: $(FASTMAIL_OBJ) ../l
- $(BINDIR)/frm: $(FRM_OBJ) ../lib/libutil.a
- $(CC) $(LFLAGS) -o $@ $(FRM_OBJ) ../lib/libutil.a $(LIBS)
-
--$(BINDIR)/mmencode: $(MMENCODE_OBJ) ../lib/libutil.a
-- $(CC) $(LFLAGS) -o $@ $(MMENCODE_OBJ) ../lib/libutil.a $(LIBS)
--
- $(BINDIR)/newalias: $(NEWALIAS_OBJ) ../lib/libutil.a
- $(CC) $(LFLAGS) -o $@ $(NEWALIAS_OBJ) ../lib/libutil.a $(LIBS)
-
-@@ -244,7 +231,6 @@ $(DESTBIN)/frm: $(BINDIR)/frm ; $(INST
- $(DESTBIN)/nfrm: $(DESTBIN)/frm ; $(INSTALL_LINK)
- $(DESTBIN)/listalias: $(BINDIR)/listalias ; $(INSTALL_EXE)
- $(DESTBIN)/messages: $(BINDIR)/messages ; $(INSTALL_EXE)
--$(DESTBIN)/mmencode: $(BINDIR)/mmencode ; $(INSTALL_EXE)
- $(DESTBIN)/newalias: $(BINDIR)/newalias ; $(INSTALL_EXE)
- $(DESTBIN)/newmail: $(BINDIR)/newmail ; $(INSTALL_EXE)
- $(DESTBIN)/printmail: $(BINDIR)/printmail ; $(INSTALL_EXE)
diff --git a/mail/elm/patches/patch-ah b/mail/elm/patches/patch-ah
deleted file mode 100644
index f3a8858d849..00000000000
--- a/mail/elm/patches/patch-ah
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/01/24 22:47:13 joerg Exp $
-
---- hdrs/elm_defs.h.orig 2006-01-24 19:52:27.000000000 +0000
-+++ hdrs/elm_defs.h
-@@ -103,11 +103,6 @@
- # define FALSE 0
- #endif
-
--#ifndef _SIZE_T /* not the greatest, but should work until I make Configure figure it out */
--#define _SIZE_T
--typedef unsigned long size_t;
--#endif
--
- #define KLICK 32 /* increment for alias and mssg lists */
-
- #define TLEN 10 /* super short (tiny) strings */
diff --git a/mail/elm/patches/patch-ai b/mail/elm/patches/patch-ai
deleted file mode 100644
index c557a6aa216..00000000000
--- a/mail/elm/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/01/24 22:47:13 joerg Exp $
-
---- hdrs/elm_lib.h.orig 2006-01-24 19:53:20.000000000 +0000
-+++ hdrs/elm_lib.h
-@@ -67,8 +67,8 @@ int elm_access P_((const char *, int));
-
-
- /* errno.c */
-+#include <errno.h>
-
--extern int errno;
- #ifndef STRERROR
- char *strerror P_((int));
- #endif
diff --git a/mail/elm/patches/patch-aj b/mail/elm/patches/patch-aj
deleted file mode 100644
index 5f3b224a000..00000000000
--- a/mail/elm/patches/patch-aj
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/01/24 22:47:13 joerg Exp $
-
---- config.h.SH.orig 2005-08-18 12:49:24.000000000 +0000
-+++ config.h.SH
-@@ -40,34 +40,34 @@ sed <<!GROK!THIS! >config.h -e 's!^#unde
- /* GETOPT:
- * This symbol, if defined, indicates that the getopt() routine exists.
- */
--#$d_getopt GETOPT /**/
-+#define GETOPT /**/
-
- /* MEMCPY:
- * This symbol, if defined, indicates that the memcpy routine is available
- * to copy blocks of memory. Otherwise you should probably use bcopy().
- * If neither is defined, roll your own.
- */
--#$d_memcpy MEMCPY /**/
-+#define MEMCPY /**/
-
- /* MKDIR:
- * This symbol, if defined, indicates that the mkdir routine is available
- * to create directories. Otherwise you should fork off a new process to
- * exec /bin/mkdir.
- */
--#$d_mkdir MKDIR /**/
-+#define MKDIR /**/
-
- /* RENAME:
- * This symbol, if defined, indicates that the rename routine is available
- * to rename files. Otherwise you should do the unlink(), link(), unlink()
- * trick.
- */
--#$d_rename RENAME /**/
-+#define RENAME /**/
-
- /* SYMLINK:
- * This symbol, if defined, indicates that the symlink routine is available
- * to create symbolic links.
- */
--#$d_symlink SYMLINK /**/
-+#define SYMLINK /**/
-
- /* WHOAMI:
- * This symbol, if defined, indicates that the program may include
diff --git a/mail/elm/patches/patch-ak b/mail/elm/patches/patch-ak
deleted file mode 100644
index cb49c0558e4..00000000000
--- a/mail/elm/patches/patch-ak
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2006/07/17 17:41:00 wiz Exp $
-
---- hdrs/mcprtlib.h.orig 2005-08-18 12:49:24.000000000 +0000
-+++ hdrs/mcprtlib.h
-@@ -46,16 +46,8 @@ up-to-date. Many thanks.
- 08/10/90 1 nazgul Initial version
- */
-
--/* taken from Xm/lib/VaSimple.h
-- currently no one defines MISSING_STDARG_H */
--
--#ifdef I_STDARG
- # include <stdarg.h>
- # define Va_start(a,b) va_start(a,b)
--#else
--# include <varargs.h>
--# define Va_start(a,b) va_start(a)
--#endif
-
- #define MCFree 0x0010 /* Reminder to MCPrintFree */
- #define MCCatalog 0x0100 /* Probably came from catalog */
-@@ -145,7 +137,7 @@ typedef struct {
- for (i = 0; i < typeCnt; ++i) { \
- switch (typeList[i].type) { \
- case MCShortType: \
-- typeList[i].u.shortV = va_arg(vl, short); \
-+ typeList[i].u.shortV = va_arg(vl, int); \
- break; \
- case MCLongType: \
- typeList[i].u.longV = va_arg(vl, long); \
-@@ -159,7 +151,7 @@ typedef struct {
- break; \
- #endif*/ \
- case MCFloatType: \
-- typeList[i].u.floatV = va_arg(vl, float); \
-+ typeList[i].u.floatV = va_arg(vl, double); \
- break; \
- case MCStringType: \
- typeList[i].u.charPV = va_arg(vl, char *); \
diff --git a/mail/elm/patches/patch-al b/mail/elm/patches/patch-al
deleted file mode 100644
index c70e10cfc64..00000000000
--- a/mail/elm/patches/patch-al
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/01/24 22:47:13 joerg Exp $
-
---- utils/newmail.c.orig 2006-01-24 22:37:59.000000000 +0000
-+++ utils/newmail.c
-@@ -88,6 +88,7 @@ static char rcsid[] = "@(#)$Id: newmail.
- #include "s_newmail.h"
- #include "port_stat.h"
-
-+#include <errno.h>
- #ifdef I_TIME
- # include <time.h>
- #endif
-@@ -160,8 +161,6 @@ FILE *fd = NULL; /* fd to use to read f
- int parent_pid; /* See if sucide should be attempt */
- #endif /* PIDCHECK */
-
--extern int errno;
--
- #if defined(BSD) && !defined(UTIMBUF)
- time_t utime_buffer[2]; /* utime command */
- #else
-@@ -700,7 +699,6 @@ char *name;
- is to check to see if new mail has arrived.... **/
-
- int ok = 1;
-- extern int errno; /* system error number! */
- struct stat buffer;
-
- if (stat(name, &buffer) != 0)
diff --git a/mail/elm/patches/patch-am b/mail/elm/patches/patch-am
deleted file mode 100644
index 05024b1c554..00000000000
--- a/mail/elm/patches/patch-am
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-am,v 1.1 2006/07/17 17:41:00 wiz Exp $
-
---- src/curses.c.orig 2005-08-18 13:20:14.000000000 +0000
-+++ src/curses.c
-@@ -47,11 +47,7 @@ static char rcsid[] = "@(#)$Id: curses.c
- #include "s_elm.h"
-
- #include <assert.h>
--#ifdef I_STDARG
--# include <stdarg.h>
--#else
--# include <varargs.h>
--#endif
-+#include <stdarg.h>
-
- #define S_(sel, str) catgets(elm_msg_cat, ElmSet, (sel), (str))
-
diff --git a/mail/elmo/DESCR b/mail/elmo/DESCR
deleted file mode 100644
index 97206d22487..00000000000
--- a/mail/elmo/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Elmo the ELectronic Mail Operator is a feature-rich, highly
-configurable and fast console mail client. It features SMTP and POP3
-support, a Bayesian mail filter, an address book, threaded mail
-display and Maildir, MIME, GnuPG, SSL & UTF8 support.
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
deleted file mode 100644
index 70954bf66c6..00000000000
--- a/mail/elmo/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2006/06/09 16:03:23 minskim Exp $
-#
-
-DISTNAME= elmo-1.3.2
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=elmo/}
-
-MAINTAINER= pkg@burningsoda.com
-HOMEPAGE= http://elmo.sourceforge.net/
-COMMENT= The ELectronic Mail Operator MUA
-
-USE_LANGUAGES= c c++
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= flex
-GNU_CONFIGURE= yes
-
-REPLACE_PERL= elmoconf.pl
-
-CONFIGURE_ARGS+= --with-gpgme-prefix=${BUILDLINK_PREFIX.gpgme}
-CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
-# I get segmentation faults when not compiled with debug enabled
-CONFIGURE_ARGS+= --enable-debug
-
-SUBST_CLASSES+= tux
-SUBST_STAGE.tux= post-patch
-SUBST_FILES.tux= configure
-SUBST_SED.tux= -e "s|==|=|"
-SUBST_MESSAGE.tux= Fixing linuxifications.
-
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../security/gpgme/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/elmo/PLIST b/mail/elmo/PLIST
deleted file mode 100644
index 7cf1e957c5d..00000000000
--- a/mail/elmo/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:23 jlam Exp $
-bin/elmo
-bin/elmoconf.pl
-man/man1/elmo.1
-man/man1/elmoconf.pl.1
-share/elmo/template
-share/elmo/themes/80x25
-share/elmo/themes/README
-share/elmo/themes/outlook
-share/elmo/tutorial
-share/locale/de/LC_MESSAGES/elmo.mo
-share/locale/pl/LC_MESSAGES/elmo.mo
-@dirrm share/elmo/themes
-@dirrm share/elmo
diff --git a/mail/elmo/distinfo b/mail/elmo/distinfo
deleted file mode 100644
index 3c20ce610b2..00000000000
--- a/mail/elmo/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/07/16 15:40:56 wiz Exp $
-
-SHA1 (elmo-1.3.2.tar.gz) = d4e7999ce85c17df082a016fd70ee4978cfe1043
-RMD160 (elmo-1.3.2.tar.gz) = 3db1fafbbe38636459c4b1bbc3dae414e54c92d6
-Size (elmo-1.3.2.tar.gz) = 536768 bytes
-SHA1 (patch-aa) = 8bfed77e5b5bae8c649b7474a3e64a188fb96f75
-SHA1 (patch-ab) = 1c66367cda9e26b98dd475b9f87e51a74be239de
diff --git a/mail/elmo/patches/patch-aa b/mail/elmo/patches/patch-aa
deleted file mode 100644
index e72ab322f06..00000000000
--- a/mail/elmo/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/07/16 15:40:56 wiz Exp $
-
---- src/mlex.l.orig Fri Aug 13 13:18:23 2004
-+++ src/mlex.l
-@@ -352,8 +352,14 @@ TEXT_PLAIN_CHARSET [ \t]*text\/plain.*(;
- * obsolete one first, and check if it was possible to get
- * the date
- */
-+ /** FIXME FIXME FIXME:
-+ * A more sophisticated Date: parser is needed, the first
-+ * call _never_ returns NULL (at least) on *BSD. Therefore
-+ * disable support for two digit years in order to NOT
-+ * garble all correctly formatted date headers....
-+
- tmp = strptime (date, "%d %b %y %H:%M:%S", &tm);
-- if (tmp == NULL)
-+ if (tmp == NULL) */
- tmp = strptime (date, "%d %b %Y %H:%M:%S", &tm);
-
- #ifdef HAVE_LOCALE_H
diff --git a/mail/elmo/patches/patch-ab b/mail/elmo/patches/patch-ab
deleted file mode 100644
index 3faf5c97bc8..00000000000
--- a/mail/elmo/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/07/16 15:40:56 wiz Exp $
-
---- src/stats.c.orig Thu Apr 29 10:06:10 2004
-+++ src/stats.c
-@@ -185,6 +185,8 @@ stats_dump (void)
- FILE *fp;
- mail_t *mail;
- struct estats stats;
-+ int fd;
-+ char fn[25] = "/tmp/elmostats.XXXXXXXXX";
-
- if (wrapbox_marray == NULL)
- return;
-@@ -200,9 +202,12 @@ stats_dump (void)
- process_mail (& stats, mail);
- }
-
-- fp = fopen ("/tmp/elmostats", "w");
-- if (fp == NULL){
-- error_ (errno, _("couldn't open %s"), "/tmp/elmostats");
-+ fp = NULL;
-+ fd = mkstemp(fn);
-+ if (fd != -1 )
-+ fp = fdopen (fd, "w");
-+ if (fp == NULL) {
-+ error_ (errno, _("couldn't open %s"), fn);
- destroy_stats (& stats);
- return;
- }
diff --git a/mail/esmtp/DESCR b/mail/esmtp/DESCR
deleted file mode 100644
index e6cbac4de84..00000000000
--- a/mail/esmtp/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-esmtp is a user-configurable relay-only Mail Transfer Agent (MTA) with
-a sendmail-compatible syntax. It is based on libESMTP supporting the
-AUTH (including the CRAM-MD5 and NTLM SASL mechanisms) and the
-StartTLS SMTP extensions.
-
-Features include:
- * fully sendmail command-line compatible,
- * supports the AUTH SMTP extension, with the CRAM-MD5 and NTLM SASL
- mechanisms,
- * supports the StartTLS SMTP extension,
- * requires no administration privileges,
- * individual user configuration,
- * does not receive mail, expand aliases or manage a queue,
- * local mail delivery via a MDA.
diff --git a/mail/esmtp/Makefile b/mail/esmtp/Makefile
deleted file mode 100644
index 21d78b6e24c..00000000000
--- a/mail/esmtp/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2006/04/22 09:22:11 rillig Exp $
-#
-
-DISTNAME= esmtp-0.5.1
-PKGREVISION= 2
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=esmtp/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://esmtp.sourceforge.net/
-COMMENT= Relay-only Mail Transfer Agent with sendmail-compatible syntax
-
-GNU_CONFIGURE= yes
-USE_TOOLS+= bison flex
-PTHREAD_OPTS+= require
-
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-
-SUBST_CLASSES+= paths
-SUBST_MESSAGE.paths= Fixing hardcoded paths.
-SUBST_STAGE.paths= pre-configure
-SUBST_FILES.paths= README esmtp.1 esmtprc.5 sample.esmtprc
-SUBST_SED.paths= -e 's|/usr/bin|${PREFIX}/bin|g'
-SUBST_SED.paths+= -e 's|/etc|${PKG_SYSCONFDIR}|g'
-
-PKG_SYSCONFSUBDIR= esmtp
-
-EGDIR= ${PREFIX}/share/examples/esmtp
-CONF_FILES= ${EGDIR}/sample.esmtprc \
- ${PKG_SYSCONFDIR}/esmtprc
-
-.include "../../mail/libesmtp/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/esmtp
- ${INSTALL_DATA} ${WRKSRC}/sample.esmtprc ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/esmtp
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/esmtp/PLIST b/mail/esmtp/PLIST
deleted file mode 100644
index 5480acf04e3..00000000000
--- a/mail/esmtp/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/11/12 04:13:12 minskim Exp $
-bin/esmtp
-man/man1/esmtp.1
-man/man5/esmtprc.5
-share/doc/esmtp/README
-share/examples/esmtp/sample.esmtprc
-@dirrm share/examples/esmtp
-@dirrm share/doc/esmtp
diff --git a/mail/esmtp/distinfo b/mail/esmtp/distinfo
deleted file mode 100644
index 9d602851239..00000000000
--- a/mail/esmtp/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/11/12 04:13:12 minskim Exp $
-
-SHA1 (esmtp-0.5.1.tar.bz2) = daf31e9e4283dbbc8a35b1841626b69bc636960e
-RMD160 (esmtp-0.5.1.tar.bz2) = 740e9bbd855095bd89673345f22bcab4557c013a
-Size (esmtp-0.5.1.tar.bz2) = 127355 bytes
-SHA1 (patch-aa) = be7a30232434f5b9bcc61b9523e434b8dc5bfed9
diff --git a/mail/esmtp/patches/patch-aa b/mail/esmtp/patches/patch-aa
deleted file mode 100644
index 524c463c373..00000000000
--- a/mail/esmtp/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/11/12 04:13:12 minskim Exp $
-
---- Makefile.in.orig 2005-03-10 18:00:26.000000000 +0000
-+++ Makefile.in
-@@ -630,11 +630,9 @@ info-am:
-
- install-data-am: install-man
- @$(NORMAL_INSTALL)
-- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
-
- install-exec-am: install-binPROGRAMS
- @$(NORMAL_INSTALL)
-- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-
- install-info: install-info-am
-
diff --git a/mail/etach/DESCR b/mail/etach/DESCR
deleted file mode 100644
index 5fef3c73b42..00000000000
--- a/mail/etach/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Etach is an Emacs add-on that allows easy management of MIME email
-attachments in RMAIL and Mail modes. Attachments and detachments are
-as simple as entering the Emacs commands M-x attach and M-x detach,
-respectively. Also provided is the ability to forward mail via
-message/rfc822 format (M-x mime-forward), useful when forwarding
-messages that contain MIME attachments.
diff --git a/mail/etach/Makefile b/mail/etach/Makefile
deleted file mode 100644
index 8675fa554f9..00000000000
--- a/mail/etach/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:00 jlam Exp $
-
-DISTNAME= etach-1.2.9
-PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= http://rulnick.com/etach/download/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://rulnick.com/etach/
-COMMENT= Emacs Lisp package for dealing with MIME email attachments
-
-NO_CONFIGURE= yes
-NO_BUILD= yes
-
-do-install:
- ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/etach
- ${INSTALL_DATA} ${WRKSRC}/etach.el ${EMACS_LISPPREFIX}/etach
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/etach
- cd ${WRKSRC} && ${INSTALL_DATA} README.txt FAQ.txt LICENSE.txt \
- ${PREFIX}/share/doc/etach/
-
-.include "../../mk/emacs.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/etach/PLIST b/mail/etach/PLIST
deleted file mode 100644
index 3ba516a41c6..00000000000
--- a/mail/etach/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/11/03 13:41:54 rillig Exp $
-${EMACS_LISPPREFIX}/etach/etach.el
-share/doc/etach/FAQ.txt
-share/doc/etach/LICENSE.txt
-share/doc/etach/README.txt
-@dirrm share/doc/etach
diff --git a/mail/etach/distinfo b/mail/etach/distinfo
deleted file mode 100644
index a5c9e87e0ad..00000000000
--- a/mail/etach/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:59:21 agc Exp $
-
-SHA1 (etach-1.2.9.tar.gz) = 3a2ec2df9fa9fb49baf5be9c212d228df1dcd8d0
-RMD160 (etach-1.2.9.tar.gz) = 470babbcd595a9df74daa0b06505d6efc4802b39
-Size (etach-1.2.9.tar.gz) = 35334 bytes
diff --git a/mail/etpan/DESCR b/mail/etpan/DESCR
deleted file mode 100644
index be1603d3866..00000000000
--- a/mail/etpan/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-etPan is a mail client that is based on libEtPan!
-
-Features:
-
-* IMAP4rev1 / POP3 / NNTP / mbox / mh / maildir
-* virtual folder tree
-* multiple folder views and message views
-* smart multi-threading
-* PGP signing and encryption (using GnuPG as external command)
-* S/MIME signing and encryption (using OpenSSL as external command)
-* SPAM process (using bogofilter as external command)
-* user interface for configuration edition
diff --git a/mail/etpan/Makefile b/mail/etpan/Makefile
deleted file mode 100644
index 3b323a1921c..00000000000
--- a/mail/etpan/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2006/06/20 22:14:07 minskim Exp $
-#
-
-DISTNAME= etpan-ng-0.7.1
-PKGNAME= ${DISTNAME:S/-ng//}
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libetpan/}
-
-MAINTAINER= dawszy@arhea.pl
-HOMEPAGE= http://libetpan.sourceforge.net/etpan/
-COMMENT= Mail console client with S/MIME and PGP support
-
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= perl:run yacc
-GNU_CONFIGURE= yes
-
-DOCDIR= ${LOCALBASE}/share/doc/etpan
-
-INSTALLATION_DIRS= share/doc/etpan
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/CONFIG ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/INTERNAL ${DOCDIR}
-
-.include "../../databases/db4/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mail/libetpan/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/etpan/PLIST b/mail/etpan/PLIST
deleted file mode 100644
index 77702a97057..00000000000
--- a/mail/etpan/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/08/06 05:32:19 xtraeme Exp $
-bin/etpan
-share/doc/etpan/CONFIG
-share/doc/etpan/INTERNAL
-share/doc/etpan/README
-@dirrm share/doc/etpan
diff --git a/mail/etpan/distinfo b/mail/etpan/distinfo
deleted file mode 100644
index 9b662f66097..00000000000
--- a/mail/etpan/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/03/17 23:40:13 wiz Exp $
-
-SHA1 (etpan-ng-0.7.1.tar.gz) = 2261913d31bbe64efe64a24cc37740eaf21d1d89
-RMD160 (etpan-ng-0.7.1.tar.gz) = bbd196a2151f99032dbdfc0ebb652a50567792f8
-Size (etpan-ng-0.7.1.tar.gz) = 364394 bytes
-SHA1 (patch-aa) = 72ab16853068fc5d7f3f736411187b720d15f8a0
-SHA1 (patch-ab) = f45fadaa7b7326fe73726761c499fb2792527787
diff --git a/mail/etpan/patches/patch-aa b/mail/etpan/patches/patch-aa
deleted file mode 100644
index f2013d6790b..00000000000
--- a/mail/etpan/patches/patch-aa
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/08/06 05:32:19 xtraeme Exp $
-
---- src/Makefile.in.orig 2005-08-05 21:37:44.000000000 +0200
-+++ src/Makefile.in 2005-08-05 21:38:46.000000000 +0200
-@@ -7,14 +7,14 @@
- bindir = @bindir@
- INSTALL = @INSTALL@
-
--SHELL = /bin/sh
--RM = rm -fr
-+#SHELL = /bin/sh
-+#RM = rm -fr
- # CPPFLAGS is duplicated for FreeBSD compatibility
--CFLAGS = @DEFS@ @CFLAGS@ @CPPFLAGS@
--CPPFLAGS = -I.. -Ilibversit @CPPFLAGS@
--CC = @CC@
-+CFLAGS += @DEFS@
-+CPPFLAGS += -I.. -Ilibversit
-+#CC = @CC@
- PROGS = etpan
--LDFLAGS = @LDFLAGS@ @LIBS@
-+LINKERFLAGS = @LDFLAGS@ @LIBS@
-
- OBJ = \
- etpan-config.o \
-@@ -104,7 +104,7 @@
- all: all-recursive $(PROGS)
-
- etpan: $(OBJ)
-- $(CC) -o $@ $(OBJ) $(VERSIT_OBJ) $(LDFLAGS)
-+ $(CC) -o $@ $(OBJ) $(VERSIT_OBJ) $(LINKERFLAGS)
-
- install: etpan
- $(INSTALL) -m 755 -d $(bindir)
-@@ -123,7 +123,7 @@
- $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-
- etpan-ldap-test: etpan-ldap-test.o etpan-ldap.o
-- $(CC) -o $@ etpan-ldap-test.o etpan-ldap.o $(LDFLAGS)
-+ $(CC) -o $@ etpan-ldap-test.o etpan-ldap.o $(LINKERFLAGS)
-
- dep:
- $(CC) -M $(CFLAGS) $(OBJ:.o=.c) etpan-ldap-test.c | sed 's,\( /[^ ]*\),,g;/^ *\\$$/d' > .deps
diff --git a/mail/etpan/patches/patch-ab b/mail/etpan/patches/patch-ab
deleted file mode 100644
index efd50d91bcb..00000000000
--- a/mail/etpan/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/08/06 05:32:19 xtraeme Exp $
-
---- src/etpan-app-subapp.c.orig 2005-08-06 07:00:51.000000000 +0200
-+++ src/etpan-app-subapp.c 2005-08-06 07:14:57.000000000 +0200
-@@ -807,7 +807,9 @@
- struct etpan_subapp * old_subapp;
- int app_index;
-
-+#if 0
- color_reset(subapp->app);
-+#endif
-
- old_subapp = subapp->app->current_subapp;
- if (old_subapp != NULL) {
diff --git a/mail/evolution-data-server/DESCR b/mail/evolution-data-server/DESCR
deleted file mode 100644
index da7d2b2b6ef..00000000000
--- a/mail/evolution-data-server/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Evolution Data Server is responsible for managing calendar and addressbook
-information within the GNOME desktop.
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
deleted file mode 100644
index 94447b2d044..00000000000
--- a/mail/evolution-data-server/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# $NetBSD: Makefile,v 1.52 2007/03/21 12:05:48 wiz Exp $
-#
-
-DISTNAME= evolution-data-server-1.8.2
-PKGREVISION= 1
-CATEGORIES= mail gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution-data-server/1.8/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= jmmv@NetBSD.org
-HOMEPAGE= http://www.gnome.org/projects/evolution/
-COMMENT= Evolution data server
-
-BUILDLINK_API_DEPENDS.libsoup-devel+= libsoup-devel>=2.2.3
-
-GNU_CONFIGURE= YES
-USE_DIRS+= xdg-1.1
-USE_TOOLS+= bison gmake intltool msgfmt pkg-config
-USE_LANGUAGES= c c++
-USE_LIBTOOL= YES
-USE_PKGLOCALEDIR= YES
-
-PYTHON_FOR_BUILD_ONLY= YES
-PYTHON_PATCH_SCRIPTS= addressbook/libebook/gen-western-table.py
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.evolution-data-server
-PKG_SUPPORTED_OPTIONS= inet6
-.include "../../mk/bsd.options.mk"
-
-.include "../../mk/bsd.prefs.mk"
-
-CONFIGURE_ENV+= PTHREAD_LIB="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
-
-.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.6.2)
-.include "../../devel/pthread-sem/buildlink3.mk"
-LIBS+= -lsemaphore
-.endif
-
-.if ${OPSYS} == "Darwin"
-CPPFLAGS+= -DBIND_8_COMPAT
-.endif
-
-CONFIGURE_ARGS+= --with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr
-CONFIGURE_ARGS+= --with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib
-CONFIGURE_ARGS+= --with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss/nss
-CONFIGURE_ARGS+= --with-nss-libs=${BUILDLINK_PREFIX.nss}/lib
-CONFIGURE_ARGS+= --with-openldap
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-ipv6
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
-PKGCONFIG_OVERRIDE+= addressbook/libebook/libebook.pc.in
-PKGCONFIG_OVERRIDE+= addressbook/libedata-book/libedata-book.pc.in
-PKGCONFIG_OVERRIDE+= calendar/libecal/libecal.pc.in
-PKGCONFIG_OVERRIDE+= calendar/libedata-cal/libedata-cal.pc.in
-PKGCONFIG_OVERRIDE+= camel/camel.pc.in
-PKGCONFIG_OVERRIDE+= camel/camel-provider.pc.in
-PKGCONFIG_OVERRIDE+= libedataserver/libedataserver.pc.in
-PKGCONFIG_OVERRIDE+= libedataserverui/libedataserverui.pc.in
-PKGCONFIG_OVERRIDE+= servers/groupwise/libegroupwise.pc.in
-PKGCONFIG_OVERRIDE+= evolution-data-server.pc.in
-
-BUILDLINK_TRANSFORM+= rm:-ldl
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/openldap-client/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/nss/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../net/libsoup-devel/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/evolution-data-server/PLIST b/mail/evolution-data-server/PLIST
deleted file mode 100644
index 53ceaaeddc8..00000000000
--- a/mail/evolution-data-server/PLIST
+++ /dev/null
@@ -1,945 +0,0 @@
-@comment $NetBSD: PLIST,v 1.17 2006/11/27 21:21:19 drochner Exp $
-include/evolution-data-server-1.8/camel/broken-date-parser.h
-include/evolution-data-server-1.8/camel/camel-address.h
-include/evolution-data-server-1.8/camel/camel-arg.h
-include/evolution-data-server-1.8/camel/camel-block-file.h
-include/evolution-data-server-1.8/camel/camel-certdb.h
-include/evolution-data-server-1.8/camel/camel-charset-map.h
-include/evolution-data-server-1.8/camel/camel-cipher-context.h
-include/evolution-data-server-1.8/camel/camel-data-cache.h
-include/evolution-data-server-1.8/camel/camel-data-wrapper.h
-include/evolution-data-server-1.8/camel/camel-debug.h
-include/evolution-data-server-1.8/camel/camel-digest-folder.h
-include/evolution-data-server-1.8/camel/camel-digest-store.h
-include/evolution-data-server-1.8/camel/camel-digest-summary.h
-include/evolution-data-server-1.8/camel/camel-disco-diary.h
-include/evolution-data-server-1.8/camel/camel-disco-folder.h
-include/evolution-data-server-1.8/camel/camel-disco-store.h
-include/evolution-data-server-1.8/camel/camel-exception-list.def
-include/evolution-data-server-1.8/camel/camel-exception.h
-include/evolution-data-server-1.8/camel/camel-file-utils.h
-include/evolution-data-server-1.8/camel/camel-filter-driver.h
-include/evolution-data-server-1.8/camel/camel-filter-search.h
-include/evolution-data-server-1.8/camel/camel-folder-search.h
-include/evolution-data-server-1.8/camel/camel-folder-summary.h
-include/evolution-data-server-1.8/camel/camel-folder-thread.h
-include/evolution-data-server-1.8/camel/camel-folder.h
-include/evolution-data-server-1.8/camel/camel-gpg-context.h
-include/evolution-data-server-1.8/camel/camel-http-stream.h
-include/evolution-data-server-1.8/camel/camel-i18n.h
-include/evolution-data-server-1.8/camel/camel-index.h
-include/evolution-data-server-1.8/camel/camel-internet-address.h
-include/evolution-data-server-1.8/camel/camel-junk-plugin.h
-include/evolution-data-server-1.8/camel/camel-list-utils.h
-include/evolution-data-server-1.8/camel/camel-lock-client.h
-include/evolution-data-server-1.8/camel/camel-lock.h
-include/evolution-data-server-1.8/camel/camel-medium.h
-include/evolution-data-server-1.8/camel/camel-mime-filter-basic.h
-include/evolution-data-server-1.8/camel/camel-mime-filter-bestenc.h
-include/evolution-data-server-1.8/camel/camel-mime-filter-canon.h
-include/evolution-data-server-1.8/camel/camel-mime-filter-charset.h
-include/evolution-data-server-1.8/camel/camel-mime-filter-crlf.h
-include/evolution-data-server-1.8/camel/camel-mime-filter-enriched.h
-include/evolution-data-server-1.8/camel/camel-mime-filter-from.h
-include/evolution-data-server-1.8/camel/camel-mime-filter-gzip.h
-include/evolution-data-server-1.8/camel/camel-mime-filter-html.h
-include/evolution-data-server-1.8/camel/camel-mime-filter-index.h
-include/evolution-data-server-1.8/camel/camel-mime-filter-linewrap.h
-include/evolution-data-server-1.8/camel/camel-mime-filter-pgp.h
-include/evolution-data-server-1.8/camel/camel-mime-filter-save.h
-include/evolution-data-server-1.8/camel/camel-mime-filter-tohtml.h
-include/evolution-data-server-1.8/camel/camel-mime-filter-windows.h
-include/evolution-data-server-1.8/camel/camel-mime-filter-yenc.h
-include/evolution-data-server-1.8/camel/camel-mime-filter.h
-include/evolution-data-server-1.8/camel/camel-mime-message.h
-include/evolution-data-server-1.8/camel/camel-mime-parser.h
-include/evolution-data-server-1.8/camel/camel-mime-part-utils.h
-include/evolution-data-server-1.8/camel/camel-mime-part.h
-include/evolution-data-server-1.8/camel/camel-mime-utils.h
-include/evolution-data-server-1.8/camel/camel-movemail.h
-include/evolution-data-server-1.8/camel/camel-multipart-encrypted.h
-include/evolution-data-server-1.8/camel/camel-multipart-signed.h
-include/evolution-data-server-1.8/camel/camel-multipart.h
-include/evolution-data-server-1.8/camel/camel-net-utils.h
-include/evolution-data-server-1.8/camel/camel-nntp-address.h
-include/evolution-data-server-1.8/camel/camel-object.h
-include/evolution-data-server-1.8/camel/camel-offline-folder.h
-include/evolution-data-server-1.8/camel/camel-offline-journal.h
-include/evolution-data-server-1.8/camel/camel-offline-store.h
-include/evolution-data-server-1.8/camel/camel-operation.h
-include/evolution-data-server-1.8/camel/camel-partition-table.h
-include/evolution-data-server-1.8/camel/camel-provider.h
-include/evolution-data-server-1.8/camel/camel-sasl-anonymous.h
-include/evolution-data-server-1.8/camel/camel-sasl-cram-md5.h
-include/evolution-data-server-1.8/camel/camel-sasl-digest-md5.h
-include/evolution-data-server-1.8/camel/camel-sasl-gssapi.h
-include/evolution-data-server-1.8/camel/camel-sasl-kerberos4.h
-include/evolution-data-server-1.8/camel/camel-sasl-login.h
-include/evolution-data-server-1.8/camel/camel-sasl-ntlm.h
-include/evolution-data-server-1.8/camel/camel-sasl-plain.h
-include/evolution-data-server-1.8/camel/camel-sasl-popb4smtp.h
-include/evolution-data-server-1.8/camel/camel-sasl.h
-include/evolution-data-server-1.8/camel/camel-search-private.h
-include/evolution-data-server-1.8/camel/camel-seekable-stream.h
-include/evolution-data-server-1.8/camel/camel-seekable-substream.h
-include/evolution-data-server-1.8/camel/camel-service.h
-include/evolution-data-server-1.8/camel/camel-session.h
-include/evolution-data-server-1.8/camel/camel-smime-context.h
-include/evolution-data-server-1.8/camel/camel-store-summary.h
-include/evolution-data-server-1.8/camel/camel-store.h
-include/evolution-data-server-1.8/camel/camel-stream-buffer.h
-include/evolution-data-server-1.8/camel/camel-stream-filter.h
-include/evolution-data-server-1.8/camel/camel-stream-fs.h
-include/evolution-data-server-1.8/camel/camel-stream-mem.h
-include/evolution-data-server-1.8/camel/camel-stream-null.h
-include/evolution-data-server-1.8/camel/camel-stream-process.h
-include/evolution-data-server-1.8/camel/camel-stream-vfs.h
-include/evolution-data-server-1.8/camel/camel-stream.h
-include/evolution-data-server-1.8/camel/camel-string-utils.h
-include/evolution-data-server-1.8/camel/camel-tcp-stream-raw.h
-include/evolution-data-server-1.8/camel/camel-tcp-stream-ssl.h
-include/evolution-data-server-1.8/camel/camel-tcp-stream.h
-include/evolution-data-server-1.8/camel/camel-text-index.h
-include/evolution-data-server-1.8/camel/camel-transport.h
-include/evolution-data-server-1.8/camel/camel-types.h
-include/evolution-data-server-1.8/camel/camel-uid-cache.h
-include/evolution-data-server-1.8/camel/camel-url-scanner.h
-include/evolution-data-server-1.8/camel/camel-url.h
-include/evolution-data-server-1.8/camel/camel-utf8.h
-include/evolution-data-server-1.8/camel/camel-vee-folder.h
-include/evolution-data-server-1.8/camel/camel-vee-store.h
-include/evolution-data-server-1.8/camel/camel-vee-summary.h
-include/evolution-data-server-1.8/camel/camel-vtrash-folder.h
-include/evolution-data-server-1.8/camel/camel.h
-include/evolution-data-server-1.8/exchange/e-folder-exchange.h
-include/evolution-data-server-1.8/exchange/e-folder.h
-include/evolution-data-server-1.8/exchange/e-shell-marshal.h
-include/evolution-data-server-1.8/exchange/e-storage.h
-include/evolution-data-server-1.8/exchange/e2k-autoconfig.h
-include/evolution-data-server-1.8/exchange/e2k-context.h
-include/evolution-data-server-1.8/exchange/e2k-freebusy.h
-include/evolution-data-server-1.8/exchange/e2k-global-catalog-ldap.h
-include/evolution-data-server-1.8/exchange/e2k-global-catalog.h
-include/evolution-data-server-1.8/exchange/e2k-http-utils.h
-include/evolution-data-server-1.8/exchange/e2k-marshal.h
-include/evolution-data-server-1.8/exchange/e2k-operation.h
-include/evolution-data-server-1.8/exchange/e2k-properties.h
-include/evolution-data-server-1.8/exchange/e2k-propnames.h
-include/evolution-data-server-1.8/exchange/e2k-restriction.h
-include/evolution-data-server-1.8/exchange/e2k-result.h
-include/evolution-data-server-1.8/exchange/e2k-security-descriptor.h
-include/evolution-data-server-1.8/exchange/e2k-sid.h
-include/evolution-data-server-1.8/exchange/e2k-types.h
-include/evolution-data-server-1.8/exchange/e2k-uri.h
-include/evolution-data-server-1.8/exchange/e2k-utils.h
-include/evolution-data-server-1.8/exchange/e2k-validate.h
-include/evolution-data-server-1.8/exchange/e2k-xml-utils.h
-include/evolution-data-server-1.8/exchange/exchange-account.h
-include/evolution-data-server-1.8/exchange/exchange-constants.h
-include/evolution-data-server-1.8/exchange/exchange-esource.h
-include/evolution-data-server-1.8/exchange/exchange-folder-size.h
-include/evolution-data-server-1.8/exchange/exchange-hierarchy-foreign.h
-include/evolution-data-server-1.8/exchange/exchange-hierarchy-somedav.h
-include/evolution-data-server-1.8/exchange/exchange-hierarchy-webdav.h
-include/evolution-data-server-1.8/exchange/exchange-hierarchy.h
-include/evolution-data-server-1.8/exchange/exchange-oof.h
-include/evolution-data-server-1.8/exchange/exchange-types.h
-include/evolution-data-server-1.8/exchange/mapi.h
-include/evolution-data-server-1.8/groupwise/e-gw-connection.h
-include/evolution-data-server-1.8/groupwise/e-gw-container.h
-include/evolution-data-server-1.8/groupwise/e-gw-filter.h
-include/evolution-data-server-1.8/groupwise/e-gw-item.h
-include/evolution-data-server-1.8/groupwise/e-gw-message.h
-include/evolution-data-server-1.8/groupwise/e-gw-proxy.h
-include/evolution-data-server-1.8/groupwise/e-gw-recur-utils.h
-include/evolution-data-server-1.8/groupwise/e-gw-sendoptions.h
-include/evolution-data-server-1.8/libebook/Evolution-DataServer-Addressbook.h
-include/evolution-data-server-1.8/libebook/e-address-western.h
-include/evolution-data-server-1.8/libebook/e-book-listener.h
-include/evolution-data-server-1.8/libebook/e-book-query.h
-include/evolution-data-server-1.8/libebook/e-book-types.h
-include/evolution-data-server-1.8/libebook/e-book-view-listener.h
-include/evolution-data-server-1.8/libebook/e-book-view.h
-include/evolution-data-server-1.8/libebook/e-book.h
-include/evolution-data-server-1.8/libebook/e-contact.h
-include/evolution-data-server-1.8/libebook/e-destination.h
-include/evolution-data-server-1.8/libebook/e-name-western-tables.h
-include/evolution-data-server-1.8/libebook/e-name-western.h
-include/evolution-data-server-1.8/libebook/e-vcard.h
-include/evolution-data-server-1.8/libecal/Evolution-DataServer-Calendar.h
-include/evolution-data-server-1.8/libecal/e-cal-component.h
-include/evolution-data-server-1.8/libecal/e-cal-listener.h
-include/evolution-data-server-1.8/libecal/e-cal-recur.h
-include/evolution-data-server-1.8/libecal/e-cal-time-util.h
-include/evolution-data-server-1.8/libecal/e-cal-types.h
-include/evolution-data-server-1.8/libecal/e-cal-util.h
-include/evolution-data-server-1.8/libecal/e-cal-view-listener.h
-include/evolution-data-server-1.8/libecal/e-cal-view.h
-include/evolution-data-server-1.8/libecal/e-cal.h
-include/evolution-data-server-1.8/libedata-book/Evolution-DataServer-Addressbook.h
-include/evolution-data-server-1.8/libedata-book/e-book-backend-cache.h
-include/evolution-data-server-1.8/libedata-book/e-book-backend-db-cache.h
-include/evolution-data-server-1.8/libedata-book/e-book-backend-factory.h
-include/evolution-data-server-1.8/libedata-book/e-book-backend-sexp.h
-include/evolution-data-server-1.8/libedata-book/e-book-backend-summary.h
-include/evolution-data-server-1.8/libedata-book/e-book-backend-sync.h
-include/evolution-data-server-1.8/libedata-book/e-book-backend.h
-include/evolution-data-server-1.8/libedata-book/e-data-book-factory.h
-include/evolution-data-server-1.8/libedata-book/e-data-book-types.h
-include/evolution-data-server-1.8/libedata-book/e-data-book-view.h
-include/evolution-data-server-1.8/libedata-book/e-data-book.h
-include/evolution-data-server-1.8/libedata-cal/Evolution-DataServer-Calendar.h
-include/evolution-data-server-1.8/libedata-cal/e-cal-backend-cache.h
-include/evolution-data-server-1.8/libedata-cal/e-cal-backend-factory.h
-include/evolution-data-server-1.8/libedata-cal/e-cal-backend-sexp.h
-include/evolution-data-server-1.8/libedata-cal/e-cal-backend-sync.h
-include/evolution-data-server-1.8/libedata-cal/e-cal-backend-util.h
-include/evolution-data-server-1.8/libedata-cal/e-cal-backend.h
-include/evolution-data-server-1.8/libedata-cal/e-data-cal-common.h
-include/evolution-data-server-1.8/libedata-cal/e-data-cal-factory.h
-include/evolution-data-server-1.8/libedata-cal/e-data-cal-view.h
-include/evolution-data-server-1.8/libedata-cal/e-data-cal.h
-include/evolution-data-server-1.8/libedataserver/e-account-list.h
-include/evolution-data-server-1.8/libedataserver/e-account.h
-include/evolution-data-server-1.8/libedataserver/e-categories.h
-include/evolution-data-server-1.8/libedataserver/e-component-listener.h
-include/evolution-data-server-1.8/libedataserver/e-data-server-module.h
-include/evolution-data-server-1.8/libedataserver/e-data-server-util.h
-include/evolution-data-server-1.8/libedataserver/e-db3-utils.h
-include/evolution-data-server-1.8/libedataserver/e-dbhash.h
-include/evolution-data-server-1.8/libedataserver/e-file-cache.h
-include/evolution-data-server-1.8/libedataserver/e-iconv.h
-include/evolution-data-server-1.8/libedataserver/e-iterator.h
-include/evolution-data-server-1.8/libedataserver/e-list-iterator.h
-include/evolution-data-server-1.8/libedataserver/e-list.h
-include/evolution-data-server-1.8/libedataserver/e-memory.h
-include/evolution-data-server-1.8/libedataserver/e-msgport.h
-include/evolution-data-server-1.8/libedataserver/e-sexp.h
-include/evolution-data-server-1.8/libedataserver/e-source-group.h
-include/evolution-data-server-1.8/libedataserver/e-source-list.h
-include/evolution-data-server-1.8/libedataserver/e-source.h
-include/evolution-data-server-1.8/libedataserver/e-time-utils.h
-include/evolution-data-server-1.8/libedataserver/e-trie.h
-include/evolution-data-server-1.8/libedataserver/e-uid.h
-include/evolution-data-server-1.8/libedataserver/e-url.h
-include/evolution-data-server-1.8/libedataserver/e-xml-hash-utils.h
-include/evolution-data-server-1.8/libedataserver/e-xml-utils.h
-include/evolution-data-server-1.8/libedataserver/md5-utils.h
-include/evolution-data-server-1.8/libedataserverui/e-book-auth-util.h
-include/evolution-data-server-1.8/libedataserverui/e-categories-dialog.h
-include/evolution-data-server-1.8/libedataserverui/e-contact-store.h
-include/evolution-data-server-1.8/libedataserverui/e-destination-store.h
-include/evolution-data-server-1.8/libedataserverui/e-name-selector-dialog.h
-include/evolution-data-server-1.8/libedataserverui/e-name-selector-entry.h
-include/evolution-data-server-1.8/libedataserverui/e-name-selector-list.h
-include/evolution-data-server-1.8/libedataserverui/e-name-selector-model.h
-include/evolution-data-server-1.8/libedataserverui/e-name-selector.h
-include/evolution-data-server-1.8/libedataserverui/e-passwords.h
-include/evolution-data-server-1.8/libedataserverui/e-source-option-menu.h
-include/evolution-data-server-1.8/libedataserverui/e-source-selector-dialog.h
-include/evolution-data-server-1.8/libedataserverui/e-source-selector.h
-include/evolution-data-server-1.8/libedataserverui/e-tree-model-generator.h
-include/evolution-data-server-1.8/libical/ical.h
-include/evolution-data-server-1.8/libical/icalarray.h
-include/evolution-data-server-1.8/libical/icalattach.h
-include/evolution-data-server-1.8/libical/icalcalendar.h
-include/evolution-data-server-1.8/libical/icalclassify.h
-include/evolution-data-server-1.8/libical/icalcluster.h
-include/evolution-data-server-1.8/libical/icalcomponent.h
-include/evolution-data-server-1.8/libical/icalderivedparameter.h
-include/evolution-data-server-1.8/libical/icalderivedproperty.h
-include/evolution-data-server-1.8/libical/icalderivedvalue.h
-include/evolution-data-server-1.8/libical/icaldirset.h
-include/evolution-data-server-1.8/libical/icaldirsetimpl.h
-include/evolution-data-server-1.8/libical/icalduration.h
-include/evolution-data-server-1.8/libical/icalenums.h
-include/evolution-data-server-1.8/libical/icalerror.h
-include/evolution-data-server-1.8/libical/icalfileset.h
-include/evolution-data-server-1.8/libical/icalfilesetimpl.h
-include/evolution-data-server-1.8/libical/icalgauge.h
-include/evolution-data-server-1.8/libical/icalgaugeimpl.h
-include/evolution-data-server-1.8/libical/icallangbind.h
-include/evolution-data-server-1.8/libical/icalmemory.h
-include/evolution-data-server-1.8/libical/icalmessage.h
-include/evolution-data-server-1.8/libical/icalmime.h
-include/evolution-data-server-1.8/libical/icalparameter.h
-include/evolution-data-server-1.8/libical/icalparser.h
-include/evolution-data-server-1.8/libical/icalperiod.h
-include/evolution-data-server-1.8/libical/icalproperty.h
-include/evolution-data-server-1.8/libical/icalrecur.h
-include/evolution-data-server-1.8/libical/icalrestriction.h
-include/evolution-data-server-1.8/libical/icalset.h
-include/evolution-data-server-1.8/libical/icalspanlist.h
-include/evolution-data-server-1.8/libical/icalss.h
-include/evolution-data-server-1.8/libical/icalssyacc.h
-include/evolution-data-server-1.8/libical/icaltime.h
-include/evolution-data-server-1.8/libical/icaltimezone.h
-include/evolution-data-server-1.8/libical/icaltypes.h
-include/evolution-data-server-1.8/libical/icalvalue.h
-include/evolution-data-server-1.8/libical/icalvcal.h
-include/evolution-data-server-1.8/libical/port.h
-include/evolution-data-server-1.8/libical/pvl.h
-include/evolution-data-server-1.8/libical/sspm.h
-include/evolution-data-server-1.8/libical/vcaltmp.h
-include/evolution-data-server-1.8/libical/vcc.h
-include/evolution-data-server-1.8/libical/vobject.h
-lib/bonobo/servers/GNOME_Evolution_DataServer_1.2.server
-lib/evolution-data-server-1.2/camel-providers/libcamelgroupwise.la
-lib/evolution-data-server-1.2/camel-providers/libcamelgroupwise.urls
-lib/evolution-data-server-1.2/camel-providers/libcamelhula.la
-lib/evolution-data-server-1.2/camel-providers/libcamelhula.urls
-lib/evolution-data-server-1.2/camel-providers/libcamelimap.la
-lib/evolution-data-server-1.2/camel-providers/libcamelimap.urls
-lib/evolution-data-server-1.2/camel-providers/libcamellocal.la
-lib/evolution-data-server-1.2/camel-providers/libcamellocal.urls
-lib/evolution-data-server-1.2/camel-providers/libcamelnntp.la
-lib/evolution-data-server-1.2/camel-providers/libcamelnntp.urls
-lib/evolution-data-server-1.2/camel-providers/libcamelpop3.la
-lib/evolution-data-server-1.2/camel-providers/libcamelpop3.urls
-lib/evolution-data-server-1.2/camel-providers/libcamelsendmail.la
-lib/evolution-data-server-1.2/camel-providers/libcamelsendmail.urls
-lib/evolution-data-server-1.2/camel-providers/libcamelsmtp.la
-lib/evolution-data-server-1.2/camel-providers/libcamelsmtp.urls
-lib/evolution-data-server-1.2/extensions/libebookbackendfile.la
-lib/evolution-data-server-1.2/extensions/libebookbackendgroupwise.la
-lib/evolution-data-server-1.2/extensions/libebookbackendldap.la
-lib/evolution-data-server-1.2/extensions/libebookbackendvcf.la
-lib/evolution-data-server-1.2/extensions/libecalbackendcaldav.la
-lib/evolution-data-server-1.2/extensions/libecalbackendcontacts.la
-lib/evolution-data-server-1.2/extensions/libecalbackendfile.la
-lib/evolution-data-server-1.2/extensions/libecalbackendgroupwise.la
-lib/evolution-data-server-1.2/extensions/libecalbackendhttp.la
-lib/evolution-data-server-1.2/extensions/libecalbackendweather.la
-lib/libcamel-1.2.la
-lib/libcamel-provider-1.2.la
-lib/libebook-1.2.la
-lib/libecal-1.2.la
-lib/libedata-book-1.2.la
-lib/libedata-cal-1.2.la
-lib/libedataserver-1.2.la
-lib/libedataserverui-1.2.la
-lib/libegroupwise-1.2.la
-lib/libexchange-storage-1.2.la
-lib/pkgconfig/camel-1.2.pc
-lib/pkgconfig/camel-provider-1.2.pc
-lib/pkgconfig/evolution-data-server-1.2.pc
-lib/pkgconfig/libebook-1.2.pc
-lib/pkgconfig/libecal-1.2.pc
-lib/pkgconfig/libedata-book-1.2.pc
-lib/pkgconfig/libedata-cal-1.2.pc
-lib/pkgconfig/libedataserver-1.2.pc
-lib/pkgconfig/libedataserverui-1.2.pc
-lib/pkgconfig/libegroupwise-1.2.pc
-lib/pkgconfig/libexchange-storage-1.2.pc
-libexec/camel-index-control-1.2
-libexec/camel-lock-helper-1.2
-libexec/evolution-data-server-1.8
-share/evolution-data-server-1.8/evolutionperson.schema
-share/evolution-data-server-1.8/glade/e-categories-dialog.glade
-share/evolution-data-server-1.8/glade/e-name-selector-dialog.glade
-share/evolution-data-server-1.8/weather/Locations.xml
-share/evolution-data-server-1.8/zoneinfo/Africa/Abidjan.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Accra.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Addis_Ababa.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Algiers.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Asmera.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Bamako.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Bangui.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Banjul.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Bissau.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Blantyre.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Brazzaville.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Bujumbura.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Cairo.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Casablanca.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Ceuta.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Conakry.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Dakar.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Dar_es_Salaam.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Djibouti.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Douala.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/El_Aaiun.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Freetown.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Gaborone.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Harare.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Johannesburg.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Kampala.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Khartoum.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Kigali.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Kinshasa.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Lagos.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Libreville.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Lome.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Luanda.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Lubumbashi.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Lusaka.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Malabo.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Maputo.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Maseru.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Mbabane.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Mogadishu.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Monrovia.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Nairobi.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Ndjamena.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Niamey.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Nouakchott.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Ouagadougou.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Porto-Novo.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Sao_Tome.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Timbuktu.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Tripoli.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Tunis.ics
-share/evolution-data-server-1.8/zoneinfo/Africa/Windhoek.ics
-share/evolution-data-server-1.8/zoneinfo/America/Adak.ics
-share/evolution-data-server-1.8/zoneinfo/America/Anchorage.ics
-share/evolution-data-server-1.8/zoneinfo/America/Anguilla.ics
-share/evolution-data-server-1.8/zoneinfo/America/Antigua.ics
-share/evolution-data-server-1.8/zoneinfo/America/Araguaina.ics
-share/evolution-data-server-1.8/zoneinfo/America/Aruba.ics
-share/evolution-data-server-1.8/zoneinfo/America/Asuncion.ics
-share/evolution-data-server-1.8/zoneinfo/America/Barbados.ics
-share/evolution-data-server-1.8/zoneinfo/America/Belem.ics
-share/evolution-data-server-1.8/zoneinfo/America/Belize.ics
-share/evolution-data-server-1.8/zoneinfo/America/Boa_Vista.ics
-share/evolution-data-server-1.8/zoneinfo/America/Bogota.ics
-share/evolution-data-server-1.8/zoneinfo/America/Boise.ics
-share/evolution-data-server-1.8/zoneinfo/America/Buenos_Aires.ics
-share/evolution-data-server-1.8/zoneinfo/America/Cambridge_Bay.ics
-share/evolution-data-server-1.8/zoneinfo/America/Cancun.ics
-share/evolution-data-server-1.8/zoneinfo/America/Caracas.ics
-share/evolution-data-server-1.8/zoneinfo/America/Catamarca.ics
-share/evolution-data-server-1.8/zoneinfo/America/Cayenne.ics
-share/evolution-data-server-1.8/zoneinfo/America/Cayman.ics
-share/evolution-data-server-1.8/zoneinfo/America/Chicago.ics
-share/evolution-data-server-1.8/zoneinfo/America/Chihuahua.ics
-share/evolution-data-server-1.8/zoneinfo/America/Cordoba.ics
-share/evolution-data-server-1.8/zoneinfo/America/Costa_Rica.ics
-share/evolution-data-server-1.8/zoneinfo/America/Cuiaba.ics
-share/evolution-data-server-1.8/zoneinfo/America/Curacao.ics
-share/evolution-data-server-1.8/zoneinfo/America/Danmarkshavn.ics
-share/evolution-data-server-1.8/zoneinfo/America/Dawson.ics
-share/evolution-data-server-1.8/zoneinfo/America/Dawson_Creek.ics
-share/evolution-data-server-1.8/zoneinfo/America/Denver.ics
-share/evolution-data-server-1.8/zoneinfo/America/Detroit.ics
-share/evolution-data-server-1.8/zoneinfo/America/Dominica.ics
-share/evolution-data-server-1.8/zoneinfo/America/Edmonton.ics
-share/evolution-data-server-1.8/zoneinfo/America/Eirunepe.ics
-share/evolution-data-server-1.8/zoneinfo/America/El_Salvador.ics
-share/evolution-data-server-1.8/zoneinfo/America/Fortaleza.ics
-share/evolution-data-server-1.8/zoneinfo/America/Glace_Bay.ics
-share/evolution-data-server-1.8/zoneinfo/America/Godthab.ics
-share/evolution-data-server-1.8/zoneinfo/America/Goose_Bay.ics
-share/evolution-data-server-1.8/zoneinfo/America/Grand_Turk.ics
-share/evolution-data-server-1.8/zoneinfo/America/Grenada.ics
-share/evolution-data-server-1.8/zoneinfo/America/Guadeloupe.ics
-share/evolution-data-server-1.8/zoneinfo/America/Guatemala.ics
-share/evolution-data-server-1.8/zoneinfo/America/Guayaquil.ics
-share/evolution-data-server-1.8/zoneinfo/America/Guyana.ics
-share/evolution-data-server-1.8/zoneinfo/America/Halifax.ics
-share/evolution-data-server-1.8/zoneinfo/America/Havana.ics
-share/evolution-data-server-1.8/zoneinfo/America/Hermosillo.ics
-share/evolution-data-server-1.8/zoneinfo/America/Indiana/Indianapolis.ics
-share/evolution-data-server-1.8/zoneinfo/America/Indiana/Knox.ics
-share/evolution-data-server-1.8/zoneinfo/America/Indiana/Marengo.ics
-share/evolution-data-server-1.8/zoneinfo/America/Indiana/Vevay.ics
-share/evolution-data-server-1.8/zoneinfo/America/Indianapolis.ics
-share/evolution-data-server-1.8/zoneinfo/America/Inuvik.ics
-share/evolution-data-server-1.8/zoneinfo/America/Iqaluit.ics
-share/evolution-data-server-1.8/zoneinfo/America/Jamaica.ics
-share/evolution-data-server-1.8/zoneinfo/America/Jujuy.ics
-share/evolution-data-server-1.8/zoneinfo/America/Juneau.ics
-share/evolution-data-server-1.8/zoneinfo/America/Kentucky/Louisville.ics
-share/evolution-data-server-1.8/zoneinfo/America/Kentucky/Monticello.ics
-share/evolution-data-server-1.8/zoneinfo/America/La_Paz.ics
-share/evolution-data-server-1.8/zoneinfo/America/Lima.ics
-share/evolution-data-server-1.8/zoneinfo/America/Los_Angeles.ics
-share/evolution-data-server-1.8/zoneinfo/America/Louisville.ics
-share/evolution-data-server-1.8/zoneinfo/America/Maceio.ics
-share/evolution-data-server-1.8/zoneinfo/America/Managua.ics
-share/evolution-data-server-1.8/zoneinfo/America/Manaus.ics
-share/evolution-data-server-1.8/zoneinfo/America/Martinique.ics
-share/evolution-data-server-1.8/zoneinfo/America/Mazatlan.ics
-share/evolution-data-server-1.8/zoneinfo/America/Mendoza.ics
-share/evolution-data-server-1.8/zoneinfo/America/Menominee.ics
-share/evolution-data-server-1.8/zoneinfo/America/Merida.ics
-share/evolution-data-server-1.8/zoneinfo/America/Mexico_City.ics
-share/evolution-data-server-1.8/zoneinfo/America/Miquelon.ics
-share/evolution-data-server-1.8/zoneinfo/America/Monterrey.ics
-share/evolution-data-server-1.8/zoneinfo/America/Montevideo.ics
-share/evolution-data-server-1.8/zoneinfo/America/Montreal.ics
-share/evolution-data-server-1.8/zoneinfo/America/Montserrat.ics
-share/evolution-data-server-1.8/zoneinfo/America/Nassau.ics
-share/evolution-data-server-1.8/zoneinfo/America/New_York.ics
-share/evolution-data-server-1.8/zoneinfo/America/Nipigon.ics
-share/evolution-data-server-1.8/zoneinfo/America/Nome.ics
-share/evolution-data-server-1.8/zoneinfo/America/Noronha.ics
-share/evolution-data-server-1.8/zoneinfo/America/North_Dakota/Center.ics
-share/evolution-data-server-1.8/zoneinfo/America/Panama.ics
-share/evolution-data-server-1.8/zoneinfo/America/Pangnirtung.ics
-share/evolution-data-server-1.8/zoneinfo/America/Paramaribo.ics
-share/evolution-data-server-1.8/zoneinfo/America/Phoenix.ics
-share/evolution-data-server-1.8/zoneinfo/America/Port-au-Prince.ics
-share/evolution-data-server-1.8/zoneinfo/America/Port_of_Spain.ics
-share/evolution-data-server-1.8/zoneinfo/America/Porto_Velho.ics
-share/evolution-data-server-1.8/zoneinfo/America/Puerto_Rico.ics
-share/evolution-data-server-1.8/zoneinfo/America/Rainy_River.ics
-share/evolution-data-server-1.8/zoneinfo/America/Rankin_Inlet.ics
-share/evolution-data-server-1.8/zoneinfo/America/Recife.ics
-share/evolution-data-server-1.8/zoneinfo/America/Regina.ics
-share/evolution-data-server-1.8/zoneinfo/America/Rio_Branco.ics
-share/evolution-data-server-1.8/zoneinfo/America/Rosario.ics
-share/evolution-data-server-1.8/zoneinfo/America/Santiago.ics
-share/evolution-data-server-1.8/zoneinfo/America/Santo_Domingo.ics
-share/evolution-data-server-1.8/zoneinfo/America/Sao_Paulo.ics
-share/evolution-data-server-1.8/zoneinfo/America/Scoresbysund.ics
-share/evolution-data-server-1.8/zoneinfo/America/Shiprock.ics
-share/evolution-data-server-1.8/zoneinfo/America/St_Johns.ics
-share/evolution-data-server-1.8/zoneinfo/America/St_Kitts.ics
-share/evolution-data-server-1.8/zoneinfo/America/St_Lucia.ics
-share/evolution-data-server-1.8/zoneinfo/America/St_Thomas.ics
-share/evolution-data-server-1.8/zoneinfo/America/St_Vincent.ics
-share/evolution-data-server-1.8/zoneinfo/America/Swift_Current.ics
-share/evolution-data-server-1.8/zoneinfo/America/Tegucigalpa.ics
-share/evolution-data-server-1.8/zoneinfo/America/Thule.ics
-share/evolution-data-server-1.8/zoneinfo/America/Thunder_Bay.ics
-share/evolution-data-server-1.8/zoneinfo/America/Tijuana.ics
-share/evolution-data-server-1.8/zoneinfo/America/Tortola.ics
-share/evolution-data-server-1.8/zoneinfo/America/Vancouver.ics
-share/evolution-data-server-1.8/zoneinfo/America/Whitehorse.ics
-share/evolution-data-server-1.8/zoneinfo/America/Winnipeg.ics
-share/evolution-data-server-1.8/zoneinfo/America/Yakutat.ics
-share/evolution-data-server-1.8/zoneinfo/America/Yellowknife.ics
-share/evolution-data-server-1.8/zoneinfo/Antarctica/Casey.ics
-share/evolution-data-server-1.8/zoneinfo/Antarctica/Davis.ics
-share/evolution-data-server-1.8/zoneinfo/Antarctica/DumontDUrville.ics
-share/evolution-data-server-1.8/zoneinfo/Antarctica/Mawson.ics
-share/evolution-data-server-1.8/zoneinfo/Antarctica/McMurdo.ics
-share/evolution-data-server-1.8/zoneinfo/Antarctica/Palmer.ics
-share/evolution-data-server-1.8/zoneinfo/Antarctica/South_Pole.ics
-share/evolution-data-server-1.8/zoneinfo/Antarctica/Syowa.ics
-share/evolution-data-server-1.8/zoneinfo/Antarctica/Vostok.ics
-share/evolution-data-server-1.8/zoneinfo/Arctic/Longyearbyen.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Aden.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Almaty.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Amman.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Anadyr.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Aqtau.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Aqtobe.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Ashgabat.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Baghdad.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Bahrain.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Baku.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Bangkok.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Beirut.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Bishkek.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Brunei.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Calcutta.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Choibalsan.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Chongqing.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Chungking.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Colombo.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Damascus.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Dhaka.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Dili.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Dubai.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Dushanbe.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Gaza.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Harbin.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Hong_Kong.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Hovd.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Irkutsk.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Istanbul.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Jakarta.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Jayapura.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Jerusalem.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Kabul.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Kamchatka.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Karachi.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Kashgar.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Katmandu.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Krasnoyarsk.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Kuala_Lumpur.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Kuching.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Kuwait.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Macao.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Magadan.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Manila.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Muscat.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Nicosia.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Novosibirsk.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Omsk.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Phnom_Penh.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Pontianak.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Pyongyang.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Qatar.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Rangoon.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Riyadh.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Saigon.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Sakhalin.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Samarkand.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Seoul.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Shanghai.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Singapore.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Taipei.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Tashkent.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Tbilisi.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Tehran.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Thimphu.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Tokyo.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Ujung_Pandang.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Ulaanbaatar.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Urumqi.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Vientiane.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Vladivostok.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Yakutsk.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Yekaterinburg.ics
-share/evolution-data-server-1.8/zoneinfo/Asia/Yerevan.ics
-share/evolution-data-server-1.8/zoneinfo/Atlantic/Azores.ics
-share/evolution-data-server-1.8/zoneinfo/Atlantic/Bermuda.ics
-share/evolution-data-server-1.8/zoneinfo/Atlantic/Canary.ics
-share/evolution-data-server-1.8/zoneinfo/Atlantic/Cape_Verde.ics
-share/evolution-data-server-1.8/zoneinfo/Atlantic/Faeroe.ics
-share/evolution-data-server-1.8/zoneinfo/Atlantic/Jan_Mayen.ics
-share/evolution-data-server-1.8/zoneinfo/Atlantic/Madeira.ics
-share/evolution-data-server-1.8/zoneinfo/Atlantic/Reykjavik.ics
-share/evolution-data-server-1.8/zoneinfo/Atlantic/South_Georgia.ics
-share/evolution-data-server-1.8/zoneinfo/Atlantic/St_Helena.ics
-share/evolution-data-server-1.8/zoneinfo/Atlantic/Stanley.ics
-share/evolution-data-server-1.8/zoneinfo/Australia/Adelaide.ics
-share/evolution-data-server-1.8/zoneinfo/Australia/Brisbane.ics
-share/evolution-data-server-1.8/zoneinfo/Australia/Broken_Hill.ics
-share/evolution-data-server-1.8/zoneinfo/Australia/Darwin.ics
-share/evolution-data-server-1.8/zoneinfo/Australia/Hobart.ics
-share/evolution-data-server-1.8/zoneinfo/Australia/Lindeman.ics
-share/evolution-data-server-1.8/zoneinfo/Australia/Lord_Howe.ics
-share/evolution-data-server-1.8/zoneinfo/Australia/Melbourne.ics
-share/evolution-data-server-1.8/zoneinfo/Australia/Perth.ics
-share/evolution-data-server-1.8/zoneinfo/Australia/Sydney.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Amsterdam.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Andorra.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Athens.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Belfast.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Belgrade.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Berlin.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Bratislava.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Brussels.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Bucharest.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Budapest.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Chisinau.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Copenhagen.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Dublin.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Gibraltar.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Helsinki.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Istanbul.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Kaliningrad.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Kiev.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Lisbon.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Ljubljana.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/London.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Luxembourg.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Madrid.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Malta.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Minsk.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Monaco.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Moscow.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Nicosia.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Oslo.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Paris.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Prague.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Riga.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Rome.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Samara.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/San_Marino.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Sarajevo.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Simferopol.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Skopje.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Sofia.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Stockholm.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Tallinn.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Tirane.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Uzhgorod.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Vaduz.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Vatican.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Vienna.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Vilnius.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Warsaw.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Zagreb.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Zaporozhye.ics
-share/evolution-data-server-1.8/zoneinfo/Europe/Zurich.ics
-share/evolution-data-server-1.8/zoneinfo/Indian/Antananarivo.ics
-share/evolution-data-server-1.8/zoneinfo/Indian/Chagos.ics
-share/evolution-data-server-1.8/zoneinfo/Indian/Christmas.ics
-share/evolution-data-server-1.8/zoneinfo/Indian/Cocos.ics
-share/evolution-data-server-1.8/zoneinfo/Indian/Comoro.ics
-share/evolution-data-server-1.8/zoneinfo/Indian/Kerguelen.ics
-share/evolution-data-server-1.8/zoneinfo/Indian/Mahe.ics
-share/evolution-data-server-1.8/zoneinfo/Indian/Maldives.ics
-share/evolution-data-server-1.8/zoneinfo/Indian/Mauritius.ics
-share/evolution-data-server-1.8/zoneinfo/Indian/Mayotte.ics
-share/evolution-data-server-1.8/zoneinfo/Indian/Reunion.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Apia.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Auckland.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Chatham.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Easter.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Efate.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Enderbury.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Fakaofo.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Fiji.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Funafuti.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Galapagos.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Gambier.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Guadalcanal.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Guam.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Honolulu.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Johnston.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Kiritimati.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Kosrae.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Kwajalein.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Majuro.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Marquesas.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Midway.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Nauru.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Niue.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Norfolk.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Noumea.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Pago_Pago.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Palau.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Pitcairn.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Ponape.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Port_Moresby.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Rarotonga.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Saipan.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Tahiti.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Tarawa.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Tongatapu.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Truk.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Wake.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Wallis.ics
-share/evolution-data-server-1.8/zoneinfo/Pacific/Yap.ics
-share/evolution-data-server-1.8/zoneinfo/zones.tab
-share/gtk-doc/html/libebook/EBook.html
-share/gtk-doc/html/libebook/EBookListener.html
-share/gtk-doc/html/libebook/EBookView.html
-share/gtk-doc/html/libebook/EBookViewListener.html
-share/gtk-doc/html/libebook/EContact.html
-share/gtk-doc/html/libebook/EDestination.html
-share/gtk-doc/html/libebook/EVCard.html
-share/gtk-doc/html/libebook/ch01.html
-share/gtk-doc/html/libebook/home.png
-share/gtk-doc/html/libebook/index.html
-share/gtk-doc/html/libebook/index.sgml
-share/gtk-doc/html/libebook/left.png
-share/gtk-doc/html/libebook/libebook-EAddressWestern.html
-share/gtk-doc/html/libebook/libebook-ENameWestern.html
-share/gtk-doc/html/libebook/libebook-e-book-query.html
-share/gtk-doc/html/libebook/libebook-e-book-types.html
-share/gtk-doc/html/libebook/libebook.devhelp
-share/gtk-doc/html/libebook/libebook.devhelp2
-share/gtk-doc/html/libebook/right.png
-share/gtk-doc/html/libebook/style.css
-share/gtk-doc/html/libebook/up.png
-share/gtk-doc/html/libecal/ECal.html
-share/gtk-doc/html/libecal/ECalComponent.html
-share/gtk-doc/html/libecal/ch01.html
-share/gtk-doc/html/libecal/home.png
-share/gtk-doc/html/libecal/index.html
-share/gtk-doc/html/libecal/index.sgml
-share/gtk-doc/html/libecal/left.png
-share/gtk-doc/html/libecal/libecal-ECalListener.html
-share/gtk-doc/html/libecal/libecal-ECalView.html
-share/gtk-doc/html/libecal/libecal-ECalViewListener.html
-share/gtk-doc/html/libecal/libecal-e-cal-recur.html
-share/gtk-doc/html/libecal/libecal-e-cal-time-util.html
-share/gtk-doc/html/libecal/libecal-e-cal-types.html
-share/gtk-doc/html/libecal/libecal-e-cal-util.html
-share/gtk-doc/html/libecal/libecal.devhelp
-share/gtk-doc/html/libecal/right.png
-share/gtk-doc/html/libecal/style.css
-share/gtk-doc/html/libecal/up.png
-share/gtk-doc/html/libedata-cal/ECalBackend.html
-share/gtk-doc/html/libedata-cal/ECalBackendSExp.html
-share/gtk-doc/html/libedata-cal/EDataCal.html
-share/gtk-doc/html/libedata-cal/EDataCalView.html
-share/gtk-doc/html/libedata-cal/ch01.html
-share/gtk-doc/html/libedata-cal/home.png
-share/gtk-doc/html/libedata-cal/index.html
-share/gtk-doc/html/libedata-cal/index.sgml
-share/gtk-doc/html/libedata-cal/left.png
-share/gtk-doc/html/libedata-cal/libedata-cal-ECalBackendCache.html
-share/gtk-doc/html/libedata-cal/libedata-cal-ECalBackendFactory.html
-share/gtk-doc/html/libedata-cal/libedata-cal-ECalBackendSync.html
-share/gtk-doc/html/libedata-cal/libedata-cal-EDataCalFactory.html
-share/gtk-doc/html/libedata-cal/libedata-cal-e-cal-backend-util.html
-share/gtk-doc/html/libedata-cal/libedata-cal.devhelp
-share/gtk-doc/html/libedata-cal/libedata-cal.devhelp2
-share/gtk-doc/html/libedata-cal/right.png
-share/gtk-doc/html/libedata-cal/style.css
-share/gtk-doc/html/libedata-cal/up.png
-share/gtk-doc/html/libedataserver/ch01.html
-share/gtk-doc/html/libedataserver/home.png
-share/gtk-doc/html/libedataserver/index.html
-share/gtk-doc/html/libedataserver/index.sgml
-share/gtk-doc/html/libedataserver/left.png
-share/gtk-doc/html/libedataserver/libedataserver-EAccount.html
-share/gtk-doc/html/libedataserver/libedataserver-EAccountList.html
-share/gtk-doc/html/libedataserver/libedataserver-EComponentListener.html
-share/gtk-doc/html/libedataserver/libedataserver-EFileCache.html
-share/gtk-doc/html/libedataserver/libedataserver-EIterator.html
-share/gtk-doc/html/libedataserver/libedataserver-EList.html
-share/gtk-doc/html/libedataserver/libedataserver-EListIterator.html
-share/gtk-doc/html/libedataserver/libedataserver-ESExp.html
-share/gtk-doc/html/libedataserver/libedataserver-ESource.html
-share/gtk-doc/html/libedataserver/libedataserver-ESourceGroup.html
-share/gtk-doc/html/libedataserver/libedataserver-ESourceList.html
-share/gtk-doc/html/libedataserver/libedataserver-e-categories.html
-share/gtk-doc/html/libedataserver/libedataserver-e-data-server-module.html
-share/gtk-doc/html/libedataserver/libedataserver-e-db3-utils.html
-share/gtk-doc/html/libedataserver/libedataserver-e-dbhash.html
-share/gtk-doc/html/libedataserver/libedataserver-e-iconv.html
-share/gtk-doc/html/libedataserver/libedataserver-e-memory.html
-share/gtk-doc/html/libedataserver/libedataserver-e-msgport.html
-share/gtk-doc/html/libedataserver/libedataserver-e-time-utils.html
-share/gtk-doc/html/libedataserver/libedataserver-e-trie.html
-share/gtk-doc/html/libedataserver/libedataserver-e-uid.html
-share/gtk-doc/html/libedataserver/libedataserver-e-url.html
-share/gtk-doc/html/libedataserver/libedataserver-e-util.html
-share/gtk-doc/html/libedataserver/libedataserver-e-xml-hash-utils.html
-share/gtk-doc/html/libedataserver/libedataserver-md5-utils.html
-share/gtk-doc/html/libedataserver/libedataserver.devhelp
-share/gtk-doc/html/libedataserver/right.png
-share/gtk-doc/html/libedataserver/style.css
-share/gtk-doc/html/libedataserver/up.png
-share/idl/evolution-data-server-1.2/Evolution-DataServer-Addressbook.idl
-share/idl/evolution-data-server-1.2/Evolution-DataServer-Calendar.idl
-share/idl/evolution-data-server-1.2/Evolution-DataServer.idl
-share/locale/am/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/ar/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/az/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/be/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/bg/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/bn/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/bn_IN/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/bs/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/ca/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/cs/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/cy/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/da/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/de/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/dz/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/el/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/en_AU/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/en_CA/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/en_GB/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/es/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/et/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/eu/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/fa/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/fi/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/fr/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/ga/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/gl/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/gu/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/he/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/hi/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/hr/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/hu/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/id/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/is/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/it/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/ja/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/ka/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/ko/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/ku/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/lt/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/lv/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/mk/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/ml/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/mn/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/mr/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/ms/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/nb/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/ne/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/nl/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/nn/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/or/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/pa/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/pl/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/pt/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/pt_BR/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/ro/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/ru/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/rw/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/sk/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/sl/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/sq/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/sr/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/sr@Latn/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/sv/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/ta/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/th/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/tr/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/uk/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/vi/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/wa/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/xh/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/zh_CN/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/zh_HK/LC_MESSAGES/evolution-data-server-1.8.mo
-share/locale/zh_TW/LC_MESSAGES/evolution-data-server-1.8.mo
-share/pixmaps/evolution-data-server-1.8/category_birthday_16.png
-share/pixmaps/evolution-data-server-1.8/category_business_16.png
-share/pixmaps/evolution-data-server-1.8/category_favorites_16.png
-share/pixmaps/evolution-data-server-1.8/category_gifts_16.png
-share/pixmaps/evolution-data-server-1.8/category_goals_16.png
-share/pixmaps/evolution-data-server-1.8/category_holiday-cards_16.png
-share/pixmaps/evolution-data-server-1.8/category_holiday_16.png
-share/pixmaps/evolution-data-server-1.8/category_hot-contacts_16.png
-share/pixmaps/evolution-data-server-1.8/category_ideas_16.png
-share/pixmaps/evolution-data-server-1.8/category_international_16.png
-share/pixmaps/evolution-data-server-1.8/category_key-customer_16.png
-share/pixmaps/evolution-data-server-1.8/category_miscellaneous_16.png
-share/pixmaps/evolution-data-server-1.8/category_personal_16.png
-share/pixmaps/evolution-data-server-1.8/category_phonecalls_16.png
-share/pixmaps/evolution-data-server-1.8/category_status_16.png
-share/pixmaps/evolution-data-server-1.8/category_strategies_16.png
-share/pixmaps/evolution-data-server-1.8/category_suppliers_16.png
-share/pixmaps/evolution-data-server-1.8/category_time-and-expenses_16.png
-@dirrm share/pixmaps/evolution-data-server-1.8
-@comment in xdg-dirs: @dirrm share/pixmaps
-@dirrm share/idl/evolution-data-server-1.2
-@comment in ORBit2: @dirrm share/idl
-@dirrm share/gtk-doc/html/libedataserver
-@dirrm share/gtk-doc/html/libedata-cal
-@dirrm share/gtk-doc/html/libecal
-@dirrm share/gtk-doc/html/libebook
-@dirrm share/evolution-data-server-1.8/zoneinfo/Pacific
-@dirrm share/evolution-data-server-1.8/zoneinfo/Indian
-@dirrm share/evolution-data-server-1.8/zoneinfo/Europe
-@dirrm share/evolution-data-server-1.8/zoneinfo/Australia
-@dirrm share/evolution-data-server-1.8/zoneinfo/Atlantic
-@dirrm share/evolution-data-server-1.8/zoneinfo/Asia
-@dirrm share/evolution-data-server-1.8/zoneinfo/Arctic
-@dirrm share/evolution-data-server-1.8/zoneinfo/Antarctica
-@dirrm share/evolution-data-server-1.8/zoneinfo/America/North_Dakota
-@dirrm share/evolution-data-server-1.8/zoneinfo/America/Kentucky
-@dirrm share/evolution-data-server-1.8/zoneinfo/America/Indiana
-@dirrm share/evolution-data-server-1.8/zoneinfo/America
-@dirrm share/evolution-data-server-1.8/zoneinfo/Africa
-@dirrm share/evolution-data-server-1.8/zoneinfo
-@dirrm share/evolution-data-server-1.8/weather
-@dirrm share/evolution-data-server-1.8/glade
-@dirrm share/evolution-data-server-1.8
-@dirrm lib/evolution-data-server-1.2/extensions
-@dirrm lib/evolution-data-server-1.2/camel-providers
-@dirrm lib/evolution-data-server-1.2
-@comment in libbonobo: @dirrm lib/bonobo/servers
-@dirrm include/evolution-data-server-1.8/libical
-@dirrm include/evolution-data-server-1.8/libedataserverui
-@dirrm include/evolution-data-server-1.8/libedataserver
-@dirrm include/evolution-data-server-1.8/libedata-cal
-@dirrm include/evolution-data-server-1.8/libedata-book
-@dirrm include/evolution-data-server-1.8/libecal
-@dirrm include/evolution-data-server-1.8/libebook
-@dirrm include/evolution-data-server-1.8/groupwise
-@dirrm include/evolution-data-server-1.8/exchange
-@dirrm include/evolution-data-server-1.8/camel
-@dirrm include/evolution-data-server-1.8
diff --git a/mail/evolution-data-server/buildlink3.mk b/mail/evolution-data-server/buildlink3.mk
deleted file mode 100644
index 03a55bbf310..00000000000
--- a/mail/evolution-data-server/buildlink3.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.21 2006/09/16 12:20:34 jmmv Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-EVOLUTION_DATA_SERVER_BUILDLINK3_MK:= ${EVOLUTION_DATA_SERVER_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= evolution-data-server
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nevolution-data-server}
-BUILDLINK_PACKAGES+= evolution-data-server
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}evolution-data-server
-
-.if !empty(EVOLUTION_DATA_SERVER_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.evolution-data-server+= evolution-data-server>=1.8.0
-BUILDLINK_ABI_DEPENDS.evolution-data-server?= evolution-data-server>=1.8.0nb1
-BUILDLINK_PKGSRCDIR.evolution-data-server?= ../../mail/evolution-data-server
-
-PRINT_PLIST_AWK+=/^@dirrm lib\/evolution-data-server-1.2\/extensions$$/ \
- { print "@comment in evolution-data-server: " $$0; next }
-PRINT_PLIST_AWK+=/^@dirrm lib\/evolution-data-server-1.2\/camel-providers$$/ \
- { print "@comment in evolution-data-server: " $$0; next }
-PRINT_PLIST_AWK+=/^@dirrm lib\/evolution-data-server-1.2$$/ \
- { print "@comment in evolution-data-server: " $$0; next }
-.endif # EVOLUTION_DATA_SERVER_BUILDLINK3_MK
-
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/nss/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/evolution-data-server/distinfo b/mail/evolution-data-server/distinfo
deleted file mode 100644
index 62d57e7249e..00000000000
--- a/mail/evolution-data-server/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.34 2007/01/18 15:22:15 tonio Exp $
-
-SHA1 (evolution-data-server-1.8.2.tar.bz2) = 7b6ba62d96b6c54e762be4ddf1c476ebf8201dc1
-RMD160 (evolution-data-server-1.8.2.tar.bz2) = b3ae6d2dafa0abbbaf5ffe2fbdc39b6b20fe762d
-Size (evolution-data-server-1.8.2.tar.bz2) = 6963774 bytes
-SHA1 (patch-af) = 1e458720684cfe3823b3b73665044336588c4620
-SHA1 (patch-ak) = f8ae411b9ea2536f5ccbb35a2e215d89997c3ea9
-SHA1 (patch-al) = 97d5c7889b886535a7cc63c00b6193130f6fa320
-SHA1 (patch-ao) = c98089bab9110eb29339e529fb88b01dbe454623
-SHA1 (patch-ap) = 69fc60b120643c8cca3a70288774839d4e153634
-SHA1 (patch-aq) = 375d592b72f59fa70160bf23aa260338d350c517
-SHA1 (patch-ar) = b6b92b068f94954d435cff11543a4de7d07712ac
diff --git a/mail/evolution-data-server/patches/patch-af b/mail/evolution-data-server/patches/patch-af
deleted file mode 100644
index 7d277d29e66..00000000000
--- a/mail/evolution-data-server/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 2006/06/11 15:05:39 wiz Exp $
-
---- config.h.in.orig 2006-05-29 13:25:13.000000000 +0000
-+++ config.h.in
-@@ -274,3 +274,8 @@
-
- /* Define to appropriate type if socklen_t is not defined */
- #undef socklen_t
-+
-+/* __PRETTY_FUNCTION__ is a GNUism only */
-+#ifndef __GNUC__
-+#define __PRETTY_FUNCTION__ __func__
-+#endif
diff --git a/mail/evolution-data-server/patches/patch-ak b/mail/evolution-data-server/patches/patch-ak
deleted file mode 100644
index bb33b21a77a..00000000000
--- a/mail/evolution-data-server/patches/patch-ak
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ak,v 1.5 2006/09/11 09:33:33 joerg Exp $
-
---- configure.orig 2006-07-31 15:37:06.000000000 +0000
-+++ configure
-@@ -26342,6 +26342,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <netdb.h>
-+ #include <stddef.h>
-
-
- int
-@@ -28447,13 +28448,13 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk
-
-
- PTHREAD_LIB=""
-- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LIB}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LIB}... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread $LIBS"
-+LIBS="${PTHREAD_LIB} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -28512,7 +28513,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
- if test $ac_cv_lib_pthread_pthread_create = yes; then
-- PTHREAD_LIB="-lpthread"
-+ PTHREAD_LIB="${PTHREAD_LIB}"
- else
- echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5
- echo $ECHO_N "checking for pthread_create in -lpthreads... $ECHO_C" >&6
diff --git a/mail/evolution-data-server/patches/patch-al b/mail/evolution-data-server/patches/patch-al
deleted file mode 100644
index 1091f59322b..00000000000
--- a/mail/evolution-data-server/patches/patch-al
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-al,v 1.2 2006/06/11 15:05:39 wiz Exp $
-
-Needed for gcc-2.95.
-
---- servers/groupwise/e-gw-connection.c.orig 2006-05-03 13:59:35.000000000 +0000
-+++ servers/groupwise/e-gw-connection.c
-@@ -1984,8 +1984,8 @@ e_gw_connection_get_categories (EGwConne
- EGwConnectionPrivate *priv;
- SoupSoapParameter *param, *subparam, *second_level_child;
- char *id, *name;
-- g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT);
- static GStaticMutex connecting = G_STATIC_MUTEX_INIT;
-+ g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT);
-
- priv = cnc->priv;
- g_static_mutex_lock (&connecting);
diff --git a/mail/evolution-data-server/patches/patch-ao b/mail/evolution-data-server/patches/patch-ao
deleted file mode 100644
index 6081d8d03b6..00000000000
--- a/mail/evolution-data-server/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2005/10/10 21:32:35 joerg Exp $
-
---- calendar/libical/src/libicalss/icalfileset.c.orig 2005-07-09 22:10:24.000000000 +0000
-+++ calendar/libical/src/libicalss/icalfileset.c
-@@ -56,8 +56,6 @@
- #define S_ISREG(mode) _S_ISTYPE((mode), _S_IFREG)
- #endif
-
--extern int errno;
--
- /** Default options used when NULL is passed to icalset_new() **/
- icalfileset_options icalfileset_options_default = {O_RDWR|O_CREAT, 0644, 0};
-
diff --git a/mail/evolution-data-server/patches/patch-ap b/mail/evolution-data-server/patches/patch-ap
deleted file mode 100644
index 6af338e5361..00000000000
--- a/mail/evolution-data-server/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/10/16 22:09:59 rillig Exp $
-
---- calendar/libical/configure.orig 2006-10-16 23:49:09.000000000 +0200
-+++ calendar/libical/configure 2006-10-16 23:50:04.000000000 +0200
-@@ -20237,7 +20237,7 @@ fi
-
-
-
--if test "x$USE_MAINTAINER_MODE" == xyes; then
-+if test "x$USE_MAINTAINER_MODE" = xyes; then
- DEV="yes"
- echo "$as_me:$LINENO: result: Setting up for development: -Wall, flex, bison" >&5
- echo "${ECHO_T}Setting up for development: -Wall, flex, bison" >&6
diff --git a/mail/evolution-data-server/patches/patch-aq b/mail/evolution-data-server/patches/patch-aq
deleted file mode 100644
index 35c9ea07f63..00000000000
--- a/mail/evolution-data-server/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2006/10/16 22:09:59 rillig Exp $
-
---- libdb/dist/configure.orig 2006-10-16 23:49:09.000000000 +0200
-+++ libdb/dist/configure 2006-10-16 23:50:28.000000000 +0200
-@@ -4925,7 +4925,7 @@ fi
- # we're using.
- case "$host_os" in
- sysv5UnixWare*|sysv5OpenUNIX8*)
-- if test "$GCC" == "yes"; then
-+ if test "$GCC" = "yes"; then
- CPPFLAGS="$CPPFLAGS -pthread"
- LDFLAGS="$LDFLAGS -pthread"
- else
diff --git a/mail/evolution-data-server/patches/patch-ar b/mail/evolution-data-server/patches/patch-ar
deleted file mode 100644
index d6b8163c2fd..00000000000
--- a/mail/evolution-data-server/patches/patch-ar
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2007/01/18 15:22:15 tonio Exp $
-
---- servers/exchange/lib/e2k-autoconfig.c.orig 2006-05-10 10:24:12.000000000 +0200
-+++ servers/exchange/lib/e2k-autoconfig.c
-@@ -44,6 +44,9 @@
- #include <netinet/in.h>
- #include <arpa/nameser.h>
- #include <resolv.h>
-+#ifndef T_SRV
-+#define T_SRV 33
-+#endif
- #else
- #include <winsock2.h>
- #include <ws2tcpip.h>
diff --git a/mail/evolution-exchange/DESCR b/mail/evolution-exchange/DESCR
deleted file mode 100644
index e293270af02..00000000000
--- a/mail/evolution-exchange/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This is the Evolution Exchange plugin, which adds support for Microsoft
-Exchange 2000 and 2003 to Evolution.
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
deleted file mode 100644
index a5ee13a43ab..00000000000
--- a/mail/evolution-exchange/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2007/03/21 12:05:48 wiz Exp $
-#
-
-DISTNAME= evolution-exchange-2.8.0
-PKGREVISION= 2
-CATEGORIES= mail gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution-exchange/2.8/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= jmmv@NetBSD.org
-HOMEPAGE= http://www.novell.com/products/desktop/features/evolution.html
-COMMENT= Support for Microsoft Exchange 2000 and 2003 in Evolution
-
-GNU_CONFIGURE= YES
-USE_TOOLS+= gmake intltool msgfmt pkg-config
-USE_LIBTOOL= YES
-USE_PKGLOCALEDIR= YES
-
-.include "../../databases/openldap-client/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../mail/evolution-data-server/buildlink3.mk"
-.include "../../mail/evolution/buildlink3.mk"
-.include "../../net/libsoup-devel/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
-.include "../../print/libgnomeprint/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/krb5.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/evolution-exchange/PLIST b/mail/evolution-exchange/PLIST
deleted file mode 100644
index 6678ac11cfa..00000000000
--- a/mail/evolution-exchange/PLIST
+++ /dev/null
@@ -1,147 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2006/09/15 15:25:08 jmmv Exp $
-bin/exchange-connector-setup-2.8
-lib/bonobo/servers/GNOME_Evolution_Exchange_Storage_2.8.server
-lib/evolution-data-server-1.2/camel-providers/libcamelexchange.la
-lib/evolution-data-server-1.2/camel-providers/libcamelexchange.urls
-libexec/evolution/2.8/evolution-exchange-storage
-share/evolution-exchange/2.8/glade/exchange-autoconfig-wizard.glade
-share/evolution-exchange/2.8/glade/exchange-change-password.glade
-share/evolution-exchange/2.8/glade/exchange-delegates.glade
-share/evolution-exchange/2.8/glade/exchange-folder-tree.glade
-share/evolution-exchange/2.8/glade/exchange-oof.glade
-share/evolution-exchange/2.8/glade/exchange-passwd-expiry.glade
-share/evolution-exchange/2.8/glade/exchange-permissions-dialog.glade
-share/evolution-exchange/2.8/images/connector-mini.png
-share/evolution-exchange/2.8/images/connector.png
-share/evolution-exchange/2.8/images/exchange-delegates-48.png
-share/evolution-exchange/2.8/images/exchange-oof-48.png
-share/evolution-exchange/2.8/ui/ximian-connector.xml
-share/gtk-doc/html/ximian-connector/E2kContext.html
-share/gtk-doc/html/ximian-connector/E2kGlobalCatalog.html
-share/gtk-doc/html/ximian-connector/E2kSecurityDescriptor.html
-share/gtk-doc/html/ximian-connector/ch01.html
-share/gtk-doc/html/ximian-connector/ch02.html
-share/gtk-doc/html/ximian-connector/ch03.html
-share/gtk-doc/html/ximian-connector/ch04.html
-share/gtk-doc/html/ximian-connector/ch05.html
-share/gtk-doc/html/ximian-connector/ch06.html
-share/gtk-doc/html/ximian-connector/home.png
-share/gtk-doc/html/ximian-connector/index.html
-share/gtk-doc/html/ximian-connector/index.sgml
-share/gtk-doc/html/ximian-connector/left.png
-share/gtk-doc/html/ximian-connector/right.png
-share/gtk-doc/html/ximian-connector/style.css
-share/gtk-doc/html/ximian-connector/up.png
-share/gtk-doc/html/ximian-connector/ximian-connector-E2kAutoconfig.html
-share/gtk-doc/html/ximian-connector/ximian-connector-E2kContext-(private).html
-share/gtk-doc/html/ximian-connector/ximian-connector-E2kOperation-(private).html
-share/gtk-doc/html/ximian-connector/ximian-connector-E2kOperation.html
-share/gtk-doc/html/ximian-connector/ximian-connector-E2kProperties.html
-share/gtk-doc/html/ximian-connector/ximian-connector-E2kRestriction-(vaporware).html
-share/gtk-doc/html/ximian-connector/ximian-connector-E2kResult-(private).html
-share/gtk-doc/html/ximian-connector/ximian-connector-E2kSid.html
-share/gtk-doc/html/ximian-connector/ximian-connector-E2kUserDialog.html
-share/gtk-doc/html/ximian-connector/ximian-connector-MAPI.html
-share/gtk-doc/html/ximian-connector/ximian-connector-autoconfig.html
-share/gtk-doc/html/ximian-connector/ximian-connector-bug-private.html
-share/gtk-doc/html/ximian-connector/ximian-connector-bug-xml.html
-share/gtk-doc/html/ximian-connector/ximian-connector-calendar.html
-share/gtk-doc/html/ximian-connector/ximian-connector-delegation.html
-share/gtk-doc/html/ximian-connector/ximian-connector-e2k-action.html
-share/gtk-doc/html/ximian-connector/ximian-connector-e2k-encoding-utils.html
-share/gtk-doc/html/ximian-connector/ximian-connector-e2k-freebusy.html
-share/gtk-doc/html/ximian-connector/ximian-connector-e2k-http-utils.html
-share/gtk-doc/html/ximian-connector/ximian-connector-e2k-kerberos.html
-share/gtk-doc/html/ximian-connector/ximian-connector-e2k-restriction.html
-share/gtk-doc/html/ximian-connector/ximian-connector-e2k-result.html
-share/gtk-doc/html/ximian-connector/ximian-connector-e2k-rule.html
-share/gtk-doc/html/ximian-connector/ximian-connector-e2k-uri.html
-share/gtk-doc/html/ximian-connector/ximian-connector-e2k-utils.html
-share/gtk-doc/html/ximian-connector/ximian-connector-e2k-xml-utils.html
-share/gtk-doc/html/ximian-connector/ximian-connector-favorites.html
-share/gtk-doc/html/ximian-connector/ximian-connector-fba.html
-share/gtk-doc/html/ximian-connector/ximian-connector-freebusy.html
-share/gtk-doc/html/ximian-connector/ximian-connector-mail-threading.html
-share/gtk-doc/html/ximian-connector/ximian-connector-mail.html
-share/gtk-doc/html/ximian-connector/ximian-connector-ntlm.html
-share/gtk-doc/html/ximian-connector/ximian-connector-oof.html
-share/gtk-doc/html/ximian-connector/ximian-connector-other-users.html
-share/gtk-doc/html/ximian-connector/ximian-connector-permissions.html
-share/gtk-doc/html/ximian-connector/ximian-connector-test-utils.html
-share/gtk-doc/html/ximian-connector/ximian-connector-xntlm-des.html
-share/gtk-doc/html/ximian-connector/ximian-connector-xntlm-md4.html
-share/gtk-doc/html/ximian-connector/ximian-connector-xntlm.html
-share/gtk-doc/html/ximian-connector/ximian-connector.devhelp
-share/gtk-doc/html/ximian-connector/ximian-connector.devhelp2
-share/gtk-doc/html/ximian-connector/ximian-connnector-booking.html
-share/locale/ar/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/az/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/bg/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/bn/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/bn_IN/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/ca/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/cs/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/cy/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/da/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/de/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/dz/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/el/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/en_CA/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/en_GB/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/es/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/et/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/eu/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/fa/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/fi/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/fr/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/gl/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/gu/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/hi/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/hu/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/id/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/it/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/ja/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/ko/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/ku/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/lt/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/lv/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/mk/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/ml/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/mn/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/ms/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/nb/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/ne/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/nl/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/nn/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/or/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/pa/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/pl/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/pt/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/pt_BR/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/ro/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/ru/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/rw/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/sk/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/sl/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/sq/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/sr/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/sr@Latn/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/sv/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/ta/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/th/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/tr/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/uk/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/vi/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/xh/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/zh_CN/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/zh_HK/LC_MESSAGES/evolution-exchange-2.8.mo
-share/locale/zh_TW/LC_MESSAGES/evolution-exchange-2.8.mo
-@dirrm share/gtk-doc/html/ximian-connector
-@dirrm share/evolution-exchange/2.8/ui
-@dirrm share/evolution-exchange/2.8/images
-@dirrm share/evolution-exchange/2.8/glade
-@dirrm share/evolution-exchange/2.8
-@dirrm share/evolution-exchange
-@comment in evolution: @dirrm libexec/evolution/2.8
-@comment in evolution-data-server: @dirrm lib/evolution-data-server-1.2/camel-providers
-@comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
deleted file mode 100644
index e6b83a89eb9..00000000000
--- a/mail/evolution-exchange/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/09/15 15:25:08 jmmv Exp $
-
-SHA1 (evolution-exchange-2.8.0.tar.bz2) = 36f203f0574dca910595fbaee8380f38431e42ed
-RMD160 (evolution-exchange-2.8.0.tar.bz2) = daf025634a9333b0a8d90a018a85f6fa5bce3194
-Size (evolution-exchange-2.8.0.tar.bz2) = 1026293 bytes
diff --git a/mail/evolution/DESCR b/mail/evolution/DESCR
deleted file mode 100644
index 5d6a80455bf..00000000000
--- a/mail/evolution/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
- Ximian Evolution(TM) is the premier personal and workgroup information
-management solution for Linux and UNIX. The software seamlessly
-integrates email, calendaring, meeting scheduling, contact management
-and online task lists in one powerful, fast, and easy to use
-application.
-
- Please note that Evolution uses a huge number of resources. Make
-sure you increase user and kernel limits for open files and processes
-if you run into trouble!
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
deleted file mode 100644
index b5d800c7975..00000000000
--- a/mail/evolution/Makefile
+++ /dev/null
@@ -1,141 +0,0 @@
-# $NetBSD: Makefile,v 1.117 2007/03/21 12:05:48 wiz Exp $
-
-DISTNAME= evolution-2.8.0
-PKGREVISION= 4
-CATEGORIES= mail time gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution/2.8/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= rh@NetBSD.org
-HOMEPAGE= http://www.gnome.org/projects/evolution/
-COMMENT= GNOME mailer, calendar, contact manager, and communications tool
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.evolution
-PKG_SUGGESTED_OPTIONS= inet6 ssl
-PKG_SUPPORTED_OPTIONS= inet6 krb4 krb5 ssl
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mssl) && !empty(PKG_OPTIONS:Mkrb[45])
-# If Kerberos is enabled, the libcrypto library is linked in, which causes
-# function name conflicts with libsoftokn3 provided by Mozilla NSS. These
-# cause runtime crashes, so don't allow these options to be specified
-# together.
-PKG_FAIL_REASON+= "Kerberos support conflicts with SSL"
-.endif
-
-GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5
-USE_TOOLS+= bison gmake intltool msgfmt pkg-config
-USE_LIBTOOL= YES
-USE_PKGLOCALEDIR= YES
-
-REPLACE_PERL+= addressbook/tools/csv2vcard
-REPLACE_PERL+= addressbook/tools/evolution-addressbook-clean
-REPLACE_PERL+= addressbook/tools/evolution-addressbook-clean.in
-
-CPPFLAGS+= -I/usr/include/gssapi
-CPPFLAGS+= -I/usr/include/krb5
-
-CONFIGURE_ARGS+= --disable-gtk-doc
-CONFIGURE_ARGS+= --with-openldap
-CONFIGURE_ARGS+= --without-static-ldap
-CONFIGURE_ARGS+= --enable-openssl=no
-CONFIGURE_ARGS+= --enable-pilot-conduits=no
-CONFIGURE_ARGS+= --with-krb4=/usr
-CONFIGURE_ARGS+= --with-krb5=/usr
-.if defined(PKGREVISION)
-CONFIGURE_ARGS+= --with-sub-version=nb${PKGREVISION}
-.endif
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-ipv6=yes
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
-.if !empty(PKG_OPTIONS:Mkrb4)
-CONFIGURE_ARGS+= --with-krb4
-.else
-CONFIGURE_ARGS+= --without-krb4
-.endif
-
-.if !empty(PKG_OPTIONS:Mkrb5)
-CONFIGURE_ARGS+= --with-krb5
-. include "../../mk/krb5.buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-krb5
-.endif
-
-.if !empty(PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+= --enable-nss=yes
-PLIST_SUBST+= HAVE_SMIME=
-PRINT_PLIST_AWK+= /smime/ { print "$${HAVE_SMIME}" $$0; next; }
-# XXX Workaround for the following problem: addressbook/util/libeabutil.la
-# is compiled as a static library only which uses the NSS stuff. When other
-# parts of the program use this .la archive, they get the right -L flags
-# (from the dependency_libs variable) but not the rpaths. buildlink3 should
-# add rpath flags to the dependency_libs, but there is an strange comment
-# in the wrapper saying that it shouldn't.
-LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nss}/lib/nss
-BUILDLINK_API_DEPENDS.nss+= nss>=3.9.2nb3
-. include "../../devel/nspr/buildlink3.mk"
-. include "../../devel/nss/buildlink3.mk"
-
-CPPFLAGS+= -I${BUILDLINK_PREFIX.nss}/include/nss/nss
-
-post-wrapper:
- cd ${BUILDLINK_DIR}/lib/pkgconfig && ${LN} -s nspr.pc mozilla-nspr.pc
- cd ${BUILDLINK_DIR}/lib/pkgconfig && ${LN} -s nss.pc mozilla-nss.pc
-.else
-CONFIGURE_ARGS+= --disable-nss
-PLIST_SUBST+= HAVE_SMIME="@comment "
-.endif
-
-PKGCONFIG_OVERRIDE= evolution-plugin.pc.in
-PKGCONFIG_OVERRIDE+= evolution-shell.pc.in
-
-GCONF2_SCHEMAS= apps-evolution-mail-prompts-checkdefault-2.8.schemas
-GCONF2_SCHEMAS+= apps_evolution_addressbook-2.8.schemas
-GCONF2_SCHEMAS+= apps_evolution_calendar-2.8.schemas
-GCONF2_SCHEMAS+= apps_evolution_shell-2.8.schemas
-GCONF2_SCHEMAS+= evolution-mail-2.8.schemas
-
-BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED
-BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
-
-BUILDLINK_API_DEPENDS.evolution-data-server+= evolution-data-server>=1.4.1
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4.0nb2
-BUILDLINK_API_DEPENDS.libsoup-devel+= libsoup-devel>=2.2.3
-
-.if !exists(/usr/include/semaphore.h)
-LDFLAGS+= -lsemaphore
-.include "../../devel/pthread-sem/buildlink3.mk"
-.endif
-.include "../../databases/openldap-client/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/atk/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../graphics/gnome-icon-theme/buildlink3.mk"
-.include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../mail/evolution-data-server/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
-.include "../../net/libsoup-devel/buildlink3.mk"
-.include "../../print/libgnomeprint/buildlink3.mk"
-.include "../../print/libgnomeprintui/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
-.include "../../www/gtkhtml38/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/evolution/PLIST b/mail/evolution/PLIST
deleted file mode 100644
index 0cbb7688605..00000000000
--- a/mail/evolution/PLIST
+++ /dev/null
@@ -1,692 +0,0 @@
-@comment $NetBSD: PLIST,v 1.29 2006/09/15 15:24:57 jmmv Exp $
-bin/evolution-2.8
-include/evolution-2.8/addressbook/gui/widgets/eab-config.h
-include/evolution-2.8/addressbook/gui/widgets/eab-menu.h
-include/evolution-2.8/addressbook/gui/widgets/eab-popup.h
-include/evolution-2.8/calendar/gui/e-cal-config.h
-include/evolution-2.8/e-conduit/e-pilot-map.h
-include/evolution-2.8/e-conduit/e-pilot-util.h
-include/evolution-2.8/e-util/e-bconf-map.h
-include/evolution-2.8/e-util/e-bit-array.h
-include/evolution-2.8/e-util/e-categories-config.h
-include/evolution-2.8/e-util/e-config-listener.h
-include/evolution-2.8/e-util/e-config.h
-include/evolution-2.8/e-util/e-corba-utils.h
-include/evolution-2.8/e-util/e-cursor.h
-include/evolution-2.8/e-util/e-dialog-utils.h
-include/evolution-2.8/e-util/e-dialog-widgets.h
-include/evolution-2.8/e-util/e-error.h
-include/evolution-2.8/e-util/e-event.h
-include/evolution-2.8/e-util/e-folder-map.h
-include/evolution-2.8/e-util/e-fsutils.h
-include/evolution-2.8/e-util/e-gtk-utils.h
-include/evolution-2.8/e-util/e-gui-utils.h
-include/evolution-2.8/e-util/e-html-utils.h
-include/evolution-2.8/e-util/e-icon-factory.h
-include/evolution-2.8/e-util/e-import.h
-include/evolution-2.8/e-util/e-menu.h
-include/evolution-2.8/e-util/e-mktemp.h
-include/evolution-2.8/e-util/e-plugin.h
-include/evolution-2.8/e-util/e-popup.h
-include/evolution-2.8/e-util/e-print.h
-include/evolution-2.8/e-util/e-profile-event.h
-include/evolution-2.8/e-util/e-request.h
-include/evolution-2.8/e-util/e-signature-list.h
-include/evolution-2.8/e-util/e-signature.h
-include/evolution-2.8/e-util/e-sorter-array.h
-include/evolution-2.8/e-util/e-sorter.h
-include/evolution-2.8/e-util/e-text-event-processor-emacs-like.h
-include/evolution-2.8/e-util/e-text-event-processor-types.h
-include/evolution-2.8/e-util/e-text-event-processor.h
-include/evolution-2.8/e-util/e-util-marshal.h
-include/evolution-2.8/e-util/e-util.h
-include/evolution-2.8/e-util/e-xml-utils.h
-include/evolution-2.8/mail/Evolution-Mail.h
-include/evolution-2.8/mail/em-composer-utils.h
-include/evolution-2.8/mail/em-config.h
-include/evolution-2.8/mail/em-event.h
-include/evolution-2.8/mail/em-folder-browser.h
-include/evolution-2.8/mail/em-folder-tree-model.h
-include/evolution-2.8/mail/em-folder-tree.h
-include/evolution-2.8/mail/em-folder-utils.h
-include/evolution-2.8/mail/em-folder-view.h
-include/evolution-2.8/mail/em-format-hook.h
-include/evolution-2.8/mail/em-format-html-display.h
-include/evolution-2.8/mail/em-format-html-print.h
-include/evolution-2.8/mail/em-format-html.h
-include/evolution-2.8/mail/em-format-quote.h
-include/evolution-2.8/mail/em-format.h
-include/evolution-2.8/mail/em-html-stream.h
-include/evolution-2.8/mail/em-icon-stream.h
-include/evolution-2.8/mail/em-inline-filter.h
-include/evolution-2.8/mail/em-junk-hook.h
-include/evolution-2.8/mail/em-menu.h
-include/evolution-2.8/mail/em-message-browser.h
-include/evolution-2.8/mail/em-popup.h
-include/evolution-2.8/mail/em-stripsig-filter.h
-include/evolution-2.8/mail/em-sync-stream.h
-include/evolution-2.8/mail/em-utils.h
-include/evolution-2.8/mail/em-vfs-stream.h
-include/evolution-2.8/mail/mail-autofilter.h
-include/evolution-2.8/mail/mail-component.h
-include/evolution-2.8/mail/mail-config.h
-include/evolution-2.8/mail/mail-mt.h
-include/evolution-2.8/mail/mail-ops.h
-include/evolution-2.8/mail/mail-session.h
-include/evolution-2.8/mail/mail-tools.h
-include/evolution-2.8/mail/mail-vfolder.h
-include/evolution-2.8/mail/message-list.h
-include/evolution-2.8/menus/gal-define-views-dialog.h
-include/evolution-2.8/menus/gal-define-views-model.h
-include/evolution-2.8/menus/gal-view-collection.h
-include/evolution-2.8/menus/gal-view-etable.h
-include/evolution-2.8/menus/gal-view-factory-etable.h
-include/evolution-2.8/menus/gal-view-factory.h
-include/evolution-2.8/menus/gal-view-instance-save-as-dialog.h
-include/evolution-2.8/menus/gal-view-instance.h
-include/evolution-2.8/menus/gal-view-new-dialog.h
-include/evolution-2.8/menus/gal-view.h
-include/evolution-2.8/misc/e-activity-handler.h
-include/evolution-2.8/misc/e-attachment-bar.h
-include/evolution-2.8/misc/e-attachment.h
-include/evolution-2.8/misc/e-calendar-item.h
-include/evolution-2.8/misc/e-calendar.h
-include/evolution-2.8/misc/e-canvas-background.h
-include/evolution-2.8/misc/e-canvas-utils.h
-include/evolution-2.8/misc/e-canvas-vbox.h
-include/evolution-2.8/misc/e-canvas.h
-include/evolution-2.8/misc/e-cell-date-edit.h
-include/evolution-2.8/misc/e-cell-percent.h
-include/evolution-2.8/misc/e-cell-renderer-combo.h
-include/evolution-2.8/misc/e-charset-picker.h
-include/evolution-2.8/misc/e-clipped-label.h
-include/evolution-2.8/misc/e-colors.h
-include/evolution-2.8/misc/e-combo-button.h
-include/evolution-2.8/misc/e-combo-cell-editable.h
-include/evolution-2.8/misc/e-config-page.h
-include/evolution-2.8/misc/e-cursors.h
-include/evolution-2.8/misc/e-dateedit.h
-include/evolution-2.8/misc/e-dropdown-button.h
-include/evolution-2.8/misc/e-expander.h
-include/evolution-2.8/misc/e-gui-utils.h
-include/evolution-2.8/misc/e-hsv-utils.h
-include/evolution-2.8/misc/e-icon-entry.h
-include/evolution-2.8/misc/e-image-chooser.h
-include/evolution-2.8/misc/e-info-label.h
-include/evolution-2.8/misc/e-map.h
-include/evolution-2.8/misc/e-multi-config-dialog.h
-include/evolution-2.8/misc/e-popup-menu.h
-include/evolution-2.8/misc/e-printable.h
-include/evolution-2.8/misc/e-reflow-model.h
-include/evolution-2.8/misc/e-reflow.h
-include/evolution-2.8/misc/e-search-bar.h
-include/evolution-2.8/misc/e-selection-model-array.h
-include/evolution-2.8/misc/e-selection-model-simple.h
-include/evolution-2.8/misc/e-selection-model.h
-include/evolution-2.8/misc/e-send-options.h
-include/evolution-2.8/misc/e-task-bar.h
-include/evolution-2.8/misc/e-task-widget.h
-include/evolution-2.8/misc/e-unicode.h
-include/evolution-2.8/misc/e-url-entry.h
-include/evolution-2.8/misc/gal-combo-box.h
-include/evolution-2.8/misc/gal-combo-text.h
-include/evolution-2.8/shell/Evolution.h
-include/evolution-2.8/shell/e-component-view.h
-include/evolution-2.8/shell/e-shell-utils.h
-include/evolution-2.8/shell/e-user-creatable-items-handler.h
-include/evolution-2.8/shell/es-event.h
-include/evolution-2.8/shell/es-menu.h
-include/evolution-2.8/shell/evolution-component.h
-include/evolution-2.8/shell/evolution-config-control.h
-include/evolution-2.8/shell/evolution-listener.h
-include/evolution-2.8/shell/evolution-shell-component-utils.h
-include/evolution-2.8/table/e-cell-checkbox.h
-include/evolution-2.8/table/e-cell-combo.h
-include/evolution-2.8/table/e-cell-date.h
-include/evolution-2.8/table/e-cell-float.h
-include/evolution-2.8/table/e-cell-hbox.h
-include/evolution-2.8/table/e-cell-number.h
-include/evolution-2.8/table/e-cell-pixbuf.h
-include/evolution-2.8/table/e-cell-popup.h
-include/evolution-2.8/table/e-cell-progress.h
-include/evolution-2.8/table/e-cell-size.h
-include/evolution-2.8/table/e-cell-spin-button.h
-include/evolution-2.8/table/e-cell-text.h
-include/evolution-2.8/table/e-cell-toggle.h
-include/evolution-2.8/table/e-cell-tree.h
-include/evolution-2.8/table/e-cell-vbox.h
-include/evolution-2.8/table/e-cell.h
-include/evolution-2.8/table/e-table-click-to-add.h
-include/evolution-2.8/table/e-table-col-dnd.h
-include/evolution-2.8/table/e-table-col.h
-include/evolution-2.8/table/e-table-column-specification.h
-include/evolution-2.8/table/e-table-config.h
-include/evolution-2.8/table/e-table-defines.h
-include/evolution-2.8/table/e-table-extras.h
-include/evolution-2.8/table/e-table-field-chooser-dialog.h
-include/evolution-2.8/table/e-table-field-chooser-item.h
-include/evolution-2.8/table/e-table-field-chooser.h
-include/evolution-2.8/table/e-table-group-container.h
-include/evolution-2.8/table/e-table-group-leaf.h
-include/evolution-2.8/table/e-table-group.h
-include/evolution-2.8/table/e-table-header-item.h
-include/evolution-2.8/table/e-table-header-utils.h
-include/evolution-2.8/table/e-table-header.h
-include/evolution-2.8/table/e-table-item.h
-include/evolution-2.8/table/e-table-memory-callbacks.h
-include/evolution-2.8/table/e-table-memory-store.h
-include/evolution-2.8/table/e-table-memory.h
-include/evolution-2.8/table/e-table-model.h
-include/evolution-2.8/table/e-table-one.h
-include/evolution-2.8/table/e-table-scrolled.h
-include/evolution-2.8/table/e-table-search.h
-include/evolution-2.8/table/e-table-selection-model.h
-include/evolution-2.8/table/e-table-simple.h
-include/evolution-2.8/table/e-table-sort-info.h
-include/evolution-2.8/table/e-table-sorted-variable.h
-include/evolution-2.8/table/e-table-sorted.h
-include/evolution-2.8/table/e-table-sorter.h
-include/evolution-2.8/table/e-table-sorting-utils.h
-include/evolution-2.8/table/e-table-specification.h
-include/evolution-2.8/table/e-table-state.h
-include/evolution-2.8/table/e-table-subset-variable.h
-include/evolution-2.8/table/e-table-subset.h
-include/evolution-2.8/table/e-table-tooltip.h
-include/evolution-2.8/table/e-table-utils.h
-include/evolution-2.8/table/e-table-without.h
-include/evolution-2.8/table/e-table.h
-include/evolution-2.8/table/e-tree-memory-callbacks.h
-include/evolution-2.8/table/e-tree-memory.h
-include/evolution-2.8/table/e-tree-model.h
-include/evolution-2.8/table/e-tree-scrolled.h
-include/evolution-2.8/table/e-tree-selection-model.h
-include/evolution-2.8/table/e-tree-sorted.h
-include/evolution-2.8/table/e-tree-table-adapter.h
-include/evolution-2.8/table/e-tree.h
-include/evolution-2.8/text/e-completion-callbacks.h
-include/evolution-2.8/text/e-completion-match.h
-include/evolution-2.8/text/e-completion-view.h
-include/evolution-2.8/text/e-completion.h
-include/evolution-2.8/text/e-entry.h
-include/evolution-2.8/text/e-table-text-model.h
-include/evolution-2.8/text/e-text-model-repos.h
-include/evolution-2.8/text/e-text-model-uri.h
-include/evolution-2.8/text/e-text-model.h
-include/evolution-2.8/text/e-text.h
-lib/bonobo/servers/GNOME_Evolution_Addressbook_2.8.server
-lib/bonobo/servers/GNOME_Evolution_Calendar_2.8.server
-lib/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_2.8.server
-lib/bonobo/servers/GNOME_Evolution_Mail_2.8.server
-lib/bonobo/servers/GNOME_Evolution_Shell_2.8.server
-lib/evolution/2.8/components/libevolution-addressbook.la
-lib/evolution/2.8/components/libevolution-calendar.la
-lib/evolution/2.8/components/libevolution-mail.la
-lib/evolution/2.8/libeabutil.la
-lib/evolution/2.8/libeconduit.la
-lib/evolution/2.8/libecontacteditor.la
-lib/evolution/2.8/libecontactlisteditor.la
-lib/evolution/2.8/libefilterbar.la
-lib/evolution/2.8/libemiscwidgets.la
-lib/evolution/2.8/libeshell.la
-${HAVE_SMIME}lib/evolution/2.8/libessmime.la
-lib/evolution/2.8/libetable.la
-lib/evolution/2.8/libetext.la
-lib/evolution/2.8/libetimezonedialog.la
-lib/evolution/2.8/libeutil.la
-lib/evolution/2.8/libevolution-a11y.la
-lib/evolution/2.8/libevolution-addressbook-a11y.la
-lib/evolution/2.8/libevolution-addressbook-importers.la
-lib/evolution/2.8/libevolution-calendar-a11y.la
-lib/evolution/2.8/libevolution-calendar-importers.la
-lib/evolution/2.8/libevolution-mail-importers.la
-${HAVE_SMIME}lib/evolution/2.8/libevolution-smime.la
-lib/evolution/2.8/libevolution-widgets-a11y.la
-lib/evolution/2.8/libfilter.la
-lib/evolution/2.8/libmenus.la
-lib/evolution/2.8/plugins/libmail-account-disable.la
-lib/evolution/2.8/plugins/liborg-gnome-addressbook-file.la
-lib/evolution/2.8/plugins/liborg-gnome-calendar-file.la
-lib/evolution/2.8/plugins/liborg-gnome-calendar-http.la
-lib/evolution/2.8/plugins/liborg-gnome-calendar-weather.la
-lib/evolution/2.8/plugins/liborg-gnome-copy-tool.la
-lib/evolution/2.8/plugins/liborg-gnome-default-mailer.la
-lib/evolution/2.8/plugins/liborg-gnome-default-source.la
-lib/evolution/2.8/plugins/liborg-gnome-evolution-bbdb.la
-lib/evolution/2.8/plugins/liborg-gnome-evolution-caldav.la
-lib/evolution/2.8/plugins/liborg-gnome-evolution-hula-account-setup.la
-lib/evolution/2.8/plugins/liborg-gnome-evolution-mail-attachments-import-ics.la
-lib/evolution/2.8/plugins/liborg-gnome-evolution-startup-wizard.la
-lib/evolution/2.8/plugins/liborg-gnome-exchange-operations.la
-lib/evolution/2.8/plugins/liborg-gnome-groupwise-features.la
-lib/evolution/2.8/plugins/liborg-gnome-gw-account-setup.la
-lib/evolution/2.8/plugins/liborg-gnome-itip-formatter.la
-lib/evolution/2.8/plugins/liborg-gnome-mail-to-task.la
-lib/evolution/2.8/plugins/liborg-gnome-mailing-list-actions.la
-lib/evolution/2.8/plugins/liborg-gnome-mark-all-read.la
-lib/evolution/2.8/plugins/liborg-gnome-mark-calendar-offline.la
-lib/evolution/2.8/plugins/liborg-gnome-new-mail-notify.la
-lib/evolution/2.8/plugins/liborg-gnome-plugin-manager.la
-lib/evolution/2.8/plugins/liborg-gnome-print-message.la
-lib/evolution/2.8/plugins/liborg-gnome-publish-calendar.la
-lib/evolution/2.8/plugins/liborg-gnome-sa-junk-plugin.la
-lib/evolution/2.8/plugins/liborg-gnome-save-calendar.la
-lib/evolution/2.8/plugins/liborg-gnome-select-one-source.la
-lib/evolution/2.8/plugins/liborg-gnome-subject-thread.la
-lib/evolution/2.8/plugins/org-gnome-addressbook-file.eplug
-lib/evolution/2.8/plugins/org-gnome-calendar-file.eplug
-lib/evolution/2.8/plugins/org-gnome-calendar-http.eplug
-lib/evolution/2.8/plugins/org-gnome-calendar-weather.eplug
-lib/evolution/2.8/plugins/org-gnome-compose-send-options.xml
-lib/evolution/2.8/plugins/org-gnome-copy-tool.eplug
-lib/evolution/2.8/plugins/org-gnome-default-mailer.eplug
-lib/evolution/2.8/plugins/org-gnome-default-source.eplug
-lib/evolution/2.8/plugins/org-gnome-evolution-bbdb.eplug
-lib/evolution/2.8/plugins/org-gnome-evolution-caldav.eplug
-lib/evolution/2.8/plugins/org-gnome-evolution-hula-account-setup.eplug
-lib/evolution/2.8/plugins/org-gnome-evolution-mail-attachments-import-ics.eplug
-lib/evolution/2.8/plugins/org-gnome-evolution-startup-wizard.eplug
-lib/evolution/2.8/plugins/org-gnome-exchange-ab-subscription.xml
-lib/evolution/2.8/plugins/org-gnome-exchange-cal-subscription.xml
-lib/evolution/2.8/plugins/org-gnome-exchange-operations.eplug
-lib/evolution/2.8/plugins/org-gnome-exchange-tasks-subscription.xml
-lib/evolution/2.8/plugins/org-gnome-folder-permissions.xml
-lib/evolution/2.8/plugins/org-gnome-folder-subscription.xml
-lib/evolution/2.8/plugins/org-gnome-groupwise-features.eplug
-lib/evolution/2.8/plugins/org-gnome-gw-account-setup.eplug
-lib/evolution/2.8/plugins/org-gnome-itip-formatter.eplug
-lib/evolution/2.8/plugins/org-gnome-mail-account-disable.eplug
-lib/evolution/2.8/plugins/org-gnome-mail-to-task.eplug
-lib/evolution/2.8/plugins/org-gnome-mail-to-task.xml
-lib/evolution/2.8/plugins/org-gnome-mailing-list-actions.eplug
-lib/evolution/2.8/plugins/org-gnome-mailing-list-actions.xml
-lib/evolution/2.8/plugins/org-gnome-mark-all-read.eplug
-lib/evolution/2.8/plugins/org-gnome-mark-calendar-offline.eplug
-lib/evolution/2.8/plugins/org-gnome-new-mail-notify.eplug
-lib/evolution/2.8/plugins/org-gnome-plugin-manager.eplug
-lib/evolution/2.8/plugins/org-gnome-plugin-manager.xml
-lib/evolution/2.8/plugins/org-gnome-print-message.eplug
-lib/evolution/2.8/plugins/org-gnome-print-message.xml
-lib/evolution/2.8/plugins/org-gnome-publish-calendar.eplug
-lib/evolution/2.8/plugins/org-gnome-publish-calendar.xml
-lib/evolution/2.8/plugins/org-gnome-sa-junk-plugin.eplug
-lib/evolution/2.8/plugins/org-gnome-save-calendar.eplug
-lib/evolution/2.8/plugins/org-gnome-select-one-source.eplug
-lib/evolution/2.8/plugins/org-gnome-subject-thread.eplug
-lib/evolution/2.8/plugins/publish-calendar.glade
-lib/pkgconfig/evolution-plugin-2.8.pc
-lib/pkgconfig/evolution-shell-2.8.pc
-libexec/evolution/2.8/csv2vcard
-libexec/evolution/2.8/evolution-addressbook-clean
-libexec/evolution/2.8/evolution-addressbook-export
-libexec/evolution/2.8/evolution-alarm-notify
-libexec/evolution/2.8/killev
-share/applications/evolution-2.8.desktop
-share/evolution/2.8/addresstypes.xml
-share/evolution/2.8/default/C/mail/local/Inbox
-share/evolution/2.8/default/de/mail/local/Inbox
-share/evolution/2.8/default/fi/mail/local/Inbox
-share/evolution/2.8/default/fr/mail/local/Inbox
-share/evolution/2.8/default/ja/mail/local/Inbox
-share/evolution/2.8/default/lt/mail/local/Inbox
-share/evolution/2.8/default/mk/mail/local/Inbox
-share/evolution/2.8/default/nl/mail/local/Inbox
-share/evolution/2.8/default/pt/mail/local/Inbox
-share/evolution/2.8/default/zh_CN/mail/local/Inbox
-share/evolution/2.8/ecps/medbook.ecps
-share/evolution/2.8/ecps/phonelist.ecps
-share/evolution/2.8/ecps/smallbook.ecps
-share/evolution/2.8/errors/addressbook.error
-share/evolution/2.8/errors/calendar.error
-share/evolution/2.8/errors/e-system.error
-share/evolution/2.8/errors/filter.error
-share/evolution/2.8/errors/mail-composer.error
-share/evolution/2.8/errors/mail.error
-share/evolution/2.8/errors/org-gnome-default-mailer.error
-share/evolution/2.8/errors/org-gnome-exchange-operations.error
-share/evolution/2.8/errors/org-gnome-itip-formatter.error
-share/evolution/2.8/errors/org-gnome-mail-retract-errors.xml
-share/evolution/2.8/errors/org-gnome-mailing-list-actions.error
-share/evolution/2.8/errors/org-gnome-proxy-errors.xml
-share/evolution/2.8/errors/org-gnome-proxy-login-errors.xml
-share/evolution/2.8/errors/org-gnome-shared-folder.errors.xml
-share/evolution/2.8/errors/shell.error
-share/evolution/2.8/etspec/e-addressbook-view.etspec
-share/evolution/2.8/etspec/e-cal-list-view.etspec
-share/evolution/2.8/etspec/e-calendar-table.etspec
-share/evolution/2.8/etspec/e-contact-list-editor.etspec
-share/evolution/2.8/etspec/e-meeting-time-sel.etspec
-share/evolution/2.8/etspec/e-memo-table.etspec
-share/evolution/2.8/etspec/message-list.etspec
-share/evolution/2.8/filtertypes.xml
-share/evolution/2.8/glade/alarm-dialog.glade
-share/evolution/2.8/glade/alarm-list-dialog.glade
-share/evolution/2.8/glade/alarm-notify.glade
-share/evolution/2.8/glade/cal-prefs-dialog.glade
-share/evolution/2.8/glade/contact-editor.glade
-share/evolution/2.8/glade/contact-list-editor.glade
-share/evolution/2.8/glade/e-active-connection-dialog.glade
-share/evolution/2.8/glade/e-attachment.glade
-share/evolution/2.8/glade/e-contact-print.glade
-share/evolution/2.8/glade/e-delegate-dialog.glade
-share/evolution/2.8/glade/e-foreign-folder-dialog.glade
-share/evolution/2.8/glade/e-itip-control.glade
-share/evolution/2.8/glade/e-send-options.glade
-share/evolution/2.8/glade/e-table-config-no-group.glade
-share/evolution/2.8/glade/e-table-config.glade
-share/evolution/2.8/glade/e-table-field-chooser.glade
-share/evolution/2.8/glade/e-timezone-dialog.glade
-share/evolution/2.8/glade/eab-contact-commit-duplicate-detected.glade
-share/evolution/2.8/glade/eab-contact-duplicate-detected.glade
-share/evolution/2.8/glade/event-page.glade
-share/evolution/2.8/glade/exchange-change-password.glade
-share/evolution/2.8/glade/exchange-delegates.glade
-share/evolution/2.8/glade/exchange-folder-tree.glade
-share/evolution/2.8/glade/exchange-oof.glade
-share/evolution/2.8/glade/exchange-passwd-expiry.glade
-share/evolution/2.8/glade/exchange-permissions-dialog.glade
-share/evolution/2.8/glade/filter.glade
-share/evolution/2.8/glade/fulladdr.glade
-share/evolution/2.8/glade/fullname.glade
-share/evolution/2.8/glade/gal-categories.glade
-share/evolution/2.8/glade/gal-define-views.glade
-share/evolution/2.8/glade/gal-view-instance-save-as-dialog.glade
-share/evolution/2.8/glade/gal-view-new-dialog.glade
-share/evolution/2.8/glade/goto-dialog.glade
-share/evolution/2.8/glade/im.glade
-share/evolution/2.8/glade/import.glade
-share/evolution/2.8/glade/junk-settings.glade
-share/evolution/2.8/glade/ldap-config.glade
-share/evolution/2.8/glade/mail-config.glade
-share/evolution/2.8/glade/mail-dialogs.glade
-share/evolution/2.8/glade/meeting-page.glade
-share/evolution/2.8/glade/memo-page.glade
-share/evolution/2.8/glade/properties.glade
-share/evolution/2.8/glade/proxy-add-dialog.glade
-share/evolution/2.8/glade/proxy-listing.glade
-share/evolution/2.8/glade/proxy-login-dialog.glade
-share/evolution/2.8/glade/recurrence-page.glade
-share/evolution/2.8/glade/schedule-page.glade
-${HAVE_SMIME}share/evolution/2.8/glade/smime-ui.glade
-share/evolution/2.8/glade/task-details-page.glade
-share/evolution/2.8/glade/task-page.glade
-share/evolution/2.8/help/quickref/C/quickref.pdf
-share/evolution/2.8/help/quickref/de/quickref.pdf
-share/evolution/2.8/images/about-box.png
-share/evolution/2.8/images/bcg.png
-share/evolution/2.8/images/evolution-contacts-mini.png
-share/evolution/2.8/images/minus.png
-share/evolution/2.8/images/monkey-16.png
-share/evolution/2.8/images/offline.png
-share/evolution/2.8/images/online.png
-share/evolution/2.8/images/plus.png
-share/evolution/2.8/images/query-free-busy.png
-share/evolution/2.8/images/world_map-960.png
-share/evolution/2.8/searchtypes.xml
-share/evolution/2.8/ui/evolution-addressbook.xml
-share/evolution/2.8/ui/evolution-calendar.xml
-share/evolution/2.8/ui/evolution-composer-entries.xml
-share/evolution/2.8/ui/evolution-editor.xml
-share/evolution/2.8/ui/evolution-event-editor.xml
-share/evolution/2.8/ui/evolution-mail-global.xml
-share/evolution/2.8/ui/evolution-mail-list.xml
-share/evolution/2.8/ui/evolution-mail-message.xml
-share/evolution/2.8/ui/evolution-mail-messagedisplay.xml
-share/evolution/2.8/ui/evolution-memo-editor.xml
-share/evolution/2.8/ui/evolution-memos.xml
-share/evolution/2.8/ui/evolution-message-composer.xml
-share/evolution/2.8/ui/evolution-signature-editor.xml
-share/evolution/2.8/ui/evolution-subscribe.xml
-share/evolution/2.8/ui/evolution-task-editor.xml
-share/evolution/2.8/ui/evolution-tasks.xml
-share/evolution/2.8/ui/evolution.xml
-share/evolution/2.8/vfoldertypes.xml
-share/evolution/2.8/views/addressbook/Address_Cards.galview
-share/evolution/2.8/views/addressbook/By_Company.galview
-share/evolution/2.8/views/addressbook/Phone_List.galview
-share/evolution/2.8/views/addressbook/galview.xml
-share/evolution/2.8/views/calendar/List_View.galview
-share/evolution/2.8/views/calendar/galview.xml
-share/evolution/2.8/views/mail/As_Sent_Folder.galview
-share/evolution/2.8/views/mail/By_Follow_Up_Flag.galview
-share/evolution/2.8/views/mail/By_Sender.galview
-share/evolution/2.8/views/mail/By_Status.galview
-share/evolution/2.8/views/mail/By_Subject.galview
-share/evolution/2.8/views/mail/Messages.galview
-share/evolution/2.8/views/mail/Wide_View_Normal.galview
-share/evolution/2.8/views/mail/Wide_View_Sent.galview
-share/evolution/2.8/views/mail/galview.xml
-share/evolution/2.8/views/memos/Memos.galview
-share/evolution/2.8/views/memos/galview.xml
-share/evolution/2.8/views/tasks/Tasks.galview
-share/evolution/2.8/views/tasks/With_DueDate.galview
-share/evolution/2.8/views/tasks/With_Status.galview
-share/evolution/2.8/views/tasks/galview.xml
-share/evolution/2.8/weather/category_weather_cloudy_16.png
-share/evolution/2.8/weather/category_weather_fog_16.png
-share/evolution/2.8/weather/category_weather_partly_cloudy_16.png
-share/evolution/2.8/weather/category_weather_rain_16.png
-share/evolution/2.8/weather/category_weather_snow_16.png
-share/evolution/2.8/weather/category_weather_sun_16.png
-share/evolution/2.8/weather/category_weather_tstorm_16.png
-share/gconf/schemas/apps-evolution-mail-prompts-checkdefault-2.8.schemas
-share/gconf/schemas/apps_evolution_addressbook-2.8.schemas
-share/gconf/schemas/apps_evolution_calendar-2.8.schemas
-share/gconf/schemas/apps_evolution_shell-2.8.schemas
-share/gconf/schemas/evolution-mail-2.8.schemas
-share/gnome/help/evolution-2.8/C/evolution-2.8.xml
-share/gnome/help/evolution-2.8/C/figures/Screenshot-Free-Busy.png
-share/gnome/help/evolution-2.8/C/figures/calendar.png
-share/gnome/help/evolution-2.8/C/figures/config-cal.png
-share/gnome/help/evolution-2.8/C/figures/config-mail.png
-share/gnome/help/evolution-2.8/C/figures/contact-editor.png
-share/gnome/help/evolution-2.8/C/figures/contact.png
-share/gnome/help/evolution-2.8/C/figures/contacts_mainwindow_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_account_info_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_contacteditor_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_email_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_gwreceive_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_identity_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_imapreceive_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_mail_callout_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_maildirreceive_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_mboxreceive_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_mereceive_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_mhreceive_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_newmess_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_popreceive_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_receive_setup2_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_receive_setup_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_rule_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_send_setup_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_timezone_a.png
-share/gnome/help/evolution-2.8/C/figures/evo_usereceive_a.png
-share/gnome/help/evolution-2.8/C/figures/exchange-delegation.png
-share/gnome/help/evolution-2.8/C/figures/exchange-identity.png
-share/gnome/help/evolution-2.8/C/figures/exchange-receive-options.png
-share/gnome/help/evolution-2.8/C/figures/exchange-receive.png
-share/gnome/help/evolution-2.8/C/figures/filter-new-fig.png
-share/gnome/help/evolution-2.8/C/figures/full-1.png
-share/gnome/help/evolution-2.8/C/figures/full-2.png
-share/gnome/help/evolution-2.8/C/figures/full-3.png
-share/gnome/help/evolution-2.8/C/figures/full-4.png
-share/gnome/help/evolution-2.8/C/figures/full-5.png
-share/gnome/help/evolution-2.8/C/figures/full-6.png
-share/gnome/help/evolution-2.8/C/figures/full-7.png
-share/gnome/help/evolution-2.8/C/figures/mail-druid-pic.png
-share/gnome/help/evolution-2.8/C/figures/mail-inbox.png
-share/gnome/help/evolution-2.8/C/figures/mail-threaded.png
-share/gnome/help/evolution-2.8/C/figures/mail_mainwindow_a.png
-share/gnome/help/evolution-2.8/C/figures/mainwindow-pic.png
-share/gnome/help/evolution-2.8/C/figures/newmsg.png
-share/gnome/help/evolution-2.8/C/figures/replymsg.png
-share/gnome/help/evolution-2.8/C/figures/schedule.png
-share/gnome/help/evolution-2.8/C/figures/vfolder-createrule-fig.png
-share/idl/evolution-2.8/Composer.idl
-share/idl/evolution-2.8/Evolution-Component.idl
-share/idl/evolution-2.8/Evolution-Composer.idl
-share/idl/evolution-2.8/Evolution-ConfigControl.idl
-share/idl/evolution-2.8/Evolution-Mail.idl
-share/idl/evolution-2.8/Evolution-Shell.idl
-share/idl/evolution-2.8/Evolution.idl
-share/idl/evolution-2.8/evolution-calendar.idl
-share/locale/am/LC_MESSAGES/evolution-2.8.mo
-share/locale/ar/LC_MESSAGES/evolution-2.8.mo
-share/locale/az/LC_MESSAGES/evolution-2.8.mo
-share/locale/be/LC_MESSAGES/evolution-2.8.mo
-share/locale/bg/LC_MESSAGES/evolution-2.8.mo
-share/locale/bn/LC_MESSAGES/evolution-2.8.mo
-share/locale/bn_IN/LC_MESSAGES/evolution-2.8.mo
-share/locale/bs/LC_MESSAGES/evolution-2.8.mo
-share/locale/ca/LC_MESSAGES/evolution-2.8.mo
-share/locale/cs/LC_MESSAGES/evolution-2.8.mo
-share/locale/cy/LC_MESSAGES/evolution-2.8.mo
-share/locale/da/LC_MESSAGES/evolution-2.8.mo
-share/locale/de/LC_MESSAGES/evolution-2.8.mo
-share/locale/dz/LC_MESSAGES/evolution-2.8.mo
-share/locale/el/LC_MESSAGES/evolution-2.8.mo
-share/locale/en_AU/LC_MESSAGES/evolution-2.8.mo
-share/locale/en_CA/LC_MESSAGES/evolution-2.8.mo
-share/locale/en_GB/LC_MESSAGES/evolution-2.8.mo
-share/locale/es/LC_MESSAGES/evolution-2.8.mo
-share/locale/et/LC_MESSAGES/evolution-2.8.mo
-share/locale/eu/LC_MESSAGES/evolution-2.8.mo
-share/locale/fa/LC_MESSAGES/evolution-2.8.mo
-share/locale/fi/LC_MESSAGES/evolution-2.8.mo
-share/locale/fr/LC_MESSAGES/evolution-2.8.mo
-share/locale/ga/LC_MESSAGES/evolution-2.8.mo
-share/locale/gl/LC_MESSAGES/evolution-2.8.mo
-share/locale/gu/LC_MESSAGES/evolution-2.8.mo
-share/locale/he/LC_MESSAGES/evolution-2.8.mo
-share/locale/hi/LC_MESSAGES/evolution-2.8.mo
-share/locale/hr/LC_MESSAGES/evolution-2.8.mo
-share/locale/hu/LC_MESSAGES/evolution-2.8.mo
-share/locale/id/LC_MESSAGES/evolution-2.8.mo
-share/locale/is/LC_MESSAGES/evolution-2.8.mo
-share/locale/it/LC_MESSAGES/evolution-2.8.mo
-share/locale/ja/LC_MESSAGES/evolution-2.8.mo
-share/locale/ka/LC_MESSAGES/evolution-2.8.mo
-share/locale/ko/LC_MESSAGES/evolution-2.8.mo
-share/locale/ku/LC_MESSAGES/evolution-2.8.mo
-share/locale/lt/LC_MESSAGES/evolution-2.8.mo
-share/locale/lv/LC_MESSAGES/evolution-2.8.mo
-share/locale/mk/LC_MESSAGES/evolution-2.8.mo
-share/locale/ml/LC_MESSAGES/evolution-2.8.mo
-share/locale/mn/LC_MESSAGES/evolution-2.8.mo
-share/locale/mr/LC_MESSAGES/evolution-2.8.mo
-share/locale/ms/LC_MESSAGES/evolution-2.8.mo
-share/locale/nb/LC_MESSAGES/evolution-2.8.mo
-share/locale/ne/LC_MESSAGES/evolution-2.8.mo
-share/locale/nl/LC_MESSAGES/evolution-2.8.mo
-share/locale/nn/LC_MESSAGES/evolution-2.8.mo
-share/locale/or/LC_MESSAGES/evolution-2.8.mo
-share/locale/pa/LC_MESSAGES/evolution-2.8.mo
-share/locale/pl/LC_MESSAGES/evolution-2.8.mo
-share/locale/pt/LC_MESSAGES/evolution-2.8.mo
-share/locale/pt_BR/LC_MESSAGES/evolution-2.8.mo
-share/locale/ro/LC_MESSAGES/evolution-2.8.mo
-share/locale/ru/LC_MESSAGES/evolution-2.8.mo
-share/locale/rw/LC_MESSAGES/evolution-2.8.mo
-share/locale/sk/LC_MESSAGES/evolution-2.8.mo
-share/locale/sl/LC_MESSAGES/evolution-2.8.mo
-share/locale/sq/LC_MESSAGES/evolution-2.8.mo
-share/locale/sr/LC_MESSAGES/evolution-2.8.mo
-share/locale/sr@Latn/LC_MESSAGES/evolution-2.8.mo
-share/locale/sv/LC_MESSAGES/evolution-2.8.mo
-share/locale/ta/LC_MESSAGES/evolution-2.8.mo
-share/locale/te/LC_MESSAGES/evolution-2.8.mo
-share/locale/th/LC_MESSAGES/evolution-2.8.mo
-share/locale/tr/LC_MESSAGES/evolution-2.8.mo
-share/locale/uk/LC_MESSAGES/evolution-2.8.mo
-share/locale/vi/LC_MESSAGES/evolution-2.8.mo
-share/locale/wa/LC_MESSAGES/evolution-2.8.mo
-share/locale/xh/LC_MESSAGES/evolution-2.8.mo
-share/locale/zh_CN/LC_MESSAGES/evolution-2.8.mo
-share/locale/zh_HK/LC_MESSAGES/evolution-2.8.mo
-share/locale/zh_TW/LC_MESSAGES/evolution-2.8.mo
-share/mime-info/evolution-2.8.keys
-share/mime-info/evolution-2.8.mime
-share/omf/evolution/evolution-2.8-C.omf
-share/pixmaps/evolution-2.8.png
-@comment in xdg-dirs: @dirrm share/pixmaps
-@dirrm share/omf/evolution
-@comment in scrollkeeper: @dirrm share/omf
-@comment in xdg-dirs: @dirrm share/mime-info
-@dirrm share/idl/evolution-2.8
-@comment in ORBit2: @dirrm share/idl
-@dirrm share/gnome/help/evolution-2.8/C/figures
-@dirrm share/gnome/help/evolution-2.8/C
-@dirrm share/gnome/help/evolution-2.8
-@comment in gnome2-dirs: @dirrm share/gnome/help
-@comment in GConf2: @dirrm share/gconf/schemas
-@dirrm share/evolution/2.8/weather
-@dirrm share/evolution/2.8/views/tasks
-@dirrm share/evolution/2.8/views/memos
-@dirrm share/evolution/2.8/views/mail
-@dirrm share/evolution/2.8/views/calendar
-@dirrm share/evolution/2.8/views/addressbook
-@dirrm share/evolution/2.8/views
-@dirrm share/evolution/2.8/ui
-@dirrm share/evolution/2.8/images
-@dirrm share/evolution/2.8/help/quickref/de
-@dirrm share/evolution/2.8/help/quickref/C
-@dirrm share/evolution/2.8/help/quickref
-@dirrm share/evolution/2.8/help
-@dirrm share/evolution/2.8/glade
-@dirrm share/evolution/2.8/etspec
-@dirrm share/evolution/2.8/errors
-@dirrm share/evolution/2.8/ecps
-@dirrm share/evolution/2.8/default/zh_CN/mail/local
-@dirrm share/evolution/2.8/default/zh_CN/mail
-@dirrm share/evolution/2.8/default/zh_CN
-@dirrm share/evolution/2.8/default/pt/mail/local
-@dirrm share/evolution/2.8/default/pt/mail
-@dirrm share/evolution/2.8/default/pt
-@dirrm share/evolution/2.8/default/nl/mail/local
-@dirrm share/evolution/2.8/default/nl/mail
-@dirrm share/evolution/2.8/default/nl
-@dirrm share/evolution/2.8/default/mk/mail/local
-@dirrm share/evolution/2.8/default/mk/mail
-@dirrm share/evolution/2.8/default/mk
-@dirrm share/evolution/2.8/default/lt/mail/local
-@dirrm share/evolution/2.8/default/lt/mail
-@dirrm share/evolution/2.8/default/lt
-@dirrm share/evolution/2.8/default/ja/mail/local
-@dirrm share/evolution/2.8/default/ja/mail
-@dirrm share/evolution/2.8/default/ja
-@dirrm share/evolution/2.8/default/fr/mail/local
-@dirrm share/evolution/2.8/default/fr/mail
-@dirrm share/evolution/2.8/default/fr
-@dirrm share/evolution/2.8/default/fi/mail/local
-@dirrm share/evolution/2.8/default/fi/mail
-@dirrm share/evolution/2.8/default/fi
-@dirrm share/evolution/2.8/default/de/mail/local
-@dirrm share/evolution/2.8/default/de/mail
-@dirrm share/evolution/2.8/default/de
-@dirrm share/evolution/2.8/default/C/mail/local
-@dirrm share/evolution/2.8/default/C/mail
-@dirrm share/evolution/2.8/default/C
-@dirrm share/evolution/2.8/default
-@dirrm share/evolution/2.8
-@dirrm share/evolution
-@comment in xdg-dirs: @dirrm share/applications
-@dirrm libexec/evolution/2.8
-@dirrm libexec/evolution
-@dirrm lib/evolution/2.8/plugins
-@dirrm lib/evolution/2.8/components
-@dirrm lib/evolution/2.8
-@dirrm lib/evolution
-@comment in libbonobo: @dirrm lib/bonobo/servers
-@dirrm include/evolution-2.8/text
-@dirrm include/evolution-2.8/table
-@dirrm include/evolution-2.8/shell
-@dirrm include/evolution-2.8/misc
-@dirrm include/evolution-2.8/menus
-@dirrm include/evolution-2.8/mail
-@dirrm include/evolution-2.8/e-util
-@dirrm include/evolution-2.8/e-conduit
-@dirrm include/evolution-2.8/calendar/gui
-@dirrm include/evolution-2.8/calendar
-@dirrm include/evolution-2.8/addressbook/gui/widgets
-@dirrm include/evolution-2.8/addressbook/gui
-@dirrm include/evolution-2.8/addressbook
-@dirrm include/evolution-2.8
diff --git a/mail/evolution/buildlink3.mk b/mail/evolution/buildlink3.mk
deleted file mode 100644
index 262378ac233..00000000000
--- a/mail/evolution/buildlink3.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/03/21 12:05:48 wiz Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-EVOLUTION_BUILDLINK3_MK:= ${EVOLUTION_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= evolution
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nevolution}
-BUILDLINK_PACKAGES+= evolution
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}evolution
-
-.if !empty(EVOLUTION_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.evolution+= evolution>=2.8.0
-BUILDLINK_ABI_DEPENDS.evolution?= evolution>=2.8.0nb4
-BUILDLINK_PKGSRCDIR.evolution?= ../../mail/evolution
-.endif # EVOLUTION_BUILDLINK3_MK
-
-PRINT_PLIST_AWK+= /^@dirrm lib\/evolution\/2.8$$/ \
- { print "@comment in evolution: " $$0; next }
-PRINT_PLIST_AWK+= /^@dirrm lib\/evolution$$/ \
- { print "@comment in evolution: " $$0; next }
-PRINT_PLIST_AWK+= /^@dirrm libexec\/evolution\/2.8$$/ \
- { print "@comment in evolution: " $$0; next }
-PRINT_PLIST_AWK+= /^@dirrm libexec\/evolution$$/ \
- { print "@comment in evolution: " $$0; next }
-
-.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/nspr/buildlink3.mk"
-.include "../../devel/nss/buildlink3.mk"
-.include "../../mail/evolution-data-server/buildlink3.mk"
-.include "../../www/gtkhtml38/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
deleted file mode 100644
index 017e1f0acc6..00000000000
--- a/mail/evolution/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.48 2006/10/11 16:45:49 joerg Exp $
-
-SHA1 (evolution-2.8.0.tar.bz2) = 0da65a3de84e60d0e41265607c7c7fcec18fe072
-RMD160 (evolution-2.8.0.tar.bz2) = ba73d9529a02f2ea6db8c8f2c7da3041276e1d5c
-Size (evolution-2.8.0.tar.bz2) = 12821926 bytes
-SHA1 (patch-aa) = 161fd9abf70ff67f8d1b22cdbdfdab44e767ae56
-SHA1 (patch-ab) = 871a322eefd1a42e7197da764d49cd1d24f6535d
diff --git a/mail/evolution/patches/patch-aa b/mail/evolution/patches/patch-aa
deleted file mode 100644
index 0d78c535a35..00000000000
--- a/mail/evolution/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.23 2006/10/11 16:45:49 joerg Exp $
-
---- widgets/e-timezone-dialog/e-timezone-dialog.c.orig 2006-09-21 19:22:45.000000000 +0000
-+++ widgets/e-timezone-dialog/e-timezone-dialog.c
-@@ -80,8 +80,6 @@ struct _ETimezoneDialogPrivate {
-
- #ifndef G_OS_WIN32 /* Declared properly in time.h already */
- extern char *tzname[2];
--extern long timezone;
--extern int daylight;
- #endif
-
- static void e_timezone_dialog_class_init (ETimezoneDialogClass *class);
-@@ -314,6 +312,8 @@ get_local_offset ()
- t_gmt = mktime (&gmt);
- t_local = mktime (&local);
- diff = t_local - t_gmt;
-+ if (local.tm_isdst == 1)
-+ diff += 3600;
-
- return diff;
- }
-@@ -324,7 +324,7 @@ get_local_timezone()
- icaltimezone *zone;
-
- tzset();
-- zone = icaltimezone_get_builtin_timezone_from_offset (-timezone, tzname[0]);
-+ zone = icaltimezone_get_builtin_timezone_from_offset (-get_local_offset(), tzname[0]);
-
- return zone;
- }
diff --git a/mail/evolution/patches/patch-ab b/mail/evolution/patches/patch-ab
deleted file mode 100644
index f3c8eb91643..00000000000
--- a/mail/evolution/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2004/10/29 14:57:15 jmmv Exp $
-
---- ./mail/em-migrate.c.orig 2004-10-11 17:24:34.000000000 +0200
-+++ ./mail/em-migrate.c
-@@ -1447,7 +1447,7 @@ cp (const char *src, const char *dest, g
- ut.actime = st.st_atime;
- ut.modtime = st.st_mtime;
- utime (dest, &ut);
-- chmod (dest, st.st_mode);
-+ chmod (dest, st.st_mode | S_IWUSR);
-
- return 0;
-
diff --git a/mail/exim-html/DESCR b/mail/exim-html/DESCR
deleted file mode 100644
index 124454a7bcf..00000000000
--- a/mail/exim-html/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-HTML documentation for the Exim mail transfer agent.
diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile
deleted file mode 100644
index 096af42fc23..00000000000
--- a/mail/exim-html/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:41 wiz Exp $
-
-DISTNAME= exim-html-4.50
-CATEGORIES= mail net
-MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \
- ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
- ftp://ftp.esat.net/pub/networking/mail/mta/exim/exim4/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= abs@NetBSD.org
-HOMEPAGE= http://www.exim.org/
-COMMENT= HTML documentation for the Exim mail transfer agent
-
-NO_CONFIGURE= yes
-NO_BUILD= yes
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/exim
- ${CP} -R ${WRKDIR}/${DISTNAME}/doc/html/* ${PREFIX}/share/doc/html/exim
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/exim-html/PLIST b/mail/exim-html/PLIST
deleted file mode 100644
index 5861b4a37ba..00000000000
--- a/mail/exim-html/PLIST
+++ /dev/null
@@ -1,145 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2005/05/17 17:06:12 abs Exp $
-share/doc/html/exim/C002.txt
-share/doc/html/exim/C006.txt
-share/doc/html/exim/C022.txt
-share/doc/html/exim/C037.txt
-share/doc/html/exim/C042.txt
-share/doc/html/exim/C043.txt
-share/doc/html/exim/C044.txt
-share/doc/html/exim/C045.txt
-share/doc/html/exim/C046.txt
-share/doc/html/exim/C047.txt
-share/doc/html/exim/C049.txt
-share/doc/html/exim/C050.txt
-share/doc/html/exim/C051.txt
-share/doc/html/exim/F001.txt
-share/doc/html/exim/F002.txt
-share/doc/html/exim/F003.txt
-share/doc/html/exim/F004.txt
-share/doc/html/exim/FAQ-KWIC_A.html
-share/doc/html/exim/FAQ-KWIC_B.html
-share/doc/html/exim/FAQ-KWIC_C.html
-share/doc/html/exim/FAQ-KWIC_D.html
-share/doc/html/exim/FAQ-KWIC_E.html
-share/doc/html/exim/FAQ-KWIC_F.html
-share/doc/html/exim/FAQ-KWIC_G.html
-share/doc/html/exim/FAQ-KWIC_H.html
-share/doc/html/exim/FAQ-KWIC_I.html
-share/doc/html/exim/FAQ-KWIC_K.html
-share/doc/html/exim/FAQ-KWIC_L.html
-share/doc/html/exim/FAQ-KWIC_M.html
-share/doc/html/exim/FAQ-KWIC_N.html
-share/doc/html/exim/FAQ-KWIC_O.html
-share/doc/html/exim/FAQ-KWIC_P.html
-share/doc/html/exim/FAQ-KWIC_Q.html
-share/doc/html/exim/FAQ-KWIC_R.html
-share/doc/html/exim/FAQ-KWIC_S.html
-share/doc/html/exim/FAQ-KWIC_T.html
-share/doc/html/exim/FAQ-KWIC_U.html
-share/doc/html/exim/FAQ-KWIC_V.html
-share/doc/html/exim/FAQ-KWIC_W.html
-share/doc/html/exim/FAQ-KWIC_X.html
-share/doc/html/exim/FAQ-KWIC_Y.html
-share/doc/html/exim/FAQ-KWIC_Z.html
-share/doc/html/exim/FAQ.html
-share/doc/html/exim/FAQ_0.html
-share/doc/html/exim/FAQ_1.html
-share/doc/html/exim/FAQ_10.html
-share/doc/html/exim/FAQ_11.html
-share/doc/html/exim/FAQ_12.html
-share/doc/html/exim/FAQ_13.html
-share/doc/html/exim/FAQ_14.html
-share/doc/html/exim/FAQ_15.html
-share/doc/html/exim/FAQ_16.html
-share/doc/html/exim/FAQ_17.html
-share/doc/html/exim/FAQ_18.html
-share/doc/html/exim/FAQ_19.html
-share/doc/html/exim/FAQ_2.html
-share/doc/html/exim/FAQ_20.html
-share/doc/html/exim/FAQ_21.html
-share/doc/html/exim/FAQ_22.html
-share/doc/html/exim/FAQ_23.html
-share/doc/html/exim/FAQ_24.html
-share/doc/html/exim/FAQ_25.html
-share/doc/html/exim/FAQ_26.html
-share/doc/html/exim/FAQ_27.html
-share/doc/html/exim/FAQ_28.html
-share/doc/html/exim/FAQ_3.html
-share/doc/html/exim/FAQ_4.html
-share/doc/html/exim/FAQ_5.html
-share/doc/html/exim/FAQ_6.html
-share/doc/html/exim/FAQ_7.html
-share/doc/html/exim/FAQ_8.html
-share/doc/html/exim/FAQ_9.html
-share/doc/html/exim/L001.txt
-share/doc/html/exim/S001.txt
-share/doc/html/exim/S002.txt
-share/doc/html/exim/filter_0.html
-share/doc/html/exim/filter_1.html
-share/doc/html/exim/filter_2.html
-share/doc/html/exim/filter_3.html
-share/doc/html/exim/filter_toc.html
-share/doc/html/exim/index.html
-share/doc/html/exim/pcrepattern.html
-share/doc/html/exim/pcretest.html
-share/doc/html/exim/relaying.gif
-share/doc/html/exim/routing.gif
-share/doc/html/exim/spec.html
-share/doc/html/exim/spec_1.html
-share/doc/html/exim/spec_10.html
-share/doc/html/exim/spec_11.html
-share/doc/html/exim/spec_12.html
-share/doc/html/exim/spec_13.html
-share/doc/html/exim/spec_14.html
-share/doc/html/exim/spec_15.html
-share/doc/html/exim/spec_16.html
-share/doc/html/exim/spec_17.html
-share/doc/html/exim/spec_18.html
-share/doc/html/exim/spec_19.html
-share/doc/html/exim/spec_2.html
-share/doc/html/exim/spec_20.html
-share/doc/html/exim/spec_21.html
-share/doc/html/exim/spec_22.html
-share/doc/html/exim/spec_23.html
-share/doc/html/exim/spec_24.html
-share/doc/html/exim/spec_25.html
-share/doc/html/exim/spec_26.html
-share/doc/html/exim/spec_27.html
-share/doc/html/exim/spec_28.html
-share/doc/html/exim/spec_29.html
-share/doc/html/exim/spec_3.html
-share/doc/html/exim/spec_30.html
-share/doc/html/exim/spec_31.html
-share/doc/html/exim/spec_32.html
-share/doc/html/exim/spec_33.html
-share/doc/html/exim/spec_34.html
-share/doc/html/exim/spec_35.html
-share/doc/html/exim/spec_36.html
-share/doc/html/exim/spec_37.html
-share/doc/html/exim/spec_38.html
-share/doc/html/exim/spec_39.html
-share/doc/html/exim/spec_4.html
-share/doc/html/exim/spec_40.html
-share/doc/html/exim/spec_41.html
-share/doc/html/exim/spec_42.html
-share/doc/html/exim/spec_43.html
-share/doc/html/exim/spec_44.html
-share/doc/html/exim/spec_45.html
-share/doc/html/exim/spec_46.html
-share/doc/html/exim/spec_47.html
-share/doc/html/exim/spec_48.html
-share/doc/html/exim/spec_49.html
-share/doc/html/exim/spec_5.html
-share/doc/html/exim/spec_50.html
-share/doc/html/exim/spec_51.html
-share/doc/html/exim/spec_52.html
-share/doc/html/exim/spec_53.html
-share/doc/html/exim/spec_6.html
-share/doc/html/exim/spec_7.html
-share/doc/html/exim/spec_8.html
-share/doc/html/exim/spec_9.html
-share/doc/html/exim/spec_cindex.html
-share/doc/html/exim/spec_oindex.html
-share/doc/html/exim/spec_toc.html
-share/doc/html/exim/spectop.html
-@dirrm share/doc/html/exim
diff --git a/mail/exim-html/distinfo b/mail/exim-html/distinfo
deleted file mode 100644
index 298a0d72bfd..00000000000
--- a/mail/exim-html/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.9 2005/05/17 17:06:12 abs Exp $
-
-SHA1 (exim-html-4.50.tar.bz2) = c8990e95e9f28b47f76739e4e1d3c5814ffb102d
-RMD160 (exim-html-4.50.tar.bz2) = 99176ac24b86df062df66818f578c02d2e8354c7
-Size (exim-html-4.50.tar.bz2) = 581781 bytes
diff --git a/mail/exim/DESCR b/mail/exim/DESCR
deleted file mode 100644
index d897da23555..00000000000
--- a/mail/exim/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-Exim is a mail transport agent (MTA) developed at the University of Cambridge
-for use on Unix systems connected to the Internet. It is freely available
-under the terms of the GNU General Public Licence. In style it is similar to
-Smail 3, but its facilities are more extensive, and in particular it has
-options for verifying incoming sender and recipient addresses, for refusing
-mail from specified hosts, networks, or senders, and for controlling mail
-relaying.
-
-This build of exim has the following non-default features enabled:
-
-TRANSPORT_LMTP SUPPORT_MAILDIR SUPPORT_MAILSTORE
-SUPPORT_MBX AUTH_CRAM_MD5 AUTH_PLAINTEXT
-AUTH_SPA SUPPORT_TLS USE_TCP_WRAPPERS
-
-The following default feature is disabled by default, but may be enabled by
-setting the 'exim-build-eximon' option:
-
-EXIM_MONITOR
diff --git a/mail/exim/MESSAGE b/mail/exim/MESSAGE
deleted file mode 100644
index caa26ebabad..00000000000
--- a/mail/exim/MESSAGE
+++ /dev/null
@@ -1,29 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.9 2005/06/01 01:22:31 gavan Exp $
-
-To use exim, you will need to perform the following steps manually; it is
-inappropriate for this package to make the changes for you.
-
-1. Read the documentation, see: http://www.exim.org/docs.html
- Edit ${PKG_SYSCONFDIR}/configure to taste.
-2. Edit ${PKG_SYSCONFDIR}/aliases to taste (or override it with the default
- /etc/aliases system file).
-3. Back-up /etc/mailer.conf to /etc/mailer.conf.sendmail.
- Copy ${EXAMPLESDIR}/mailer.conf to /etc/mailer.conf.
-4. If sendmail (or postfix) is running, stop the daemons:
- run '/etc/rc.d/sendmail stop' and '/etc/rc.d/smmsp stop'.
-5. In /etc/rc.conf set 'sendmail=NO', 'smmsp=NO', 'exim=YES' and exim_flags
- to some sane value (for example "-bd -q15m").
- Copy ${LOCALBASE}/${RCD_SCRIPTS_EXAMPLEDIR}/exim to /etc/rc.d.
-6. Run '/etc/rc.d/exim start' to start the daemon.
-7. Configuring log rotation is dependent on personal taste and the version
- of NetBSD in use. See weekly.conf(5), newsyslog(8), exicyclog and
- eximstats.
-
-Also note:
-
-1. Try `pkg_info exim` to see which features are enabled in this build.
-2. Consider enabling SSL (STARTTLS) for receiving mail in your config.
- This build automatically uses SSL when sending mail.
-
-===========================================================================
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
deleted file mode 100644
index 884f37f057f..00000000000
--- a/mail/exim/Makefile
+++ /dev/null
@@ -1,106 +0,0 @@
-# $NetBSD: Makefile,v 1.81 2007/01/10 12:54:36 abs Exp $
-
-DISTNAME= exim-4.66
-CATEGORIES= mail net
-MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \
- ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
- ftp://ftp.esat.net/pub/networking/mail/mta/exim/exim4/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= abs@NetBSD.org
-HOMEPAGE= http://www.exim.org/
-COMMENT= The Exim mail transfer agent, a replacement for sendmail
-
-CONFLICTS+= exim-exiscan-[0-9]*
-
-USE_TOOLS+= perl:run
-INSTALLATION_DIRS+= ${PKGMANDIR}/man8
-
-MAKE_ENV+= SSLBASE=${SSLBASE:Q}
-MAKE_ENV+= INST_CHOWN=${CHOWN:Q}
-MAKE_FLAGS+= FULLECHO=''
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+= EXIM_USER EXIM_GROUP EXIM_DB
-
-PKG_GROUPS= ${EXIM_GROUP}
-PKG_USERS= ${EXIM_USER}:${EXIM_GROUP}
-
-PKG_GECOS.${EXIM_USER}= Exim mail server user
-PKG_HOME.${EXIM_USER}= ${VARBASE}/mail
-PKG_SHELL.${EXIM_USER}= ${NOLOGIN}
-
-PKG_SYSCONFSUBDIR?= exim
-EXAMPLESDIR= ${PREFIX}/share/examples/exim
-CONF_FILES= ${EXAMPLESDIR}/aliases ${PKG_SYSCONFDIR}/aliases
-CONF_FILES+= ${EXAMPLESDIR}/configure ${PKG_SYSCONFDIR}/configure
-MESSAGE_SUBST+= EXAMPLESDIR="${EXAMPLESDIR}"
-PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
-
-RCD_SCRIPTS= exim
-
-OWN_DIRS_PERMS= ${VARBASE}/log/exim ${EXIM_USER} ${EXIM_GROUP} 0750
-OWN_DIRS_PERMS+= ${VARBASE}/spool/exim ${EXIM_USER} ${EXIM_GROUP} 0750
-
-# XXX: The following will be handled by buildlink3 at some point.
-CFLAGS+= ${_STRIPFLAG_CC}
-
-# pay attention to CPPFLAGS as well
-CFLAGS+= ${CPPFLAGS}
-
-.include "options.mk"
-
-# BDB_TYPE gets set to "db1" if USE_DB185=="yes"
-USE_DB185?= no
-BDB_ACCEPTED?= db1 db2 db3 db4
-
-post-extract:
- ${MKDIR} ${WRKSRC}/Local
- ${CP} ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.pkgsrc
- ${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf.pkgsrc
- ${CP} ${FILESDIR}/Makefile-DragonFly ${FILESDIR}/os.h-DragonFly \
- ${WRKSRC}/OS/
-
-pre-configure:
- ${SED} -e 's:@PREFIX@:${PREFIX}:' \
- -e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
- -e 's:@EXIM_USER@:${EXIM_USER}:' \
- -e 's:@EXIM_GROUP@:${EXIM_GROUP}:' \
- -e 's:@EXIM_USE_DB_CONFIG@:${EXIM_USE_DB_CONFIG}:' \
- -e 's:@EXIM_DBMLIB@:${EXIM_DBMLIB}:' \
- -e 's:@EXIM_INCLUDE@:${EXIM_INCLUDE}:' \
- -e 's:@LOOKUP_LIBS@:${LOOKUP_LIBS}:' \
- -e 's:@CHOWN@:${CHOWN}:' \
- -e 's:@CHGRP@:${CHGRP}:' \
- -e 's:@MV@:${MV}:' \
- -e 's:@RM@:${RM}:' \
- -e 's:@PERL5@:${PERL5}:' \
- -e 's:@VARBASE@:${VARBASE}:' \
- < ${WRKSRC}/Local/Makefile.pkgsrc \
- > ${WRKSRC}/Local/Makefile
-.for opt in ${LOCAL_MAKEFILE_OPTIONS}
- @${ECHO} ${opt} >> ${WRKSRC}/Local/Makefile
-.endfor
- ${SED} -e 's:@PREFIX@:${PREFIX}:' \
- -e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
- < ${WRKSRC}/Local/eximon.conf.pkgsrc \
- > ${WRKSRC}/Local/eximon.conf
-# CFLAGS is already set by pkgsrc
- @for f in ${WRKSRC}/OS/Makefile-*; do \
- ${SED} -e 's/^CFLAGS=.*//' $$f > $$f.subst; \
- ${MV} -f $$f.subst $$f; \
- done
-
-post-build:
- ${SED} -e 's:@PREFIX@:${PREFIX}:' \
- ${FILESDIR}/mailer.conf.exim \
- > ${WRKDIR}/mailer.conf
-
-post-install:
- ${INSTALL_DATA_DIR} ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/exim.8 ${PREFIX}/${PKGMANDIR}/man8/exim.8
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/exim/PLIST b/mail/exim/PLIST
deleted file mode 100644
index 16ec39436e9..00000000000
--- a/mail/exim/PLIST
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $NetBSD: PLIST,v 1.11 2005/05/02 20:34:00 reed Exp $
-man/man8/exim.8
-sbin/${DISTNAME}-1
-sbin/exicyclog
-sbin/exigrep
-sbin/exim
-sbin/exim_checkaccess
-sbin/exim_dbmbuild
-sbin/exim_dumpdb
-sbin/exim_fixdb
-sbin/exim_lock
-sbin/exim_tidydb
-sbin/eximstats
-sbin/exinext
-sbin/exipick
-sbin/exiqgrep
-sbin/exiqsumm
-sbin/exiwhat
-share/examples/exim/aliases
-share/examples/exim/configure
-share/examples/exim/mailer.conf
-share/examples/rc.d/exim
-@dirrm share/examples/exim
diff --git a/mail/exim/PLIST.eximon b/mail/exim/PLIST.eximon
deleted file mode 100644
index c9cc9890952..00000000000
--- a/mail/exim/PLIST.eximon
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.eximon,v 1.1 2005/10/03 20:20:18 abs Exp $
-sbin/eximon
-sbin/eximon.bin
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
deleted file mode 100644
index 592e783b530..00000000000
--- a/mail/exim/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.36 2007/01/10 12:54:36 abs Exp $
-
-SHA1 (exim-4.66.tar.bz2) = 4a2ac2cd51865b57610e2b153e20c305b7f9f504
-RMD160 (exim-4.66.tar.bz2) = 4481c9ca4932be9ab5f4f0a66b99f3e2f8e6c5fa
-Size (exim-4.66.tar.bz2) = 1584704 bytes
-SHA1 (patch-aa) = d6c067e75f16275b4d8c4e46c8ded0627cb11ae4
-SHA1 (patch-ab) = 1c6e7882346974390c22e7b9e09a76c5ed670d1d
-SHA1 (patch-ac) = a3ecdafc44ad2212b00e49de594efb26612b0b75
-SHA1 (patch-ad) = 52c768378483bf02295d46c01d55f955697834eb
-SHA1 (patch-ae) = 6cb0f00d159de7c342a55b09fb87ab533c5670bf
-SHA1 (patch-af) = f4dd3bad1b67a1ae27c14c3f92f338d3280f390c
-SHA1 (patch-ag) = 8512795060ad913f4699c277867fd24e7a785519
diff --git a/mail/exim/files/Makefile-DragonFly b/mail/exim/files/Makefile-DragonFly
deleted file mode 100644
index 7a1c52eb0a4..00000000000
--- a/mail/exim/files/Makefile-DragonFly
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Cambridge: exim/exim-src/OS/Makefile-FreeBSD,v 1.2 2005/05/23 16:58:55 fanf2 Exp $
-
-# Exim: OS-specific make file for DragonFly
-# There's no setting of CFLAGS here, to allow the system default
-# for "make" to be the default.
-
-CHOWN_COMMAND=/usr/sbin/chown
-
-HAVE_SA_LEN=YES
-
-# crypt() is in a separate library
-LIBS=-lcrypt -lm
-
-# DragonFly always ships with Berkeley DB
-USE_DB=yes
-
-# X11 may be under /usr/pkg/xorg/ for example.
-# X11=/usr/X11R6
-X11=$(X11BASE)
-
-XINCLUDE=-I$(X11)/include
-XLFLAGS=-L$(X11)/lib
-XLFLAGS+=-Wl,-rpath,${X11BASE}/lib
-X11_LD_LIB=$(X11)/lib
-
-EXIWHAT_PS_ARG=-ax
-EXIWHAT_EGREP_ARG='/exim( |$$)'
-EXIWHAT_MULTIKILL_CMD='killall -m'
-EXIWHAT_MULTIKILL_ARG='^exim($$|-[0-9.]+-[0-9]+$$)'
-EXIWHAT_KILL_SIGNAL=-USR1
-
-# End
diff --git a/mail/exim/files/exim.sh b/mail/exim/files/exim.sh
deleted file mode 100644
index 1a92d271276..00000000000
--- a/mail/exim/files/exim.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: exim.sh,v 1.7 2004/11/26 10:17:40 grant Exp $
-#
-# PROVIDE: mail
-# REQUIRE: LOGIN
-
-. /etc/rc.subr
-
-name="exim"
-exim_flags=${exim_flags-"-bd -q30m"}
-rcvar=$name
-command="@PREFIX@/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="@PKG_SYSCONFDIR@/configure"
-extra_commands="reload"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/exim/files/mailer.conf.exim b/mail/exim/files/mailer.conf.exim
deleted file mode 100644
index d19b4d74b94..00000000000
--- a/mail/exim/files/mailer.conf.exim
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: mailer.conf.exim,v 1.3 2005/10/03 18:45:50 abs Exp $
-#
-# Use "exim" as replacement for "sendmail".
-#
-mailq @PREFIX@/sbin/exim
-newaliases @PREFIX@/sbin/exim
-rmail @PREFIX@/sbin/exim
-rsmtp @PREFIX@/sbin/exim
-runq @PREFIX@/sbin/exim
-send-mail @PREFIX@/sbin/exim
-sendmail @PREFIX@/sbin/exim
diff --git a/mail/exim/files/os.h-DragonFly b/mail/exim/files/os.h-DragonFly
deleted file mode 100644
index 717a207c8cf..00000000000
--- a/mail/exim/files/os.h-DragonFly
+++ /dev/null
@@ -1,12 +0,0 @@
-/* $Cambridge: exim/exim-src/OS/os.h-FreeBSD,v 1.1 2004/10/06 15:07:39 ph10 Exp $ */
-
-/* Exim: OS-specific C header file for DragonFly */
-
-#define HAVE_BSD_GETLOADAVG
-#define HAVE_MMAP
-#define HAVE_SYS_MOUNT_H
-#define SIOCGIFCONF_GIVES_ADDR
-
-typedef struct flock flock_t;
-
-/* End */
diff --git a/mail/exim/options.mk b/mail/exim/options.mk
deleted file mode 100644
index ed5ca3064b2..00000000000
--- a/mail/exim/options.mk
+++ /dev/null
@@ -1,145 +0,0 @@
-# $NetBSD: options.mk,v 1.11 2006/12/22 21:04:14 joerg Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.exim
-PKG_SUPPORTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
-PKG_SUPPORTED_OPTIONS+= exim-appendfile-mbx exim-build-eximon
-PKG_SUPPORTED_OPTIONS+= exim-content-scan exim-lookup-cdb exim-lookup-dnsdb
-PKG_SUPPORTED_OPTIONS+= exim-lookup-dsearch exim-lookup-ldap exim-lookup-mysql
-PKG_SUPPORTED_OPTIONS+= exim-lookup-pgsql exim-lookup-sqlite exim-lookup-whoson
-PKG_SUPPORTED_OPTIONS+= exim-old-demime exim-router-iplookup exim-tcp-wrappers
-PKG_SUPPORTED_OPTIONS+= exim-tls exim-transport-lmtp gdbm inet6 saslauthd
-
-PKG_SUGGESTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
-PKG_SUGGESTED_OPTIONS+= exim-appendfile-mbx exim-content-scan
-PKG_SUGGESTED_OPTIONS+= exim-lookup-dsearch exim-old-demime exim-tcp-wrappers
-PKG_SUGGESTED_OPTIONS+= exim-tls
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_SRC=${PKGDIR}/PLIST
-
-.if !empty(PKG_OPTIONS:Mexim-appendfile-maildir)
-LOCAL_MAKEFILE_OPTIONS+=SUPPORT_MAILDIR=yes
-.endif
-
-.if !empty(PKG_OPTIONS:Mexim-appendfile-mailstore)
-LOCAL_MAKEFILE_OPTIONS+=SUPPORT_MAILSTORE=yes
-.endif
-
-.if !empty(PKG_OPTIONS:Mexim-appendfile-mbx)
-LOCAL_MAKEFILE_OPTIONS+=SUPPORT_MBX=yes
-.endif
-
-.if !empty(PKG_OPTIONS:Mexim-build-eximon)
-LOCAL_MAKEFILE_OPTIONS+=EXIM_MONITOR=eximon.bin
-LOCAL_MAKEFILE_OPTIONS+=X11=${X11BASE}
-PLIST_SRC+=${PKGDIR}/PLIST.eximon
-. include "../../mk/x11.buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mexim-content-scan)
-LOCAL_MAKEFILE_OPTIONS+=WITH_CONTENT_SCAN=YES
-.endif
-
-.if !empty(PKG_OPTIONS:Mexim-lookup-cdb)
-LOCAL_MAKEFILE_OPTIONS+=LOOKUP_CDB=YES
-DEPENDS+=cdb-[0-9]*:../../databases/cdb
-.endif
-
-.if !empty(PKG_OPTIONS:Mexim-lookup-dnsdb)
-LOCAL_MAKEFILE_OPTIONS+=LOOKUP_DNSDB=YES
-.endif
-
-.if !empty(PKG_OPTIONS:Mexim-lookup-dsearch)
-LOCAL_MAKEFILE_OPTIONS+=LOOKUP_DSEARCH=YES
-.endif
-
-.if !empty(PKG_OPTIONS:Mexim-lookup-ldap)
-LOCAL_MAKEFILE_OPTIONS+=LOOKUP_LDAP=YES
-LOCAL_MAKEFILE_OPTIONS+=LDAP_LIB_TYPE=OPENLDAP2
-LOOKUP_LIBS+=-lldap -llber
-. include "../../databases/openldap-client/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mexim-lookup-mysql)
-LOCAL_MAKEFILE_OPTIONS+=LOOKUP_MYSQL=YES
-LOOKUP_LIBS+=-lmysqlclient
-. include "../../mk/mysql.buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mexim-lookup-pgsql)
-LOCAL_MAKEFILE_OPTIONS+=LOOKUP_PGSQL=YES
-LOOKUP_LIBS+=-lpq
-. include "../../mk/pgsql.buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mexim-lookup-sqlite)
-LOCAL_MAKEFILE_OPTIONS+=LOOKUP_SQLITE=YES
-LOOKUP_LIBS+=-lsqlite3
-. include "../../databases/sqlite3/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mexim-lookup-whoson)
-LOCAL_MAKEFILE_OPTIONS+=LOOKUP_WHOSON=YES
-LOOKUP_LIBS+=-lwhoson
-. include "../../net/whoson/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mexim-old-demime)
-LOCAL_MAKEFILE_OPTIONS+=WITH_OLD_DEMIME=YES
-.endif
-
-.if !empty(PKG_OPTIONS:Mexim-router-iplookup)
-LOCAL_MAKEFILE_OPTIONS+=ROUTER_IPLOOKUP=yes
-.endif
-
-.if !empty(PKG_OPTIONS:Mexim-tcp-wrappers)
-LOCAL_MAKEFILE_OPTIONS+=USE_TCP_WRAPPERS=yes
-LOOKUP_LIBS+=-lwrap
-. include "../../security/tcp_wrappers/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mexim-tls)
-LOCAL_MAKEFILE_OPTIONS+=SUPPORT_TLS=yes
-LOOKUP_LIBS+=-lssl -lcrypto
-. include "../../security/openssl/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mexim-transport-lmtp)
-LOCAL_MAKEFILE_OPTIONS+=TRANSPORT_LMTP=yes
-.endif
-
-.if !empty(PKG_OPTIONS:Minet6)
-LOCAL_MAKEFILE_OPTIONS+=HAVE_IPV6=YES
-.endif
-
-.if !empty(PKG_OPTIONS:Mgdbm)
-. include "../../databases/gdbm/buildlink3.mk"
-EXIM_USE_DB_CONFIG= USE_GDBM=yes
-EXIM_DBMLIB= DBMLIB=${LDFLAGS} -lgdbm
-EXIM_INCLUDE= -I${PREFIX}/include
-.else # use native or Berkeley DB as defined by BDB_DEFAULT and BDB_ACCEPTED
-. include "../../mk/bdb.buildlink3.mk"
-EXIM_USE_DB_CONFIG= USE_DB=yes # the default
-. if ${BDB_TYPE} == "db4"
-EXIM_DBMLIB= DBMLIB=${LDFLAGS} ${BDB_LIBS}
-EXIM_INCLUDE= -I${PREFIX}/${BUILDLINK_INCDIRS.db4}
-. elif ${BDB_TYPE} == "db3"
-EXIM_DBMLIB= DBMLIB=${LDFLAGS} ${BDB_LIBS}
-EXIM_INCLUDE= -I${PREFIX}/${BUILDLINK_INCDIRS.db3}
-. elif ${BDB_TYPE} == "db2"
-EXIM_DBMLIB= DBMLIB=${LDFLAGS} ${BDB_LIBS}
-EXIM_INCLUDE= -I${PREFIX}/${BUILDLINK_INCDIRS.db2}
-. else # using native
-EXIM_DBMLIB= # empty so use defaults
-EXIM_USE_DB_CONFIG= # empty so use defaults
-EXIM_INCLUDE= -I/usr/${BUILDLINK_INCDIRS.db-native}
-. endif
-.endif
-
-.if !empty(PKG_OPTIONS:Msaslauthd)
-LOCAL_MAKEFILE_OPTIONS+=AUTH_CYRUS_SASL=YES
-LOCAL_MAKEFILE_OPTIONS+=CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
-LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.cyrus-sasl} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.cyrus-sasl} -lsasl2
-. include "../../security/cyrus-sasl/buildlink3.mk"
-.endif
diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa
deleted file mode 100644
index 066c3b7ee62..00000000000
--- a/mail/exim/patches/patch-aa
+++ /dev/null
@@ -1,119 +0,0 @@
-$NetBSD: patch-aa,v 1.18 2007/01/10 12:54:36 abs Exp $
-
---- Local/Makefile.pkgsrc.orig 2007-01-10 12:40:16.000000000 +0000
-+++ Local/Makefile.pkgsrc
-@@ -100,7 +100,7 @@
- # /usr/local/sbin. The installation script will try to create this directory,
- # and any superior directories, if they do not exist.
-
--BIN_DIRECTORY=/usr/exim/bin
-+BIN_DIRECTORY=@PREFIX@/sbin
-
-
- #------------------------------------------------------------------------------
-@@ -116,7 +116,7 @@ BIN_DIRECTORY=/usr/exim/bin
- # don't exist. It will also install a default runtime configuration if this
- # file does not exist.
-
--CONFIGURE_FILE=/usr/exim/configure
-+CONFIGURE_FILE=@PKG_SYSCONFDIR@/configure
-
- # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
- # In this case, Exim will use the first of them that exists when it is run.
-@@ -134,7 +134,7 @@ CONFIGURE_FILE=/usr/exim/configure
- # owner of a local mailbox.) Specifying these values as root is very strongly
- # discouraged.
-
--EXIM_USER=
-+EXIM_USER=ref:@EXIM_USER@
-
- # If you specify EXIM_USER as a name, this is looked up at build time, and the
- # uid number is built into the binary. However, you can specify that this
-@@ -155,7 +155,7 @@ EXIM_USER=
- # for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless
- # you want to use a group other than the default group for the given user.
-
--# EXIM_GROUP=
-+EXIM_GROUP=ref:@EXIM_GROUP@
-
- # Many sites define a user called "exim", with an appropriate default group,
- # and use
-@@ -176,7 +176,7 @@ EXIM_USER=
-
- # Almost all installations choose this:
-
--SPOOL_DIRECTORY=/var/spool/exim
-+SPOOL_DIRECTORY=@VARBASE@/spool/exim
-
-
-
-@@ -320,7 +320,7 @@ LOOKUP_LSEARCH=yes
- # files are defaulted in the OS/Makefile-Default file, but can be overridden in
- # local OS-specific make files.
-
--EXIM_MONITOR=eximon.bin
-+# EXIM_MONITOR=eximon.bin
-
-
- #------------------------------------------------------------------------------
-@@ -473,11 +473,11 @@ FIXED_NEVER_USERS=root
- # included in the Exim binary. You will then need to set up the run time
- # configuration to make use of the mechanism(s) selected.
-
--# AUTH_CRAM_MD5=yes
-+AUTH_CRAM_MD5=yes
- # AUTH_CYRUS_SASL=yes
- # AUTH_DOVECOT=yes
--# AUTH_PLAINTEXT=yes
--# AUTH_SPA=yes
-+AUTH_PLAINTEXT=yes
-+AUTH_SPA=yes
-
-
- #------------------------------------------------------------------------------
-@@ -643,7 +643,7 @@ HEADERS_CHARSET="ISO-8859-1"
- # %s. This will be replaced by one of the strings "main", "panic", or "reject"
- # to form the final file names. Some installations may want something like this:
-
--# LOG_FILE_PATH=/var/log/exim_%slog
-+LOG_FILE_PATH=@VARBASE@/log/exim/%s
-
- # which results in files with names /var/log/exim_mainlog, etc. The directory
- # in which the log files are placed must exist; Exim does not try to create
-@@ -884,11 +884,11 @@ SYSTEM_ALIASES_FILE=/etc/aliases
- # haven't got Perl, Exim will still build and run; you just won't be able to
- # use those utilities.
-
--# CHOWN_COMMAND=/usr/bin/chown
--# CHGRP_COMMAND=/usr/bin/chgrp
--# MV_COMMAND=/bin/mv
--# RM_COMMAND=/bin/rm
--# PERL_COMMAND=/usr/bin/perl
-+CHOWN_COMMAND=@CHOWN@
-+CHGRP_COMMAND=@CHGRP@
-+MV_COMMAND=@MV@
-+RM_COMMAND=@RM@
-+PERL_COMMAND=@PERL5@
-
-
- #------------------------------------------------------------------------------
-@@ -1082,7 +1082,7 @@ TMPDIR="/tmp"
- # (process id) to a file so that it can easily be identified. The path of the
- # file can be specified here. Some installations may want something like this:
-
--# PID_FILE_PATH=/var/lock/exim.pid
-+PID_FILE_PATH=/var/run/exim.pid
-
- # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
- # using the name "exim-daemon.pid".
-@@ -1118,3 +1118,10 @@ TMPDIR="/tmp"
- # SUPPORT_MOVE_FROZEN_MESSAGES=yes
-
- # End of EDITME for Exim 4.
-+
-+EXTRALIBS_EXIM=-liconv
-+
-+@EXIM_USE_DB_CONFIG@
-+@EXIM_DBMLIB@
-+INCLUDE=@EXIM_INCLUDE@
-+LOOKUP_LIBS=@LOOKUP_LIBS@
diff --git a/mail/exim/patches/patch-ab b/mail/exim/patches/patch-ab
deleted file mode 100644
index c7b41bff7fc..00000000000
--- a/mail/exim/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.13 2006/08/08 15:24:01 abs Exp $
-
---- OS/Makefile-Default.orig 2006-04-28 11:32:21.000000000 +0100
-+++ OS/Makefile-Default
-@@ -71,7 +71,7 @@ PERL_COMMAND=/usr/bin/perl
-
- # CC contains the name of the C compiler to be used.
-
--CC=gcc
-+# CC=gcc
-
-
- # CFLAGS contains flags to be passed to the compiler. Nothing is defaulted
diff --git a/mail/exim/patches/patch-ac b/mail/exim/patches/patch-ac
deleted file mode 100644
index de97d440e42..00000000000
--- a/mail/exim/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2006/08/08 15:24:01 abs Exp $
-
---- OS/Makefile-NetBSD-a.out.orig 2006-04-28 11:32:21.000000000 +0100
-+++ OS/Makefile-NetBSD-a.out
-@@ -3,7 +3,7 @@
- # Exim: OS-specific make file for NetBSD (a.out/COFF object format)
-
- CHOWN_COMMAND=/usr/sbin/chown
--CFLAGS=-O
-+CFLAGS?=-O2
-
- HAVE_SA_LEN=YES
- HAVE_IPV6=YES
diff --git a/mail/exim/patches/patch-ad b/mail/exim/patches/patch-ad
deleted file mode 100644
index eb0af548f8c..00000000000
--- a/mail/exim/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.9 2006/08/08 15:24:01 abs Exp $
-
---- OS/Makefile-NetBSD.orig 2006-04-28 11:32:21.000000000 +0100
-+++ OS/Makefile-NetBSD
-@@ -3,7 +3,7 @@
- # Exim: OS-specific make file for NetBSD (ELF object format)
-
- CHOWN_COMMAND=/usr/sbin/chown
--CFLAGS=-O
-+CFLAGS?=-O2
-
- HAVE_SA_LEN=YES
- HAVE_IPV6=YES
diff --git a/mail/exim/patches/patch-ae b/mail/exim/patches/patch-ae
deleted file mode 100644
index 12c703e3f50..00000000000
--- a/mail/exim/patches/patch-ae
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ae,v 1.9 2006/08/08 15:24:01 abs Exp $
-
---- scripts/exim_install.orig 2006-04-28 11:32:21.000000000 +0100
-+++ scripts/exim_install
-@@ -84,6 +84,8 @@ if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; t
- SYSTEM_ALIASES_FILE=/etc/aliases
- fi
-
-+INST_CONFIGURE_FILE=${PREFIX}/share/examples/exim/configure
-+
- # Allow INST_xx to over-ride xx
- case "$INST_BIN_DIRECTORY" in ?*) BIN_DIRECTORY="$INST_BIN_DIRECTORY";; esac
- case "$INST_CONFIGURE_FILE" in ?*) CONFIGURE_FILE="$INST_CONFIGURE_FILE";; esac
-@@ -415,15 +417,8 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then
- echo $com "*** Exim installation ${ver}failed ***"
- exit 1
- fi
-- if [ ! -f ${SYSTEM_ALIASES_FILE} ]; then
-- echo $com '****'
-- echo $com Installing a dummy ${SYSTEM_ALIASES_FILE} file because you do not have
-- echo $com one, and the default configuration requires it. You should
-- echo $com edit ${SYSTEM_ALIASES_FILE} and at least create an alias for postmaster.
-- echo $com '***'
-- echo ${CP} ../src/aliases.default ${SYSTEM_ALIASES_FILE}
-- ${real} ${CP} ../src/aliases.default ${SYSTEM_ALIASES_FILE}
-- fi
-+ echo ${CP} ../src/aliases.default ${PREFIX}/share/examples/exim/aliases
-+ ${real} ${CP} ../src/aliases.default ${PREFIX}/share/examples/exim/aliases
-
- else
- echo $com Configuration file ${CONFIGURE_FILE} already exists
diff --git a/mail/exim/patches/patch-af b/mail/exim/patches/patch-af
deleted file mode 100644
index 236e8155c9e..00000000000
--- a/mail/exim/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.7 2006/08/08 15:24:01 abs Exp $
-
---- OS/os.h-NetBSD.orig 2006-04-28 11:32:21.000000000 +0100
-+++ OS/os.h-NetBSD
-@@ -12,4 +12,10 @@ typedef struct flock flock_t;
- #define os_strsignal strsignal
- #define OS_STRSIGNAL
-
-+#include <sys/param.h>
-+
-+#if __NetBSD_Version__ >= 299000900
-+#define HAVE_SYS_STATVFS_H
-+#endif
-+
- /* End */
diff --git a/mail/exim/patches/patch-ag b/mail/exim/patches/patch-ag
deleted file mode 100644
index cf2cd59591e..00000000000
--- a/mail/exim/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.6 2006/08/08 15:24:01 abs Exp $
-
---- src/spam.h.orig 2006-04-28 11:32:23.000000000 +0100
-+++ src/spam.h
-@@ -12,7 +12,7 @@
- #ifdef WITH_CONTENT_SCAN
-
- /* timeout for reading and writing spamd */
--#define SPAMD_TIMEOUT 120
-+#define SPAMD_TIMEOUT 240
-
- /* maximum length of the spam bar */
- #define MAX_SPAM_BAR_CHARS 50
diff --git a/mail/exim3/DESCR b/mail/exim3/DESCR
deleted file mode 100644
index ffdd088272f..00000000000
--- a/mail/exim3/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Exim is a mail transport agent (MTA) developed at the University of
-Cambridge for use on Unix systems connected to the Internet. It is
-freely available under the terms of the GNU General Public Licence.
-In style it is similar to Smail 3, but its facilities are more
-extensive, and in particular it has options for verifying incoming
-sender and recipient addresses, for refusing mail from specified
-hosts, networks, or senders, and for controlling mail relaying.
diff --git a/mail/exim3/MESSAGE b/mail/exim3/MESSAGE
deleted file mode 100644
index 320ef5200fe..00000000000
--- a/mail/exim3/MESSAGE
+++ /dev/null
@@ -1,21 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/02/13 23:47:02 snj Exp $
-
-To use exim, you will need to do the following:
-
-1. Read the documentation. Edit ${PKG_SYSCONFDIR}/configure to taste.
- Note that depending on your operating system, the `aliases' file may
- be in /etc/mail or /etc.
-
-2. If you use mailwrapper (eg. NetBSD), back-up /etc/mailer.conf to
- /etc/mailer.conf.sendmail and copy
- ${EGDIR}/mailer.conf to /etc/mailer.conf.
-
-3. If you use rc.conf, set 'exim=YES' and be sure to disable any other
- MTAs.
-
-4. Configuring log rotation is dependent on personal taste and your
- operating system. See exicyclog and eximstats. Additionally, on NetBSD,
- see weekly.conf(5) and newsyslog(8).
-
-===========================================================================
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
deleted file mode 100644
index 5c4e070e485..00000000000
--- a/mail/exim3/Makefile
+++ /dev/null
@@ -1,109 +0,0 @@
-# $NetBSD: Makefile,v 1.33 2007/01/07 09:13:57 rillig Exp $
-
-DISTNAME= exim-3.36
-PKGREVISION= 7
-CATEGORIES= mail net
-MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim3/ \
- http://public.planetmirror.com.au/pub/exim/exim3/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= grant@NetBSD.org
-HOMEPAGE= http://www.exim.org/
-COMMENT= The Exim mail transfer agent, a replacement for sendmail
-
-CONFLICTS+= exim-exiscan-[0-9]*
-
-
-BUILD_DEFS+= EXIM_USER EXIM_GROUP
-BUILD_DEFS+= EXIM_DB.mysql EXIM_DB.pgsql
-
-PKG_SYSCONFSUBDIR?= exim
-EGDIR= ${PREFIX}/share/examples/exim
-MAKE_ENV+= INST_CONFIGURE_FILE="${EGDIR}/configure"
-CONF_FILES= ${EGDIR}/configure ${PKG_SYSCONFDIR}/configure
-MESSAGE_SUBST+= EGDIR="${EGDIR}"
-
-RCD_SCRIPTS= exim
-
-OWN_DIRS_PERMS= /var/log/exim ${EXIM_USER} ${EXIM_GROUP} 0750
-OWN_DIRS_PERMS+= /var/spool/exim ${EXIM_USER} ${EXIM_GROUP} 0750
-
-PKG_GROUPS= ${EXIM_GROUP}
-PKG_USERS= ${EXIM_USER}:${EXIM_GROUP}
-
-PKG_UID.${EXIM_USER}?= 8
-PKG_GECOS.${EXIM_USER}= Exim mail server user
-PKG_HOME.${EXIM_USER}= ${VARBASE}/mail
-PKG_SHELL.${EXIM_USER}= ${NOLOGIN}
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_TOOLS+= gzip gzcat perl:run
-FILES_SUBST+= GZIP_CMD="${GZIP_CMD:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"
-FILES_SUBST+= GZCAT=${GZCAT:Q}
-
-_LOOKUP_LIBS+= ${LDFLAGS}
-
-.if defined(EXIM_DB.mysql) && ${EXIM_DB.mysql} == "YES"
-LOOKUP_INCLUDE+= -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
-LOOKUP_LIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql
-LOOKUP_LIBS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql
-LOOKUP_LIBS+= -lmysqlclient
-MAKE_ENV+= LOOKUP_MYSQL=YES
-. include "../../mk/mysql.buildlink3.mk"
-.endif
-.if defined(EXIM_DB.pgsql) && ${EXIM_DB.pgsql} == "YES"
-LOOKUP_INCLUDE+= -I${PGSQL_PREFIX}/include/postgresql
-LOOKUP_LIBS+= -L${PGSQL_PREFIX}/lib
-LOOKUP_LIBS+= ${COMPILER_RPATH_FLAG}${PGSQL_PREFIX}/lib -lpq
-MAKE_ENV+= LOOKUP_PGSQL=YES
-. include "../../mk/pgsql.buildlink3.mk"
-.endif
-
-BDB_ACCEPTED= db1 db3 db2 # does not compile with db4
-.include "../../mk/bdb.buildlink3.mk"
-DBMLIB+= ${LDFLAGS} ${BDB_LIBS}
-
-MAKE_ENV+= DBMLIB=${DBMLIB:Q}
-MAKE_ENV+= LOOKUP_INCLUDE=${LOOKUP_INCLUDE:Q}
-MAKE_ENV+= LOOKUP_LIBS=${LOOKUP_LIBS:Q}
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= Local/Makefile.pkgsrc ${WRKDIR}/mailer.conf
-SUBST_FILES.paths+= ${WRKDIR}/exim_newaliases
-SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+= -e 's,@GZIP_CMD@,${GZIP_CMD},g'
-SUBST_SED.paths+= -e 's,@GZCAT@,${GZCAT},g'
-SUBST_SED.paths+= -e 's,@PERL5@,${PERL5},g'
-SUBST_SED.paths+= -e 's,@SH@,${SH},g'
-SUBST_STAGE.paths= post-patch
-
-post-extract:
- ${CP} ${FILESDIR}/Makefile-DragonFly ${FILESDIR}/os.h-DragonFly \
- ${WRKSRC}/OS/
- ${CP} ${FILESDIR}/mailer.conf.exim ${WRKDIR}/mailer.conf
- ${CP} ${FILESDIR}/exim_newaliases ${WRKDIR}/exim_newaliases
-
-pre-patch:
- ${MKDIR} ${WRKSRC}/Local
- ${CP} ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.pkgsrc
-
-pre-configure:
- ${CP} ${WRKSRC}/Local/Makefile.pkgsrc ${WRKSRC}/Local/Makefile
- @for f in ${WRKSRC}/OS/Makefile-*; do \
- ${SED} -e 's/^CFLAGS.*/& $$(CPPFLAGS)/' \
- -e '/^DBMLIB/d' $$f > $$f.subst; \
- ${MV} -f $$f.subst $$f; \
- done
-
-pre-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
-
-post-install:
- ${INSTALL_SCRIPT} ${WRKDIR}/exim_newaliases ${PREFIX}/sbin/exim_newaliases
- ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EGDIR}
- ${CP} ${FILESDIR}/exim.8 ${PREFIX}/${PKGMANDIR}/man8/exim.8
-
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/exim3/PLIST b/mail/exim3/PLIST
deleted file mode 100644
index 943acf9b383..00000000000
--- a/mail/exim3/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/02 20:34:00 reed Exp $
-man/man8/exim.8
-sbin/exicyclog
-sbin/exigrep
-sbin/exim
-sbin/exim_dbmbuild
-sbin/exim_dumpdb
-sbin/exim_fixdb
-sbin/exim_lock
-sbin/exim_newaliases
-sbin/exim_tidydb
-sbin/eximstats
-sbin/exinext
-sbin/exiqsumm
-sbin/exiwhat
-share/examples/exim/configure
-share/examples/exim/mailer.conf
-share/examples/rc.d/exim
-@unexec ${RMDIR} /var/log/exim 2>/dev/null || true
-@dirrm share/examples/exim
diff --git a/mail/exim3/distinfo b/mail/exim3/distinfo
deleted file mode 100644
index 8a42aa17b64..00000000000
--- a/mail/exim3/distinfo
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: distinfo,v 1.9 2006/03/06 22:49:16 joerg Exp $
-
-SHA1 (exim-3.36.tar.bz2) = 2a06a2858ebf8cdedf2e41fa3f258b5e468e270d
-RMD160 (exim-3.36.tar.bz2) = 2654601eaf54fc15c1ebeabfee53c828f2fd22dd
-Size (exim-3.36.tar.bz2) = 982104 bytes
-SHA1 (patch-aa) = b0d23fa0763a16a932e051a79b70b2d708ab69fc
-SHA1 (patch-ab) = 6664ab8fa62ad56e933d87319abb4505abcf7a5b
-SHA1 (patch-ac) = 3a74d412a1c6c00cb23ae63ed018d02002fa4595
-SHA1 (patch-ad) = d4962927418489f77a8e0234f7f95628ed506026
-SHA1 (patch-ae) = 0a01f3cfd2bfe59577edcb09b0f2f355185e28f0
-SHA1 (patch-af) = bb171d4048ab3f802243dfec1aade86c0a7e0d21
-SHA1 (patch-ag) = 9248e3fde82fed7a464c28f3335d4c419c038a03
-SHA1 (patch-ah) = e8b0d19451581548f3ba838a99d2460dacff2613
-SHA1 (patch-ai) = db1d47bd5db3fb20f472f13e59b8147599cc9709
-SHA1 (patch-aj) = 90059f7df6f9ef11554a663110aa3573fbf0a5f9
-SHA1 (patch-ak) = 59ec9e8726c00237d631349cf963b2a5112d75d6
-SHA1 (patch-al) = dd1263e5d8dd18c6ea1bfbe79cee74d3bc76f4c4
-SHA1 (patch-am) = 26f66062bb133340ed2b336008673a78bd017e9e
-SHA1 (patch-an) = 7d40d720613b88772bb69993ffbfc754c9310acb
-SHA1 (patch-ao) = b96e99cf56f205a7273759a2f090c1eed188cc36
-SHA1 (patch-ap) = bba7a0412976e7c022a48ed47207e9d9b42f073f
diff --git a/mail/exim3/files/Makefile-DragonFly b/mail/exim3/files/Makefile-DragonFly
deleted file mode 100644
index 7736b7d480b..00000000000
--- a/mail/exim3/files/Makefile-DragonFly
+++ /dev/null
@@ -1,18 +0,0 @@
-# Exim: OS-specific make file for DragonFly
-# There's no setting of CFLAGS here, to allow the system default
-# for "make" to be the default.
-
-CHOWN_COMMAND=/usr/sbin/chown
-HAVE_SA_LEN=YES
-LIBS=-lcrypt
-USE_DB=yes
-
-XINCLUDE=-I$(X11BASE)/include
-XLFLAGS=-L$(X11BASE)/lib -R$(X11BASE)/lib
-X11_LD_LIB=$(X11BASE)/lib
-
-EXIWHAT_PS_ARG=-ax
-EXIWHAT_EGREP_ARG='/exim( |$$)'
-EXIWHAT_KILL_ARG=-USR1
-
-# End
diff --git a/mail/exim3/files/exim.8 b/mail/exim3/files/exim.8
deleted file mode 100644
index a115cd7f754..00000000000
--- a/mail/exim3/files/exim.8
+++ /dev/null
@@ -1,909 +0,0 @@
-.TH EXIM 8
-.SH exim
-exim \- Mail Transfer Agent
-.SH SYNOPSIS
-.B exim
-.I "[options] arguments ..."
-.br
-.B mailq
-.I "[options] arguments ..."
-.br
-.B rmail
-.I "[options] arguments ..."
-.br
-.B rsmtp
-.I "[options] arguments ..."
-.br
-.B runq
-.I "[options] arguments ..."
-.br
-.B sendmail
-.I "[options] arguments ..."
-.SH "DESCRIPTION"
-.B Exim
-is a mail transport agent (MTA) developed at the University of
-Cambridge for use on Unix systems connected to the Internet. It is
-freely available under the terms of the GNU General Public Licence. In
-style it is similar to Smail 3, but its facilities are more extensive,
-and in particular it has some defences against mail bombs and
-unsolicited junk mail, in the form of options for refusing messages
-from particular hosts, networks, or senders.
-.PP
-Exim's command line takes the standard Unix form of a sequence of
-options, each starting with a hyphen character, followed by a number
-of arguments. The options are compatible with the main options of
-Sendmail, and there are also some additional options, some of which
-are compatible with Smail 3. Certain combinations of options do not
-make sense, and provoke an error if used. The form of the arguments
-depends on which options are set.
-.PP
-If Exim is called under the name mailq, it behaves as if the option
--bp were present before any other options. This is for compatibility
-with some systems that contain a command of that name in one of the
-standard libraries, symbolically linked to /usr/lib/sendmail.
-.PP
-If Exim is called under the name rsmtp it behaves as if the option -bS
-were present before any other options, for compatibility with
-smail. The -bS option is used for reading in a number of messages in
-batched SMTP format.
-.PP
-If Exim is called under the name rmail it behaves as if the option -i
-were present before any other options, for compatibility with
-smail. The -i option is used for reading a message that should not be
-terminated by a dot on a line by itself. The name rmail is used as an
-interface by some UUCP systems.
-.PP
-If Exim is called under the name runq it behaves as if the option -q
-were present before any other options, for compatibility with
-smail. The -q option causes a single queue-runner process to be
-started.
-.SH LIMITATIONS
-For the benefit of those reading this overview to see whether Exim is
-of interest to them, its limitations are listed first.
-.TP
-.B ANSI-C
-Exim is written in ANSI C. This should not be much of a limitation
-these days. However, to help with systems that lack a true ANSI C
-library, Exim avoids making any use of the value returned by the
-sprintf() function, which is one of the main incompatibilities. It has
-its own version of strerror() for use with SunOS4 and any other system
-that lacks this function, and a macro can be defined to turn memmove()
-into bcopy() if necessary.
-.TP
-.B Filenames
-Exim uses file names that are longer than 14 characters.
-.TP
-.B Bangpaths
-Exim is intended for use as an Internet mailer, and therefore handles
-addresses in RFC 822 domain format only. It cannot handle 'bang
-paths', though simple two-component bang paths can be converted by a
-straightforward rewriting configuration.
-.TP
-.B Domains required
-Exim insists that every address it handles has a domain attached. For
-incoming local messages, domainless addresses are automatically
-qualified with a configured domain value. Configuration options
-specify from which remote systems unqualified addresses are
-acceptable.
-.TP
-.B Transports
-The only external transport currently implemented is an SMTP transport
-over a TCP/IP network (using sockets), suitable for machines on the
-Internet. However, a pipe transport is available, and there are
-facilities for writing messages to files in 'batched SMTP' format;
-this can be used to send messages to some other transport
-mechanism. Batched SMTP input is also catered for.
-.SH FEATURES
-Exim follows the same general approach of decentralized control that
-Smail 3 does. There is no central process doing overall management of
-mail delivery. However, unlike Smail, the independent delivery
-processes share data in the form of 'hints', which makes delivery more
-efficient in some cases. The hints are kept in a number of DBM
-files. If any of these files are lost, the only effect is to change
-the pattern of delivery attempts and retries.
-.PP
-Many configuration options can be given as expansion strings, and as
-these can include file lookups, much of Exim's operation can be made
-table-driven if desired. For example, it is possible to do local
-delivery on a machine on which the users do not have accounts.
-.PP
-Regular expressions are available in a number of configuration
-parameters.
-.PP
-Domain lists can include file lookups, making it possible to support a
-large number of local domains.
-.PP
-Exim has flexible retry algorithms, applicable to mail routing as well as
-to delivery.
-.PP
-Exim contains header and envelope rewriting facilities.
-.PP
-Unqualified addresses are accepted only from specified hosts or networks.
-.PP
-Exim can perform multiple deliveries down the same SMTP channel after
-deliveries to a host have been delayed.
-.PP
-Exim can be configured to do local deliveries immediately but to leave
-remote deliveries until the message is picked up by a queue-runner
-process. This increases the likelihood of multiple messages being sent
-down a single SMTP connection.
-.PP
-When copies of a message have to be delivered to more than one remote
-host, up to a configured maximum number of remote deliveries can be
-done in parallel.
-.PP
-Exim supports optional checking of incoming return path (sender) and
-receiver addresses as they are received by SMTP.
-.PP
-SMTP calls from specific machines, optionally from specific idents,
-can be locked out, and incoming SMTP messages from specific senders
-can also be locked out.
-.PP
-It is possible to control which hosts may use the Exim host as a relay
-for onward transmission of mail; the control can be made to depend on
-the address domain.
-.PP
-Messages on the queue can be 'frozen' and 'thawed' by the
-administrator.
-.PP
-The maximum size of message can be specified. Exim can handle a
-number of independent local domains on the same machine; each domain
-can have its own alias files, etc. These are commonly called "virtual
-domains".
-.PP
-Exim stats a user's home directory before looking for a .forward file,
-in order to detect the case of a missing NFS mount.
-.PP
-Exim contains an optional built-in mail filtering facility. This
-enables users to set up their own mail filtering in a straightfoward
-manner without the need to run an external program. There can also be
-a system filter file that applies to all messages.
-.PP
-There is support for multiple user mailboxes controlled by prefixes or
-suffixes on the user name, either via the filter mechanism or through
-multiple .forward files.
-.PP
-Periodic warnings are automatically sent to messages' senders when
-delivery is delayed - the time between warnings is configurable.
-.PP
-A queue run can be manually started to deliver just a particular
-portion of the queue, or those messages with a recipient whose address
-contains a given string.
-.PP
-Exim can be configured to run as root all the time, except when
-performing local deliveries, which it always does in a separate
-process under an appropriate uid and gid. Alternatively, it can be
-configured to run as root only when needed; in particular, it need not
-run as root when receiving incoming messages or when sending out
-messages over SMTP.
-.PP
-I have tried to make the wording of delivery failure messages clearer
-and simpler, for the benefit of those less-experienced people who are
-now using email.
-.PP
-The Exim Monitor is an optional extra; it displays information about
-Exim's processing in an X window, and an administrator can perform a
-number of control actions from the window interface.
-.SH METHOD OF OPERATION
-When Exim receives a message, it writes two files in its spool
-directory. The first contains the envelope information, the current
-status of the message, and the headers, while the second contains the
-body of the message. The status of the message includes a complete
-list of recipients and a list of those that have already received the
-message. The header file gets updated during the course of delivery if
-necessary.
-.PP
-A message remains in the spool directory until it is completely
-delivered to its recipients or to an error address, or until it is
-deleted by an administrator or by the user who originally created
-it. In cases when delivery cannot proceed - for example, when a
-message can neither be delivered to its recipients nor returned to its
-sender, the message is marked 'frozen' on the spool, and no more
-deliveries are attempted. The administrator can thaw such messages
-when the problem has been corrected, and can also freeze individual
-messages by hand if necessary.
-.PP
-As delivery proceeds, Exim writes timestamped information about each
-address to a per-message log file; this includes any delivery error
-messages. This log is solely for the benefit of the administrator. All
-the information Exim itself needs for delivery is kept in the header
-spool file. The message log file is deleted with the spool files. If a
-message is delayed for more than a configured time, a warning message
-is sent to the sender. This is repeated whenever the same time elapses
-again without delivery being complete.
-.PP
-The main delivery processing elements of Exim are called directors,
-routers, and transports. Code for a number of these is provided, and
-compile-time options specify which ones are actually included in the
-binary. Directors handle addresses that include one of the local
-domains, routers handle remote addresses, and transports do actual
-deliveries.
-.SH TRUSTED AND ADMIN USERS
-Some Exim options are available only to "trusted users" and others are
-available only to "admin users".
-.PP
-A trusted user is root or the Exim user (if defined) or any user
-listed in the trusted_users configuration option, or any user, if the
-currently set group is one of those listed in the trusted_groups
-configuration option. Trusted users are permitted to use the -f option
-to specify the senders of messages that are passed to Exim through the
-local interface, and also to specify host names, host addresses,
-protocol names, and ident values. Thus they are able to insert
-messages into Exim's queue locally that have the characteristics of
-messages received from a remote host.
-.PP
-An admin user is root or the Exim user (if defined) or any user that
-is a member of the Exim group (if defined). The current group does not
-have to be the Exim group. Admin users are permitted to operate on
-messages in the queue, for example, to force delivery failures. It is
-also necessary to be an admin user in order to see the full
-information provided by the Exim monitor.
-.SH OPTIONS
-Exim's command options are as follows:
-.TP
-.B -bd
-Run Exim as a daemon, awaiting incoming SMTP connections. This option
-can be used only by an admin user. If either of the -d or -dm options
-are set, the daemon does not disconnect from the controlling
-terminal. By default, Exim listens for incoming connections on all the
-host's interfaces, but it can be restricted to specific interfaces by
-setting the local_interfaces option in the configuration file. The
-standard SMTP port is used, but this can be varied by means of the -oX
-option. Most commonly, the -bd option is combined with the -q<time>
-option, to cause periodic queue runs to happen as well.
-
-The process id of a daemon that is both listening and starting queue
-runners is written to a file called exim-daemon.pid in Exim's spool
-directory, unless the -oX option is used, in which case the file
-name is exim-daemon.<port-number>.pid. If a daemon is run with only
-one of -bd and -q<time>, then that option is added on to the end of
-the file name, allowing sites that run two separate daemons to
-distinguish them.
-
-It is possible to change the directory in which these pid files are
-written by changing the setting of PID_FILE_PATH in Local/Makefile.
-Further details are given in the comments in src/EDITME.
-
-The SIGHUP signal can be used to cause the daemon to re-exec itself.
-This should be done whenever Exim's configuration file is changed,
-or a new version of Exim is installed. It is not necessary to do
-this when other files (e.g. alias files) are changed.
-.TP
-.B -bf <filename>
-Run Exim in filter testing mode; the file is the filter file to be
-tested, and a test message must be supplied on the standard input.
-If there are no message-dependent tests in the filter, an empty file
-can be supplied. If the test file does not begin with the special
-line
-
- # Exim filter
-
-then it is taken to be a normal .forward file, and is tested for
-validity under that interpretation. The result of this command,
-provided no errors are detected, is a list of the actions that Exim
-would try to take if presented with the message for real. More
-details of filter testing are given in the separate document
-entitled "Exim's User interface to mail filtering".
-
-When testing a filter file, various parameters that would normally
-be taken from the envelope recipient address of a message can be set
-by means of additional command line options. These are:
-
- -bfd <domain> default is the qualify domain
- -bfl <local_part>default is the logged in user
- -bfp <local_part_prefix> default is null
- -bfs <local_part_suffix> default is null
-
-The local part should always be set to the incoming address with any
-prefix or suffix stripped, because that is how it appears when a
-message is actually being delivered.
-.TP
-.B -bi
-Sendmail interprets the -bi option as a request to rebuild its alias
-file. Exim does not have the concept of a single alias file, and so
-it cannot mimic this behaviour. However, calls to /usr/lib/sendmail
--bi tend to appear in various scripts such as NIS make files, so the
-option must be recognized.
-
-If -bi is encountered, the command specified by the bi_command
-configuration option is run, under the uid and gid of the caller of
-Exim. If the -oA option is used, its value is passed to the command
-as an argument. The command set by bi_command may not contain
-arguments. The command can use the exim_dbmbuild utility, or some
-other means, to rebuild alias files if this is required. If the
-bi_command option is not set, then calling Exim with -bi is a no-op.
-.TP
-.B -bm
-Accept an incoming, locally-generated message on the current input,
-and deliver it to the addresses given as the command arguments
-(except when -t is also given - see below). Each argument can be a
-comma-separated list of RFC 822 addresses. This is the default
-option, and is assumed if no other conflicting option is present.
-The message may or may not be delivered immediately, depending on
-the setting of the -od option and the queue_only and queue_smtp
-configuration options.
-
-The format of the message must be as defined in RFC 822, except
-that, for compatibility with sendmail and smail, a line of the form
-
- From sender Fri Jan 5 12:55 GMT 1996
-
-is permitted to appear at the start of the message. The Solaris 2
-version of the "mail" command inserts such a line, though there is
-no mention of it in the sendmail man page. The sender specified in
-this line is treated as if it were given as the argument to the -f
-option.
-.TP
-.B -bp
-List the contents of the mail queue on the current output. Each
-message on the queue is displayed as in the following example:
-
- 25m 2.9K 0t5C6f-0000c8-00 <alice@wonderland.fict.book>
- red.king@looking-glass.fict.book
- <other addresses>
-
-The first line contains the amount of time the message has been on
-the queue (in this case 25 minutes), the size of the message (2.9K),
-the unique identifier for the message, and the message sender, as
-contained in the envelope. If the message is a delivery error
-message, the sender address is empty, and appears as <>. If the
-message is frozen (attempts to deliver it are suspended) then the
-text '*** frozen ***' is displayed at the end of this line.
-
-The recipients of the message (taken from the envelope, not the
-headers) are displayed on subsequent lines. Those addresses to which
-the message has already been delivered are marked with the letter D.
-If an original address gets expanded into several addresses via an
-alias or forward file, the original is displayed with a 'D' when
-deliveries for all of its child addresses are completed.
-.TP
-.B -bP
-If this option is given with no arguments, it causes the values of
-all Exim's main configuration options to be written to the standard
-output. The values of one or more specific options can be requested
-by giving their names as arguments, for example:
-
- exim -bP qualify_domain local_domains
-
-If configure_file is given, the name of the runtime configuration
-file is output. If log_file_path or pid_file_path are given, the
-names of the directories where log files and daemon pid files are
-written are output, respectively. If these values are unset, log
-files are written in a subdirectory of the spool directory called
-log, and pid files are written directly into the spool directory.
-
-If one of the words director, router, or transport is given,
-followed by the name of an appropriate driver instance, the option
-settings for that driver are output. For example:
-
- exim -bP transport local_delivery
-
-The generic driver options are output first, followed by the
-driver's private options. A list of the names of drivers of a
-particular type can be obtained by using one of the words
-director_list, router_list, or transport_list, and a complete list
-of all drivers with their option settings can be obtained by using
-directors, routers, or drivers.
-.TP
-.B -brt
-This option is for testing retry rules, and it must be followed by
-up to three arguments. It causes Exim to look for a retry rule that
-matches the values and to output it on the standard output. For
-example:
-
- exim -brt bach.comp.mus
- Retry rule: *.comp.mus F,2h,15m; FG,4d,30m;
-
-See chapter 30 for a description of Exim's retry rules. The first
-argument, which is required, can be a complete address in the form
-local_part@domain, or it can be just a domain name. The second
-argument is an optional second domain name; if no retry rule is
-found for the first argument, the second is tried. This ties in with
-Exim's behaviour when looking for retry rules for remote hosts - if
-no rule is found that matches the host, one that matches the mail
-domain is sought. The final argument is the name of a specific
-delivery error, as used in setting up retry rules, for example
-'quota_3d'.
-.TP
-.B -brw
-This option is for testing address rewriting rules, and it must be
-followed by a single argument, consisting of either a local part
-without a domain, or a complete address with a fully-qualified
-domain. Exim outputs how this address would be rewritten for each
-possible place it might appear.
-.TP
-.B -bS
-This option is used for batched SMTP input, where messages have been
-received from some external source by an alternative transport
-mechanism. It causes Exim to accept one or more messages by reading
-SMTP on the standard input, but to generate no responses. All errors
-are reported by sending mail. If the caller is trusted, then the
-senders in the MAIL FROM commands are believed; otherwise the sender
-is always the caller of Exim. Unqualified senders and receivers are
-not rejected (there seems little point) but instead just get
-qualified. Receiver verification and administrative rejection is not
-done, even if configured. HELO and EHLO act as RSET; VRFY, EXPN, ETRN,
-HELP, and DEBUG act as NOOP; QUIT quits.
-.TP
-.B -bs
-This option causes Exim to accept one or more messages by reading SMTP
-commands on the standard input, and producing SMTP replies on the
-standard output. Some user agents use this interface as a way of
-passing locally-generated messages to the MTA. The option can also be
-used to run Exim from inetd, as an alternative to using a listening
-daemon, in which case the standard input is the connected socket. Exim
-distinguishes between the two cases by attempting to read the IP
-address of the peer connected to the standard input. If it is not a
-socket, the call to getpeername() fails, and Exim assumes it is
-dealing with a local message.
-
-If the caller of Exim is trusted, then the senders of messages are
-taken from the SMTP MAIL FROM commands. Otherwise the content of these
-commands is ignored and the sender is set up as the calling user.
-.TP
-.B -bt
-Run in address testing mode, in which each argument is taken as an
-address to be tested. The results are written to the standard
-output. If no arguments are given, Exim runs in an interactive manner,
-prompting with > for addresses to be tested. Each address is handled
-as if it were the recipient address on a message and passed to the
-appropriate directors or routers.
-.TP
-.B -bV
-Write the current version number, compilation number, and compi-
-lation date of the exim binary to the standard output.
-.TP
-.B -bv
-Verify the addresses that are given as the arguments to the command,
-and write the results to the standard output. Verification differs
-from address testing (the -bt option) in that directors and routers
-that have no_verify set are skipped, and if the address is accepted by
-a director or router that has fail_verify set, verification
-fails. This is the same logic that is used when verifying addresses on
-incoming messages (see the sender_verify and receiver_verify options).
-
-If the -v (or -d) option is not set, the output consists of a single
-line for each address, stating whether it was verified or not, and
-giving a reason in the latter case. Otherwise, more details are given
-of how the address has been handled, and in the case of aliases or
-forwarding, the generated addresses are also considered.
-.TP
-.B -C <filename>
-Read the runtime configuration from the given file instead of from
-the default file specified by the CONFIGURE_FILE compile-time set-
-ting. When this option is used by an unprivileged caller, Exim gives
-up its root privilege immediately, and runs with the real and
-effective uid and gid set to those of the caller, to avoid any
-security exposure. It does not do this if the caller is root or the
-exim user. The facility is useful for ensuring that configuration
-files are syntactically correct, but cannot be used for test
-deliveries, unless the caller is privileged, or unless it's an
-exotic configuration that does not require privilege. No check is
-made on the owner or group of the file specified by this option.
-.TP
-.B -d<number>
-Sets a debug level, causing debugging information to be written to the
-standard error file. Whitespace between -d and the number is
-optional. If no number is given, 1 is assumed, and the higher the
-number, the more output is produced. A value of zero turns debugging
-output off. A value of 9 gives the maximum amount of general
-information, 10 gives in addition details of the interpretation of
-filter files, and 11 or higher also turns on the debugging option for
-DNS lookups.
-.TP
-.B -df
-If this option is set and STDERR_FILE was defined when Exim was built,
-debugging information is written to the file defined by that variable
-instead of to the standard error file. This option provides a way of
-obtaining debugging information when Exim is run from inetd.
-.TP
-.B -dm
-This option causes information about memory allocation and freeing
-operations to be written to the standard error file.
-.TP
-.B -E
-This option specifies that an incoming message is a locally-generated
-delivery failure message. It is used internally by Exim when handling
-delivery failures and is not intended for external use. Its only
-effect is to stop Exim generating certain messages to the mailmaster,
-as otherwise message cascades could occur in some situations. As part
-of the same option, a message id may follow the characters -E. If it
-does, the log entry for the receipt of the new message contains the
-id, following 'R=', as a cross reference.
-.TP
-.B -ex
-There are a number of sendmail options starting with -oe which seem to
-be called by various programs without the leading o in the option. For
-example, the vacation program uses -eq. Exim treats all options of the
-form -ex as synonymous with the corresponding -oex options.
-.TP
-.B -F <string>
-Set the sender's full name for use when a locally-generated message
-is being accepted. In the absence of this option, the user's "gecos"
-entry from the password file is used. As users are generally
-permitted to alter their "gecos" entries, no security considerations
-are involved. White space between -F and the <string> is optional.
-.TP
-.B -f <address>
-Set the address of the sender of a locally-generated message. This
-option can normally be used only by root or the Exim user or by one
-of the configured trusted users. In other cases, the sender of a
-local message is always set up as the user who ran the exim command,
-and -f is ignored, with one exception. If the special setting -f <>
-is used by an untrusted user, it does not affect the sender for the
-purposes of managing the Sender: and From: headers, but it does have
-the effect of causing any SMTP transmissions to be sent out with
-
- MAIL FROM: <>
-
-and local deliveries to contain
-
- Return-path: <>
-
-when configured to contain Return-path: headers. The filtering code
-treats such a message as an error message, and won't generate
-messages as a result of reading it.
-
-White space between -f and the <string> is optional. The sender of a
-locally-generated message can also be set by an initial 'From' line
-in the message - see the description of -bm above.
-.TP
-.B -h <number>
-This option is accepted for compatibility with sendmail, but at
-present has no effect. (In sendmail it overrides the 'hop count'
-obtained by counting Received headers.)
-.TP
-.B -i
-This option, which has the same effect as -oi, specifies that a dot
-on a line by itself should not terminate an incoming, non-SMTP
-message. I can find no documentation for this option in Solaris 2.4
-sendmail, but the mailx command in Solaris 2.4 uses it.
-.TP
-.B -M
-The arguments are interpreted as a list of message ids, and Exim runs
-a delivery attempt on each message in turn. Retry hints for any of the
-addresses are overridden - this option forces Exim to try to deliver
-even if the normal retry time has not yet been reached. If any of the
-messages is frozen, it is automatically thawed before the delivery
-attempt, provided that the caller is an admin user.
-.TP
-.B -Mar <message-id> <address> <address> ...
-The first argument must be a message id, and the remaining ones must
-be email addresses. Exim adds the addresses to the list of recipi-
-ents of the message. However, if the message is active (in the middle
-of a delivery attempt), its status is not altered. This option can be
-used only by an admin user.
-.TP
-.B -Meb <message-id>
-This runs, under /bin/sh, the command defined in the shell variable
-VISUAL or, if that is not defined, EDITOR or, if that is not defined,
-the command vi, on a copy of the spool file containing the body of
-message (eb = Edit Body). If the editor exits normally, then the
-result of editing replaces the spool file. The message is locked
-during this process, so no delivery attempts can occur. Note that the
-first line of the spool file is its own name; care should be taken not
-to disturb this. The thinking behind providing this feature is that an
-administrator who has had to mess around with the addresses to get a
-message delivered might want to add some (grumbly) comment at the
-start of the message text. This option can be used only by an admin
-user.
-.TP
-.B -Mes <message-id> <address>
-There must be exactly two arguments. The first argument must be a
-message id, and the second one an email address. Exim changes the
-sender address in the message to the given address, which must be a
-fully qualified address, or '<>'. However, if the message is active
-(in the middle of a delivery attempt), its status is not altered.
-This option can be used only by an admin user.
-.TP
-.B -Mmad <message-id>
-Exim marks the all recipient addresses in the message as already
-delivered. However, if the message is active (in the middle of a
-delivery attempt), its status is not altered. This option can be used
-only by an admin user.
-.TP
-.B -Mmd <message-id> <address> <address> ...
-The first argument must be a message id, and the remaining ones must
-be email addresses. Exim marks the given addresses as already
-delivered. However, if the message is active (in the middle of a
-delivery attempt), its status is not altered. This option can be used
-only by an admin user.
-.TP
-.B -MC <transport> <hostname> <sequence number> <message id>
-This option is not intended for use by outside callers. It is used
-internally by Exim to invoke another instance of itself to deliver a
-waiting message using an existing SMTP channel, which is passed as the
-standard input and output. Details are given in chapter 43. This must
-be the final option, and the caller must be root or the Exim user in
-order to use it.
-.TP
-.B -Mc
-The arguments are interpreted as a list of message ids, and Exim runs
-a delivery attempt on each message in turn, but unlike the -M option,
-it does check for retry hints, and respects any that are found. This
-option is not very useful to external callers (except for testing). It
-is provided for internal use by Exim when it needs to re-invoke itself
-in order to regain root privilege for a delivery (see chapter 44).
-.TP
-.B -Mf
-The arguments are interpreted as a list of message ids, and each
-message is marked 'frozen'. This prevents any delivery attempts taking
-place until the message is 'thawed', either manually or as a result of
-the auto_thaw configuration option. However, if any of the messages is
-active (in the middle of a delivery attempt), its status is not
-altered. This option can be used only by an admin user.
-.TP
-.B -Mg
-The arguments are interpreted as a list of message ids, and Exim gives
-up trying to deliver those messages. A delivery error message is sent,
-containing the text 'cancelled by administrator'. However, if any of
-the messages is active, its status is not altered. This option can be
-used only by an admin user.
-.TP
-.B -Mt
-The arguments are interpreted as a list of message ids, and each
-message that was 'frozen' is now 'thawed', so that delivery attempts
-can resume. However, if any of the messages is active, its status is
-not altered. This option can be used only by an admin user.
-.TP
-.B -Mrm
-The arguments are interpreted as a list of message ids, and each
-message is completely removed from Exim's queue, and forgotten.
-However, if any of the messages is active, its status is not
-altered. This option can be used only by an admin user or by the user
-who originally caused the message to be placed on the queue.
-.TP
-.B -m
-This is apparently a synonym for -om that is accepted by sendmail, so
-Exim treats it that way too.
-.TP
-.B -N
-This is a debugging option that inhibits delivery of a message at the
-transport level. It implies at least -d1. Exim goes through many of
-the motions of delivery - it just doesn't actually transport the
-message, but instead behaves as if it had successfully done so. The
-log, for example, will contain entries as if the message had been
-delivered. Only root or the exim user are allowed to use -N with -bd,
--q, or -M. In other words, an ordinary user can use it only when
-supplying an incoming message.
-.TP
-.B -oA <file name>
-This option is used by Sendmail in conjunction with -bi to specify an
-alternative alias file name. Exim handles -bi differently; see the
-description above.
-.TP
-.B -oB <n>
-This is a debugging option which limits the maximum number of SMTP
-deliveries down one channel to <n>, overriding the value set in the
-smtp transport. If <n> is omitted, the limit is set to 1 (no
-batching).
-.TP
-.B -odb
-This option applies to all modes in which Exim accepts incoming
-messages, including the listening daemon. It requests 'background'
-delivery of such messages, which means that the accepting process
-automatically starts another delivery process for each message
-received. Exim does not wait for such processes to complete (it can
-take some time to perform SMTP deliveries). This is the default action
-if none of the -od options are present.
-.TP
-.B -odf
-This option (compatible with smail) requests 'foreground' (syn-
-chronous) delivery when Exim has accepted a locally-generated mess-
-age. For the daemon it is exactly the same as -odb. For a single
-message received on the standard input, if the protection regime
-permits it (see chapter 44), Exim converts the reception process into
-a delivery process. In other cases, it creates a new delivery process,
-and then waits for it to complete before proceeding.
-.TP
-.B -odi
-This option is synonymous with -odf. It is provided for compati-
-bility with sendmail.
-.TP
-.B -odq
-This option applies to all modes in which Exim accepts incoming
-messages, including the listening daemon. It specifies that the
-accepting process should not automatically start a delivery attempt
-for each message received. Messages are placed on the queue, and
-remain there until a subsequent queue-running process encounters
-them. The queue_only configuration option has the same effect.
-.TP
-.B -odqr
-This option applies to all modes in which Exim accepts incoming
-messages, including the listening daemon. It causes Exim to process
-local addresses when a message is received, but not even to try
-routing remote addresses. Contrast with -odqs below, which does the
-routing, but not the delivery. The remote addresses will be picked up
-by the next queue runner. The queue_remote configuration option has
-the same effect.
-.TP
-.B -odqs
-This option is a hybrid between -odb and -odq. A delivery process is
-started for each incoming message, the addresses are all processed,
-and local deliveries are done in the normal way. However, if any SMTP
-deliveries are required, they are not done at this time. Such messages
-remain on the queue until a subsequent queue-running process
-encounters them. Because routing was done, Exim knows which messages
-are waiting for which hosts, and so a number of messages for the same
-host will get sent in a single SMTP connection. The queue_smtp
-configuration option has the same effect.
-.TP
-.B -oem
-If an error is detected while a non-SMTP message is being received
-(e.g. a malformed address), the error is reported to the sender in a
-mail message. This is the default option. After a message has been
-successfully received, any subsequent delivery errors are always
-reported in this way.
-.TP
-.B -oep
-If an error is detected while a non-SMTP message is being received,
-the error is reported by writing a message to the standard error file
-(stderr).
-.TP
-.B -oeq
-This option is supported for compatibility with sendmail, but has the
-same effect as -oep.
-.TP
-.B -oew
-This option is supported for compatibility with sendmail, but has the
-same effect as -oem.
-.TP
-.B -oi
-This option, which has the same effect as -i, specifies that a dot on
-a line by itself should not terminate an incoming, non-SMTP message.
-.TP
-.B -oMa <host address>
-This option sets the sender host address value, and can be used only
-by a trusted caller. The value is used in log entries and can appear
-in Received headers. The option is intended for use when handing to
-Exim messages received by other means.
-.TP
-.B -oMr <protocol name>
-This option sets the received protocol value, and can be used only by
-a trusted caller. The value is used in log entries and can appear in
-Received headers. The option is intended for use when handing to Exim
-messages received by other means.
-.TP
-.B -oMs <host name>
-This option sets the sender host name value, and can be used only by a
-trusted caller. The value is used in log entries and can appear in
-Received headers. The option is intended for use when handing to Exim
-messages received by other means.
-.TP
-.B -oMt <ident string>
-This option sets the sender ident value, and can be used only by a
-trusted caller. The value is used in log entries and can appear in
-Received headers. The option is intended for use when handing to Exim
-messages received by other means.
-.TP
-.B -om
-In sendmail, this option means 'me too', indicating that the sender of
-a message should receive a copy of the message if the sender appears
-in an alias expansion. Exim always does this, so the option does
-nothing.
-.TP
-.B -or <time>
-This option sets a timeout value for incoming non-SMTP messages. If it
-is not set, Exim will wait forever for the standard input. The value
-can also be set using the accept_timeout configuration vari- able. The
-format used for specifying times is described in section 7.6.
-.TP -ov
-This option has exactly the same effect as -v.
-.TP
-.B -oX <number>
-This option is relevant only when the -bd option is also given. It
-specifies an alternative TCP/IP port number for the listening daemon,
-and is useful for testing. When used, the process number of the daemon
-is written to a file whose name is exim- daemon.<number>.pid in Exim's
-spool directory.
-.TP
-.B -q
-If the -q option is not followed by a time value, it requests a single
-queue run operation. This option can be used only by an admin
-user. Exim starts up a delivery process for each (inactive) message on
-the queue in turn, and waits for it to finish before starting the next
-one. When all the queued messages have been considered, the original
-process terminates. In other words, a single pass is made over the
-waiting mail. Use -q with a time (see below) if you want this to be
-repeated periodically.
-
-Exim processes the waiting messages in an unpredictable order. It
-isn't very random, but it is likely to be different each time, which
-is all that matters. If one particular message screws up a remote MTA,
-other messages to the same MTA have a chance of getting through if
-they get tried first.
-
-However, it is possible to cause the messages to be processed in
-lexical id order, which is essentially the order in which they
-arrived, and to start this operation at a particular point by
-following the -q option with a starting message id. For example:
-
- exim -q 0t5C6f-0000c8-00
-
-This causes Exim to skip any messages whose ids are lexically less
-than the given id. A second id can also be given to stop the queue run
-before the end. See also the -R option.
-.TP
-.B -q <time>
-This version of the -q option (which again can be run only by an admin
-user) causes Exim to run as a daemon, starting a queue-running process
-at intervals specified by the given time value (whose format is
-described in section 7.6). This form of the -q option is commonly
-combined with the -bd option, in which case a single daemon process
-handles both functions. A common way of starting up a combined daemon
-at system boot time is to use a command such as
-
- /opt/exim/bin/exim -bd -q30m
-
-Such a daemon listens for incoming SMTP calls, and also fires up a
-queue-runner process every 30 minutes. The process id of such a daemon
-is written to a file called exim-daemon.pid in Exim's spool directory,
-unless the -oX option has been used, in which case the file is called
-exim-daemon.<port-number>.pid. The location of the pid file can be
-changed by defining PID_FILE_PATH in Local/Makefile. If a daemon is
-started without -bd then the -q option used to start it is added to
-the pid file name.
-.TP
-.B -qf
-This option operates like -q, and may appear with or without a
-following time. The difference is that a delivery attempt is forced
-for each message, whereas with -q only those addresses that have
-passed their retry times are tried.
-.TP
-.B -qfl
-This option operates like -ql, and may appear with or without a
-following time. The difference is that a delivery attempt is forced
-for each message, whereas with -ql only those local addresses that
-have passed their retry times are tried.
-.TP
-.B -ql
-This option operates like -q, and may appear with or without a
-following time. The difference is that only local addresses are
-considered for delivery. Note that -ql cannot detect apparently remote
-addresses that actually turn out to be local when their domains get
-fully qualified.
-.TP -R <string>
-This option is similar to -q with no time value, except that, when
-scanning the messages on the queue, Exim processes only those that
-have at least one undelivered address containing the given string,
-which is checked in a case-independent way. However, once a message is
-selected, all its addresses are processed. For the first message
-containing a matching address, Exim overrides any retry information
-and forces a delivery attempt. This makes it straightforward to
-initiate delivery for all messages to a given domain after a host has
-been down for some time. When the SMTP command ETRN is permitted (see
-the smtp_etrn options), its effect is to run Exim with the -R option.
-.TP
-.B -r
-This is a documented (for sendmail) obsolete alternative name for -f.
-.TP
-.B -t
-When Exim is receiving a locally-generated, non-SMTP message on the
-current input, the -t option causes the recipients of the message to
-be obtained from the To, Cc, and Bcc headers in the message instead of
-from the command arguments. If there are any arguments, they specify
-addresses to which the message is not to be delivered. That is, the
-argument addresses are removed from the recipients list obtained from
-the headers. If a Bcc header is present, it is removed from the
-message unless there is no To or Cc header, in which case a Bcc header
-with no data is created, in accordance with RFC 822.
-.TP
-.B -v
-This option has exactly the same effect as -d1; it causes Exim to be
-'verbose' and produce some output describing what it is doing on the
-standard error file. In particular, if an SMTP connection is made, the
-SMTP dialogue is shown.
-.TP
-.B -x
-AIX uses -x for a private purpose ('mail from a local mail program has
-National Language Support extended characters in the body of the mail
-item'). It sets -x when calling the MTA from its mail command. Exim
-ignores this option.
-.SH "SEE ALSO"
-sendmail(8), mailwrapper(8), mailer.conf(5).
-.SH AUTHOR
-This manual page was stitched together by Christoph Lameter,
-<clameter@debian.org>, from the original documentation coming with the
-sourcepackage for the Debian GNU/Linux system, and cleaned up a little
-by Tim Cutts <tjrc1@scalopus.bio.cam.ac.uk>. Modifications for NetBSD
-made by Andy Doran <ad@NetBSD.org>.
diff --git a/mail/exim3/files/exim.sh b/mail/exim3/files/exim.sh
deleted file mode 100644
index 4ff11db7fa8..00000000000
--- a/mail/exim3/files/exim.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: exim.sh,v 1.3 2004/05/06 22:34:27 reed Exp $
-#
-# PROVIDE: mail
-# REQUIRE: LOGIN
-
-. /etc/rc.subr
-
-name="exim"
-exim_flags=${exim_flags-"-bd -q30m"}
-rcvar=$name
-command="@PREFIX@/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="@PKG_SYSCONFDIR@/configure"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/exim3/files/exim_newaliases b/mail/exim3/files/exim_newaliases
deleted file mode 100644
index ecbb6176a59..00000000000
--- a/mail/exim3/files/exim_newaliases
+++ /dev/null
@@ -1,13 +0,0 @@
-#!@SH@
-#
-# $NetBSD: exim_newaliases,v 1.2 2006/01/21 00:22:58 joerg Exp $
-#
-if [ -f /etc/mail/aliases ]; then
- ALIASDIR=/etc/mail
-else
- ALIASDIR=/etc
-fi
-
-cd $ALIASDIR
-echo -n "$ALIASDIR/aliases: "
-@PREFIX@/sbin/exim_dbmbuild aliases aliases.db
diff --git a/mail/exim3/files/mailer.conf.exim b/mail/exim3/files/mailer.conf.exim
deleted file mode 100644
index 41735421eed..00000000000
--- a/mail/exim3/files/mailer.conf.exim
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: mailer.conf.exim,v 1.1.1.1 2003/12/04 04:24:51 grant Exp $
-#
-# Use "exim" as replacement for "sendmail".
-#
-sendmail @PREFIX@/sbin/exim
-send-mail @PREFIX@/sbin/exim
-mailq @PREFIX@/sbin/exim
-newaliases @PREFIX@/sbin/exim_newaliases
diff --git a/mail/exim3/files/os.h-DragonFly b/mail/exim3/files/os.h-DragonFly
deleted file mode 100644
index 669bb232746..00000000000
--- a/mail/exim3/files/os.h-DragonFly
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Exim: OS-specific C header file for DragonFly */
-
-#define HAVE_BSD_GETLOADAVG
-#define HAVE_MMAP
-#define HAVE_SYS_MOUNT_H
-#define SIOCGIFCONF_GIVES_ADDR
-
-typedef struct flock flock_t;
-
-/* End */
diff --git a/mail/exim3/patches/patch-aa b/mail/exim3/patches/patch-aa
deleted file mode 100644
index e8b69f9960c..00000000000
--- a/mail/exim3/patches/patch-aa
+++ /dev/null
@@ -1,104 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/01/20 23:09:42 joerg Exp $
-
---- Local/Makefile.pkgsrc.orig Fri May 7 18:36:39 2004
-+++ Local/Makefile.pkgsrc
-@@ -78,7 +78,7 @@
- # CHGRP_COMMAND=/usr/bin/chgrp
- # MV_COMMAND=/bin/mv
- # RM_COMMAND=/bin/rm
--# PERL_COMMAND=/usr/bin/perl
-+PERL_COMMAND=@PERL5@
-
-
- # The following macro can be used to change the command for building a library
-@@ -92,8 +92,8 @@
- # appropriate code is included in the binary. You then need to set up the
- # runtime configuration to make use of the mechanism(s) selected.
-
--# AUTH_CRAM_MD5=yes
--# AUTH_PLAINTEXT=yes
-+AUTH_CRAM_MD5=yes
-+AUTH_PLAINTEXT=yes
-
-
- # The binary directory: This variable defines where the exim binary will be
-@@ -103,7 +103,7 @@
- # installed in this directory. There is no default for this variable built into
- # the source files; it must be set in one of the local configuration files.
-
--BIN_DIRECTORY=/usr/exim/bin
-+BIN_DIRECTORY=@PREFIX@/sbin
-
-
- # The default distribution of Exim contains only the plain text form of the
-@@ -121,14 +121,14 @@ BIN_DIRECTORY=/usr/exim/bin
- # files. Both the name of the command and the suffix that it adds to files
- # need to be defined here. See also the EXICYCLOG_MAX configuration.
-
--COMPRESS_COMMAND=/opt/gnu/bin/gzip
-+COMPRESS_COMMAND=@GZIP_CMD@
- COMPRESS_SUFFIX=gz
-
-
- # If the exigrep utility is fed compressed log files, it tries to uncompress
- # them using this command.
-
--ZCAT_COMMAND=/opt/gnu/bin/zcat
-+ZCAT_COMMAND=@GZCAT@
-
-
- # The runtime configuration file: This variable defines where Exim's runtime
-@@ -137,7 +137,7 @@ ZCAT_COMMAND=/opt/gnu/bin/zcat
- # location of all other runtime files and directories can be changed in the
- # runtime configuration file.
-
--CONFIGURE_FILE=/usr/exim/configure
-+CONFIGURE_FILE=@PKG_SYSCONFDIR@/configure
-
-
- # In some installations there may be multiple machines sharing file systems,
-@@ -243,7 +243,7 @@ EXICYCLOG_MAX=10
- # are defaulted in the OS/Makefile-Default file, and can be overridden
- # in local OS-specific make files.
-
--EXIM_MONITOR=eximon.bin
-+# EXIM_MONITOR=eximon.bin
-
-
- # Compiling in support for embedded Perl: If you want to be able to
-@@ -286,7 +286,7 @@ EXIM_MONITOR=eximon.bin
- # "panic", or "reject" to form the final file name. For example, some
- # installations may want something like this:
-
--# LOG_FILE_PATH=/var/log/exim_%slog
-+LOG_FILE_PATH=/var/log/exim/%slog
-
- # which results in files with names /var/log/exim_mainlog, etc. The directory
- # in which the log files are placed must exist; Exim does not try to create
-@@ -411,7 +411,7 @@ LOOKUP_LSEARCH=yes
- # the file name, allowing sites that run two separate daemons to distinguish
- # them. Some installations may want something like this
-
--# PID_FILE_PATH=/var/lock/exim%s.pid
-+PID_FILE_PATH=/var/run/exim%s.pid
-
- # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
- # (see SPOOL_DIRECTORY below) with the name "exim-daemon.pid" for the standard
-@@ -460,7 +460,7 @@ ROUTER_QUERYPROGRAM=yes
- # uid and gid.
-
- # Many installations will want something like this:
--# SPOOL_DIRECTORY=/var/spool/exim
-+SPOOL_DIRECTORY=/var/spool/exim
-
- # Others may prefer to keep all Exim things under one directory:
- # SPOOL_DIRECTORY=/usr/exim/spool
-@@ -567,7 +567,7 @@ TRANSPORT_SMTP=yes
- # This one is special-purpose, and commonly not required, so do not include
- # it by default.
-
--# TRANSPORT_LMTP=yes
-+TRANSPORT_LMTP=yes
-
-
- # TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment
diff --git a/mail/exim3/patches/patch-ab b/mail/exim3/patches/patch-ab
deleted file mode 100644
index 1343a773a2d..00000000000
--- a/mail/exim3/patches/patch-ab
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/05/07 17:47:32 abs Exp $
-
---- OS/Makefile-NetBSD.orig Thu Apr 4 13:56:13 2002
-+++ OS/Makefile-NetBSD
-@@ -3,15 +3,31 @@
-
- # Include Makfile.NetBSD-a.out
-
--.if exists(OS/Makefile-NetBSD-a.out)
--.include "OS/Makefile-NetBSD-a.out"
--.elif exists(../OS/Makefile-NetBSD-a.out)
--.include "../OS/Makefile-NetBSD-a.out"
--.else
--.include "Makefile.NetBSD-a.out, submit a bug report."
--.endif
-+# Exim: OS-specific make file for NetBSD (a.out binary format)
-+
-+CHOWN_COMMAND=/usr/sbin/chown
-+CFLAGS=-O
-+
-+HAVE_SA_LEN=YES
-+LIBS=-lcrypt
-+
-+X11=/usr/X11R6
-+XINCLUDE=-I$(X11)/include
-+XLFLAGS=-L$(X11)/lib
-+X11_LD_LIB=$(X11)/lib
-+
-+EXIWHAT_PS_ARG=-ax
-+EXIWHAT_EGREP_ARG='/exim( |$$)'
-+EXIWHAT_KILL_ARG=-USR1
-+
-+# NetBSD always ships with Berkeley DB
-+
-+USE_DB=yes
-+
-+# End
-+
-
- # NetBSD ELF linker needs a -R flag.
--XLFLAGS+=-Wl,-R$(X11)/lib/
-+#XLFLAGS+=-Wl,-R$(X11)/lib/
-
- # End
diff --git a/mail/exim3/patches/patch-ac b/mail/exim3/patches/patch-ac
deleted file mode 100644
index 071ec4b0570..00000000000
--- a/mail/exim3/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/05/07 17:47:32 abs Exp $
-
---- OS/os.h-Darwin.orig Thu Apr 4 13:56:14 2002
-+++ OS/os.h-Darwin
-@@ -1,6 +1,8 @@
- /* Exim: OS-specific C header file for Darwin (Mac OS X) */
-
-+/* Darwin 6.8 does not have crypt.h
- #define CRYPT_H
-+*/
- #define HAVE_MMAP
- #define HAVE_SYS_MOUNT_H
- #define SIOCGIFCONF_GIVES_ADDR
diff --git a/mail/exim3/patches/patch-ad b/mail/exim3/patches/patch-ad
deleted file mode 100644
index 2b2cefac90c..00000000000
--- a/mail/exim3/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/05/07 17:47:32 abs Exp $
-
---- src/accept.c.orig Thu Apr 4 13:56:16 2002
-+++ src/accept.c
-@@ -1895,7 +1895,7 @@ if (headers_check_syntax)
- char *verb = "is";
- int len;
-
-- while (*t != ':') *tt++ = *t++;
-+ while (*t != ':' && tt < &hname[sizeof(hname)-2]) *tt++ = *t++;
- *tt = 0;
-
- /* Arrange not to include any white space at the end in the
diff --git a/mail/exim3/patches/patch-ae b/mail/exim3/patches/patch-ae
deleted file mode 100644
index dbda8faf6e7..00000000000
--- a/mail/exim3/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2004/05/07 17:47:32 abs Exp $
-
---- src/configure.default.orig Thu Apr 4 13:56:16 2002
-+++ src/configure.default
-@@ -298,8 +298,8 @@ end
-
- system_aliases:
- driver = aliasfile
-- file = /etc/aliases
-- search_type = lsearch
-+ file = /etc/aliases.db
-+ search_type = dbm
- # user = exim
- file_transport = address_file
- pipe_transport = address_pipe
diff --git a/mail/exim3/patches/patch-af b/mail/exim3/patches/patch-af
deleted file mode 100644
index 734a8d61140..00000000000
--- a/mail/exim3/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.2 2004/05/07 17:47:32 abs Exp $
-
---- src/smtp_in.c.orig Thu Apr 4 13:56:20 2002
-+++ src/smtp_in.c
-@@ -2021,13 +2021,12 @@ while (done <= 0)
-
- if (!check_helo(smtp_data))
- {
-- char *s;
-- smtp_printf("501 syntactically invalid %s argument(s)\r\n", hello);
-- if (*smtp_data == 0) strcpy(smtp_data, "(no argument given)");
-- s = string_printing(smtp_data);
-+ smtp_printf("501 Syntactically invalid %s argument(s)\r\n", hello);
- log_write(0, LOG_MAIN|LOG_REJECT, "rejected %s from %s: syntactically "
- "invalid argument(s): %s", hello,
-- (sender_fullhost == NULL)? "local process" : sender_fullhost, s);
-+ (sender_fullhost == NULL)? "local process" : sender_fullhost,
-+ (*smtp_data == 0)? "(no argument given)" :
-+ string_printing(smtp_data));
- break;
- }
-
diff --git a/mail/exim3/patches/patch-ag b/mail/exim3/patches/patch-ag
deleted file mode 100644
index b5a1db9670f..00000000000
--- a/mail/exim3/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2004/05/07 17:47:32 abs Exp $
-
---- src/verify.c.orig Thu Apr 4 13:56:21 2002
-+++ src/verify.c
-@@ -892,7 +892,7 @@ if (!sender_verify_reject || (rc == DEFE
- /* Set up the key for the reject hints database, and attempt to open it.
- If successful, read the record. */
-
--sprintf(buffer, "%s:%.200s", sender_address,
-+snprintf(buffer, sizeof(buffer), "%s:%.200s", sender_address,
- (sender_host_name != NULL)? sender_host_name :
- (sender_host_address != NULL)? sender_host_address : "");
-
-@@ -1182,7 +1182,7 @@ if (sender_verify_callback_error != NULL
- O_WRONLY) is needed by Berkeley native DB even when reading only. If the
- database won't open, we can do no more. */
-
--sprintf(buffer, "%s:%.200s", sender_address,
-+snprintf(buffer, sizeof(buffer), "%s:%.200s", sender_address,
- (sender_host_name != NULL)? sender_host_name :
- (sender_host_address != NULL)? sender_host_address : "");
-
diff --git a/mail/exim3/patches/patch-ah b/mail/exim3/patches/patch-ah
deleted file mode 100644
index cd07ee42843..00000000000
--- a/mail/exim3/patches/patch-ah
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2005/09/06 08:10:58 abs Exp $
-
---- OS/os.h-NetBSD.orig 2002-04-04 22:56:14.000000000 +1000
-+++ OS/os.h-NetBSD
-@@ -10,4 +10,15 @@ typedef struct flock flock_t;
- #define os_strsignal strsignal
- #define OS_STRSIGNAL
-
-+#include <sys/param.h>
-+
-+#if __NetBSD_Version__ >= 299000900
-+/* NetBSD 2.0D switched to statvfs() */
-+# include <sys/statvfs.h>
-+# define statfs statvfs
-+#else
-+/* before NetBSD 2.0D */
-+# include <sys/mount.h>
-+#endif
-+
- /* End */
diff --git a/mail/exim3/patches/patch-ai b/mail/exim3/patches/patch-ai
deleted file mode 100644
index ce00e23cec6..00000000000
--- a/mail/exim3/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/02/13 23:20:32 joerg Exp $
-
---- src/exim.h.orig 2006-02-12 21:26:40.000000000 +0100
-+++ src/exim.h
-@@ -322,7 +322,7 @@ extern int ferror(FILE *);
-
- /* The header from the PCRE regex package */
-
--#include "pcre/pcre.h"
-+#include <pcre.h>
-
- /* Exim includes are in several files */
-
diff --git a/mail/exim3/patches/patch-aj b/mail/exim3/patches/patch-aj
deleted file mode 100644
index ce1e3d5a09d..00000000000
--- a/mail/exim3/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/02/13 23:20:32 joerg Exp $
-
---- src/exim_dumpdb.c.orig 2006-02-12 21:30:01.000000000 +0100
-+++ src/exim_dumpdb.c
-@@ -14,7 +14,7 @@
- #include <sys/stat.h>
-
- #include <pwd.h> /* Because used in includes below */
--#include "pcre/pcre.h" /* Ditto */
-+#include <pcre.h> /* Ditto */
- #define MAXPACKET 1024 /* Ditto */
-
- #include "macros.h"
diff --git a/mail/exim3/patches/patch-ak b/mail/exim3/patches/patch-ak
deleted file mode 100644
index 8023f2cc57c..00000000000
--- a/mail/exim3/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/02/13 23:20:32 joerg Exp $
-
---- src/exim_fixdb.c.orig 2006-02-12 21:27:24.000000000 +0100
-+++ src/exim_fixdb.c
-@@ -18,7 +18,7 @@
- #include <sys/stat.h>
-
- #include <pwd.h> /* Because used in includes below */
--#include "pcre/pcre.h" /* Ditto */
-+#include <pcre.h> /* Ditto */
- #define MAXPACKET 1024 /* Ditto */
-
- #include "macros.h"
diff --git a/mail/exim3/patches/patch-al b/mail/exim3/patches/patch-al
deleted file mode 100644
index ae9de04a045..00000000000
--- a/mail/exim3/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/02/13 23:20:32 joerg Exp $
-
---- src/exim_tidydb.c.orig 2006-02-12 21:27:48.000000000 +0100
-+++ src/exim_tidydb.c
-@@ -36,7 +36,7 @@ This argument is required. */
- #include <sys/stat.h>
-
- #include <pwd.h> /* Because used in includes below */
--#include "pcre/pcre.h" /* Ditto */
-+#include <pcre.h> /* Ditto */
- #define MAXPACKET 1024 /* Ditto */
-
- #include "macros.h"
diff --git a/mail/exim3/patches/patch-am b/mail/exim3/patches/patch-am
deleted file mode 100644
index 9411234df6a..00000000000
--- a/mail/exim3/patches/patch-am
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-am,v 1.1 2006/02/13 23:20:32 joerg Exp $
-
---- scripts/MakeLinks.orig 2006-02-12 21:30:42.000000000 +0100
-+++ scripts/MakeLinks
-@@ -39,21 +39,6 @@ ln -s ../../src/libident/support.c
- ln -s ../../src/libident/version.c version.c
- cd ..
-
--# Likewise for the PCRE regular expression library
--mkdir pcre
--cd pcre
--ln -s ../../src/pcre/Makefile Makefile
--ln -s ../../src/pcre/config.h config.h
--ln -s ../../src/pcre/dftables.c dftables.c
--ln -s ../../src/pcre/internal.h internal.h
--ln -s ../../src/pcre/pcre.h pcre.h
--ln -s ../../src/pcre/maketables.c maketables.c
--ln -s ../../src/pcre/get.c get.c
--ln -s ../../src/pcre/pcre.c pcre.c
--ln -s ../../src/pcre/pcretest.c pcretest.c
--ln -s ../../src/pcre/study.c study.c
--cd ..
--
- # Likewise for the lookups
- mkdir lookups
- cd lookups
diff --git a/mail/exim3/patches/patch-an b/mail/exim3/patches/patch-an
deleted file mode 100644
index 1ffb01b836f..00000000000
--- a/mail/exim3/patches/patch-an
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-an,v 1.1 2006/02/13 23:20:32 joerg Exp $
-
---- OS/Makefile-Base.orig 2006-02-12 21:31:59.000000000 +0100
-+++ OS/Makefile-Base
-@@ -79,7 +79,7 @@ config.h: Makefile buildconfig ../src/co
- # This is the real default target for all the various exim binaries and
- # scripts, once the configuring stuff is done.
-
--allexim: config.h buildpcre $(EXIM_MONITOR) exicyclog exinext exiwhat \
-+allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \
- ../util/exigrep ../util/eximstats ../util/exiqsumm \
- ../util/transport-filter.pl ../util/convert4r3 \
- exim_dbmbuild exim_dumpdb exim_fixdb exim_tidydb exim_lock \
-@@ -207,7 +207,7 @@ OBJ_EXIM = accept.o child.o daemon.o dbf
- route.o search.o smtp_in.o smtp_out.o spool_in.o spool_out.o \
- store.o string.o tls.o tod.o transport.o tree.o verify.o $(EXIM_PERL)
-
--exim: libident/libident.a pcre/libpcre.a lookups/lookups.a auths/auths.a \
-+exim: libident/libident.a lookups/lookups.a auths/auths.a \
- directors/directors.a routers/routers.a transports/transports.a \
- $(OBJ_EXIM) version.c
- awk '{ print ($$1+1) }' cnumber.h > cnumber.temp
-@@ -215,10 +215,10 @@ exim: libident/libident.a pcre/libpcre
- $(CC) -c $(CFLAGS) $(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) version.c
- /bin/rm -f exim
- $(PURIFY) $(CC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \
-- libident/libident.a pcre/libpcre.a directors/directors.a \
-+ libident/libident.a directors/directors.a \
- routers/routers.a transports/transports.a lookups/lookups.a \
- auths/auths.a \
-- $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) $(EXTRALIBS_EXIM) \
-+ $(LIBS) -lpcre $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) $(EXTRALIBS_EXIM) \
- $(DBMLIB) $(LIBRESOLV) $(LOOKUP_LIBS) $(PERL_LIBS) $(TLS_LIBS)
- @if [ x"$(STRIP_COMMAND)" != x"" ]; then $(STRIP_COMMAND) exim; fi
- $(EXIM_CHMOD)
-@@ -293,12 +293,12 @@ MONBIN = em_StripChart.o $(EXIMON_TEXTPO
-
- OBJ_MONBIN = dummies.o spool_in.o store.o string.o tree.o $(MONBIN)
-
--eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) pcre/libpcre.a \
-+eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) \
- ../exim_monitor/em_version.c
- $(CC) -o em_version.o -c \
- $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c
- $(PURIFY) $(CC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \
-- $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 pcre/libpcre.a \
-+ $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 -lpcre \
- $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc
- @if [ x"$(STRIP_COMMAND)" != x"" ]; then $(STRIP_COMMAND) eximon.bin; fi
- @echo " "
diff --git a/mail/exim3/patches/patch-ao b/mail/exim3/patches/patch-ao
deleted file mode 100644
index 735d6f43d7b..00000000000
--- a/mail/exim3/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2006/03/06 22:49:16 joerg Exp $
-
---- src/lookups/dnsdb.c.orig 2006-02-14 16:38:38.000000000 +0100
-+++ src/lookups/dnsdb.c
-@@ -116,7 +116,7 @@ if (equals != NULL)
- /* If the type is PTR, we have to construct the relevant magic lookup
- key. */
-
--if (type == T_PTR)
-+if (type == T_PTR && string_is_ip_address(keystring, NULL))
- {
- char *p = keystring + (int)strlen(keystring);
- char *pp = buffer;
diff --git a/mail/exim3/patches/patch-ap b/mail/exim3/patches/patch-ap
deleted file mode 100644
index 49c700a553f..00000000000
--- a/mail/exim3/patches/patch-ap
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/03/06 22:49:16 joerg Exp $
-
---- src/host.c.orig 2006-02-14 16:41:01.000000000 +0100
-+++ src/host.c
-@@ -620,12 +620,18 @@ if (strchr(address, ':') != NULL)
-
- if (*p == ':') p++;
-
-- /* Split the address into components separated by colons. */
-+ /* Split the address into components separated by colons. The input address
-+ is supposed to be checked for syntax. There was a case where this was
-+ overlooked; to guard against that happening again, check here and crash if
-+ there is a violation. */
-
- while (*p != 0)
- {
- int len = strcspn(p, ":");
- if (len == 0) nulloffset = ci;
-+ if (ci > 7) log_write(0, LOG_MAIN|LOG_PANIC_DIE,
-+ "Internal error: invalid IPv6 address \"%s\" passed to host_aton()",
-+ address);
- component[ci++] = p;
- p += len;
- if (*p == ':') p++;
diff --git a/mail/exmh/DESCR b/mail/exmh/DESCR
deleted file mode 100644
index 456b9847cde..00000000000
--- a/mail/exmh/DESCR
+++ /dev/null
@@ -1,23 +0,0 @@
-exmh is a TCL/TK based interface to the MH mail system.
-
-IMPORTANT: exmh depends on the TK send facility for its background
-processing. With TK 3.3, send now uses xauthority mechanisms by default,
-unless you compile TK with -DTK_NO_SECURITY. Generally, this means that
-you **MUST** must run xdm to start your Xserver.
-
-FEATURES: As well as providing the usual layer on top of MH commands, exmh
-has a number of other features:
-
- MIME support! Displays richtext and enriched directly.
- Color feedback in the scan listing.
- A colour coded folder display with one label per folder.
- Smart scan caching. News read/post. koi8-r support.
- Facesaver bitmap display. Ispell support.
- Background inc. You can set exmh to run inc periodically.
- Searching over folder listing and message body.
- A dialog-box interface to MH pick.
- A editor editor with emacs-like bindings with MIME support.
- Glimpse interface. You can index all your mail with glimpse
- and search for messages by content.
- User preferences. You can tune exmh through a dialog box.
- User hacking support. A user library of TCL routines is supported.
diff --git a/mail/exmh/Makefile b/mail/exmh/Makefile
deleted file mode 100644
index 490ee93e41c..00000000000
--- a/mail/exmh/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# $NetBSD: Makefile,v 1.46 2007/02/15 14:46:27 joerg Exp $
-
-DISTNAME= exmh-2.7.2
-CATEGORIES= mail tk
-MASTER_SITES= ftp://ftp.tcl.tk/pub/tcl/exmh/
-
-MAINTAINER= dsainty@NetBSD.org
-HOMEPAGE= http://www.beedub.com/exmh/
-COMMENT= X11/TK based mail reader front end to MH
-
-DEPENDS+= nmh>=1.0:../../mail/nmh
-DEPENDS+= metamail>=2.7:../../mail/metamail
-
-USE_TOOLS+= tclsh
-USE_TOOLS+= wish:run
-
-.include "../../mk/bsd.prefs.mk"
-
-DIST_SUBDIR= ${PKGNAME_NOREV}
-
-# Additionally, exmh will use the following packages if present:
-# lang/expect
-# textproc/glimpse
-# security/gnupg
-# security/pgp
-# mail/faces
-# audio/rplay
-
-do-build:
- cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} TCLSH=${TCLSH:Q} \
- WISH=${WISH:Q} WRKSRC=${WRKSRC} \
- FILESDIR=${FILESDIR} ${SH} ${FILESDIR}/build
-
-do-install:
- ${INSTALL_MAN} ${WRKSRC}/exmh.l ${PREFIX}/${PKGMANDIR}/man1/exmh.1
- for binfile in exmh-async exmh-bg exmh-strip exmh ftp.expect; do \
- ${INSTALL_SCRIPT} ${WRKSRC}/$$binfile ${PREFIX}/bin; \
- done
- vers=`sed -ne 's/^set vers \(.*\)/\1/p' ${WRKSRC}/exmh.install`; \
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/exmh-$${vers}; \
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/exmh-$${vers}/html; \
- for libfile in \
- ${WRKSRC}/lib/PgpDecryptExpect \
- ${WRKSRC}/lib/*.tcl ${WRKSRC}/lib/*.bitmap \
- ${WRKSRC}/lib/*.ppm ${WRKSRC}/lib/help.* \
- ${WRKSRC}/lib/tclIndex ${WRKSRC}/lib/app-defaults \
- ${WRKSRC}/lib/app-defaults-* ${WRKSRC}/lib/*.mask \
- ${WRKSRC}/lib/*.exp ${WRKSRC}/lib/mime.types \
- ${WRKSRC}/lib/*.au ${WRKSRC}/lib/*.gif; do \
- ${INSTALL_DATA} $$libfile ${PREFIX}/lib/exmh-$${vers}; \
- done; \
- for hfile in ${WRKSRC}/lib/html/*; do \
- ${INSTALL_DATA} $$hfile ${PREFIX}/lib/exmh-$${vers}/html; \
- done
-
-.include "../../x11/tk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/exmh/PLIST b/mail/exmh/PLIST
deleted file mode 100644
index 9450447c6b5..00000000000
--- a/mail/exmh/PLIST
+++ /dev/null
@@ -1,203 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/10/20 08:15:14 dsainty Exp $
-bin/exmh
-bin/exmh-async
-bin/exmh-bg
-bin/exmh-strip
-bin/ftp.expect
-lib/${PKGNAME}/PgpDecryptExpect
-lib/${PKGNAME}/addr.tcl
-lib/${PKGNAME}/aliases.tcl
-lib/${PKGNAME}/app-defaults
-lib/${PKGNAME}/app-defaults-color
-lib/${PKGNAME}/app-defaults-mono
-lib/${PKGNAME}/audit.tcl
-lib/${PKGNAME}/autorefile.tcl
-lib/${PKGNAME}/background.tcl
-lib/${PKGNAME}/base64.tcl
-lib/${PKGNAME}/bindings.tcl
-lib/${PKGNAME}/bogo.tcl
-lib/${PKGNAME}/busy.tcl
-lib/${PKGNAME}/buttons.tcl
-lib/${PKGNAME}/clink.au
-lib/${PKGNAME}/crypt.tcl
-lib/${PKGNAME}/cutbuffer.tcl
-lib/${PKGNAME}/dragNdrop.tcl
-lib/${PKGNAME}/drip.au
-lib/${PKGNAME}/editor.tcl
-lib/${PKGNAME}/env.tcl
-lib/${PKGNAME}/error.tcl
-lib/${PKGNAME}/exec.tcl
-lib/${PKGNAME}/exmh.bitmap
-lib/${PKGNAME}/extrasInit.tcl
-lib/${PKGNAME}/exwin.tcl
-lib/${PKGNAME}/faces.tcl
-lib/${PKGNAME}/fcache.tcl
-lib/${PKGNAME}/fdisp.tcl
-lib/${PKGNAME}/fdispColor.tcl
-lib/${PKGNAME}/fdispPopup.tcl
-lib/${PKGNAME}/fileselect.tcl
-lib/${PKGNAME}/find.tcl
-lib/${PKGNAME}/flag.tcl
-lib/${PKGNAME}/flagdown.bitmap
-lib/${PKGNAME}/flagdown.gif
-lib/${PKGNAME}/flagdown.mask
-lib/${PKGNAME}/flagspool.bitmap
-lib/${PKGNAME}/flagspool.gif
-lib/${PKGNAME}/flagspool.mask
-lib/${PKGNAME}/flagup.bitmap
-lib/${PKGNAME}/flagup.gif
-lib/${PKGNAME}/flagup.mask
-lib/${PKGNAME}/flist.tcl
-lib/${PKGNAME}/folder.tcl
-lib/${PKGNAME}/folderNew.tcl
-lib/${PKGNAME}/fontsel.tcl
-lib/${PKGNAME}/ftoc.tcl
-lib/${PKGNAME}/ftocFind.tcl
-lib/${PKGNAME}/ftp_get.tcl
-lib/${PKGNAME}/getnews.tcl
-lib/${PKGNAME}/glimpse.tcl
-lib/${PKGNAME}/help.tcl
-lib/${PKGNAME}/hourglass.bitmap
-lib/${PKGNAME}/hourglass.mask
-lib/${PKGNAME}/hourglass1.bitmap
-lib/${PKGNAME}/hourglass2.bitmap
-lib/${PKGNAME}/hourglass2.mask
-lib/${PKGNAME}/html.tcl
-lib/${PKGNAME}/html/AddrEdit.html
-lib/${PKGNAME}/html/AddressBk.html
-lib/${PKGNAME}/html/AliasAddr.html
-lib/${PKGNAME}/html/Aliases.html
-lib/${PKGNAME}/html/Bindings.html
-lib/${PKGNAME}/html/DSN-MDN.html
-lib/${PKGNAME}/html/Font.html
-lib/${PKGNAME}/html/Import.html
-lib/${PKGNAME}/html/Intro.html
-lib/${PKGNAME}/html/Keys.html
-lib/${PKGNAME}/html/Lists.html
-lib/${PKGNAME}/html/PGP.html
-lib/${PKGNAME}/html/Preferences.html
-lib/${PKGNAME}/html/Reply.html
-lib/${PKGNAME}/html/Search.html
-lib/${PKGNAME}/html/Sedit.html
-lib/${PKGNAME}/html/Seditpref.html
-lib/${PKGNAME}/html/Y2K.html
-lib/${PKGNAME}/html/blu-ball.gif
-lib/${PKGNAME}/html/bugfixes.html
-lib/${PKGNAME}/html/copyright.html
-lib/${PKGNAME}/html/custom.html
-lib/${PKGNAME}/html/exmh-fans.html
-lib/${PKGNAME}/html/exmh-faq.html
-lib/${PKGNAME}/html/exmh.CHANGES.txt
-lib/${PKGNAME}/html/exmh.README.html
-lib/${PKGNAME}/html/exmh.pref.gif
-lib/${PKGNAME}/html/exmh.snap1.gif
-lib/${PKGNAME}/html/guide.html
-lib/${PKGNAME}/html/index.html
-lib/${PKGNAME}/html/left-arrow.gif
-lib/${PKGNAME}/html/maillist.html
-lib/${PKGNAME}/html/mime.attack.html
-lib/${PKGNAME}/html/newfeatures.html
-lib/${PKGNAME}/html/overview.html
-lib/${PKGNAME}/html/ppp.howto.html
-lib/${PKGNAME}/html/red-ball.gif
-lib/${PKGNAME}/html/reference.html
-lib/${PKGNAME}/html/right-arrow.gif
-lib/${PKGNAME}/html/software.html
-lib/${PKGNAME}/html/symlink.html
-lib/${PKGNAME}/html/tutorial.html
-lib/${PKGNAME}/html/whatis.html
-lib/${PKGNAME}/html/yel-ball.gif
-lib/${PKGNAME}/html_cache.tcl
-lib/${PKGNAME}/html_content.tcl
-lib/${PKGNAME}/html_dpackage.tcl
-lib/${PKGNAME}/html_formtag.tcl
-lib/${PKGNAME}/html_frame.tcl
-lib/${PKGNAME}/html_get_http.tcl
-lib/${PKGNAME}/html_head.tcl
-lib/${PKGNAME}/html_hr.tcl
-lib/${PKGNAME}/html_images.tcl
-lib/${PKGNAME}/html_links.tcl
-lib/${PKGNAME}/html_maps.tcl
-lib/${PKGNAME}/html_stubs.tcl
-lib/${PKGNAME}/html_tags.tcl
-lib/${PKGNAME}/html_text.tcl
-lib/${PKGNAME}/http_proxy.tcl
-lib/${PKGNAME}/import.tcl
-lib/${PKGNAME}/inc.tcl
-lib/${PKGNAME}/ispell.tcl
-lib/${PKGNAME}/labels.tcl
-lib/${PKGNAME}/linethru.bitmap
-lib/${PKGNAME}/loaderror.ppm
-lib/${PKGNAME}/loading.ppm
-lib/${PKGNAME}/mailcap.tcl
-lib/${PKGNAME}/main.tcl
-lib/${PKGNAME}/mbempty.bitmap
-lib/${PKGNAME}/mbtidy.bitmap
-lib/${PKGNAME}/mbuntidy.bitmap
-lib/${PKGNAME}/mh.tcl
-lib/${PKGNAME}/mime.tcl
-lib/${PKGNAME}/mime.types
-lib/${PKGNAME}/mimeSun.tcl
-lib/${PKGNAME}/mimencode.tcl
-lib/${PKGNAME}/mosaic.tcl
-lib/${PKGNAME}/msg.tcl
-lib/${PKGNAME}/msgShow.tcl
-lib/${PKGNAME}/partial.tcl
-lib/${PKGNAME}/pgpBase.tcl
-lib/${PKGNAME}/pgpEWN.tcl
-lib/${PKGNAME}/pgpExec.tcl
-lib/${PKGNAME}/pgpGpg.tcl
-lib/${PKGNAME}/pgpMain.tcl
-lib/${PKGNAME}/pgpMatch.tcl
-lib/${PKGNAME}/pgpMisc.tcl
-lib/${PKGNAME}/pgpOld.tcl
-lib/${PKGNAME}/pgpPgp2.tcl
-lib/${PKGNAME}/pgpPgp5.tcl
-lib/${PKGNAME}/pgpPgp65.tcl
-lib/${PKGNAME}/pgpShared.tcl
-lib/${PKGNAME}/pgpWWW.tcl
-lib/${PKGNAME}/pick.tcl
-lib/${PKGNAME}/pop.tcl
-lib/${PKGNAME}/post.tcl
-lib/${PKGNAME}/preferences.tcl
-lib/${PKGNAME}/print.tcl
-lib/${PKGNAME}/ps.tcl
-lib/${PKGNAME}/quote.tcl
-lib/${PKGNAME}/receipt.tcl
-lib/${PKGNAME}/report.tcl
-lib/${PKGNAME}/rich2tk.tcl
-lib/${PKGNAME}/scan.tcl
-lib/${PKGNAME}/sedit.tcl
-lib/${PKGNAME}/seditBind.tcl
-lib/${PKGNAME}/seditCompose.tcl
-lib/${PKGNAME}/seditEnriched.tcl
-lib/${PKGNAME}/seditExtras.tcl
-lib/${PKGNAME}/seditMime.tcl
-lib/${PKGNAME}/seditQP.tcl
-lib/${PKGNAME}/seditSel.tcl
-lib/${PKGNAME}/select.tcl
-lib/${PKGNAME}/send.tcl
-lib/${PKGNAME}/sequences.tcl
-lib/${PKGNAME}/seqwin.tcl
-lib/${PKGNAME}/sound.tcl
-lib/${PKGNAME}/source.tcl
-lib/${PKGNAME}/tclIndex
-lib/${PKGNAME}/text.tcl
-lib/${PKGNAME}/textButton.tcl
-lib/${PKGNAME}/textSelect.tcl
-lib/${PKGNAME}/thread.tcl
-lib/${PKGNAME}/timer.bitmap
-lib/${PKGNAME}/tioga.tcl
-lib/${PKGNAME}/uri.tcl
-lib/${PKGNAME}/url.bitmap
-lib/${PKGNAME}/urlFace.tcl
-lib/${PKGNAME}/user.tcl
-lib/${PKGNAME}/utils.tcl
-lib/${PKGNAME}/widgetMenu.tcl
-lib/${PKGNAME}/widgetText.tcl
-lib/${PKGNAME}/widgets.tcl
-lib/${PKGNAME}/xns.tcl
-lib/${PKGNAME}/xnsgetmail.exp
-man/man1/exmh.1
-@dirrm lib/${PKGNAME}/html
-@dirrm lib/${PKGNAME}
diff --git a/mail/exmh/distinfo b/mail/exmh/distinfo
deleted file mode 100644
index 50b26359ae0..00000000000
--- a/mail/exmh/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.6 2006/10/20 08:15:14 dsainty Exp $
-
-SHA1 (exmh-2.7.2/exmh-2.7.2.tar.gz) = 0e8e11c29c7e1b9371d5a72b4cb2bf6085f20edf
-RMD160 (exmh-2.7.2/exmh-2.7.2.tar.gz) = fd0d8689304cdb6dcbcd341ec5ba5f8f5b2f9712
-Size (exmh-2.7.2/exmh-2.7.2.tar.gz) = 1081601 bytes
-SHA1 (patch-aw) = 396ef41611de11a9ba48f15711e20f4e44f73da9
diff --git a/mail/exmh/files/build b/mail/exmh/files/build
deleted file mode 100644
index 992651a4b63..00000000000
--- a/mail/exmh/files/build
+++ /dev/null
@@ -1,95 +0,0 @@
-#! /bin/sh
-#
-# $NetBSD: build,v 1.2 2006/10/20 08:15:15 dsainty Exp $
-# FreeBSD Id: build,v 1.5 1997/08/21 08:09:56 peter Exp
-#
-
-VERSION="`sed -ne 's/^set vers \(.*\)/\1/p' ${WRKSRC}/exmh.install`"
-DATE="`sed -ne 's/^set date \(.*\)/\1/p' ${WRKSRC}/exmh.install`"
-
-SEDFILE=sed.$$
-
-EXPECT="{}"
-EXPECTK="{}"
-FACES="{}"
-DOMAIN="{}"
-PGP="{}"
-PGP5="{}"
-PGP6="{}"
-GPG="{}"
-GLIMPSE="{}"
-PLAY="{}"
-
-if [ -f ${PREFIX}/bin/expect ]; then
- EXPECT=${PREFIX}/bin/expect #executable
-fi
-if [ -f ${PREFIX}/bin/expectk ]; then
- EXPECTK=${PREFIX}/bin/expectk #executable
-fi
-
-if [ -d ${PREFIX}/share/faces ]; then
- FACES=${PREFIX}/share/faces #dir
- shortname="`hostname -s`"
- domain="`hostname | sed -e s/^${shortname}// -e s/^.// | tr A-Z a-z`"
- if [ "${domain}" != "" ]; then
- DOMAIN="{${domain}}"
- fi
-fi
-
-if [ -f ${PREFIX}/bin/pgp ]; then
- PGP=${PREFIX}/bin #bindir
-fi
-
-if [ -f ${PREFIX}/bin/pgp5 ]; then
- PGP5=${PREFIX}/bin #bindir
-fi
-
-if [ -f ${PREFIX}/bin/pgp6 ]; then
- PGP6=${PREFIX}/bin #bindir
-fi
-
-if [ -f ${PREFIX}/bin/gpg ]; then
- GPG=${PREFIX}/bin #bindir
-fi
-
-if [ -f ${PREFIX}/bin/glimpse ]; then
- GLIMPSE=${PREFIX}/bin #bindir
-fi
-
-if [ -f ${PREFIX}/bin/rplay ]; then
- PLAY=${PREFIX}/bin/rplay #executable
-fi
-
-echo "s@^#!wish@#!${WISH}@" >${SEDFILE}
-if [ "${EXPECT}" != "{}" ]; then
- echo "s@^#!expect@#!${EXPECT}@" >>${SEDFILE}
-fi
-echo "/^#CONFIGURATION/a\\" >>${SEDFILE}
-
-sed <${FILESDIR}/config \
- -e "s+!!PREFIX!!+${PREFIX}+g" \
- -e "s+!!WISH!!+${WISH}+g" \
- -e "s+!!EXPECT!!+${EXPECT}+g" \
- -e "s+!!EXPECTK!!+${EXPECTK}+g" \
- -e "s+!!FACES!!+${FACES}+g" \
- -e "s+!!DOMAIN!!+${DOMAIN}+g" \
- -e "s+!!PGP!!+${PGP}+g" \
- -e "s+!!PGP5!!+${PGP5}+g" \
- -e "s+!!PGP6!!+${PGP6}+g" \
- -e "s+!!GPG!!+${GPG}+g" \
- -e "s+!!GLIMPSE!!+${GLIMPSE}+g" \
- -e "s+!!PLAY!!+${PLAY}+g" \
- -e "s+!!VERSION!!+${VERSION}+g" \
- -e "s+!!DATE!!+${DATE}+g" \
- | sed -e 's/$/\\/' >> ${SEDFILE}
-
-for i in exmh-async exmh-bg exmh-strip exmh ftp.expect
-do
- echo "sed -f ${SEDFILE} < $i.MASTER > $i"
- sed -f ${SEDFILE} < $i.MASTER > $i
-done
-
-rm -f ${SEDFILE}
-
-echo "cd lib ; echo 'auto_mkindex . *.tcl ; exit' | ${TCLSH}"
-cd lib ; echo 'auto_mkindex . *.tcl ; exit' | ${TCLSH}
diff --git a/mail/exmh/files/config b/mail/exmh/files/config
deleted file mode 100644
index 5b853bbbe2d..00000000000
--- a/mail/exmh/files/config
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: config,v 1.6 2001/10/22 21:46:50 agc Exp $
-
-set wish !!WISH!!
-set exmh(version) {version !!VERSION!! !!DATE!!}
-set exmh(name) exmh
-set exmh(maintainer) welch@acm.org
-set mh_path !!PREFIX!!/bin
-set exmh(slocal) !!PREFIX!!/libexec/nmh/slocal
-set mime(dir) !!PREFIX!!/bin
-set mailcap_default !!PREFIX!!/etc/mailcap
-set mimetypes_default !!PREFIX!!/lib/exmh-!!VERSION!!/mime.types
-set exmh(expect) !!EXPECT!!
-set exmh(expectk) !!EXPECTK!!
-set faces(dir) !!FACES!!
-set faces(set,user) {local users usenix misc}
-set faces(set,unknown) {domains unknown}
-set faces(set,news) {news}
-set faces(defaultDomain) !!DOMAIN!!
-set faces(suffix) {xpm gif xbm}
-set pgp(pgp,path) !!PGP!!
-set pgp(pgp5,path) !!PGP5!!
-set pgp(pgp6,path) !!PGP6!!
-set pgp(gpg,path) !!GPG!!
-set glimpse(path) !!GLIMPSE!!
-set sound(cmd) !!PLAY!!
-set exmh(library) !!PREFIX!!/lib/exmh-!!VERSION!!
-set install(dir,bin) !!PREFIX!!/bin
-set install(dir,man) !!PREFIX!!/man/man1
-set install(dir,lib) !!PREFIX!!/lib/exmh-!!VERSION!!
diff --git a/mail/exmh/patches/patch-aw b/mail/exmh/patches/patch-aw
deleted file mode 100644
index 65f5e1f552e..00000000000
--- a/mail/exmh/patches/patch-aw
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aw,v 1.3 2003/05/12 20:40:18 agc Exp $
-
-Modify default threading offsets so that standard scan format is correct.
-
---- lib/thread.tcl 1998/08/17 13:43:05 1.1
-+++ lib/thread.tcl 1998/08/17 13:43:15
-@@ -141,17 +141,17 @@
- return 0
- }
-
--proc Thread_Display { {breakoff 20} {mark "+->"} } {
-+proc Thread_Display { {breakoff 30} {mark "+->"} } {
-
- busy Thread_Ftoc 1 $breakoff $mark
- }
-
--proc Thread_DisplayAll { {breakoff 20} {mark "+->"} } {
-+proc Thread_DisplayAll { {breakoff 30} {mark "+->"} } {
-
- busy Thread_Ftoc 0 $breakoff $mark
- }
-
--proc Thread_Ftoc { {selected 0} {breakoff 20} {mark "+->"} } {
-+proc Thread_Ftoc { {selected 0} {breakoff 30} {mark "+->"} } {
- global exwin exmh ftoc msg mhProfile
-
- #
diff --git a/mail/ezmlm-idx/DESCR b/mail/ezmlm-idx/DESCR
deleted file mode 100644
index 646adf2cb70..00000000000
--- a/mail/ezmlm-idx/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-This is an addition and patch to ezmlm-0.53 [(c) Dan J. Bernstein].
-Ezmlm-idx uses Dan's libraries and heavily relies on ezmlm-0.53
-code. ezmlm-idx does not function without ezmlm-0.53.
-
-ezmlm-0.53 provides basic message distribution, subscriber address
-handling, message archiving (single quoted message retrieval only),
-and bounce handling. ezmlm-idx adds multi-message threaded archive
-retrieval, digests, remote administration, message and subscription
-moderation, subscriber-only restrictions, message trailer, subject
-prefix, subscriber name storage, customizable setup, multi-language
-and MIME support and more. In addition, improved bounce handling,
-case-insensitive subscriber address storage, and support for
-distributed lists (main + sublist transparent to the subscriber).
-Ezmlm-idx can now be compiled with MySQL or Postgres support.
diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
deleted file mode 100644
index 6a6cc7614eb..00000000000
--- a/mail/ezmlm-idx/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# $NetBSD: Makefile,v 1.28 2006/12/29 06:21:06 schmonz Exp $
-#
-
-.include "../../mail/ezmlm/Makefile.common"
-
-DISTNAME= ezmlm-idx-${IDXVERSION}
-IDXVERSION= 0.444
-SITES.${DISTNAME}.tar.gz= http://www.ezmlm.org/archive/${IDXVERSION}/
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://www.ezmlm.org/
-COMMENT= Version of ezmlm with enhancements by third parties
-
-CONFLICTS= ezmlm-[0-9]*
-
-DISTFILES+= ${EZMLM_VERS}.tar.gz
-PLIST_SRC+= PLIST.idx
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-# ezmlm-idx is a modification of the ezmlm source.
-DJB_RESTRICTED= YES
-
-PKG_SYSCONFSUBDIR= ezmlm
-CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
-USE_TOOLS+= patch
-
-EGDIR= ${PREFIX}/share/examples/ezmlm-idx
-CONF_FILES= ${EGDIR}/ezcgirc ${PKG_SYSCONFDIR}/ezcgirc
-CONF_FILES+= ${EGDIR}/ezmlmrc ${PKG_SYSCONFDIR}/ezmlmrc
-
-INSTALLATION_DIRS= bin ${PKGMANDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
-INSTALLATION_DIRS+= ${PKGMANDIR}/cat1 ${PKGMANDIR}/cat5
-INSTALLATION_DIRS+= share/examples/ezmlm-idx
-
-post-extract:
- @${MV} ${WRKSRC}/* ${WRKDIR}/${EZMLM_VERS}
- @${RMDIR} ${WRKSRC}
- @${MV} ${WRKDIR}/${EZMLM_VERS} ${WRKSRC}
-
-pre-patch:
- @cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < idx.patch
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/ezcgirc ${EGDIR}/ezcgirc
- ${INSTALL_DATA} ${WRKSRC}/ezmlmrc ${EGDIR}/ezmlmrc
- ${INSTALL_DATA} ${WRKSRC}/ezmlmglrc ${EGDIR}/ezmlmglrc
- ${INSTALL_DATA} ${WRKSRC}/ezmlmsubrc ${EGDIR}/ezmlmsubrc
-
-.include "../../mk/djbware.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/ezmlm-idx/PLIST.idx b/mail/ezmlm-idx/PLIST.idx
deleted file mode 100644
index cda42670735..00000000000
--- a/mail/ezmlm-idx/PLIST.idx
+++ /dev/null
@@ -1,68 +0,0 @@
-@comment $NetBSD: PLIST.idx,v 1.5 2005/07/05 06:04:17 schmonz Exp $
-bin/ezmlm-accept
-bin/ezmlm-archive
-bin/ezmlm-check
-bin/ezmlm-clean
-bin/ezmlm-confirm
-bin/ezmlm-cron
-bin/ezmlm-dispatch
-bin/ezmlm-gate
-bin/ezmlm-get
-bin/ezmlm-glconf
-bin/ezmlm-idx
-bin/ezmlm-issubn
-bin/ezmlm-limit
-bin/ezmlm-mktab
-bin/ezmlm-moderate
-bin/ezmlm-request
-bin/ezmlm-split
-bin/ezmlm-store
-bin/ezmlm-tstdig
-man/cat1/ezmlm-accept.0
-man/cat1/ezmlm-archive.0
-man/cat1/ezmlm-check.0
-man/cat1/ezmlm-clean.0
-man/cat1/ezmlm-confirm.0
-man/cat1/ezmlm-cron.0
-man/cat1/ezmlm-gate.0
-man/cat1/ezmlm-get.0
-man/cat1/ezmlm-glconf.0
-man/cat1/ezmlm-idx.0
-man/cat1/ezmlm-issubn.0
-man/cat1/ezmlm-limit.0
-man/cat1/ezmlm-mktab.0
-man/cat1/ezmlm-moderate.0
-man/cat1/ezmlm-request.0
-man/cat1/ezmlm-split.0
-man/cat1/ezmlm-store.0
-man/cat1/ezmlm-tstdig.0
-man/cat5/ezmlmglrc.0
-man/cat5/ezmlmrc.0
-man/cat5/ezmlmsubrc.0
-man/man1/ezmlm-accept.1
-man/man1/ezmlm-archive.1
-man/man1/ezmlm-check.1
-man/man1/ezmlm-clean.1
-man/man1/ezmlm-confirm.1
-man/man1/ezmlm-cron.1
-man/man1/ezmlm-dispatch.1
-man/man1/ezmlm-gate.1
-man/man1/ezmlm-get.1
-man/man1/ezmlm-glconf.1
-man/man1/ezmlm-idx.1
-man/man1/ezmlm-issubn.1
-man/man1/ezmlm-limit.1
-man/man1/ezmlm-mktab.1
-man/man1/ezmlm-moderate.1
-man/man1/ezmlm-request.1
-man/man1/ezmlm-split.1
-man/man1/ezmlm-store.1
-man/man1/ezmlm-tstdig.1
-man/man5/ezmlmglrc.5
-man/man5/ezmlmrc.5
-man/man5/ezmlmsubrc.5
-share/examples/ezmlm-idx/ezcgirc
-share/examples/ezmlm-idx/ezmlmglrc
-share/examples/ezmlm-idx/ezmlmrc
-share/examples/ezmlm-idx/ezmlmsubrc
-@dirrm share/examples/ezmlm-idx
diff --git a/mail/ezmlm-idx/distinfo b/mail/ezmlm-idx/distinfo
deleted file mode 100644
index 78bd6fab914..00000000000
--- a/mail/ezmlm-idx/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.17 2006/12/29 06:21:06 schmonz Exp $
-
-SHA1 (ezmlm-0.53.tar.gz) = 3a7b618737fed8b774bec69c272d70f4142c1e30
-RMD160 (ezmlm-0.53.tar.gz) = 6d366de2d7028a984ba454f1bec9d2d9f495c88b
-Size (ezmlm-0.53.tar.gz) = 62693 bytes
-SHA1 (ezmlm-idx-0.444.tar.gz) = ef4225fc023e95c5b84aa48b417a68a0796cc72a
-RMD160 (ezmlm-idx-0.444.tar.gz) = 7af28d61c604123113e6718d263d7d207f09fd33
-Size (ezmlm-idx-0.444.tar.gz) = 615519 bytes
-SHA1 (patch-aa) = 1a30d5f859ed87723f2c32e33a3b96167c460446
-SHA1 (patch-ab) = a8f41d4fad49dca3e65a317e95bc54a1b530afe0
diff --git a/mail/ezmlm-idx/options.mk b/mail/ezmlm-idx/options.mk
deleted file mode 100644
index 2316d465e7f..00000000000
--- a/mail/ezmlm-idx/options.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: options.mk,v 1.8 2005/07/14 03:49:40 schmonz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.ezmlm-idx
-PKG_OPTIONS_OPTIONAL_GROUPS= database
-PKG_OPTIONS_GROUP.database= mysql pgsql
-
-.include "../../mk/bsd.options.mk"
-
-###
-### MySQL support
-###
-.if !empty(PKG_OPTIONS:Mmysql)
-. include "../../mk/mysql.buildlink3.mk"
-DJB_CONFIG_CMDS= \
- ${ECHO} ${CPPFLAGS} > sub_mysql/conf-sqlcc; \
- ${ECHO} ${LDFLAGS} -lmysqlclient > sub_mysql/conf-sqlld; \
- ${ECHO} mysql > conf-sub
-.endif
-
-###
-### PostgreSQL support
-###
-.if !empty(PKG_OPTIONS:Mpgsql)
-. include "../../mk/pgsql.buildlink3.mk"
-DJB_CONFIG_CMDS= \
- ${ECHO} ${CPPFLAGS} > sub_pgsql/conf-sqlcc; \
- ${ECHO} ${LDFLAGS} -lpq > sub_pgsql/conf-sqlld; \
- ${ECHO} pgsql > conf-sub
-.endif
diff --git a/mail/ezmlm-idx/patches/patch-aa b/mail/ezmlm-idx/patches/patch-aa
deleted file mode 100644
index 1f6fe26d162..00000000000
--- a/mail/ezmlm-idx/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2006/12/29 06:21:06 schmonz Exp $
-
---- idx.h.orig 2006-11-23 14:12:30.000000000 -0500
-+++ idx.h
-@@ -255,7 +255,7 @@
- /* ezmlm-make looks first (unless the -c switch is specified) before */
- /* falling back to the (usually unchanged) version in the ezmlm bin */
- /* directory. */
--#define TXT_ETC_EZMLMRC "/etc/ezmlm/ezmlmrc"
-+#define TXT_ETC_EZMLMRC PKG_SYSCONFDIR "/ezmlmrc"
-
- /* same name added to auto_bin. Note leading slash! */
- #define TXT_EZMLMRC "/ezmlmrc"
-@@ -270,7 +270,7 @@
- #define TXT_LOOPNUM "loopnum"
-
- /* ezmlm-cgi config file for normal SUID root install */
--#define EZ_CGIRC "/etc/ezmlm/ezcgirc"
-+#define EZ_CGIRC PKG_SYSCONFDIR "/ezcgirc"
-
- /* ezmlm-cgi config file for local install we expect to find the file in PWD */
- #define EZ_CGIRC_LOC ".ezcgirc"
diff --git a/mail/ezmlm-idx/patches/patch-ab b/mail/ezmlm-idx/patches/patch-ab
deleted file mode 100644
index d9bfb188f0a..00000000000
--- a/mail/ezmlm-idx/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2005/07/12 10:58:09 schmonz Exp $
-
---- BIN.orig 2005-07-12 02:52:52.000000000 -0400
-+++ BIN
-@@ -1,7 +1,4 @@
- d:::755:::
--c:::644:/:ezmlmglrc:
--c:::644:/:ezmlmrc:
--c:::644:/:ezmlmsubrc:
- c:::755:/:ezmlm-accept:
- c:::755:/:ezmlm-archive:
- c:::755:/:ezmlm-check:
diff --git a/mail/ezmlm/DESCR b/mail/ezmlm/DESCR
deleted file mode 100644
index 742e51ef581..00000000000
--- a/mail/ezmlm/DESCR
+++ /dev/null
@@ -1,21 +0,0 @@
-ezmlm is an easy-to-use, high-speed mailing list manager for qmail.
-
-ezmlm lets users set up their own mailing lists within qmail's address
-hierarchy. A user, Joe, types
-
- ezmlm-make ~/SOS ~/.qmail-sos joe-sos isp.net
-
-and instantly has a functioning mailing list, joe-sos@isp.net, with all
-relevant information stored in a new ~/SOS directory.
-
-ezmlm takes advantage of qmail's VERPs to reliably determine the
-recipient address and message number for every incoming bounce message.
-
-ezmlm is reliable, even in the face of system crashes. It writes each
-new subscription and each new message safely to disk before it reports
-success to qmail.
-
-ezmlm doesn't mind huge mailing lists. Lists don't even have to fit into
-memory. ezmlm hashes the subscription list into a set of independent
-files so that it can handle subscription requests quickly. ezmlm uses
-qmail for blazingly fast parallel SMTP deliveries.
diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile
deleted file mode 100644
index 499cbee56f4..00000000000
--- a/mail/ezmlm/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2007/01/07 09:13:58 rillig Exp $
-#
-
-.include "../../mail/ezmlm/Makefile.common"
-
-DISTNAME= ${EZMLM_VERS}
-PKGREVISION= 1
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://cr.yp.to/ezmlm.html
-COMMENT= Easy-to-use, high-speed mailing list manager for qmail
-
-CONFLICTS= ezmlm-idx-[0-9]*
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-# We change conf-bin and conf-man from the default "/usr/local"
-# and don't provide compatibility symlinks.
-DJB_RESTRICTED= YES
-
-INSTALLATION_DIRS= bin man ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/cat1 ${PKGMANDIR}/cat5
-
-.include "../../mk/djbware.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/ezmlm/Makefile.common b/mail/ezmlm/Makefile.common
deleted file mode 100644
index 55fb2404c6b..00000000000
--- a/mail/ezmlm/Makefile.common
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile.common,v 1.9 2006/01/05 03:00:21 schmonz Exp $
-#
-
-EZMLM_VERS= ezmlm-0.53
-
-MASTER_SITES= http://cr.yp.to/software/
-CATEGORIES= mail
-DISTFILES= ${DISTNAME}.tar.gz
-
-DEPENDS+= qmail>=1.03:../../mail/qmail
-
-USE_TOOLS+= nroff
-
-PLIST_SRC= ../../mail/ezmlm/PLIST.common
-
-DJB_BUILD_TARGETS= man install
-INSTALL_TARGET= setup
diff --git a/mail/ezmlm/PLIST.common b/mail/ezmlm/PLIST.common
deleted file mode 100644
index a09157b98c6..00000000000
--- a/mail/ezmlm/PLIST.common
+++ /dev/null
@@ -1,33 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.1 2002/07/23 08:42:37 schmonz Exp $
-bin/ezmlm-list
-bin/ezmlm-make
-bin/ezmlm-manage
-bin/ezmlm-reject
-bin/ezmlm-return
-bin/ezmlm-send
-bin/ezmlm-sub
-bin/ezmlm-unsub
-bin/ezmlm-warn
-bin/ezmlm-weed
-man/cat1/ezmlm-list.0
-man/cat1/ezmlm-make.0
-man/cat1/ezmlm-manage.0
-man/cat1/ezmlm-reject.0
-man/cat1/ezmlm-return.0
-man/cat1/ezmlm-send.0
-man/cat1/ezmlm-sub.0
-man/cat1/ezmlm-unsub.0
-man/cat1/ezmlm-warn.0
-man/cat1/ezmlm-weed.0
-man/cat5/ezmlm.0
-man/man1/ezmlm-list.1
-man/man1/ezmlm-make.1
-man/man1/ezmlm-manage.1
-man/man1/ezmlm-reject.1
-man/man1/ezmlm-return.1
-man/man1/ezmlm-send.1
-man/man1/ezmlm-sub.1
-man/man1/ezmlm-unsub.1
-man/man1/ezmlm-warn.1
-man/man1/ezmlm-weed.1
-man/man5/ezmlm.5
diff --git a/mail/ezmlm/distinfo b/mail/ezmlm/distinfo
deleted file mode 100644
index e3648fc16dc..00000000000
--- a/mail/ezmlm/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:22 agc Exp $
-
-SHA1 (ezmlm-0.53.tar.gz) = 3a7b618737fed8b774bec69c272d70f4142c1e30
-RMD160 (ezmlm-0.53.tar.gz) = 6d366de2d7028a984ba454f1bec9d2d9f495c88b
-Size (ezmlm-0.53.tar.gz) = 62693 bytes
diff --git a/mail/ezmlm/files/patch-althash b/mail/ezmlm/files/patch-althash
deleted file mode 100644
index b0565418c1f..00000000000
--- a/mail/ezmlm/files/patch-althash
+++ /dev/null
@@ -1,78 +0,0 @@
-Attached below are diffs. They convert the hashing to do:
- '@'..'Z'
-
-It's not that great as a hashing algorithm since you end up with a
-non-prime number that's reasonably close to a power of 2 for your number
-of buckets, but hey.
-
-It's possible one other place (in constmap) needs to be changed. DJB's
-code scares me in its lack of constants and lack of subroutines to
-factor away similar bits of code.
-
-Test it and see if it works.
-
-
-cheers,
---
-Iain.
-
-
---- ezmlm-list.c.orig 1997-06-29 23:11:54.000000000 -0400
-+++ ezmlm-list.c
-@@ -36,7 +36,7 @@ char **argv;
- if (chdir(dir) == -1)
- strerr_die4sys(111,FATAL,"unable to switch to ",dir,": ");
-
-- for (fn[12] = 64;fn[12] < 64 + 53;++fn[12]) {
-+ for (fn[12] = 64;fn[12] < 64 + 27;++fn[12]) {
- fd = open_read(fn);
- if (fd == -1) {
- if (errno != error_noent)
---- ezmlm-send.c.orig 1997-06-29 23:11:54.000000000 -0400
-+++ ezmlm-send.c
-@@ -288,7 +288,7 @@ char **argv;
-
- qmail_from(&qq,line.s);
-
-- for (i = 0;i < 53;++i) {
-+ for (i = 0;i < 27;++i) {
- ch = 64 + i;
- if (!stralloc_copys(&fnsub,"subscribers/")) die_nomem();
- if (!stralloc_catb(&fnsub,&ch,1)) strerr_die2x(111,FATAL,"out of memory");
---- ezmlm.5.orig 1997-06-29 23:11:54.000000000 -0400
-+++ ezmlm.5
-@@ -30,10 +30,10 @@ allows automatic subscription if
- .I dir\fB/public
- exists.
-
--The list is hashed into 53 files, named
-+The list is hashed into 27 files, named
- .B @
- through
--.B t
-+.B Z
- in ASCII.
- A nonexistent file is treated as an empty file.
-
---- issub.c.orig 1997-06-29 23:11:54.000000000 -0400
-+++ issub.c
-@@ -35,7 +35,7 @@ char *userhost;
- h = 5381;
- for (j = 0;j < addr.len;++j)
- h = (h + (h << 5)) ^ (uint32) (unsigned char) addr.s[j];
-- ch = 64 + (h % 53);
-+ ch = 64 + (h % 27);
-
- if (!stralloc_0(&addr)) return -2;
-
---- subscribe.c.orig 1997-06-29 23:11:54.000000000 -0400
-+++ subscribe.c
-@@ -45,7 +45,7 @@ int flagadd;
- h = 5381;
- for (j = 0;j < addr.len;++j)
- h = (h + (h << 5)) ^ (uint32) (unsigned char) addr.s[j];
-- ch = 64 + (h % 53);
-+ ch = 64 + (h % 27);
-
- if (!stralloc_0(&addr)) return -2;
-
diff --git a/mail/ezmlm/hacks.mk b/mail/ezmlm/hacks.mk
deleted file mode 100644
index 98b3b1b2927..00000000000
--- a/mail/ezmlm/hacks.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2005/01/08 17:54:34 schmonz Exp $
-
-.include "../../mk/compiler.mk"
-
-.if !empty(CC_VERSION:Mgcc-*)
-PKG_HACKS+= builtin-log
-CFLAGS+= -fno-builtin-log
-.endif
diff --git a/mail/ezmlm/options.mk b/mail/ezmlm/options.mk
deleted file mode 100644
index 1b80b5839bf..00000000000
--- a/mail/ezmlm/options.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: options.mk,v 1.7 2006/03/18 06:45:51 schmonz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.ezmlm
-PKG_SUPPORTED_OPTIONS+= ezmlm-althash
-
-.if ${OPSYS} == "Darwin"
-PKG_SUGGESTED_OPTIONS+= ezmlm-althash
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mezmlm-althash)
-USE_TOOLS+= patch
-post-patch:
- @cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-althash
-.endif
diff --git a/mail/faces/DESCR b/mail/faces/DESCR
deleted file mode 100644
index 01878bac600..00000000000
--- a/mail/faces/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This is the third general release of a "faces" server for monitoring a
-list visually. Typically this is a list of incoming mail messages, jobs
-in the print queue or users on a system.
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
deleted file mode 100644
index 32f19be9766..00000000000
--- a/mail/faces/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# $NetBSD: Makefile,v 1.54 2007/02/15 14:46:27 joerg Exp $
-
-DISTNAME= faces-1.6.1
-PKGREVISION= 4
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.cs.indiana.edu/pub/faces/faces/faces-1.6.1/
-EXTRACT_SUFX= .tar.Z
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Visual mail, user and print face server
-
-DEPENDS+= netpbm>=9.2:../../graphics/netpbm
-
-CONFLICTS= compface-[0-9]*
-
-LICENSE= faces-license
-RESTRICTED= Distribution not allowed if money exchanged
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-
-WRKSRC= ${WRKDIR}/faces
-USE_X11BASE= YES
-USE_LIBTOOL= YES
-USE_TOOLS+= perl:run yacc
-
-MAKE_FLAGS+= PREFIX=${PREFIX:Q}
-MAKE_FLAGS+= CCOMP=${CFLAGS:M*:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+= SVR4LIBS="-lnsl -lsocket -lgen"
-MAKE_ENV+= SYSV=-DSYSV32
-MAKE_ENV+= CC=gcc
-MAKE_ENV+= CPPFLAGS=
-.endif
-
-.if ${OPSYS} != "Interix"
-MAKE_ENV+= NISLOOKUP=-DNISLOOKUP
-.endif
-
-REPLACE_PERL= scripts/addxface scripts/deepen scripts/facesaddr \
- scripts/facesall scripts/from.faces scripts/lpqall.faces \
- scripts/mailq.faces scripts/mailqto scripts/mailqto.faces \
- scripts/mkfacesindex scripts/newscheck.faces \
- scripts/newsfrom.faces scripts/rotary.faces
-
-do-configure:
- ${LN} -sf Makefile.dist ${WRKSRC}/${MAKE_FILE}
- cd ${WRKSRC}; \
- files=" \
- x11.c \
- scripts/addxface \
- scripts/facesall \
- scripts/mkfacesindex \
- "; \
- for FILE in $${files}; do \
- ${SED} -e "s|@PREFIX@|${PREFIX}|g" \
- $${FILE} > $${FILE}.fixed; \
- if [ -x $${FILE} ]; then \
- ${CHMOD} +x $${FILE}.fixed; \
- fi; \
- ${MV} -f $${FILE}.fixed $${FILE}; \
- done
-
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/faces/PLIST b/mail/faces/PLIST
deleted file mode 100644
index 234b20dad33..00000000000
--- a/mail/faces/PLIST
+++ /dev/null
@@ -1,37 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:41 jlam Exp $
-bin/addxface
-bin/compface
-bin/face_update
-bin/faces
-bin/faces.sendmail
-bin/facesaddr
-bin/facesall
-bin/from.faces
-bin/fs2ikon
-bin/fs2xbm
-bin/icon2ikon
-bin/ikon2icon
-bin/ikon2xbm
-bin/lpqall.faces
-bin/mailq.faces
-bin/mkfacesindex
-bin/newscheck.faces
-bin/newsfrom.faces
-bin/rotary.faces
-bin/rs2icon
-bin/uncompface
-bin/xbm2ikon
-bin/xbmcut48
-bin/xbmsize48
-include/compface.h
-lib/X11/app-defaults/Faces
-lib/libcompface.la
-man/man1/compface.1
-man/man1/face_update.1
-man/man1/faces.1
-man/man1/uncompface.1
-man/man3/compface.3
-man/man3/uncompface.3
-share/faces/machine.tab
-share/faces/people.tab
-@dirrm share/faces
diff --git a/mail/faces/buildlink3.mk b/mail/faces/buildlink3.mk
deleted file mode 100644
index 0c22049a802..00000000000
--- a/mail/faces/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:57 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-FACES_BUILDLINK3_MK:= ${FACES_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= faces
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfaces}
-BUILDLINK_PACKAGES+= faces
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}faces
-
-.if !empty(FACES_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.faces+= faces>=1.6.1nb1
-BUILDLINK_ABI_DEPENDS.faces+= faces>=1.6.1nb4
-BUILDLINK_PKGSRCDIR.faces?= ../../mail/faces
-.endif # FACES_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/faces/distinfo b/mail/faces/distinfo
deleted file mode 100644
index db901a07948..00000000000
--- a/mail/faces/distinfo
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: distinfo,v 1.12 2006/01/08 14:30:01 tron Exp $
-
-SHA1 (faces-1.6.1.tar.Z) = 8402a74e43e78345c23a975a417c2407322db65f
-RMD160 (faces-1.6.1.tar.Z) = fdf0d1eca4d094b0b50c00c627082c78ae5dd195
-Size (faces-1.6.1.tar.Z) = 249469 bytes
-SHA1 (patch-aa) = 99012a91d3ac39bdd0ad8b5ab454812ace346dbb
-SHA1 (patch-ab) = d7f35df34ab4e584ce8d0edcdcf60c45bf30fa4f
-SHA1 (patch-ac) = adb2718262027b4ba68425ffd4bef37192ff6d0c
-SHA1 (patch-ad) = 8383d81ea922122c5fc1fa23fd44c4a45b376c68
-SHA1 (patch-ae) = 0a7e57277e0e8133c81997258ef7f7a656834088
-SHA1 (patch-af) = 28eca0e38e04aef8b51d596d00f19d329f7570ec
-SHA1 (patch-ag) = df1e715582dd8f76fabed97ceb994d77d6d14ab7
-SHA1 (patch-ah) = 0333bb755c9fb3f71bc17c963eaa9c0b1322a6d6
-SHA1 (patch-ai) = 37ac5631b842794f5f6d24f33fad44573a186114
-SHA1 (patch-aj) = 77386cbb0fc62300d61205d68bfb795125cd0ca6
-SHA1 (patch-ak) = 17d2781ad02394ed148ba654bf553f0f46a3db99
-SHA1 (patch-al) = 4cda3f50c6071137abde13f9f1afd7a1d80aa8d4
-SHA1 (patch-am) = 47121da4ec605ef24474ec830615643972b864ab
-SHA1 (patch-an) = 826208a9ac5b21e185f64e899ad09a95192e704c
-SHA1 (patch-ao) = 4121b8310a3fa4067f1cbe2b5b8ae51f182f4b23
-SHA1 (patch-ap) = 200bf4c20bc36d5f08505af69084a4de2283e07f
-SHA1 (patch-aq) = 57d3f14ae8229cc4d879fdca5f87f04bb5398edc
-SHA1 (patch-ar) = 0a21b5fa5e8f200e8873286a128aed62e1edd5b9
-SHA1 (patch-as) = 3751bb0603637db885263d49a50769c7d6c39377
-SHA1 (patch-at) = ee84e7a191c0db0f278be753562ba086050a7f8c
-SHA1 (patch-au) = 582e9ad10b44e2e8af10c5c5e8682a7bfe508318
-SHA1 (patch-av) = 0167d89f23dcc997af9a9b9ab78439d5840e0724
-SHA1 (patch-aw) = a53df4bc5b1eb696bc9416f7109d152d735b76f7
-SHA1 (patch-ax) = d815d247fbbfe9a0553bd3c2187d842269d36000
-SHA1 (patch-ay) = 47cfbfb581fcfb9a781c76dd9dfdcd410ce39a93
-SHA1 (patch-az) = 1d753d201e2c4790a027b0ccad1da3ce02e20085
-SHA1 (patch-ba) = 52325ea46828e6c7fd56e0faf8487a15dafbb0b7
-SHA1 (patch-bb) = 4693aa848a3059d291a1fb8b2c391ee2acf07649
-SHA1 (patch-bc) = c6af853a024cb1f4389cb594b0ad8f747bee5ac0
diff --git a/mail/faces/patches/patch-aa b/mail/faces/patches/patch-aa
deleted file mode 100644
index 80f74bc14e7..00000000000
--- a/mail/faces/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2000/07/08 12:47:04 tron Exp $
-
---- Faces.ad.orig Mon Jul 1 03:25:46 1991
-+++ Faces.ad Sat Jul 8 14:25:27 2000
-@@ -13,5 +13,5 @@
- faces.displayHostname: false
-
- faces.audioSupport: false
--faces.audioCommand: play
-+faces.audioCommand: rplay
- faces.bellAudioFile:
diff --git a/mail/faces/patches/patch-ab b/mail/faces/patches/patch-ab
deleted file mode 100644
index 0cdc2062bb4..00000000000
--- a/mail/faces/patches/patch-ab
+++ /dev/null
@@ -1,216 +0,0 @@
-$NetBSD: patch-ab,v 1.13 2006/01/08 14:30:01 tron Exp $
-
---- Makefile.dist.orig 1991-11-24 23:55:28.000000000 +0000
-+++ Makefile.dist 2006-01-08 14:13:23.000000000 +0000
-@@ -22,15 +22,18 @@
- # uncommented and set accordingly, if needed.
- #
- #========================================================================
-+# Installation prefix.
-+#PREFIX ?=/usr/local
-+#------------------------------------------------------------------------
- # If you want audio support, then the following line should be uncommented.
- #
--#AUDIO_SUPPORT = -DAUDIO_SUPPORT
-+AUDIO_SUPPORT = -DAUDIO_SUPPORT
- #========================================================================
- # There is a default command (/usr/demo/SOUND/play), which is used to
- # play audio files. Alternatively you can specify your own custom
- # command here. Uncomment the following line and set appropriately.
- #
--#AUDIO_CMD = -DAUDIO_CMD=\"/usr/local/bin/play\"
-+AUDIO_CMD = -DAUDIO_CMD=\"$(LOCALBASE)/bin/rplay\"
- #========================================================================
- # Faces displays a background pattern in its' window. When the window
- # is not completely full, this gives the appearance of trying to blend
-@@ -38,7 +41,7 @@
- # can specify the name of a file containing an alternate pattern to use.
- # Uncomment the next two lines and set appropriately.
- #
--#BACKNAME = /usr/local/sample-background
-+#BACKNAME = $(PREFIX)/sample-background
- #BACKGROUND = -DBACKGROUND=\"$(BACKNAME)\"
- #------------------------------------------------------------------------
- # Uncomment the following two lines to use the Domain Name Service to
-@@ -54,8 +57,8 @@
- # NOTE that for this to work you must have at least a minimal
- # /etc/resolv.conf file containing a valid nameserver entry.
- #
--#DNSLOOKUP = -DDNSLOOKUP
--#DNSLIB = -lresolv
-+DNSLOOKUP = -DDNSLOOKUP
-+DNSLIB =
- #------------------------------------------------------------------------
- # If you do not want to show the number of messages on the face icon,
- # then uncomment the next line.
-@@ -72,12 +75,12 @@
- #
- #DONTSHOWUSER = -DDONTSHOWUSER
- #------------------------------------------------------------------------
--# By default, faces looks for the face images in /usr/local/faces. If
-+# By default, faces looks for the face images in $(PREFIX)/faces. If
- # you wish to specify an alternate location, then these two lines should
- # be uncommented and set appropriately. Note that the value must be
- # a single directory name, not a colon separated list of paths.
- #
--FACEDIR = /usr/local/faces
-+FACEDIR = $(PREFIX)/share/faces
- CFACEDIR = -DFACEDIR=\"$(FACEDIR)\"
- #------------------------------------------------------------------------
- # It is possible to determine what type of monitoring faces does at
-@@ -188,7 +191,7 @@
- # to the select call are different, and this definition should be
- # uncommented. You need to uncomment this for SunOS v3.x.
- #
--#SELTYPE = -DNO_43SELECT
-+SELTYPE = -DNO_43SELECT
- #------------------------------------------------------------------------
- # If you are building faces on a Silicon Graphics machine, then you will
- # need to uncomment the following two definitions.
-@@ -199,7 +202,7 @@
- # If the pending mail for users is in a different directory than
- # /usr/spool/mail, uncomment the following and set appropriately.
- #
--#SPOOLDIR = -DSPOOLDIR=\"/usr/mail\"
-+SPOOLDIR = -DSPOOLDIR=\"/var/mail\"
- #------------------------------------------------------------------------
- # If faces is setup to monitor mail, then the name of the default
- # spoolfile is /usr/spool/mail/username. An alternative spoolfile name
-@@ -258,8 +261,8 @@
- # library files are not in a standard place, then the following
- # two lines should be uncommented, and set appropriately.
- #
--#X11INCDIR = -I$(OPENWINHOME)/include
--#X11LIBDIR = -L$(OPENWINHOME)/lib
-+X11INCDIR = -I${X11BASE}/include
-+X11LIBDIR = -L${X11BASE}/lib
- #------------------------------------------------------------------------
- # If you are compiling the XView version, then the following two lines
- # should be uncommented, and set appropriately.
-@@ -272,17 +275,19 @@
- # Default locations where faces files will be installed.
- # You might wish to alter these values.
- #
--BINDIR = /usr/local/bin
--LIBDIR = /usr/local/lib
--MANDIR = /usr/man
--MANSECT = l
-+BINDIR = $(PREFIX)/bin
-+LIBDIR = $(PREFIX)/lib
-+INCDIR = $(PREFIX)/include
-+MANDIR = $(PREFIX)/man
-+MANSECT = 1
-
- #
- # Options for submakes
- #
- MAKEOPTS = $(MFLAGS) BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) \
-- MANDIR=$(MANDIR) CC=$(CC) \
-- NOINDEX=$(NOINDEX) SYSV=$(SYSV)
-+ INCDIR=$(INCDIR) MANDIR=$(MANDIR) CC="$(CC)" \
-+ NOINDEX=$(NOINDEX) SYSV=$(SYSV) PREFIX=$(PREFIX) \
-+ CCOMP="$(CCOMP)"
-
- #
- # Override DEBUG on the command line as `DEBUG=-DDEBUG' to enable various
-@@ -302,7 +307,7 @@
- $(SELTYPE) $(SGIDEF) $(SPOOLDIR) $(SPOOLFILE) $(SYSV) \
- $(TTEXT) $(TOPIX) $(UPDATE) $(USE_BZERO) $(USE_GETWD) \
- $(X11R3) $(X11INCDIR) $(XVIEWINCDIR) $(DEBUG)
--CCOMP = -O
-+CCOMP = -g
- CFLAGS = $(CCOMP) $(CDEFS)
- #
- #=======================================================================
-@@ -311,12 +316,9 @@
-
- BINARIES = psfaces svfaces xfaces xvfaces
-
--CC = cc
--MAKE = make
--
- STDSRCS = address.c get.c main.c mon.c parsefrom.c rec.c
- STDOBJS = address.o get.o main.o mon.o parsefrom.o rec.o
--STDLIBS = compface/libcompface.a $(DNSLIB) $(SGILIBS)
-+STDLIBS = $(LDFLAGS) compface/libcompface.la $(DNSLIB) $(SGILIBS)
-
- COMPFACE = compface
- FACES = facedir
-@@ -357,25 +359,25 @@
- # Dell Unix (Interactive 386/ix): $(X11LIBDIR) -lX11 -linet
- # AT&T's XWIN: $(X11LIBDIR) -lX11_s -lc_s -lnsl_s -lpt
- #
--X11LIBS = $(X11LIBDIR) -lX11
-+X11LIBS = -lX11
- XVIEWLIBS = $(XVIEWLIBDIR) -lxview -lolgx -lX11
-
- help:
- @echo
- @echo "You need to specify one of the following options:"
- @echo
-- @echo " make sunview - to make the SunView version."
-- @echo " make news - to make the NeWS version."
-- @echo " make x11 - to make the X11 version."
-- @echo " make xview - to make the XView version."
-+ @echo " ${MAKE} sunview - to make the SunView version."
-+ @echo " ${MAKE} news - to make the NeWS version."
-+ @echo " ${MAKE} x11 - to make the X11 version."
-+ @echo " ${MAKE} xview - to make the XView version."
- @echo
- @echo "This should be followed by:"
- @echo
-- @echo " make install"
-- @echo " make clean"
-+ @echo " ${MAKE} install"
-+ @echo " ${MAKE} clean"
- @echo
-
--all: $(BINARIES)
-+all: x11
-
- news: $(STDOBJS) news.o faces_cps.h
- (cd compface; $(MAKE) $(MAKEOPTS))
-@@ -394,9 +396,8 @@
- x11: $(STDOBJS) x11.o
- (cd compface; $(MAKE) $(MAKEOPTS))
- (cd filters; $(MAKE) $(MAKEOPTS))
-- $(CC) -o xfaces $(CFLAGS) $(STDOBJS) x11.o \
-+ $(LIBTOOL) $(CC) -o faces $(CFLAGS) $(STDOBJS) x11.o \
- $(STDLIBS) $(X11LIBS) $(SVR4LIBS)
-- -cp xfaces faces
-
- xview: $(STDOBJS) xview.o
- (cd compface; $(MAKE) $(MAKEOPTS))
-@@ -406,21 +407,24 @@
- -cp xvfaces faces
-
- tables:
-- -mkdir $(FACEDIR)
-- -install -c -m 644 machine.tab $(FACEDIR)
-- -install -c -m 644 people.tab $(FACEDIR)
-+ ${BSD_INSTALL_DATA_DIR} $(FACEDIR)
-+ ${BSD_INSTALL_DATA} machine.tab $(FACEDIR)
-+ ${BSD_INSTALL_DATA} people.tab $(FACEDIR)
-
- install:
-+ ${MAKE} tables
- (cd compface; $(MAKE) $(MAKEOPTS) install)
- (cd filters; $(MAKE) $(MAKEOPTS) install)
- (cd scripts; $(MAKE) $(MAKEOPTS) install)
-- install -s -m 751 faces $(BINDIR)
-- install -c -m 755 face_update $(BINDIR)
-- install -c -m 755 faces.sendmail $(BINDIR)
-- install -c -m 644 faces.man \
-+ $(LIBTOOL) ${BSD_INSTALL_PROGRAM} faces $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} face_update $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} faces.sendmail $(BINDIR)
-+ ${BSD_INSTALL_MAN} faces.man \
- $(MANDIR)/man$(MANSECT)/faces.$(MANSECT)
-- install -c -m 644 face_update.1 \
-+ ${BSD_INSTALL_MAN} face_update.1 \
- $(MANDIR)/man$(MANSECT)/face_update.$(MANSECT)
-+ ${BSD_INSTALL_DATA_DIR} $(PREFIX)/lib/X11/app-defaults
-+ ${BSD_INSTALL_DATA} Faces.ad $(PREFIX)/lib/X11/app-defaults/Faces
-
- clean:
- (cd compface; $(MAKE) $(MAKEOPTS) clean)
diff --git a/mail/faces/patches/patch-ac b/mail/faces/patches/patch-ac
deleted file mode 100644
index 635d8fd0509..00000000000
--- a/mail/faces/patches/patch-ac
+++ /dev/null
@@ -1,92 +0,0 @@
-$NetBSD: patch-ac,v 1.11 2001/11/30 16:29:28 jlam Exp $
-
---- compface/Makefile.orig Wed Oct 23 22:28:06 1991
-+++ compface/Makefile
-@@ -22,20 +22,22 @@
- # BINDIR, LIBDIR, and MANDIR are expected to be overridden by the
- # calling Makefile
-
--BINDIR = /usr/local/bin
--LIBDIR = /usr/local/lib
--MANDIR = /usr/manl
-+PREFIX ?=/usr/local
-+BINDIR = $(PREFIX)/bin
-+INCDIR = $(PREFIX)/include
-+LIBDIR = $(PREFIX)/lib
-+MANDIR = $(PREFIX)/man
-
- NAME = compface
- UNNAME = uncompface
- EXECUTABLE = $(BINDIR)/$(NAME)
- UNEXECUTABLE = $(BINDIR)/$(UNNAME)
--LIBNAME = lib$(NAME).a
-+LIBNAME = lib$(NAME).la
- LIBRARY = $(LIBDIR)/$(LIBNAME)
- MAN1DIR = $(MANDIR)/man1
- MAN3DIR = $(MANDIR)/man3
- OBJECTS = arith.o file.o compress.o gen.o uncompface.o
--SOURCES = compface.c uncompface.o arith.c file.c compress.c gen.c \
-+SOURCES = compface.c uncompface.c arith.c file.c compress.c gen.c \
- cmain.c uncmain.c
- HDRS = compface.h data.h
- OTHERS = README $(NAME).1 $(NAME).3 Makefile
-@@ -45,17 +47,16 @@
- CCOMP = -g
- CFLAGS = $(CDEFS) $(CCOMP)
-
--all: $(NAME) $(UNNAME)
-+all: $(LIBNAME) $(NAME) $(UNNAME)
-
- $(NAME) : cmain.o compface.o $(LIBNAME)
-- $(CC) $(CFLAGS) -o $(NAME) cmain.o compface.o $(LIBNAME)
-+ $(LIBTOOL) $(CC) $(CFLAGS) -o $(NAME) cmain.o compface.o $(LIBNAME)
-
- $(UNNAME) : uncmain.o $(LIBNAME)
-- $(CC) $(CFLAGS) -o $(UNNAME) uncmain.o $(LIBNAME)
-+ $(LIBTOOL) $(CC) $(CFLAGS) -o $(UNNAME) uncmain.o $(LIBNAME)
-
--$(LIBNAME) : $(OBJECTS)
-- ar rc $(LIBNAME) $(OBJECTS)
-- -ranlib $(LIBNAME)
-+$(LIBNAME) : $(OBJECTS:.o=.lo)
-+ $(LIBTOOL) $(CC) -o $(LIBNAME) $(OBJECTS:.o=.lo) -rpath $(LIBDIR) -version-info 1:0
-
- lint :
- lint -abchx $(SOURCES)
-@@ -64,21 +65,25 @@
- rm -f *.o *.a *.sh core a.out $(NAME) $(UNNAME)
-
- install : $(NAME) $(UNNAME) $(LIBNAME)
-- -cp $(NAME) $(EXECUTABLE)
-- strip $(EXECUTABLE)
-- -cp $(UNNAME) $(UNEXECUTABLE)
-- strip $(UNEXECUTABLE)
-- -cp $(NAME).1 $(MAN1DIR)
-- rm -f $(MAN1DIR)/$(UNNAME).1
-- -ln $(MAN1DIR)/$(NAME).1 $(MAN1DIR)/$(UNNAME).1
-- -cp $(LIBNAME) $(LIBRARY)
-- -cp $(NAME).3 $(MAN3DIR)
-- rm -f $(MAN3DIR)/$(UNNAME).3
-- -ln $(MAN3DIR)/$(NAME).3 $(MAN3DIR)/$(UNNAME).3
-+ $(LIBTOOL) ${BSD_INSTALL_DATA} $(LIBNAME) $(LIBDIR)
-+ $(LIBTOOL) ${BSD_INSTALL_PROGRAM} $(NAME) $(EXECUTABLE)
-+ $(LIBTOOL) ${BSD_INSTALL_PROGRAM} $(UNNAME) $(UNEXECUTABLE)
-+ ${BSD_INSTALL_MAN} $(NAME).1 $(MAN1DIR)
-+ rm -f $(MAN1DIR)/$(UNNAME).1*
-+ -ln -fs $(MAN1DIR)/$(NAME).1 $(MAN1DIR)/$(UNNAME).1
-+ ${BSD_INSTALL_MAN} $(NAME).3 $(MAN3DIR)
-+ rm -f $(MAN3DIR)/$(UNNAME).3*
-+ -ln -fs $(MAN3DIR)/$(NAME).3 $(MAN3DIR)/$(UNNAME).3
-+ ${BSD_INSTALL_DATA} compface.h $(INCDIR)
-
- shar :
- shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh
- compress $(NAME).sh
-+
-+.SUFFIXES: .lo
-+
-+.c.lo:
-+ $(LIBTOOL) $(CC) $(CFLAGS) -c $<
-
- arith.o: arith.c compface.h data.h
- cmain.o: cmain.c compface.h data.h
diff --git a/mail/faces/patches/patch-ad b/mail/faces/patches/patch-ad
deleted file mode 100644
index 2116c85d15c..00000000000
--- a/mail/faces/patches/patch-ad
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2000/07/08 12:47:05 tron Exp $
-
---- compface/compface.1.orig Fri Mar 15 06:10:29 1991
-+++ compface/compface.1 Sat Jul 8 14:25:27 2000
-@@ -12,6 +12,8 @@
- .LP
- .B uncompface
- [
-+.B \-X
-+] [
- .I infile
- [
- .I outfile
-@@ -25,7 +27,7 @@
- face image files.
- .I uncompface
- is an inverse filter which performs an inverse transformation with no
--loss of data.
-+loss of data.
- The algorithm used is highly tuned for its purpose and achieves better
- than a five to one compression ratio on average.
- Arguments operate identically for both programmes.
-@@ -56,6 +58,12 @@
- .I compface
- averages less than 200 characters.
- The average number of output lines is three.
-+.SH OPTIONS
-+.TP 12
-+.B \-X
-+The same as
-+.I uncompface
-+| ikon2xbm. Usefull for exmh!
- .SH DIAGNOSTICS
- Exit status is normally 0.
- Possible errors include IO errors when opening, reading or writing
diff --git a/mail/faces/patches/patch-ae b/mail/faces/patches/patch-ae
deleted file mode 100644
index d69328d5840..00000000000
--- a/mail/faces/patches/patch-ae
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2000/07/08 12:47:05 tron Exp $
-
---- compface/file.c.orig Wed Jun 19 08:29:13 1991
-+++ compface/file.c Sat Jul 8 14:25:27 2000
-@@ -15,6 +15,8 @@
-
- #include "compface.h"
-
-+int xbitmap=0;
-+
- void
- BigRead(fbuf)
- register char *fbuf;
-@@ -127,10 +129,19 @@
- {
- register char *s, *t;
- register int i, bits, digits, words;
-+ extern int xbitmap;
-+ int digsperword = DIGSPERWORD;
-+ int wordsperline = WORDSPERLINE;
-
- s = F;
- t = fbuf;
- bits = digits = words = i = 0;
-+ if (xbitmap) {
-+ sprintf(t,"#define noname_width 48\n#define noname_height 48\nstatic char noname_bits[] = {\n ");
-+ while (*t) t++;
-+ digsperword = 2;
-+ wordsperline = 15;
-+ }
- while (s < F + PIXELS)
- {
- if ((bits == 0) && (digits == 0))
-@@ -138,25 +149,43 @@
- *(t++) = '0';
- *(t++) = 'x';
- }
-- if (*(s++))
-- i = i * 2 + 1;
-- else
-- i *= 2;
-+ if (xbitmap) {
-+ if (*(s++))
-+ i = (i >> 1) | 0x8;
-+ else
-+ i >>= 1;
-+ }
-+ else {
-+ if (*(s++))
-+ i = i * 2 + 1;
-+ else
-+ i *= 2;
-+ }
- if (++bits == BITSPERDIG)
- {
-- *(t++) = *(i + HexDigits);
-+ if (xbitmap) {
-+ t++;
-+ t[-(digits & 1) * 2] = *(i + HexDigits);
-+ }
-+ else *(t++) = *(i + HexDigits);
- bits = i = 0;
-- if (++digits == DIGSPERWORD)
-+ if (++digits == digsperword)
- {
-+ if (xbitmap && (s >= F + PIXELS)) break;
- *(t++) = ',';
- digits = 0;
-- if (++words == WORDSPERLINE)
-+ if (++words == wordsperline)
- {
- *(t++) = '\n';
-+ if (xbitmap) *(t++) = ' ';
- words = 0;
- }
- }
- }
-+ }
-+ if (xbitmap) {
-+ sprintf(t, "}\n");
-+ while (*t) t++;
- }
- *(t++) = '\0';
- }
diff --git a/mail/faces/patches/patch-af b/mail/faces/patches/patch-af
deleted file mode 100644
index cf7e468ec96..00000000000
--- a/mail/faces/patches/patch-af
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-af,v 1.7 2006/01/08 14:30:01 tron Exp $
-
---- compface/uncmain.c.orig 1991-10-24 03:28:07.000000000 +0100
-+++ compface/uncmain.c 2006-01-08 14:24:41.000000000 +0000
-@@ -18,6 +18,8 @@
- #include <fcntl.h>
- #include "compface.h"
-
-+extern int xbitmap;
-+
- /* the buffer is longer than needed to handle sparse input formats */
- #define FACEBUFLEN 2048
- char fbuf[FACEBUFLEN];
-@@ -33,12 +35,21 @@
-
- /* error handling definitions follow */
-
--extern int errno, sys_nerr;
-+#include <errno.h>
-+#include <stdio.h>
-+
-+#if !defined(__NetBSD__) && !defined(__INTERIX) && !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__APPLE__)
-+extern int sys_nerr;
- extern char *sys_errlist[];
-+#endif
-
- extern void exit P((int)) ;
-
-+#ifdef __INTERIX
-+#define ERR strerror(errno)
-+#else
- #define ERR ((errno < sys_nerr) ? sys_errlist[errno] : "")
-+#endif
- #define INITERR(s) {(void)strcpy(fbuf, cmdname); (void)strcat(fbuf, ": ");\
- (void)strcat(fbuf, (s));}
- #define ADDERR(s) (void)strcat(fbuf, (s));
-@@ -60,6 +71,13 @@
- if (*((*argv)++) == '/')
- cmdname = *argv; /* find the command's basename */
-
-+ if (argc > 1 && !strcmp(argv[1], "-X"))
-+ {
-+ xbitmap++;
-+ argc--;
-+ argv++;
-+ }
-+
- if (argc > 3)
- {
- INITERR("usage: ")
diff --git a/mail/faces/patches/patch-ag b/mail/faces/patches/patch-ag
deleted file mode 100644
index 15789cda9f6..00000000000
--- a/mail/faces/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2000/07/08 12:47:06 tron Exp $
-
---- extern.h.orig Tue Nov 19 05:00:48 1991
-+++ extern.h Sat Jul 8 14:25:27 2000
-@@ -82,6 +82,7 @@
- extern int facetype ; /* Type of face file found. */
- extern int firsttime ; /* Zeroised after first mail/printer check. */
- extern int flashes ; /* Number of flashes for arrival of new mail. */
-+extern int border_width ; /* Border width of window. */
- extern int fromc_found ; /* Set if "From:" line found during processing. */
- extern int froms_found ; /* Set if "From " line found during processing. */
- extern int height ; /* Height in pixels of faces display. */
diff --git a/mail/faces/patches/patch-ah b/mail/faces/patches/patch-ah
deleted file mode 100644
index 4c3d5a6364d..00000000000
--- a/mail/faces/patches/patch-ah
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2001/11/30 16:29:28 jlam Exp $
-
---- faces.h.orig Tue Nov 19 05:00:49 1991
-+++ faces.h Sat Jul 8 14:25:27 2000
-@@ -102,9 +102,10 @@
- enum mon_type { MONNEW, MONALL, MONPRINTER, MONPROG, MONUSERS } ;
-
- /* X resources used by faces. */
--enum res_type { R_WINGEOM, R_ICONGEOM, R_FGCOLOR, R_BGCOLOR,
-- R_FONT, R_BGICON, R_PERIOD, R_BELL,
-- R_FLASH, R_LOWER, R_RAISE, R_BUT1CLR, R_DISPHOST,
-+enum res_type { R_WINGEOM, R_ICONGEOM, R_FGCOLOR, R_BGCOLOR,
-+ R_FONT, R_BGICON, R_PERIOD, R_BELL,
-+ R_FLASH, R_BORDERWIDTH, R_LOWER, R_RAISE,
-+ R_BUT1CLR, R_DISPHOST,
- #ifdef AUDIO_SUPPORT
- R_AUDIO, R_AUDIOCMD, R_BELLFILE
- #endif /*AUDIO_SUPPORT*/
-@@ -193,8 +194,6 @@
- #endif /*NOUTIME*/
-
- extern char *getenv P(()) ;
--extern char *malloc P(()) ;
--extern char *realloc P(()) ;
- extern char *index P(()) ;
- extern char *rindex P(()) ;
- extern char *strcpy P(()) ;
-@@ -204,6 +203,8 @@
- extern FILE *popen P(()) ;
- #endif /*SYSV32*/
-
-+#include <sys/param.h>
-+
- /* Various programs that are used by faces.
- * You might need to change these on some machines.
- */
-@@ -217,7 +218,11 @@
- #define PRINTDEF "lpq -P %s"
-
- /* Updating the faces database: %s replaced with mail update alias name. */
-+#if (defined(BSD) && BSD >= 199306)
-+#define UPDATEDEF "/usr/sbin/sendmail -oeq -oi %s"
-+#else
- #define UPDATEDEF "/usr/lib/sendmail -oeq -oi %s"
-+#endif
-
- /* Monitoring users on a machine: %s replaced with hostname. */
- #define USERSDEF "rusers -l %s"
diff --git a/mail/faces/patches/patch-ai b/mail/faces/patches/patch-ai
deleted file mode 100644
index b342fe0ae57..00000000000
--- a/mail/faces/patches/patch-ai
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2000/07/08 12:47:06 tron Exp $
-
---- faces.sendmail.orig Mon Jul 1 03:25:50 1991
-+++ faces.sendmail Sat Jul 8 14:25:27 2000
-@@ -37,4 +37,4 @@
- -e ': copy' \
- -e p \
- -e n \
-- -e 'b copy' | /usr/lib/sendmail "$@"
-+ -e 'b copy' | /usr/sbin/sendmail "$@"
diff --git a/mail/faces/patches/patch-aj b/mail/faces/patches/patch-aj
deleted file mode 100644
index f69784cadc4..00000000000
--- a/mail/faces/patches/patch-aj
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2001/11/30 16:29:28 jlam Exp $
-
---- filters/Makefile.orig Wed Oct 23 22:26:14 1991
-+++ filters/Makefile
-@@ -55,12 +55,12 @@
- rm -f *.o $(BINARIES)
-
- install: $(BINARIES)
-- install -s -m 751 icon2ikon $(BINDIR)
-- install -s -m 751 ikon2icon $(BINDIR)
-- install -s -m 751 rs2icon $(BINDIR)
-- install -c -m 755 fs2ikon $(BINDIR)
-- install -c -m 755 fs2xbm $(BINDIR)
-- install -c -m 755 ikon2xbm $(BINDIR)
-- install -c -m 755 xbm2ikon $(BINDIR)
-- install -c -m 755 xbmcut48 $(BINDIR)
-- install -c -m 755 xbmsize48 $(BINDIR)
-+ ${BSD_INSTALL_PROGRAM} icon2ikon $(BINDIR)
-+ ${BSD_INSTALL_PROGRAM} ikon2icon $(BINDIR)
-+ ${BSD_INSTALL_PROGRAM} rs2icon $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} fs2ikon $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} fs2xbm $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} ikon2xbm $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} xbm2ikon $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} xbmcut48 $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} xbmsize48 $(BINDIR)
diff --git a/mail/faces/patches/patch-ak b/mail/faces/patches/patch-ak
deleted file mode 100644
index b357e058e8d..00000000000
--- a/mail/faces/patches/patch-ak
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2000/07/08 12:47:07 tron Exp $
-
---- filters/ikon2icon.c.orig Mon Apr 15 05:40:02 1991
-+++ filters/ikon2icon.c Sat Jul 8 14:25:27 2000
-@@ -13,12 +13,17 @@
- * either to the comments or the code of this program, but if reported
- * to me, then an attempt will be made to fix them.
- */
-+#include <sys/param.h>
-
- #include <stdio.h>
-
- #define PATCHLEVEL 1
-
--#define GETS (void) gets /* To make lint happy. */
-+#if (defined(BSD) && BSD >= 199306)
-+#define GETS(s) { (void)fgets(s, sizeof(s), stdin); s[sizeof(s) - 1] = 0; }
-+#else
-+#define GETS(s) (void) gets(s) /* To make lint happy. */
-+#endif
- #define PRINTF (void) printf
- #define SPRINTF (void) sprintf
- #define SSCANF (void) sscanf
diff --git a/mail/faces/patches/patch-al b/mail/faces/patches/patch-al
deleted file mode 100644
index 16e3df5b9d0..00000000000
--- a/mail/faces/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.3 2000/07/08 12:47:07 tron Exp $
-
---- filters/ikon2xbm.orig Tue May 7 00:51:50 1991
-+++ filters/ikon2xbm Sat Jul 8 14:25:27 2000
-@@ -26,7 +26,7 @@
- \2\
- \3/' > $tmp
-
--dim=`wc -l < $tmp | awk '{ print 4 * sqrt }'`
-+dim=`wc -l < $tmp | awk '{ print 4 * sqrt(144) }'`
-
- pr -l1 -t -8 -s, < $tmp |
- (cat << EOF
diff --git a/mail/faces/patches/patch-am b/mail/faces/patches/patch-am
deleted file mode 100644
index d80dd71231f..00000000000
--- a/mail/faces/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.3 2000/07/08 12:47:07 tron Exp $
-
---- filters/rs2icon.c.orig Mon Apr 15 05:40:03 1991
-+++ filters/rs2icon.c Sat Jul 8 14:25:27 2000
-@@ -21,7 +21,7 @@
- */
-
- #include <stdio.h>
--#ifdef SYSV32 || hpux
-+#if defined(SYSV32) || defined(hpux)
- #include <string.h>
- #else
- #include <strings.h>
diff --git a/mail/faces/patches/patch-an b/mail/faces/patches/patch-an
deleted file mode 100644
index 03a6af1fa95..00000000000
--- a/mail/faces/patches/patch-an
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-an,v 1.5 2005/03/12 12:53:56 schwarz Exp $
-
---- main.c.orig 1991-11-19 05:00:47.000000000 +0100
-+++ main.c 2005-03-09 21:51:22.000000000 +0100
-@@ -25,7 +25,7 @@
- #include <sys/param.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#if !defined(mips) || defined(ultrix)
-+#if !defined(mips) || defined(ultrix) || (defined(BSD) && BSD >= 199306) || defined(__sgi)
- #include <netdb.h>
- #else
- #ifdef SYSTYPE_BSD43
-@@ -36,6 +36,13 @@
- #endif
- #include <ctype.h>
-
-+#include <string.h>
-+
-+#ifdef __sgi
-+/* for calloc(), malloc(), realloc() */
-+#include <stdlib.h>
-+#endif
-+
- #ifdef DNSLOOKUP
- #include <sys/socket.h>
- #endif /*DNSLOOKUP*/
-@@ -63,6 +70,7 @@
- "period", /* Integer: period in seconds between checks. */
- "bell", /* Integer: number of beeps for new arrival. */
- "flash", /* Integer: number of flashes for new arrival. */
-+ "borderWidth", /* Integer: border width of window. */
- "lower", /* Boolean: lower window if no mail. */
- "raise", /* Boolean: raise window on update? */
- "button1clear", /* Boolean: mouse button 1 clear window? */
-@@ -150,6 +158,7 @@
- int facetype ; /* Type of face file found. */
- int firsttime = 1 ; /* Zeroised after first mail/printer check. */
- int flashes = 0 ; /* Number of flashes for arrival of new mail. */
-+int border_width = 2 ; /* Border width of window. */
- int fromc_found = 0 ; /* Set if "From:" line found during processing. */
- int froms_found = 0 ; /* Set if "From " line found during processing. */
- int height ; /* Height in pixels of faces display. */
-@@ -743,9 +752,10 @@
- if (get_str_resource(R_FONT, str)) read_str(&fontname, str) ;
- if (get_str_resource(R_BGICON, str)) read_str(&bgicon, str) ;
-
-- if (get_int_resource(R_PERIOD, &intval)) period = intval ;
-- if (get_int_resource(R_BELL, &intval)) beeps = intval ;
-- if (get_int_resource(R_FLASH, &intval)) flashes = intval ;
-+ if (get_int_resource(R_PERIOD, &intval)) period = intval ;
-+ if (get_int_resource(R_BELL, &intval)) beeps = intval ;
-+ if (get_int_resource(R_FLASH, &intval)) flashes = intval ;
-+ if (get_int_resource(R_BORDERWIDTH,&intval)) border_width = intval ;
-
- if (get_bool_resource(R_LOWER, &boolval)) lowerwindow = boolval ;
- if (get_bool_resource(R_RAISE, &boolval)) raisewindow = boolval ;
diff --git a/mail/faces/patches/patch-ao b/mail/faces/patches/patch-ao
deleted file mode 100644
index c6246962114..00000000000
--- a/mail/faces/patches/patch-ao
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ao,v 1.4 2005/03/12 12:53:56 schwarz Exp $
-
---- mon.c.orig 1991-11-19 05:00:48.000000000 +0100
-+++ mon.c 2005-03-09 21:52:39.000000000 +0100
-@@ -23,7 +23,8 @@
- #endif /* SYSV32 || hpux */
- #include <sys/types.h>
- #include <sys/stat.h>
--#if ( !defined(mips) && !defined(TOPIX) ) || defined(ultrix)
-+#include <sys/param.h>
-+#if ( !defined(mips) && !defined(TOPIX) ) || defined(ultrix) || (defined(BSD) && BSD >= 199306) || defined(__sgi)
- #include <sys/time.h>
- #else
- #ifdef SYSTYPE_BSD43
-@@ -50,6 +51,11 @@
- #endif /*TOPIX*/
- #endif /*!NOUTIME*/
-
-+#ifdef __sgi
-+/* for calloc(), malloc(), realloc() */
-+#include <stdlib.h>
-+#endif
-+
- #include "faces.h"
- #include "extern.h"
-
diff --git a/mail/faces/patches/patch-ap b/mail/faces/patches/patch-ap
deleted file mode 100644
index 80b121eac73..00000000000
--- a/mail/faces/patches/patch-ap
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ap,v 1.4 2001/11/30 16:29:28 jlam Exp $
-
---- scripts/Makefile.orig Mon May 6 18:55:26 1991
-+++ scripts/Makefile
-@@ -11,20 +11,20 @@
- #
- # BINDIR is expected to be overridden by the calling Makefile
-
--LBINDIR = /usr/local/bin
--BINDIR = /usr/local/faces/bin
-+LBINDIR = $(PREFIX)/bin
-+BINDIR = $(PREFIX)/bin
-
- install:
-- install -c -m 755 addxface $(BINDIR)
-- install -c -m 755 mailq.faces $(BINDIR)
-- install -c -m 755 from.faces $(BINDIR)
-- install -c -m 755 lpqall.faces $(BINDIR)
-- install -c -m 755 rotary.faces $(BINDIR)
-- install -c -m 755 facesaddr $(BINDIR)
-- install -c -m 755 facesall $(BINDIR)
-- install -c -m 755 mkfacesindex $(BINDIR)
-- install -c -m 755 newscheck.faces $(BINDIR)
-- install -c -m 755 newsfrom.faces $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} addxface $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} mailq.faces $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} from.faces $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} lpqall.faces $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} rotary.faces $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} facesaddr $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} facesall $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} mkfacesindex $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} newscheck.faces $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} newsfrom.faces $(BINDIR)
-
- install2:
-- install -c -m 755 faces $(LBINDIR)
-+ ${BSD_INSTALL_SCRIPT} faces $(LBINDIR)
diff --git a/mail/faces/patches/patch-aq b/mail/faces/patches/patch-aq
deleted file mode 100644
index d505025df9b..00000000000
--- a/mail/faces/patches/patch-aq
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aq,v 1.4 2001/11/30 16:29:29 jlam Exp $
-
---- scripts/addxface.orig Tue Nov 19 05:05:58 1991
-+++ scripts/addxface Sat Jul 8 14:31:35 2000
-@@ -15,7 +15,7 @@
- # than version v1.6.0:
- #$olddb = 1;
-
--$faces = '/usr/local/faces';
-+$faces = '@PREFIX@/share/faces';
- $umask = 000;
-
- # addxface - install any X-Face: in the header of the given mail message
-@@ -23,7 +23,7 @@
- #
- # Intended as an alternative to "faces -U" and to be used in a .forward file.
- # For example:
--# kinzler,"|/usr/local/faces/bin/addxface"
-+# kinzler,"|@localbase@/faces/bin/addxface"
- # Overwrites any existing face. User 'daemon' will need write permissions
- # in $faces/xface.
- #
diff --git a/mail/faces/patches/patch-ar b/mail/faces/patches/patch-ar
deleted file mode 100644
index a351d55426e..00000000000
--- a/mail/faces/patches/patch-ar
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ar,v 1.4 2001/11/30 16:29:29 jlam Exp $
-
---- scripts/facesall.orig Mon Nov 25 01:30:24 1991
-+++ scripts/facesall Sat Jul 8 14:36:06 2000
-@@ -20,7 +20,7 @@
- #$olddb = 1;
-
- $cols = 15; $rows = 13;
--$FACEDIR = '/usr/local/faces';
-+$FACEDIR = '@PREFIX@/share/faces';
-
- # facesall - show all available faces in the given faces bitmap directory
- # usage: facesall [ -a ] [ bitmap_directory ]
diff --git a/mail/faces/patches/patch-as b/mail/faces/patches/patch-as
deleted file mode 100644
index 10a7b0e1e6a..00000000000
--- a/mail/faces/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.4 2001/11/30 16:29:29 jlam Exp $
-
---- scripts/mkfacesindex.orig Tue Nov 19 05:05:58 1991
-+++ scripts/mkfacesindex Sat Jul 8 14:38:08 2000
-@@ -15,7 +15,7 @@
- # than version v1.6.0:
- #$olddb = 1;
-
--$FACEDIR = '/usr/local/faces';
-+$FACEDIR = '@PREFIX@/share/faces';
-
- # mkfacesindex - make a .index file at the root of a faces database that
- # facesall can use more speedily instead of tabulating the
diff --git a/mail/faces/patches/patch-at b/mail/faces/patches/patch-at
deleted file mode 100644
index 590c2ae148e..00000000000
--- a/mail/faces/patches/patch-at
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-at,v 1.6 2005/03/12 12:53:56 schwarz Exp $
-
---- x11.c.orig Mon Nov 18 23:00:50 1991
-+++ x11.c Fri Feb 2 20:01:06 2001
-@@ -19,8 +19,9 @@
- #include <stdio.h>
- #include <ctype.h>
--#if ( !defined(mips) && !defined(TOPIX) ) || defined(ultrix)
-+#include <sys/param.h>
-+#if ( !defined(mips) && !defined(TOPIX) ) || defined(ultrix) || (defined(BSD) && BSD >= 199306) || defined(__sgi)
- #include <sys/types.h>
- #include <sys/time.h>
--#include <sys/param.h>
-+#include <string.h>
- #else
- #ifdef SYSTYPE_BSD43
-@@ -31,13 +32,14 @@
- #include <bsd/sys/types.h>
- #include <bsd/sys/time.h>
--#include <sys/param.h>
- #else
- #include <sys/bsd_time.h>
- #endif /*TOPIX*/
- #endif /*SYSTYPE_BSD43*/
--#endif /*( !defined(mips) && !defined(TOPIX) ) || defined(ultrix)*/
-+#endif /*( !defined(mips) && !defined(TOPIX) ) || defined(ultrix) || (defined(BSD) && BSD >= 199306) */
- #include "faces.h"
- #include "extern.h"
-
-+#include <sys/param.h>
-+
- #ifdef HASPOLL
- #include <poll.h>
-@@ -59,5 +61,4 @@
- #define F_ICON 0 /* Icon index to frame array. */
- #define F_WINDOW 1 /* Window index to frame array. */
--#define FACES_BORDER_WIDTH 2
- #define FRAME_MASK (ButtonPressMask | ExposureMask | \
- ButtonMotionMask | KeyPressMask)
-@@ -365,9 +366,11 @@
- gc_mask = GCFont | GCForeground | GCBackground | GCGraphicsExposures ;
- gc_val.font = sfont->fid ;
-- gc_val.foreground = foregnd ;
-- gc_val.background = backgnd ;
-+ gc_val.foreground = BlackPixel(dpy, screen) ;
-+ gc_val.background = WhitePixel(dpy, screen) ;
- gc_val.graphics_exposures = False ;
- gc = XCreateGC(dpy, root, gc_mask, &gc_val) ;
-
-+ gc_val.foreground = foregnd ;
-+ gc_val.background = backgnd ;
- tilegc = XCreateGC(dpy, root, gc_mask, &gc_val) ;
- if (depth == 1) XSetFillStyle(dpy, tilegc, FillOpaqueStippled) ;
-@@ -460,5 +463,9 @@
- home = getenv("HOME") ;
- XrmInitialize() ;
-+#if (defined(BSD) && BSD >= 199306)
-+ STRCPY(name, "@x11prefix@/lib/X11/app-defaults/Faces") ;
-+#else
- STRCPY(name, "/usr/lib/X11/app-defaults/Faces") ;
-+#endif
-
- /* Get applications defaults file, if any. */
-@@ -577,5 +584,5 @@
-
- frame[F_WINDOW] = XCreateWindow(dpy, root, size.x, size.y,
-- size.width, size.height, FACES_BORDER_WIDTH,
-+ size.width, size.height, border_width,
- CopyFromParent, InputOutput, CopyFromParent,
- CWBackPixel | CWBorderPixel | CWEventMask, &winattrs) ;
-@@ -584,5 +591,5 @@
-
- frame[F_ICON] = XCreateWindow(dpy, root,
-- ix, iy, imagewidth, imageheight, FACES_BORDER_WIDTH,
-+ ix, iy, imagewidth, imageheight, border_width,
- CopyFromParent, InputOutput, CopyFromParent,
- CWBackPixel | CWBorderPixel | CWEventMask, &winattrs) ;
-@@ -857,4 +864,5 @@
- (unsigned int) textwidth+2, 13) ;
- XSetFunction(dpy, gc, GXxor) ;
-+ XSetForeground(dpy, gc, WhitePixel(dpy, screen));
- XDrawImageString(dpy, pr[(int) dtype], gc, x, y, str, len) ;
- XSetFunction(dpy, gc, GXcopy) ;
diff --git a/mail/faces/patches/patch-au b/mail/faces/patches/patch-au
deleted file mode 100644
index 0e6ae9cb45b..00000000000
--- a/mail/faces/patches/patch-au
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-au,v 1.3 2000/07/08 12:47:09 tron Exp $
-
---- y.tab.h.orig Sat Jul 8 14:25:27 2000
-+++ y.tab.h Sat Jul 8 14:25:27 2000
-@@ -0,0 +1,11 @@
-+#define EOL 257
-+#define ATOM 258
-+#define LIT_DOMAIN 259
-+#define QUOTED_STRING 260
-+typedef union {
-+ char yChar;
-+ char *yString;
-+ Dom *yDom;
-+ Addr *yAddr;
-+} YYSTYPE;
-+extern YYSTYPE yylval;
diff --git a/mail/faces/patches/patch-av b/mail/faces/patches/patch-av
deleted file mode 100644
index a5c5fad19d4..00000000000
--- a/mail/faces/patches/patch-av
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-av,v 1.4 2006/01/08 14:30:01 tron Exp $
-
---- compface/cmain.c.orig 1991-10-24 03:28:07.000000000 +0100
-+++ compface/cmain.c 2006-01-08 14:19:04.000000000 +0000
-@@ -33,12 +33,21 @@
-
- /* error handling definitions follow */
-
--extern int errno, sys_nerr;
-+#include <errno.h>
-+#include <stdio.h>
-+
-+#if !defined(__NetBSD__) && !defined(__INTERIX) && !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__APPLE__)
-+extern int sys_nerr;
- extern char *sys_errlist[];
-+#endif
-
- extern void exit P((int)) ;
-
-+#ifdef __INTERIX
-+#define ERR strerror(errno)
-+#else
- #define ERR ((errno < sys_nerr) ? sys_errlist[errno] : "")
-+#endif
- #define INITERR(s) {(void)strcpy(fbuf, cmdname); (void)strcat(fbuf, ": ");\
- (void)strcat(fbuf, (s));}
- #define ADDERR(s) (void)strcat(fbuf, (s));
diff --git a/mail/faces/patches/patch-aw b/mail/faces/patches/patch-aw
deleted file mode 100644
index 25f0a40c88b..00000000000
--- a/mail/faces/patches/patch-aw
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2001/02/03 01:53:03 dmcmahill Exp $
-
-add prototypes for 64-bit machines
-
---- address.y.orig Sun Jun 30 21:25:54 1991
-+++ address.y Fri Feb 2 18:03:04 2001
-@@ -2,4 +2,5 @@
- #include <stdio.h>
- #include <signal.h>
-+#include <string.h>
- #include "addr.h"
- #include "faces.h"
diff --git a/mail/faces/patches/patch-ax b/mail/faces/patches/patch-ax
deleted file mode 100644
index c7018de8c71..00000000000
--- a/mail/faces/patches/patch-ax
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ax,v 1.2 2002/08/25 19:23:05 jlam Exp $
-
---- filters/fs2ikon.orig Thu Oct 24 03:26:14 1991
-+++ filters/fs2ikon Sun Jul 7 16:18:17 2002
-@@ -26,14 +26,14 @@
- y=$2
- if [ $x -ge $y ]
- then
-- ppmscale -width 48 $file.pgm | ppmtopgm | pgmtopbm > $file.pbm
-+ pnmscale -width 48 $file.pgm | ppmtopgm | pgmtopbm > $file.pbm
- set `sed -n -e 2p -e 2q $file.pbm`
- yo=`expr '(' 48 - $2 ')' / 2`
- pbmmake 48 48 |
- pnmpaste $file.pbm 0 $yo |
- pbmtoicon
- else
-- ppmscale -height 48 $file.pgm | ppmtopgm | pgmtopbm > $file.pbm
-+ pnmscale -height 48 $file.pgm | ppmtopgm | pgmtopbm > $file.pbm
- set `sed -n -e 2p -e 2q $file.pbm`
- xo=`expr '(' 48 - $1 ')' / 2`
- pbmmake 48 48 |
diff --git a/mail/faces/patches/patch-ay b/mail/faces/patches/patch-ay
deleted file mode 100644
index d232ac59057..00000000000
--- a/mail/faces/patches/patch-ay
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ay,v 1.2 2002/08/25 19:23:05 jlam Exp $
-
---- filters/fs2xbm.orig Tue Nov 19 05:02:32 1991
-+++ filters/fs2xbm Sun Jul 7 16:19:16 2002
-@@ -35,14 +35,14 @@
-
- if test $x -ge $y
- then
-- ppmscale -width 48 $tmp1 | ppmtopgm | pgmtopbm > $tmp2
-+ pnmscale -width 48 $tmp1 | ppmtopgm | pgmtopbm > $tmp2
- set `sed -n -e 2p -e 2q $tmp2`
- yo=`expr '(' 48 - $2 ')' / 2`
- pbmmake 48 48 |
- pnmpaste $tmp2 0 $yo |
- pbmtoxbm
- else
-- ppmscale -height 48 $tmp1 | ppmtopgm | pgmtopbm > $tmp2
-+ pnmscale -height 48 $tmp1 | ppmtopgm | pgmtopbm > $tmp2
- set `sed -n -e 2p -e 2q $tmp2`
- xo=`expr '(' 48 - $1 ')' / 2`
- pbmmake 48 48 |
diff --git a/mail/faces/patches/patch-az b/mail/faces/patches/patch-az
deleted file mode 100644
index 5480f3cc13e..00000000000
--- a/mail/faces/patches/patch-az
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-az,v 1.2 2002/08/25 19:23:05 jlam Exp $
-
---- filters/xbmsize48.orig Tue Nov 19 05:02:32 1991
-+++ filters/xbmsize48 Sun Jul 7 16:19:23 2002
-@@ -43,7 +43,7 @@
- else dim=ysize
- fi
-
-- xbmtopbm < $tmp | ppmscale -$dim $size |
-+ xbmtopbm < $tmp | pnmscale -$dim $size |
- ppmtopgm | pgmtopbm | pbmtoxbm > $tmp2
- mv $tmp2 $tmp
- fi
diff --git a/mail/faces/patches/patch-ba b/mail/faces/patches/patch-ba
deleted file mode 100644
index 327d3ef505c..00000000000
--- a/mail/faces/patches/patch-ba
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2005/03/12 12:53:56 schwarz Exp $
-
---- rec.c.orig 2005-03-09 21:51:57.000000000 +0100
-+++ rec.c 2005-03-09 21:52:19.000000000 +0100
-@@ -20,6 +20,10 @@
- #else
- #include <strings.h>
- #endif /* SYSV32 || hpux */
-+#ifdef __sgi
-+/* for calloc(), malloc(), realloc() */
-+#include <stdlib.h>
-+#endif
- #include "faces.h"
- #include "extern.h"
-
diff --git a/mail/faces/patches/patch-bb b/mail/faces/patches/patch-bb
deleted file mode 100644
index 0ede0d8368a..00000000000
--- a/mail/faces/patches/patch-bb
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2005/03/12 12:53:56 schwarz Exp $
-
---- xview.c.orig 2005-03-09 21:53:05.000000000 +0100
-+++ xview.c 2005-03-09 21:53:26.000000000 +0100
-@@ -27,6 +27,11 @@
- #include <X11/Xlib.h>
- #include <X11/Xresource.h>
-
-+#ifdef __sgi
-+/* for calloc(), malloc(), realloc() */
-+#include <stdlib.h>
-+#endif
-+
- #define DEF_FONT "fixed"
- #define F_ICON 0 /* Icon index to frame array. */
- #define F_WINDOW 1 /* Window index to frame array. */
diff --git a/mail/faces/patches/patch-bc b/mail/faces/patches/patch-bc
deleted file mode 100644
index c67632ac882..00000000000
--- a/mail/faces/patches/patch-bc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2005/03/12 12:53:56 schwarz Exp $
-
---- xface/xface.c.orig 2005-03-09 21:54:30.000000000 +0100
-+++ xface/xface.c 2005-03-09 21:54:55.000000000 +0100
-@@ -20,6 +20,11 @@
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-
-+#ifdef __sgi
-+/* for calloc(), malloc(), realloc() */
-+#include <stdlib.h>
-+#endif
-+
- #include "xface.h"
-
- static char empty_bits[(WIDTH/8) * HEIGHT];
diff --git a/mail/fastforward/DESCR b/mail/fastforward/DESCR
deleted file mode 100644
index 06b25cd7e8b..00000000000
--- a/mail/fastforward/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-fastforward handles qmail forwarding according to a cdb database. It can create
-forwarding databases from a sendmail-style /etc/aliases or from user-oriented
-virtual-domain tables.
-
-fastforward supports external mailing lists, stored in a binary format for fast
-access. It has a tool to convert sendmail-style include files into binary
-lists.
diff --git a/mail/fastforward/MESSAGE b/mail/fastforward/MESSAGE
deleted file mode 100644
index e32512f8e34..00000000000
--- a/mail/fastforward/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2004/07/21 23:31:24 schmonz Exp $
-
-Be sure to read the documentation in
-${PREFIX}/share/doc/qmail/fastforward/ALIASES for setting up and
-using fastforward.
-
-===========================================================================
diff --git a/mail/fastforward/Makefile b/mail/fastforward/Makefile
deleted file mode 100644
index 55f15893eb4..00000000000
--- a/mail/fastforward/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/01/08 18:27:11 joerg Exp $
-#
-
-DISTNAME= fastforward-0.51
-PKGREVISION= 2
-CATEGORIES= mail
-MASTER_SITES= http://cr.yp.to/software/
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://cr.yp.to/fastforward.html
-COMMENT= Sendmail-style /etc/aliases support for qmail
-
-DEPENDS+= qmail>=1.03nb7:../../mail/qmail
-
-CONFLICTS+= postfix-[0-9]* sendmail-[0-9]*
-
-USE_TOOLS+= nroff
-
-DJB_BUILD_TARGETS= install instcheck
-
-DJB_RESTRICTED= YES
-
-SUBST_FILES.djbware+= cdb_seek.c
-
-.include "../../mk/djbware.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/fastforward/PLIST b/mail/fastforward/PLIST
deleted file mode 100644
index 234e22d800d..00000000000
--- a/mail/fastforward/PLIST
+++ /dev/null
@@ -1,24 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/07/21 23:31:24 schmonz Exp $
-share/doc/qmail/fastforward/ALIASES
-bin/fastforward
-bin/printforward
-bin/setforward
-bin/newaliases
-bin/printmaillist
-bin/setmaillist
-bin/newinclude
-man/man1/fastforward.1
-man/man1/printforward.1
-man/man1/setforward.1
-man/man1/newaliases.1
-man/man1/printmaillist.1
-man/man1/setmaillist.1
-man/man1/newinclude.1
-man/cat1/fastforward.0
-man/cat1/printforward.0
-man/cat1/setforward.0
-man/cat1/newaliases.0
-man/cat1/printmaillist.0
-man/cat1/setmaillist.0
-man/cat1/newinclude.0
-@dirrm share/doc/qmail/fastforward
diff --git a/mail/fastforward/distinfo b/mail/fastforward/distinfo
deleted file mode 100644
index fb7386c3a31..00000000000
--- a/mail/fastforward/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:22 agc Exp $
-
-SHA1 (fastforward-0.51.tar.gz) = 5a20d2a60d2de791d9a7fbbe6ddb1fdca567053e
-RMD160 (fastforward-0.51.tar.gz) = 84518647b43f0d32dd4fde198dd4712896e8ed25
-Size (fastforward-0.51.tar.gz) = 40659 bytes
diff --git a/mail/fetchmail/DESCR b/mail/fetchmail/DESCR
deleted file mode 100644
index 1d005033ac1..00000000000
--- a/mail/fetchmail/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Fetchmail is a full-featured IMAP/POP2/POP3/APOP/KPOP client with easy
-configuration, daemon mode, forwarding via SMTP or local MDA, superior
-reply handling. Not a mail user agent, rather a pipe-fitting that
-seamlessly forwards fetched mail to your local delivery system. Your
-one-stop solution for intermittent email connections. This is the
-lineal descendant of and replacement for the old popclient program.
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
deleted file mode 100644
index 2edf94ee948..00000000000
--- a/mail/fetchmail/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-# $NetBSD: Makefile,v 1.161 2007/01/17 19:18:01 tron Exp $
-
-DISTNAME= fetchmail-6.3.6
-CATEGORIES= mail
-MASTER_SITES= http://download.berlios.de/fetchmail/ \
- http://download2.berlios.de/fetchmail/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= frueauf@NetBSD.org
-HOMEPAGE= http://fetchmail.berlios.de/
-COMMENT= Batch mail retrieval/forwarding utility for pop2, pop3, apop, imap
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --without-hesiod
-CONFIGURE_ENV+= PYTHON=:
-LDFLAGS+= ${CFLAGS}
-USE_TOOLS+= msgfmt tbl
-
-.if ${OPSYS} == "Darwin"
-LDFLAGS+= -lresolv
-CFLAGS.Darwin+= -DBIND_8_COMPAT -DHAVE_RESOLV_H
-.endif
-
-.include "options.mk"
-
-DOCDIR= ${PREFIX}/share/doc/fetchmail
-RCD_SCRIPTS= fetchmail
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-
-post-extract:
- @${RM} -f ${WRKSRC}/intl/libintl.h
-.if ${OPSYS} == "NetBSD"
- @${RM} -f ${WRKSRC}/md5.h
-.endif
-
-.if defined(REPLACE_KERBEROS_LIBS)
-pre-configure:
- cd ${WRKSRC} && \
- for F in configure.in configure; do \
- ${SED} -e "s/-lkrb -ldes/-lkrb -ldes -lcom_err -lroken/" \
- $$F > $$F.mod; \
- ${MV} -f $$F.mod $$F; \
- done
- ${CHMOD} a+x ${WRKSRC}/configure
-.endif
-
-post-build:
- for file in ${WRKSRC}/fetchmail.man; do \
- ${MV} -f $$file $$file.tbl; \
- ${TBL} $$file.tbl > $$file; \
- done
-
-post-install:
- ${INSTALL_DATA_DIR} ${DOCDIR}
- cd ${WRKSRC}; for file in \
- FAQ NOTES FEATURES README COPYING \
- fetchmail-FAQ.html fetchmail-features.html \
- design-notes.html; \
- do \
- ${INSTALL_DATA} $$file ${DOCDIR}; \
- done
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/fetchmail/PLIST b/mail/fetchmail/PLIST
deleted file mode 100644
index 31ad80b396e..00000000000
--- a/mail/fetchmail/PLIST
+++ /dev/null
@@ -1,24 +0,0 @@
-@comment $NetBSD: PLIST,v 1.11 2007/01/17 14:29:11 tron Exp $
-bin/fetchmail
-man/man1/fetchmail.1
-share/doc/fetchmail/README
-share/doc/fetchmail/COPYING
-share/doc/fetchmail/FAQ
-share/doc/fetchmail/NOTES
-share/doc/fetchmail/FEATURES
-share/doc/fetchmail/fetchmail-FAQ.html
-share/doc/fetchmail/design-notes.html
-share/doc/fetchmail/fetchmail-features.html
-share/locale/ca/LC_MESSAGES/fetchmail.mo
-share/locale/cs/LC_MESSAGES/fetchmail.mo
-share/locale/de/LC_MESSAGES/fetchmail.mo
-share/locale/en_GB/LC_MESSAGES/fetchmail.mo
-share/locale/es/LC_MESSAGES/fetchmail.mo
-share/locale/fr/LC_MESSAGES/fetchmail.mo
-share/locale/ja/LC_MESSAGES/fetchmail.mo
-share/locale/pl/LC_MESSAGES/fetchmail.mo
-share/locale/ru/LC_MESSAGES/fetchmail.mo
-share/locale/sq/LC_MESSAGES/fetchmail.mo
-share/locale/vi/LC_MESSAGES/fetchmail.mo
-share/examples/rc.d/fetchmail
-@dirrm share/doc/fetchmail
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
deleted file mode 100644
index 311baf52575..00000000000
--- a/mail/fetchmail/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.36 2007/01/17 19:18:01 tron Exp $
-
-SHA1 (fetchmail-6.3.6.tar.bz2) = 4c362d8d86c0d4efb191d0faae0b48b54b0887ba
-RMD160 (fetchmail-6.3.6.tar.bz2) = 455c1413cc5090f834e82be4876b572d4bef35cc
-Size (fetchmail-6.3.6.tar.bz2) = 1307730 bytes
diff --git a/mail/fetchmail/files/fetchmail.sh b/mail/fetchmail/files/fetchmail.sh
deleted file mode 100755
index 09380f9fc4b..00000000000
--- a/mail/fetchmail/files/fetchmail.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: fetchmail.sh,v 1.2 2004/08/01 04:54:56 jlam Exp $
-#
-# PROVIDE: fetchmail
-# REQUIRE: mail
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="fetchmail"
-rcvar=$name
-command="@PREFIX@/bin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="@PKG_SYSCONFDIR@/${name}.conf"
-extra_commands="reload"
-command_args="-f - < @PKG_SYSCONFDIR@/${name}.conf"
-
-if [ -f /etc/rc.subr ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- @ECHO@ -n ' ${name}'
- ${command} ${fetchmail_flags} ${command_args}
-fi
diff --git a/mail/fetchmail/options.mk b/mail/fetchmail/options.mk
deleted file mode 100644
index c304cd60949..00000000000
--- a/mail/fetchmail/options.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-# $NetBSD: options.mk,v 1.14 2005/12/05 23:55:10 rillig Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.fetchmail
-PKG_SUPPORTED_OPTIONS= inet6 kerberos4 kerberos gssapi ssl
-PKG_OPTIONS_OPTIONAL_GROUPS= socks
-PKG_OPTIONS_GROUP.socks= socks4 socks5
-
-PKG_SUGGESTED_OPTIONS= ssl
-
-.include "../../mk/bsd.options.mk"
-
-###
-### IPv6 support.
-###
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-inet6
-.endif
-
-###
-### Authentication via GSSAPI (currently only over Kerberos V) support.
-###
-.if !empty(PKG_OPTIONS:Mgssapi)
-CONFIGURE_ARGS+= --with-gssapi=${KRB5BASE:Q}
-.else
-CONFIGURE_ARGS+= --with-gssapi=no
-.endif
-
-###
-### KPOP (POP3 + Kerberos IV) support.
-###
-.if !empty(PKG_OPTIONS:Mkerberos4)
-PKG_USE_KERBEROS= yes
-CONFIGURE_ARGS+= --with-kerberos=yes
-. if empty(MACHINE_PLATFORM:MNetBSD-1.[0-4]*-i386)
-REPLACE_KERBEROS_LIBS= yes
-. endif
-.else
-CONFIGURE_ARGS+= --with-kerberos=no
-.endif
-
-###
-### Kerberos V support.
-###
-.if !empty(PKG_OPTIONS:Mkerberos) || !empty(PKG_OPTIONS:Mgssapi)
-. include "../../mk/krb5.buildlink3.mk"
-PKG_USE_KERBEROS= yes
-CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE:Q}
-.else
-CONFIGURE_ARGS+= --with-kerberos5=no
-.endif
-
-###
-### Support POP3 and IMAP over SSL.
-###
-.if !empty(PKG_OPTIONS:Mssl)
-. include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
-.else
-CONFIGURE_ARGS+= --without-ssl
-.endif
-
-###
-### Include SOCKS firewall support
-###
-.if !empty(PKG_OPTIONS:Msocks4)
-.include "../../net/socks4/buildlink3.mk"
-CONFIGURE_ARGS+= --with-socks=${BUILDLINK_PREFIX.socks4}
-.endif
-.if !empty(PKG_OPTIONS:Msocks5)
-.include "../../net/socks5/buildlink3.mk"
-CONFIGURE_ARGS+= --with-socks5=${BUILDLINK_PREFIX.socks5}
-.endif
diff --git a/mail/fetchmailconf/DESCR b/mail/fetchmailconf/DESCR
deleted file mode 100644
index 2ec571e6d94..00000000000
--- a/mail/fetchmailconf/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Fetchmailconf provides an easy-to-use GUI to "fetchmail".
diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile
deleted file mode 100644
index 4e36899f0c5..00000000000
--- a/mail/fetchmailconf/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.71 2007/01/17 17:36:51 salo Exp $
-
-DISTNAME= fetchmail-6.3.6
-PKGNAME= ${DISTNAME:S/fetchmail/fetchmailconf/}
-CATEGORIES= mail
-MASTER_SITES= http://download.berlios.de/fetchmail/ \
- http://download2.berlios.de/fetchmail/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://fetchmail.berlios.de/
-COMMENT= Configuration tool for fetchmail
-
-DEPENDS+= ${DISTNAME}{,nb*}:../../mail/fetchmail
-
-NO_BUILD= YES
-
-DISTINFO_FILE= ${.CURDIR}/../../mail/fetchmail/distinfo
-PATCHDIR= ${.CURDIR}/../../mail/fetchmail/patches
-
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --without-hesiod
-LDFLAGS+= ${CFLAGS}
-USE_TOOLS+= msgfmt tbl
-USE_LANGUAGES+= c
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-INSTALL_TARGET= install-pythonPYTHON
-
-PLIST_SUBST+= PYSITELIB=${PYSITELIB}
-PYTHON_PATCH_SCRIPTS= fetchmailconf.py
-
-post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${PREFIX}/bin/fetchmailconf
- ${LN} -s fetchmail.1 ${PREFIX}/${PKGMANDIR}/man1/fetchmailconf.1
-
-.include "../../lang/python/application.mk"
-.include "../../x11/py-Tk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/fetchmailconf/PLIST b/mail/fetchmailconf/PLIST
deleted file mode 100644
index cd88ce35f87..00000000000
--- a/mail/fetchmailconf/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2007/01/17 14:29:12 tron Exp $
-bin/fetchmailconf
-${PYSITELIB}/fetchmailconf.py
-${PYSITELIB}/fetchmailconf.pyc
-${PYSITELIB}/fetchmailconf.pyo
-man/man1/fetchmailconf.1
diff --git a/mail/fetchyahoo/DESCR b/mail/fetchyahoo/DESCR
deleted file mode 100644
index fa53ad745f4..00000000000
--- a/mail/fetchyahoo/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-FetchYahoo is a Perl script that downloads mail from a Yahoo! account
-to a local mail spool. It is meant to replace fetchmail for people
-using Yahoo! mail since Yahoo!'s POP service no longer free. It
-downloads messages to a local mail spool, including all parts and
-attachments. It then deletes messages unless requested not to. It can
-also optionally forward messages to a specified e-mail address and
-repeat with a given interval.
diff --git a/mail/fetchyahoo/MESSAGE b/mail/fetchyahoo/MESSAGE
deleted file mode 100644
index f08520093f5..00000000000
--- a/mail/fetchyahoo/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2007/01/13 15:38:52 obache Exp $
-
- To use fetchyahoo, copy
- ${PREFIX}/share/examples/fetchyahoo/fetchyahoorc to
- ~/.fetchyahoorc and edit the config file or just run
- fetchyahoo from the commandline.
-
-===========================================================================
diff --git a/mail/fetchyahoo/Makefile b/mail/fetchyahoo/Makefile
deleted file mode 100644
index bd8aa3358d6..00000000000
--- a/mail/fetchyahoo/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/01/13 15:38:52 obache Exp $
-#
-
-DISTNAME= fetchyahoo-2.10.6
-CATEGORIES= mail
-MASTER_SITES= http://fetchyahoo.sourceforge.net/
-#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fetchyahoo/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://fetchyahoo.sourceforge.net/
-#HOMEPAGE= http://fetchyahoo.twizzler.org
-COMMENT= Download mails from Yahoo webmail into mbox
-
-DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
-DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
-DEPENDS+= p5-MIME-tools-[0-9]*:../../mail/p5-MIME-tools
-DEPENDS+= p5-Net-[0-9]*:../../net/p5-Net
-DEPENDS+= p5-Crypt-SSLeay-[0-9]*:../../security/p5-Crypt-SSLeay
-DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI
-DEPENDS+= p5-MailTools-[0-9]*:../../mail/p5-MailTools
-DEPENDS+= p5-IO-stringy-[0-9]*:../../devel/p5-IO-stringy
-DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
-DEPENDS+= p5-Term-ReadKey-[0-9]*:../../devel/p5-Term-ReadKey
-
-USE_TOOLS+= perl:run
-REPLACE_PERL= fetchyahoo
-
-NO_BUILD= yes
-
-EGDIR= ${PREFIX}/share/examples/fetchyahoo
-DOCDIR= ${PREFIX}/share/doc/fetchyahoo
-
-CONF_FILES= ${EGDIR}/fetchyahoorc ${PKG_SYSCONFDIR}/fetchyahoorc
-
-SUBST_CLASSES+= sa2
-SUBST_STAGE.sa2= pre-configure
-SUBST_FILES.sa2= fetchyahoo fetchyahoo.1 INSTALL
-SUBST_SED.sa2= -e s!/etc/fetchyahoorc!${PKG_SYSCONFDIR}/fetchyahoorc!g
-SUBST_SED.sa2+= -e s!/usr/share/doc/fetchyahoo!${DOCDIR}!g
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/fetchyahoo ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/fetchyahoo.1 ${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA_DIR} ${EGDIR}
-.for i in COPYING ChangeLog Credits INSTALL TODO index.html
- ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/fetchyahoo
-.endfor
- ${INSTALL_DATA} ${WRKSRC}/fetchyahoorc ${PREFIX}/share/examples/fetchyahoo
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/fetchyahoo/PLIST b/mail/fetchyahoo/PLIST
deleted file mode 100644
index 6511efd9d10..00000000000
--- a/mail/fetchyahoo/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/13 15:38:52 obache Exp $
-bin/fetchyahoo
-man/man1/fetchyahoo.1
-share/doc/fetchyahoo/COPYING
-share/doc/fetchyahoo/ChangeLog
-share/doc/fetchyahoo/Credits
-share/doc/fetchyahoo/INSTALL
-share/doc/fetchyahoo/TODO
-share/doc/fetchyahoo/index.html
-share/examples/fetchyahoo/fetchyahoorc
-@dirrm share/examples/fetchyahoo
-@dirrm share/doc/fetchyahoo
diff --git a/mail/fetchyahoo/distinfo b/mail/fetchyahoo/distinfo
deleted file mode 100644
index e578ef1fd3b..00000000000
--- a/mail/fetchyahoo/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/01/13 15:38:52 obache Exp $
-
-SHA1 (fetchyahoo-2.10.6.tar.gz) = 460c4806abb455fbc058fdeff76e2324a7ba983c
-RMD160 (fetchyahoo-2.10.6.tar.gz) = 51a11fcff0273870d1eedb4167b9b3480e6dd9f0
-Size (fetchyahoo-2.10.6.tar.gz) = 43670 bytes
diff --git a/mail/fix-mime-charset/DESCR b/mail/fix-mime-charset/DESCR
deleted file mode 100644
index 74e4959cb26..00000000000
--- a/mail/fix-mime-charset/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-In non-English mailing lists (particularly in Russian) there is a
-big problem with messages, where charset parameter of Content-Type
-header is set incorrectly. Sometimes software is buggy, sometimes
-people cannot set up their software properly, sometimes web-based
-email clients do not implement charsets. While reading such a
-mail, one should manually switch encoding in MUA back and forth.
-Incorrectly encoded or plain 8-bit Subject field is another big
-problem. Such fields often get corrupted while passing e-mail
-gateways.
-
-This program can be used to solve this problem while used as mail
-filter (in MTA, procmail, or a similar program).
diff --git a/mail/fix-mime-charset/Makefile b/mail/fix-mime-charset/Makefile
deleted file mode 100644
index afcb71b8ff5..00000000000
--- a/mail/fix-mime-charset/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2007/03/18 18:56:47 wiz Exp $
-#
-
-DISTNAME= fix-mime-charset-0.5.3
-PKGREVISION= 1
-CATEGORIES= mail converters
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fix-mime-chr/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://fix-mime-chr.sourceforge.net/
-COMMENT= Correct MIME charset type in mail headers
-
-USE_LANGUAGES= c c++
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= perl pkg-config
-GNU_CONFIGURE= yes
-
-.include "../../textproc/enca/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/fix-mime-charset/PLIST b/mail/fix-mime-charset/PLIST
deleted file mode 100644
index 2569d28aba4..00000000000
--- a/mail/fix-mime-charset/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/26 10:21:51 wiz Exp $
-bin/fix-mime-charset
-man/man1/fix-mime-charset.1
diff --git a/mail/fix-mime-charset/distinfo b/mail/fix-mime-charset/distinfo
deleted file mode 100644
index 59576f8c944..00000000000
--- a/mail/fix-mime-charset/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:59:22 agc Exp $
-
-SHA1 (fix-mime-charset-0.5.3.tar.gz) = e331d21ba71460041958b8d4eeb61757e9f52182
-RMD160 (fix-mime-charset-0.5.3.tar.gz) = 7a456f8e40c017b9f3f06db79c7cfcd2d2d15149
-Size (fix-mime-charset-0.5.3.tar.gz) = 115465 bytes
diff --git a/mail/fromto/DESCR b/mail/fromto/DESCR
deleted file mode 100644
index ee3ad6aeb9b..00000000000
--- a/mail/fromto/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Fromto prints the sendmail logfile information in human readable format.
diff --git a/mail/fromto/Makefile b/mail/fromto/Makefile
deleted file mode 100644
index 6d79af74cbc..00000000000
--- a/mail/fromto/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2006/04/22 09:22:11 rillig Exp $
-#
-
-DISTNAME= fromto-1.5
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/
-EXTRACT_SUFX= #empty
-
-MAINTAINER= bad@NetBSD.org
-COMMENT= Sendmail logfile viewer
-
-RESTRICTED= Redistribution allowed for non-commercial purposes only
-
-WRKSRC= ${WRKDIR}
-USE_TOOLS+= perl:run
-
-INSTALLATION_DIRS= bin
-
-do-extract:
- ${MKDIR} ${WRKSRC}
- ${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}/fromto.in
-
-do-build:
- (cd ${WRKSRC} ; ${SED} -e "1s,/usr/local,${PREFIX}," fromto.in >fromto)
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/fromto ${PREFIX}/bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/fromto/PLIST b/mail/fromto/PLIST
deleted file mode 100644
index a2885ca20ed..00000000000
--- a/mail/fromto/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:09 zuntum Exp $
-bin/fromto
diff --git a/mail/fromto/distinfo b/mail/fromto/distinfo
deleted file mode 100644
index 3993ca234aa..00000000000
--- a/mail/fromto/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:22 agc Exp $
-
-SHA1 (fromto-1.5) = 45deaf7f456b8cffbc9f45aaf7990d52c887a36c
-RMD160 (fromto-1.5) = e51767a47b423d2b092ebc6d7bbab12fb34a31af
-Size (fromto-1.5) = 10860 bytes
diff --git a/mail/getmail/DESCR b/mail/getmail/DESCR
deleted file mode 100644
index 44aebadb54a..00000000000
--- a/mail/getmail/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-getmail is a mail retriever designed to allow you to get your mail
-from one or more mail accounts on various mail servers to your
-local machine for reading with a minimum of fuss. getmail is designed
-to be secure, flexible, reliable, and easy-to-use. getmail is
-designed to replace other mail retrievers such as fetchmail.
diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile
deleted file mode 100644
index 24f7299f849..00000000000
--- a/mail/getmail/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.71 2007/03/18 21:37:00 schmonz Exp $
-
-DISTNAME= getmail-4.7.3
-CATEGORIES= mail
-MASTER_SITES= ${HOMEPAGE}old-versions/
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://pyropus.ca/software/getmail/
-COMMENT= Secure, flexible, reliable, easy-to-use fetchmail replacement
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-PYTHON_VERSIONS_ACCEPTED?= 24 23
-PYTHON_PATCH_SCRIPTS= *.py getmailcore/*.py
-PYDISTUTILSPKG= yes
-
-.include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/getmail/PLIST b/mail/getmail/PLIST
deleted file mode 100644
index ea03fa32604..00000000000
--- a/mail/getmail/PLIST
+++ /dev/null
@@ -1,63 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2005/11/21 05:23:43 schmonz Exp $
-bin/getmail
-bin/getmail_fetch
-bin/getmail_maildir
-bin/getmail_mbox
-man/man1/getmail.1
-man/man1/getmail_fetch.1
-man/man1/getmail_maildir.1
-man/man1/getmail_mbox.1
-share/doc/getmail/BUGS
-share/doc/getmail/CHANGELOG
-share/doc/getmail/COPYING
-share/doc/getmail/README
-share/doc/getmail/THANKS
-share/doc/getmail/TODO
-share/doc/getmail/configuration.html
-share/doc/getmail/configuration.txt
-share/doc/getmail/documentation.html
-share/doc/getmail/documentation.txt
-share/doc/getmail/faq.html
-share/doc/getmail/faq.txt
-share/doc/getmail/getmaildocs.css
-share/doc/getmail/getmailrc-examples
-share/doc/getmail/troubleshooting.html
-share/doc/getmail/troubleshooting.txt
-${PYSITELIB}/getmailcore/__init__.py
-${PYSITELIB}/getmailcore/__init__.pyc
-${PYSITELIB}/getmailcore/__init__.pyo
-${PYSITELIB}/getmailcore/_pop3ssl.py
-${PYSITELIB}/getmailcore/_pop3ssl.pyc
-${PYSITELIB}/getmailcore/_pop3ssl.pyo
-${PYSITELIB}/getmailcore/_retrieverbases.py
-${PYSITELIB}/getmailcore/_retrieverbases.pyc
-${PYSITELIB}/getmailcore/_retrieverbases.pyo
-${PYSITELIB}/getmailcore/baseclasses.py
-${PYSITELIB}/getmailcore/baseclasses.pyc
-${PYSITELIB}/getmailcore/baseclasses.pyo
-${PYSITELIB}/getmailcore/constants.py
-${PYSITELIB}/getmailcore/constants.pyc
-${PYSITELIB}/getmailcore/constants.pyo
-${PYSITELIB}/getmailcore/destinations.py
-${PYSITELIB}/getmailcore/destinations.pyc
-${PYSITELIB}/getmailcore/destinations.pyo
-${PYSITELIB}/getmailcore/exceptions.py
-${PYSITELIB}/getmailcore/exceptions.pyc
-${PYSITELIB}/getmailcore/exceptions.pyo
-${PYSITELIB}/getmailcore/filters.py
-${PYSITELIB}/getmailcore/filters.pyc
-${PYSITELIB}/getmailcore/filters.pyo
-${PYSITELIB}/getmailcore/logging.py
-${PYSITELIB}/getmailcore/logging.pyc
-${PYSITELIB}/getmailcore/logging.pyo
-${PYSITELIB}/getmailcore/message.py
-${PYSITELIB}/getmailcore/message.pyc
-${PYSITELIB}/getmailcore/message.pyo
-${PYSITELIB}/getmailcore/retrievers.py
-${PYSITELIB}/getmailcore/retrievers.pyc
-${PYSITELIB}/getmailcore/retrievers.pyo
-${PYSITELIB}/getmailcore/utilities.py
-${PYSITELIB}/getmailcore/utilities.pyc
-${PYSITELIB}/getmailcore/utilities.pyo
-@dirrm share/doc/getmail
-@dirrm ${PYSITELIB}/getmailcore
diff --git a/mail/getmail/distinfo b/mail/getmail/distinfo
deleted file mode 100644
index 3a9c8aea2b7..00000000000
--- a/mail/getmail/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.60 2007/03/18 21:37:01 schmonz Exp $
-
-SHA1 (getmail-4.7.3.tar.gz) = f4ad7c4bcc9ba6d3b2207e997ec96be47b52a6c7
-RMD160 (getmail-4.7.3.tar.gz) = 83def5c02eeb0fdeeeee40044943f857ab18defd
-Size (getmail-4.7.3.tar.gz) = 146806 bytes
-SHA1 (patch-aa) = 8298be4812f193b45901f5c9ed23d86080be103b
diff --git a/mail/getmail/patches/patch-aa b/mail/getmail/patches/patch-aa
deleted file mode 100644
index e81515d5826..00000000000
--- a/mail/getmail/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2005/05/01 17:29:13 schmonz Exp $
-
---- setup.py.orig 2005-03-14 14:17:17.000000000 -0500
-+++ setup.py
-@@ -39,12 +39,11 @@ GETMAILDOCDIR = os.path.join(
- datadir or prefix,
- 'share',
- 'doc',
-- 'getmail-%s' % __version__
-+ 'getmail'
- )
-
- GETMAILMANDIR = os.path.join(
- datadir or prefix,
-- 'share',
- 'man',
- 'man1'
- )
diff --git a/mail/gld/DESCR b/mail/gld/DESCR
deleted file mode 100644
index 0f3dfa4102e..00000000000
--- a/mail/gld/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Gld is a standalone greylisting daemon for Postfix. It listens on a TCP port
-and uses MySQL or PostgreSQL for storing its data.
-
-The server supports whitelists based on sender, sender_domain and client_ip.
-It also supports light greylisting and DNS whitelists.
diff --git a/mail/gld/MESSAGE.mysql b/mail/gld/MESSAGE.mysql
deleted file mode 100644
index 7692e02d80b..00000000000
--- a/mail/gld/MESSAGE.mysql
+++ /dev/null
@@ -1,22 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.mysql,v 1.1 2006/03/02 20:54:08 wiz Exp $
-
-To configure gld, the following steps should be completed:
-
- $ mysql -e "create database gld"
- $ mysql -e "grant all on gld.* to gld@localhost identified by 'PASSWORD'"
- $ mysql gld < ${PREFIX}/share/gld/tables.mysql
-
-Modify "PASSWORD" with your desired password.
-
-Now edit your postfix's main.cf configuration file, and add the following
-line:
-
- smtpd_recipient_restrictions = permit_mynetworks,
- reject_unauth_destination,
- check_policy_service inet:127.0.0.1:2525
-
-Start gld via ${RCD_SCRIPTS_DIR}/gld start
-
-It should be running fine now; good luck!
-===========================================================================
diff --git a/mail/gld/Makefile b/mail/gld/Makefile
deleted file mode 100644
index 836530e4151..00000000000
--- a/mail/gld/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:41 wiz Exp $
-#
-
-DISTNAME= gld-1.6
-PKGREVISION= 2
-CATEGORIES= mail
-MASTER_SITES= http://www.gasmi.net/down/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.gasmi.net/
-COMMENT= Standalone greylisting server for Postfix
-
-GNU_CONFIGURE= yes
-
-LDFLAGS.SunOS+= -lsocket -lnsl -lresolv
-
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES_PERMS= ${EGDIR}/gld.conf ${PKG_SYSCONFDIR}/gld.conf \
- ${BINOWN} ${GLD_GROUP} 0640
-
-RCD_SCRIPTS= gld
-GLD_USER?= gld
-GLD_GROUP?= gld
-PKG_GROUPS= ${GLD_GROUP}
-PKG_USERS= ${GLD_USER}:${GLD_GROUP}
-PKG_GECOS.${GLD_USER}= Greylisting Daemon user
-BUILD_DEFS+= GLD_USER GLD_GROUP
-
-SUBST_CLASSES+= gld users
-SUBST_STAGE.gld= post-patch
-SUBST_FILES.gld= gld.h
-SUBST_SED.gld= -e "s,/etc,${PKG_SYSCONFDIR},"
-SUBST_MESSAGE.gld= Fixing harcoded paths.
-SUBST_STAGE.users= post-patch
-SUBST_FILES.users= gld.conf
-SUBST_SED.users+= -e "s|^USER=nobody|USER=${GLD_USER}|"
-SUBST_SED.users+= -e "s|^GROUP=nobody|GROUP=${GLD_GROUP}|"
-SUBST_MESSAGE.users= Adjusting user/group in configuration file.
-
-.include "options.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/gld/PLIST b/mail/gld/PLIST
deleted file mode 100644
index 5d8a3a42119..00000000000
--- a/mail/gld/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/02 20:34:00 reed Exp $
-bin/gld
-share/doc/gld/LICENCE
-share/doc/gld/README
-share/examples/gld/gld.conf
-share/examples/rc.d/gld
-share/gld/table-whitelist.sql
-share/gld/tables.mysql
-share/gld/tables.pgsql
-@dirrm share/gld
-@dirrm share/examples/gld
-@dirrm share/doc/gld
diff --git a/mail/gld/distinfo b/mail/gld/distinfo
deleted file mode 100644
index aa9ce7a7d97..00000000000
--- a/mail/gld/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.13 2006/07/10 20:32:59 sketch Exp $
-
-SHA1 (gld-1.6.tgz) = 09a87119b376e370c63444e2bcd1111288b78267
-RMD160 (gld-1.6.tgz) = 72ff4363f3813f421e64e7644142cf227a43885d
-Size (gld-1.6.tgz) = 40333 bytes
-SHA1 (patch-aa) = 2dcd261ff37dc6ab8343060ad711d98427d10d7f
-SHA1 (patch-ab) = 9622bd744acd326a679e9c25007bffff9241dd2e
-SHA1 (patch-ac) = 876f896412a48d18c0ca314af59f82b4c9d915e2
-SHA1 (patch-ad) = 7d810a935677022953d01b7a146881d8cf86162b
-SHA1 (patch-ae) = e610e20acee890ae9a53eb84382fb1d741736bb3
-SHA1 (patch-af) = 9d5a06fa399963937fc8a0c94a80ac85528f872d
-SHA1 (patch-ag) = ef1b5acca6ba4cfc75ffd553624693b83b4f73ab
diff --git a/mail/gld/files/gld.sh b/mail/gld/files/gld.sh
deleted file mode 100644
index 852b78002c2..00000000000
--- a/mail/gld/files/gld.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: gld.sh,v 1.5 2005/01/19 15:48:41 xtraeme Exp $
-#
-
-# PROVIDE: gld
-# BEFORE: mail
-# REQUIRE: DAEMON LOGIN mysqld
-
-. /etc/rc.subr
-
-name="gld"
-rcvar=$name
-command="@PREFIX@/bin/${name}"
-required_files="@PKG_SYSCONFDIR@/$name.conf"
-pidfile="@VARBASE@/run/${name}.pid"
-extra_commands="gld_waitmysql_seconds"
-
-: ${gld_waitmysql_seconds:=5}
-start_precmd="waitmysql $gld_waitmysql_seconds"
-
-if [ "$1" != "stop" -o "$1" != "status" ]; then
- echo $(check_process $command) > $pidfile
-fi
-
-waitmysql()
-{
- _sec=$1
- echo "$name: waiting for MySQL ${_sec} seconds..."
- sleep ${_sec}
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/gld/options.mk b/mail/gld/options.mk
deleted file mode 100644
index 90bbcd07a43..00000000000
--- a/mail/gld/options.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: options.mk,v 1.7 2007/01/02 11:47:40 ghen Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.gld
-PKG_OPTIONS_REQUIRED_GROUPS= database
-PKG_OPTIONS_GROUP.database= mysql pgsql
-PKG_SUGGESTED_OPTIONS= mysql
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mmysql)
-. include "../../mk/mysql.buildlink3.mk"
-CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client}
-LIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib -lmysqlclient
-MESSAGE_SRC+= MESSAGE.mysql
-.endif
-
-.if !empty(PKG_OPTIONS:Mpgsql)
-. include "../../mk/pgsql.buildlink3.mk"
-CONFIGURE_ARGS+= --with-pgsql=${BUILDLINK_PREFIX.postgresql-libs}
-LIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib -lpq
-# Replace rc.d dependency by pgsql
-SUBST_CLASSES+= pgsql
-SUBST_STAGE.pgsql= pre-install
-SUBST_FILES.pgsql= ../gld
-SUBST_SED.pgsql= -e "s,mysqld,pgsql,"
-.endif
diff --git a/mail/gld/patches/patch-aa b/mail/gld/patches/patch-aa
deleted file mode 100644
index 31679078b1f..00000000000
--- a/mail/gld/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2006/03/02 21:03:39 wiz Exp $
-
---- Makefile.in.orig 2004-10-12 14:41:49.000000000 +0200
-+++ Makefile.in
-@@ -1,8 +1,8 @@
- all: gld
-
- gld: cnf.o server.o sql.o sockets.o greylist.o gld.h
-- @CC@ -O2 @DEFS@ -Wall server.o sql.o sockets.o cnf.o greylist.o @LIBS@ @SQL_LIBS@ -o gld
-- strip gld
-+ @CC@ -O2 @DEFS@ -Wall server.o sql.o sockets.o cnf.o greylist.o \
-+ $(LDFLAGS) @SQL_LIBS@ -o gld
-
- sockets.o: sockets.c sockets.h
- @CC@ -O2 @DEFS@ -Wall -c sockets.c
-@@ -23,11 +23,15 @@ clean:
- rm -f gld *.o
-
- install: gld gld.conf
-- mkdir -p /usr/local/bin
-- cp gld /usr/local/bin
-- chmod 700 /usr/local/bin/gld
-- cp gld.conf /etc/gld.conf.sample
-- chmod 600 /etc/gld.conf.sample
-+ $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/bin
-+ $(BSD_INSTALL_PROGRAM) gld $(PREFIX)/bin
-+ $(BSD_INSTALL_DATA_DIR) $(PREFIX)/share/examples/gld
-+ $(BSD_INSTALL_DATA_DIR) $(PREFIX)/share/gld
-+ $(BSD_INSTALL_DATA_DIR) $(PREFIX)/share/doc/gld
-+ $(BSD_INSTALL_DATA) gld.conf $(PREFIX)/share/examples/gld
-+ $(BSD_INSTALL_DATA) table-whitelist.sql $(PREFIX)/share/gld
-+ $(BSD_INSTALL_DATA) tables.* $(PREFIX)/share/gld
-+ $(BSD_INSTALL_DATA) README LICENCE $(PREFIX)/share/doc/gld
-
- distclean: clean
- rm -f Makefile config.status config.log config.cache
diff --git a/mail/gld/patches/patch-ab b/mail/gld/patches/patch-ab
deleted file mode 100644
index 4a3b1b2b157..00000000000
--- a/mail/gld/patches/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2006/03/02 21:03:39 wiz Exp $
-
---- greylist.c.orig 2005-09-16 11:52:41.000000000 +0200
-+++ greylist.c
-@@ -20,8 +20,11 @@ pid=getpid();
-
- ts=time(0);
- strncpy(oip,ip,sizeof(oip)-1);
-+oip[sizeof(oip)-1] = '\0';
- strncpy(osender,sender,sizeof(osender)-1);
-+osender[sizeof(osender)-1] = '\0';
- strncpy(orecipient,recipient,sizeof(orecipient)-1);
-+orecipient[sizeof(orecipient)-1] = '\0';
-
- if(conf->debug==1) printf("%d: Starting the greylist algo\n",pid);
-
-@@ -97,6 +100,7 @@ if(conf->whitelist==1)
- if(domain==NULL) domain=osender;
-
- strncpy(netw,oip,sizeof(netw)-1);
-+ netw[sizeof(netw)-1] = '\0';
- l=strlen(netw);
- for(i=l-1;i>=0;i--)
- {
-@@ -127,7 +131,7 @@ if(conf->dnswl[0]!=0)
- if(x==4)
- {
- snprintf(query,sizeof(query)-1,"%d.%d.%d.%d.%s",d,c,b,a,conf->dnswl);
-- n=DnsIp(query,NULL);
-+ n=DnsIp(query,NULL, 0);
- if(conf->debug==1) printf("%d: DNSQuery=(%s) result=%ld\n",pid,query,n);
- if(n==0)
- {
diff --git a/mail/gld/patches/patch-ac b/mail/gld/patches/patch-ac
deleted file mode 100644
index ceb731e2352..00000000000
--- a/mail/gld/patches/patch-ac
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2006/03/02 21:03:39 wiz Exp $
-
---- cnf.c.orig 2005-09-16 12:02:44.000000000 +0200
-+++ cnf.c
-@@ -36,11 +36,16 @@ if(fic==(FILE *)NULL) return(-1);
-
- // We set the default values
-
--strcpy(conf->sqlhost,"localhost");
--strcpy(conf->sqluser,"myuser");
--strcpy(conf->sqldb,"mydb");
--strcpy(conf->sqlpasswd,"mypasswd");
--strcpy(conf->message,"Greylisted");
-+strncpy(conf->sqlhost,"localhost",sizeof(conf->sqlhost)-1);
-+conf->sqlhost[sizeof(conf->sqlhost)-1] = '\0';
-+strncpy(conf->sqluser,"myuser",sizeof(conf->sqluser)-1);
-+conf->sqluser[sizeof(conf->sqluser)-1] = '\0';
-+strncpy(conf->sqldb,"mydb",sizeof(conf->sqldb)-1);
-+conf->sqldb[sizeof(conf->sqldb)-1] = '\0';
-+strncpy(conf->sqlpasswd,"mypasswd",sizeof(conf->sqlpasswd)-1);
-+conf->sqlpasswd[sizeof(conf->sqlpasswd)-1] = '\0';
-+strncpy(conf->message,"Greylisted",sizeof(conf->message)-1);
-+conf->message[sizeof(conf->message)-1] = '\0';
- conf->training=0;
- conf->port=2525;
- conf->maxcon=100;
-@@ -72,14 +77,46 @@ while(fgets(buffer,1024,fic)!=NULL)
- buffer[strlen(buffer)-1]=0;
- *p=0;
- if(strcmp(buffer,"CLIENTS")==0) ReadClients(conf,p+1);
-- if(strcmp(buffer,"USER")==0) strcpy(conf->user,p+1);
-- if(strcmp(buffer,"GROUP")==0) strcpy(conf->grp,p+1);
-- if(strcmp(buffer,"DNSWL")==0) strcpy(conf->dnswl,p+1);
-- if(strcmp(buffer,"SQLHOST")==0) strcpy(conf->sqlhost,p+1);
-- if(strcmp(buffer,"SQLUSER")==0) strcpy(conf->sqluser,p+1);
-- if(strcmp(buffer,"SQLDB")==0) strcpy(conf->sqldb,p+1);
-- if(strcmp(buffer,"SQLPASSWD")==0) strcpy(conf->sqlpasswd,p+1);
-- if(strcmp(buffer,"MESSAGE")==0) strcpy(conf->message,p+1);
-+ if(strcmp(buffer,"USER")==0)
-+ {
-+ strncpy(conf->user,p+1,sizeof(conf->user)-1);
-+ conf->user[sizeof(conf->user)-1] = '\0';
-+ }
-+ if(strcmp(buffer,"GROUP")==0)
-+ {
-+ strncpy(conf->grp,p+1,sizeof(conf->grp)-1);
-+ conf->grp[sizeof(conf->grp)-1] = '\0';
-+ }
-+ if(strcmp(buffer,"DNSWL")==0)
-+ {
-+ strncpy(conf->dnswl,p+1,sizeof(conf->dnswl)-1);
-+ conf->dnswl[sizeof(conf->dnswl)-1] = '\0';
-+ }
-+ if(strcmp(buffer,"SQLHOST")==0)
-+ {
-+ strncpy(conf->sqlhost,p+1,sizeof(conf->sqlhost)-1);
-+ conf->sqlhost[sizeof(conf->sqlhost)-1] = '\0';
-+ }
-+ if(strcmp(buffer,"SQLUSER")==0)
-+ {
-+ strncpy(conf->sqluser,p+1,sizeof(conf->sqluser)-1);
-+ conf->sqluser[sizeof(conf->sqluser)-1] = '\0';
-+ }
-+ if(strcmp(buffer,"SQLDB")==0)
-+ {
-+ strncpy(conf->sqldb,p+1,sizeof(conf->sqldb)-1);
-+ conf->sqldb[sizeof(conf->sqldb)-1] = '\0';
-+ }
-+ if(strcmp(buffer,"SQLPASSWD")==0)
-+ {
-+ strncpy(conf->sqlpasswd,p+1,sizeof(conf->sqlpasswd)-1);
-+ conf->sqlpasswd[sizeof(conf->sqlpasswd)-1] = '\0';
-+ }
-+ if(strcmp(buffer,"MESSAGE")==0)
-+ {
-+ strncpy(conf->message,p+1,sizeof(conf->message)-1);
-+ conf->message[sizeof(conf->message)-1] = '\0';
-+ }
- if(strcmp(buffer,"PORT")==0) conf->port=atoi(p+1);
- if(strcmp(buffer,"MAXCON")==0) conf->maxcon=atoi(p+1);
- if(strcmp(buffer,"TRAINING")==0) conf->training=atoi(p+1);
diff --git a/mail/gld/patches/patch-ad b/mail/gld/patches/patch-ad
deleted file mode 100644
index 5ff878ff85a..00000000000
--- a/mail/gld/patches/patch-ad
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/03/02 21:03:39 wiz Exp $
-
---- server.c.orig 2005-09-16 12:17:59.000000000 +0200
-+++ server.c
-@@ -208,7 +208,7 @@ long ts;
- int pid;
-
- pid=getpid();
--GetPeerIp(s,ip,buff);
-+GetPeerIp(s,ip,BLEN,buff,BLEN);
-
- //
- // We check if this IP is authorized to connect to us
-@@ -261,21 +261,34 @@ while(1==1)
- // Now, we are sure our buffer string length is no more than BLEN
- // as all parameters are defined also as buffers with a BLEN size
- // no buffer overflow is possible using strcpy .
-+ // But what's the point. Protect it anyway.
- //
-
- if(strcmp(buff,"")==0) break;
-
- if(strncmp(buff,"request=",8)==0)
-- strcpy(request,buff+8);
-+ {
-+ strncpy(request,buff+8, sizeof(request)-1);
-+ request[sizeof(request)-1] = '\0';
-+ }
-
- if(strncmp(buff,"sender=",7)==0)
-- strcpy(sender,buff+7);
-+ {
-+ strncpy(sender,buff+7, sizeof(sender)-1);
-+ sender[sizeof(sender)-1] = '\0';
-+ }
-
- if(strncmp(buff,"recipient=",10)==0)
-- strcpy(recipient,buff+10);
-+ {
-+ strncpy(recipient,buff+10, sizeof(recipient)-1);
-+ recipient[sizeof(recipient)-1] = '\0';
-+ }
-
- if(strncmp(buff,"client_address=",15)==0)
-- strcpy(ip,buff+15);
-+ {
-+ strncpy(ip,buff+15,sizeof(ip)-1);
-+ ip[sizeof(ip)-1] = '\0';
-+ }
-
- }
-
-@@ -300,7 +313,11 @@ Quote(sender);
- // Now, we can safely use, str** functions
- //
-
--if(sender[0]==0) strcpy(sender,"void@void");
-+if(sender[0]==0)
-+ {
-+ strncpy(sender,"void@void",sizeof(sender)-1);
-+ sender[sizeof(sender)-1] = '\0';
-+ }
-
- if(strcmp(request,REQ)!=0 || recipient[0]==0 || ip[0]==0)
- {
diff --git a/mail/gld/patches/patch-ae b/mail/gld/patches/patch-ae
deleted file mode 100644
index 2ccec646d27..00000000000
--- a/mail/gld/patches/patch-ae
+++ /dev/null
@@ -1,95 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2006/03/02 21:03:39 wiz Exp $
-
---- sockets.c.orig 2004-10-12 14:39:34.000000000 +0200
-+++ sockets.c
-@@ -540,7 +540,7 @@ int CloseSocket(int s)
- /* */
- /************************************************/
-
--int DnsIp(char *host,char *ip)
-+int DnsIp(char *host,char *ip, size_t len)
- {
- struct hostent *hostptr;
- struct in_addr *ptr;
-@@ -552,7 +552,11 @@ if(hostptr->h_addrtype != AF_INET) retur
-
- ptr=(struct in_addr *) *hostptr->h_addr_list;
-
--if(ip!=NULL) strcpy(ip,(char *)inet_ntoa(*ptr));
-+if(ip!=NULL)
-+ {
-+ strncpy(ip,(char *)inet_ntoa(*ptr), len - 1);
-+ ip[len-1] = '\0';
-+ }
- return(0);
- }
-
-@@ -572,13 +576,14 @@ return(0);
- /* */
- /************************************************/
-
--int DnsFQDN(char *host,char *fqdn)
-+int DnsFQDN(char *host,char *fqdn, size_t len)
- {
- struct hostent *hostptr;
-
- if((hostptr=(struct hostent *)gethostbyname(host))==NULL) return(S_HOST_ERR);
-
--strcpy(fqdn,hostptr->h_name);
-+strncpy(fqdn,hostptr->h_name, len-1);
-+fqdn[len-1] = '\0';
- return(0);
-
- }
-@@ -599,7 +604,7 @@ return(0);
- /* */
- /************************************************/
-
--int DnsName(char *ip,char *fqdn)
-+int DnsName(char *ip,char *fqdn, size_t len)
- {
-
- struct hostent *hostptr;
-@@ -609,7 +614,8 @@ addr.s_addr=inet_addr(ip);
-
- if((hostptr=(struct hostent *)gethostbyaddr((char *)&addr,sizeof(struct in_addr),AF_INET))==NULL) return(S_HOST_ERR);
-
--strcpy(fqdn,hostptr->h_name);
-+strncpy(fqdn,hostptr->h_name, len-1);
-+fqdn[len-1] = '\0';
-
- return(0);
- }
-@@ -631,20 +637,27 @@ return(0);
- /* */
- /************************************************/
-
--void GetPeerIp(int sock,char *ipfrom,char *hostfrom)
-+void GetPeerIp(int sock,char *ipfrom, size_t lip, char *hostfrom, size_t hip)
- {
- struct sockaddr_in from;
- size_t foo=sizeof(struct sockaddr_in);
- struct hostent *hostptr;
-
--strcpy(ipfrom,"???.???.???.???");
--strcpy(hostfrom,"?????");
-+strncpy(ipfrom,"???.???.???.???", lip-1);
-+ipfrom[lip-1] = '\0';
-+strncpy(hostfrom,"?????", hip-1);
-+hostfrom[hip-1] = '\0';
-
- if (getpeername(sock,(struct sockaddr *)&from, &foo) == 0)
- {
-- strcpy(ipfrom,(char *)inet_ntoa(from.sin_addr));
-+ strncpy(ipfrom,(char *)inet_ntoa(from.sin_addr), lip-1);
-+ ipfrom[lip-1] = '\0';
- hostptr=(struct hostent *)gethostbyaddr((char *)&from.sin_addr,sizeof(struct in_addr),AF_INET);
-- if(hostptr!=NULL) strcpy(hostfrom,hostptr->h_name);
-+ if(hostptr!=NULL)
-+ {
-+ strncpy(hostfrom,hostptr->h_name, hip-1);
-+ hostfrom[hip-1] = '\0';
-+ }
- }
- }
-
diff --git a/mail/gld/patches/patch-af b/mail/gld/patches/patch-af
deleted file mode 100644
index 2adcc7a915f..00000000000
--- a/mail/gld/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.2 2006/03/02 21:03:39 wiz Exp $
-
---- sockets.h.orig 2004-10-12 14:07:27.000000000 +0200
-+++ sockets.h
-@@ -118,10 +118,10 @@ int CloseSocket(int sock);
-
- /* DNS functions */
-
--int DnsIp(char *host,char *ip);
--int DnsFQDN(char *host,char *fqdn);
--int DnsName(char *ip,char *fqdn);
--void GetPeerIp(int sock,char *ip,char *fqdn);
-+int DnsIp(char *host,char *ip,size_t);
-+int DnsFQDN(char *host,char *fqdn,size_t);
-+int DnsName(char *ip,char *fqdn,size_t);
-+void GetPeerIp(int sock,char *ip,size_t,char *fqdn,size_t);
-
- /* Special Functions */
-
diff --git a/mail/gld/patches/patch-ag b/mail/gld/patches/patch-ag
deleted file mode 100644
index 59b419b464f..00000000000
--- a/mail/gld/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/07/10 20:32:59 sketch Exp $
-
---- sql.c.orig Sun Feb 5 20:17:36 2006
-+++ sql.c Sun Feb 5 20:18:50 2006
-@@ -33,10 +33,10 @@
- void SQLClose(void)
- {
- #ifdef _DB_MYSQL_
--return(MySQLClose());
-+MySQLClose();
- #endif
- #ifdef _DB_PGSQL_
--return(PgSQLClose());
-+PgSQLClose();
- #endif
- }
-
diff --git a/mail/gmime/DESCR b/mail/gmime/DESCR
deleted file mode 100644
index 9238064afd0..00000000000
--- a/mail/gmime/DESCR
+++ /dev/null
@@ -1,29 +0,0 @@
-GMime is a set of utilities for parsing and creating messages using
-the Multipurpose Internet Mail Extension (MIME) as defined by the
-following RFCs:
-
- * 0822: Standard for the Format of Arpa Internet Text Messages
- * 1521: MIME (Multipurpose Internet Mail Extensions) Part One:
- Mechanisms for Specifying and Describing the Format of
- Internet Message Bodies
- * 1847: Security Multiparts for MIME: Multipart/Signed and
- Multipart/Encrypted
- * 1864: The Content-MD5 Header Field (Obsoletes rfc1544)
- * 2015: MIME Security with Pretty Good Privacy (PGP)
- * 2045: Multipurpose Internet Mail Extensions (MIME) Part One:
- Format of Internet Message Bodies
- * 2046: Multipurpose Internet Mail Extensions (MIME) Part Two:
- Media Types
- * 2047: Multipurpose Internet Mail Extensions (MIME) Part Three:
- Message Header Extensions for Non-ASCII Text
- * 2048: Multipurpose Internet Mail Extensions (MIME) Part Four:
- Registration Procedures
- * 2049: Multipurpose Internet Mail Extensions (MIME) Part Five:
- Conformance Criteria and Examples
- * 2183: Communicating Presentation Information in Internet Messages:
- The Content-Disposition Header Field
- * 2184: MIME Parameter Value and Encoded Word Extensions: Character
- Sets, Languages, and Continuations
- * 2231: MIME Parameter Value and Encoded Word Extensions: Character
- Sets, Languages, and Continuations (Obsoletes rfc2184)
- * 3156: MIME Security with OpenPGP (Updates rfc2015)
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
deleted file mode 100644
index a3fc9782dd1..00000000000
--- a/mail/gmime/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2007/03/08 20:04:06 wiz Exp $
-#
-
-DISTNAME= gmime-2.2.4
-CATEGORIES= mail
-MASTER_SITES= http://spruce.sourceforge.net/gmime/sources/v2.2/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://spruce.sourceforge.net/gmime/
-COMMENT= Library for the creation and parsing of MIME messages
-
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake pkg-config
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --enable-gtk-doc=no
-CONFIGURE_ARGS+= --disable-mono
-PKGCONFIG_OVERRIDE+= gmime-2.0.pc.in
-TEST_TARGET= check
-
-.include "options.mk"
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/gmime/PLIST b/mail/gmime/PLIST
deleted file mode 100644
index 44dd5622e04..00000000000
--- a/mail/gmime/PLIST
+++ /dev/null
@@ -1,135 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2007/03/08 20:04:06 wiz Exp $
-bin/gmime-config
-bin/uudecode
-bin/uuencode
-include/gmime-2.0/gmime/gmime-charset.h
-include/gmime-2.0/gmime/gmime-cipher-context.h
-include/gmime-2.0/gmime/gmime-content-type.h
-include/gmime-2.0/gmime/gmime-data-wrapper.h
-include/gmime-2.0/gmime/gmime-disposition.h
-include/gmime-2.0/gmime/gmime-error.h
-include/gmime-2.0/gmime/gmime-filter-basic.h
-include/gmime-2.0/gmime/gmime-filter-best.h
-include/gmime-2.0/gmime/gmime-filter-charset.h
-include/gmime-2.0/gmime/gmime-filter-crlf.h
-include/gmime-2.0/gmime/gmime-filter-enriched.h
-include/gmime-2.0/gmime/gmime-filter-from.h
-include/gmime-2.0/gmime/gmime-filter-gzip.h
-include/gmime-2.0/gmime/gmime-filter-html.h
-include/gmime-2.0/gmime/gmime-filter-md5.h
-include/gmime-2.0/gmime/gmime-filter-strip.h
-include/gmime-2.0/gmime/gmime-filter-windows.h
-include/gmime-2.0/gmime/gmime-filter-yenc.h
-include/gmime-2.0/gmime/gmime-filter.h
-include/gmime-2.0/gmime/gmime-gpg-context.h
-include/gmime-2.0/gmime/gmime-header.h
-include/gmime-2.0/gmime/gmime-iconv-utils.h
-include/gmime-2.0/gmime/gmime-iconv.h
-include/gmime-2.0/gmime/gmime-message-part.h
-include/gmime-2.0/gmime/gmime-message-partial.h
-include/gmime-2.0/gmime/gmime-message.h
-include/gmime-2.0/gmime/gmime-multipart-encrypted.h
-include/gmime-2.0/gmime/gmime-multipart-signed.h
-include/gmime-2.0/gmime/gmime-multipart.h
-include/gmime-2.0/gmime/gmime-object.h
-include/gmime-2.0/gmime/gmime-param.h
-include/gmime-2.0/gmime/gmime-parser.h
-include/gmime-2.0/gmime/gmime-part.h
-include/gmime-2.0/gmime/gmime-session-simple.h
-include/gmime-2.0/gmime/gmime-session.h
-include/gmime-2.0/gmime/gmime-stream-buffer.h
-include/gmime-2.0/gmime/gmime-stream-cat.h
-include/gmime-2.0/gmime/gmime-stream-file.h
-include/gmime-2.0/gmime/gmime-stream-filter.h
-include/gmime-2.0/gmime/gmime-stream-fs.h
-include/gmime-2.0/gmime/gmime-stream-mem.h
-include/gmime-2.0/gmime/gmime-stream-mmap.h
-include/gmime-2.0/gmime/gmime-stream-null.h
-include/gmime-2.0/gmime/gmime-stream.h
-include/gmime-2.0/gmime/gmime-utils.h
-include/gmime-2.0/gmime/gmime.h
-include/gmime-2.0/gmime/internet-address.h
-lib/gmimeConf.sh
-lib/libgmime-2.0.la
-lib/pkgconfig/gmime-2.0.pc
-share/gtk-doc/html/gmime/CipherContexts.html
-share/gtk-doc/html/gmime/DataWrappers.html
-share/gtk-doc/html/gmime/Filters.html
-share/gtk-doc/html/gmime/Headers.html
-share/gtk-doc/html/gmime/InternetAddresses.html
-share/gtk-doc/html/gmime/MimeParts.html
-share/gtk-doc/html/gmime/Parsers.html
-share/gtk-doc/html/gmime/Sessions.html
-share/gtk-doc/html/gmime/Streams.html
-share/gtk-doc/html/gmime/ch01.html
-share/gtk-doc/html/gmime/classes.html
-share/gtk-doc/html/gmime/core.html
-share/gtk-doc/html/gmime/fundamentals.html
-share/gtk-doc/html/gmime/gmime-building.html
-share/gtk-doc/html/gmime/gmime-changes-2-0.html
-share/gtk-doc/html/gmime/gmime-changes-2-2.html
-share/gtk-doc/html/gmime/gmime-compiling.html
-share/gtk-doc/html/gmime/gmime-data-wrappers.html
-share/gtk-doc/html/gmime/gmime-filters.html
-share/gtk-doc/html/gmime/gmime-gmime-charset.html
-share/gtk-doc/html/gmime/gmime-gmime-cipher-context.html
-share/gtk-doc/html/gmime/gmime-gmime-content-type.html
-share/gtk-doc/html/gmime/gmime-gmime-data-wrapper.html
-share/gtk-doc/html/gmime/gmime-gmime-disposition.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-basic.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-best.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-charset.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-crlf.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-enriched.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-from.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-gzip.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-html.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-md5.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-strip.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-windows.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-yenc.html
-share/gtk-doc/html/gmime/gmime-gmime-filter.html
-share/gtk-doc/html/gmime/gmime-gmime-gpg-context.html
-share/gtk-doc/html/gmime/gmime-gmime-header.html
-share/gtk-doc/html/gmime/gmime-gmime-iconv-utils.html
-share/gtk-doc/html/gmime/gmime-gmime-iconv.html
-share/gtk-doc/html/gmime/gmime-gmime-message-part.html
-share/gtk-doc/html/gmime/gmime-gmime-message-partial.html
-share/gtk-doc/html/gmime/gmime-gmime-message.html
-share/gtk-doc/html/gmime/gmime-gmime-multipart-encrypted.html
-share/gtk-doc/html/gmime/gmime-gmime-multipart-signed.html
-share/gtk-doc/html/gmime/gmime-gmime-multipart.html
-share/gtk-doc/html/gmime/gmime-gmime-object.html
-share/gtk-doc/html/gmime/gmime-gmime-param.html
-share/gtk-doc/html/gmime/gmime-gmime-parser.html
-share/gtk-doc/html/gmime/gmime-gmime-part.html
-share/gtk-doc/html/gmime/gmime-gmime-session-simple.html
-share/gtk-doc/html/gmime/gmime-gmime-session.html
-share/gtk-doc/html/gmime/gmime-gmime-stream-buffer.html
-share/gtk-doc/html/gmime/gmime-gmime-stream-cat.html
-share/gtk-doc/html/gmime/gmime-gmime-stream-file.html
-share/gtk-doc/html/gmime/gmime-gmime-stream-filter.html
-share/gtk-doc/html/gmime/gmime-gmime-stream-fs.html
-share/gtk-doc/html/gmime/gmime-gmime-stream-mem.html
-share/gtk-doc/html/gmime/gmime-gmime-stream-mmap.html
-share/gtk-doc/html/gmime/gmime-gmime-stream-null.html
-share/gtk-doc/html/gmime/gmime-gmime-stream.html
-share/gtk-doc/html/gmime/gmime-gmime-utils.html
-share/gtk-doc/html/gmime/gmime-gmime.html
-share/gtk-doc/html/gmime/gmime-internet-address.html
-share/gtk-doc/html/gmime/gmime-question-index.html
-share/gtk-doc/html/gmime/gmime-resources.html
-share/gtk-doc/html/gmime/gmime-streams.html
-share/gtk-doc/html/gmime/gmime.devhelp
-share/gtk-doc/html/gmime/gmime.devhelp2
-share/gtk-doc/html/gmime/gmime.html
-share/gtk-doc/html/gmime/home.png
-share/gtk-doc/html/gmime/index.html
-share/gtk-doc/html/gmime/index.sgml
-share/gtk-doc/html/gmime/left.png
-share/gtk-doc/html/gmime/right.png
-share/gtk-doc/html/gmime/style.css
-share/gtk-doc/html/gmime/up.png
-@dirrm share/gtk-doc/html/gmime
-@dirrm include/gmime-2.0/gmime
-@dirrm include/gmime-2.0
diff --git a/mail/gmime/buildlink3.mk b/mail/gmime/buildlink3.mk
deleted file mode 100644
index abff4d4e884..00000000000
--- a/mail/gmime/buildlink3.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:57 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GMIME_BUILDLINK3_MK:= ${GMIME_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= gmime
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngmime}
-BUILDLINK_PACKAGES+= gmime
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gmime
-
-.if !empty(GMIME_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gmime+= gmime>=2.1.7
-BUILDLINK_PKGSRCDIR.gmime?= ../../mail/gmime
-.endif # GMIME_BUILDLINK3_MK
-
-.include "../../devel/glib2/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/gmime/distinfo b/mail/gmime/distinfo
deleted file mode 100644
index 93cb180c223..00000000000
--- a/mail/gmime/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.9 2007/03/17 14:39:58 joerg Exp $
-
-SHA1 (gmime-2.2.4.tar.gz) = 1cf5de2e9e594b136c37b7627f7676be6a977704
-RMD160 (gmime-2.2.4.tar.gz) = c28793597d33397ff17b2b8f54b0c6a87f00604f
-Size (gmime-2.2.4.tar.gz) = 933842 bytes
-SHA1 (patch-aa) = 03a3a2e91926d3ae24a2f7e93029dcaae8ede453
-SHA1 (patch-ab) = f6b63e3516c941fb044fc42d931a7b4e5d717f86
diff --git a/mail/gmime/options.mk b/mail/gmime/options.mk
deleted file mode 100644
index 983f9f6084f..00000000000
--- a/mail/gmime/options.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2005/01/10 20:59:43 adrianp Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.gmime
-PKG_SUPPORTED_OPTIONS= inet6
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-ipv6
-.endif
diff --git a/mail/gmime/patches/patch-aa b/mail/gmime/patches/patch-aa
deleted file mode 100644
index 35ad6dd1cbd..00000000000
--- a/mail/gmime/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2007/03/08 20:04:06 wiz Exp $
-
---- zentimer.h.orig 2007-02-08 05:12:08.000000000 +0000
-+++ zentimer.h
-@@ -23,6 +23,8 @@
-
- #ifdef ENABLE_ZENTIMER
-
-+#include "config.h"
-+
- #include <stdio.h>
-
- #ifdef HAVE_STDINT_H
diff --git a/mail/gmime/patches/patch-ab b/mail/gmime/patches/patch-ab
deleted file mode 100644
index 965f835c3ab..00000000000
--- a/mail/gmime/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2007/03/17 14:39:58 joerg Exp $
-
---- gmime/gmime-gpg-context.c.orig 2007-03-17 14:33:47.000000000 +0000
-+++ gmime/gmime-gpg-context.c
-@@ -1115,7 +1115,11 @@ gpg_ctx_op_step (struct _GpgCtx *gpg, GE
- const char *diagnostics, *mode;
- struct pollfd pfds[GPG_N_FDS];
- int ready, save;
-+#if defined(__DragonFly__)
-+ int n;
-+#else
- nfds_t n;
-+#endif
-
- for (n = 0; n < GPG_N_FDS; n++) {
- pfds[n].events = 0;
diff --git a/mail/gnus/DESCR b/mail/gnus/DESCR
deleted file mode 100644
index ca1b6b4cf92..00000000000
--- a/mail/gnus/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-Gnus is a flexible message reader running under GNU Emacs. It supports
-reading and composing both news and mail. In addition, it is able to
-use a number of web-based sources as inputs for its groups.
-
-The main Gnus goal is to provide the user with an efficient and
-extensible interface towards dealing with large numbers of messages,
-no matter the form they may have or wherever they may come from.
-
-Gnus is a fully MIME-compliant and supports reading and composing
-messages using any charset that GNU Emacs supports.
diff --git a/mail/gnus/Makefile b/mail/gnus/Makefile
deleted file mode 100644
index 88e182bb811..00000000000
--- a/mail/gnus/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2007/02/22 19:01:21 wiz Exp $
-
-DISTNAME= gnus-5.10.8
-PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
-CATEGORIES= mail news
-MASTER_SITES= http://gnus.org/dist/
-
-MAINTAINER= lha@NetBSD.org
-HOMEPAGE= http://gnus.org/
-COMMENT= Gnus is a flexible message reader running under GNU Emacs
-
-#EMACS_VERSIONS_ACCEPTED= emacs21 emacs20 xemacs211 xemacs215
-
-DEPENDS+= digest>=20010101:../../pkgtools/digest
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-lispdir=${EMACS_LISPPREFIX}/gnus
-CONFIGURE_ARGS+= --with-etcdir=${PREFIX}/share/gnus
-CONFIGURE_ENV+= EMACS=${EMACS_BIN:Q}
-EMACS_MODULES+= base
-
-# Avoid conflicting with Emacsen provided gnus info files
-GNU_CONFIGURE_INFODIR= ${PREFIX}/share/doc/gnus/info
-
-USE_TOOLS+= makeinfo
-INFO_FILES= # PLIST
-
-.include "../../mk/emacs.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/gnus/PLIST b/mail/gnus/PLIST
deleted file mode 100644
index 5523c41f0f1..00000000000
--- a/mail/gnus/PLIST
+++ /dev/null
@@ -1,460 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2006/11/10 17:57:51 perry Exp $
-share/doc/gnus/info/emacs-mime
-share/doc/gnus/info/gnus
-share/doc/gnus/info/gnus-1
-share/doc/gnus/info/gnus-2
-share/doc/gnus/info/gnus-3
-share/doc/gnus/info/gnus-4
-share/doc/gnus/info/gnus-5
-share/doc/gnus/info/message
-share/doc/gnus/info/pgg
-share/doc/gnus/info/sieve
-share/gnus/gnus-tut.txt
-share/gnus/images/gnus/bar.xbm
-share/gnus/images/gnus/bar.xpm
-share/gnus/images/gnus/catchup.pbm
-share/gnus/images/gnus/catchup.xpm
-share/gnus/images/gnus/cu-exit.pbm
-share/gnus/images/gnus/cu-exit.xpm
-share/gnus/images/gnus/dead.xpm
-share/gnus/images/gnus/describe-group.pbm
-share/gnus/images/gnus/describe-group.xpm
-share/gnus/images/gnus/exit-gnus.pbm
-share/gnus/images/gnus/exit-gnus.xpm
-share/gnus/images/gnus/exit-summ.pbm
-share/gnus/images/gnus/exit-summ.xpm
-share/gnus/images/gnus/followup.pbm
-share/gnus/images/gnus/followup.xpm
-share/gnus/images/gnus/fuwo.pbm
-share/gnus/images/gnus/fuwo.xpm
-share/gnus/images/gnus/get-news.pbm
-share/gnus/images/gnus/get-news.xpm
-share/gnus/images/gnus/gnntg.pbm
-share/gnus/images/gnus/gnntg.xpm
-share/gnus/images/gnus/gnus-group-catchup-current-up.xbm
-share/gnus/images/gnus/gnus-group-catchup-current-up.xpm
-share/gnus/images/gnus/gnus-group-catchup-current.xbm
-share/gnus/images/gnus/gnus-group-catchup-current.xpm
-share/gnus/images/gnus/gnus-group-describe-group-up.xbm
-share/gnus/images/gnus/gnus-group-describe-group-up.xpm
-share/gnus/images/gnus/gnus-group-exit-up.xbm
-share/gnus/images/gnus/gnus-group-exit-up.xpm
-share/gnus/images/gnus/gnus-group-get-new-news-this-group-up.xbm
-share/gnus/images/gnus/gnus-group-get-new-news-this-group-up.xpm
-share/gnus/images/gnus/gnus-group-get-new-news-up.xbm
-share/gnus/images/gnus/gnus-group-get-new-news-up.xpm
-share/gnus/images/gnus/gnus-group-kill-group-up.xbm
-share/gnus/images/gnus/gnus-group-kill-group-up.xpm
-share/gnus/images/gnus/gnus-group-subscribe-up.xbm
-share/gnus/images/gnus/gnus-group-subscribe-up.xpm
-share/gnus/images/gnus/gnus-group-unsubscribe-up.xbm
-share/gnus/images/gnus/gnus-group-unsubscribe-up.xpm
-share/gnus/images/gnus/gnus-pointer.xbm
-share/gnus/images/gnus/gnus-pointer.xpm
-share/gnus/images/gnus/gnus-summary-caesar-message-up.xbm
-share/gnus/images/gnus/gnus-summary-caesar-message-up.xpm
-share/gnus/images/gnus/gnus-summary-cancel-article-up.xbm
-share/gnus/images/gnus/gnus-summary-cancel-article-up.xpm
-share/gnus/images/gnus/gnus-summary-catchup-and-exit-up.xbm
-share/gnus/images/gnus/gnus-summary-catchup-and-exit-up.xpm
-share/gnus/images/gnus/gnus-summary-catchup-up.xbm
-share/gnus/images/gnus/gnus-summary-catchup-up.xpm
-share/gnus/images/gnus/gnus-summary-exit-up.xbm
-share/gnus/images/gnus/gnus-summary-exit-up.xpm
-share/gnus/images/gnus/gnus-summary-followup-up.xbm
-share/gnus/images/gnus/gnus-summary-followup-up.xpm
-share/gnus/images/gnus/gnus-summary-followup-with-original-up.xbm
-share/gnus/images/gnus/gnus-summary-followup-with-original-up.xpm
-share/gnus/images/gnus/gnus-summary-mail-copy-up.xbm
-share/gnus/images/gnus/gnus-summary-mail-copy-up.xpm
-share/gnus/images/gnus/gnus-summary-mail-delete-up.xbm
-share/gnus/images/gnus/gnus-summary-mail-delete-up.xpm
-share/gnus/images/gnus/gnus-summary-mail-forward-up.xbm
-share/gnus/images/gnus/gnus-summary-mail-forward-up.xpm
-share/gnus/images/gnus/gnus-summary-mail-get-up.xbm
-share/gnus/images/gnus/gnus-summary-mail-get-up.xpm
-share/gnus/images/gnus/gnus-summary-mail-originate-up.xbm
-share/gnus/images/gnus/gnus-summary-mail-originate-up.xpm
-share/gnus/images/gnus/gnus-summary-mail-reply-up.xbm
-share/gnus/images/gnus/gnus-summary-mail-reply-up.xpm
-share/gnus/images/gnus/gnus-summary-mail-save-up.xbm
-share/gnus/images/gnus/gnus-summary-mail-save-up.xpm
-share/gnus/images/gnus/gnus-summary-next-unread-up.xbm
-share/gnus/images/gnus/gnus-summary-next-unread-up.xpm
-share/gnus/images/gnus/gnus-summary-post-news-up.xbm
-share/gnus/images/gnus/gnus-summary-post-news-up.xpm
-share/gnus/images/gnus/gnus-summary-prev-unread-up.xbm
-share/gnus/images/gnus/gnus-summary-prev-unread-up.xpm
-share/gnus/images/gnus/gnus-summary-reply-up.xbm
-share/gnus/images/gnus/gnus-summary-reply-up.xpm
-share/gnus/images/gnus/gnus-summary-reply-with-original-up.xbm
-share/gnus/images/gnus/gnus-summary-reply-with-original-up.xpm
-share/gnus/images/gnus/gnus-summary-save-article-file-up.xbm
-share/gnus/images/gnus/gnus-summary-save-article-file-up.xpm
-share/gnus/images/gnus/gnus-summary-save-article-up.xbm
-share/gnus/images/gnus/gnus-summary-save-article-up.xpm
-share/gnus/images/gnus/gnus-uu-decode-uu-up.xbm
-share/gnus/images/gnus/gnus-uu-decode-uu-up.xpm
-share/gnus/images/gnus/gnus-uu-post-news-up.xbm
-share/gnus/images/gnus/gnus-uu-post-news-up.xpm
-share/gnus/images/gnus/gnus.xbm
-share/gnus/images/gnus/gnus.xpm
-share/gnus/images/gnus/important.xpm
-share/gnus/images/gnus/kill-group.pbm
-share/gnus/images/gnus/kill-group.xpm
-share/gnus/images/gnus/mail-reply.pbm
-share/gnus/images/gnus/mail-reply.xpm
-share/gnus/images/gnus/next-ur.pbm
-share/gnus/images/gnus/next-ur.xpm
-share/gnus/images/gnus/post.pbm
-share/gnus/images/gnus/post.xpm
-share/gnus/images/gnus/prev-ur.pbm
-share/gnus/images/gnus/prev-ur.xpm
-share/gnus/images/gnus/preview.xbm
-share/gnus/images/gnus/preview.xpm
-share/gnus/images/gnus/receipt.xpm
-share/gnus/images/gnus/reply-wo.pbm
-share/gnus/images/gnus/reply-wo.xpm
-share/gnus/images/gnus/reply.pbm
-share/gnus/images/gnus/reply.xpm
-share/gnus/images/gnus/reverse-smile.xpm
-share/gnus/images/gnus/rot13.pbm
-share/gnus/images/gnus/rot13.xpm
-share/gnus/images/gnus/save-aif.pbm
-share/gnus/images/gnus/save-aif.xpm
-share/gnus/images/gnus/save-art.pbm
-share/gnus/images/gnus/save-art.xpm
-share/gnus/images/gnus/subscribe.pbm
-share/gnus/images/gnus/subscribe.xpm
-share/gnus/images/gnus/toggle-subscription.xpm
-share/gnus/images/gnus/unimportant.xpm
-share/gnus/images/gnus/unsubscribe.pbm
-share/gnus/images/gnus/unsubscribe.xpm
-share/gnus/images/gnus/uu-decode.pbm
-share/gnus/images/gnus/uu-decode.xpm
-share/gnus/images/gnus/uu-post.pbm
-share/gnus/images/gnus/uu-post.xpm
-share/gnus/images/gnus/x-splash
-share/gnus/images/smilies/blink.pbm
-share/gnus/images/smilies/blink.xpm
-share/gnus/images/smilies/braindamaged.xpm
-share/gnus/images/smilies/cry.xpm
-share/gnus/images/smilies/evil.xpm
-share/gnus/images/smilies/forced.xpm
-share/gnus/images/smilies/frown.pbm
-share/gnus/images/smilies/frown.xpm
-share/gnus/images/smilies/grin.xpm
-share/gnus/images/smilies/indifferent.xpm
-share/gnus/images/smilies/sad.pbm
-share/gnus/images/smilies/sad.xpm
-share/gnus/images/smilies/smile.pbm
-share/gnus/images/smilies/smile.xpm
-share/gnus/images/smilies/wry.pbm
-share/gnus/images/smilies/wry.xpm
-${FOR_xemacs}${EMACS_LISPPREFIX}/gnus/auto-autoloads.el
-${FOR_xemacs}${EMACS_LISPPREFIX}/gnus/auto-autoloads.elc
-${EMACS_LISPPREFIX}/gnus/binhex.el
-${EMACS_LISPPREFIX}/gnus/binhex.elc
-${EMACS_LISPPREFIX}/gnus/canlock.el
-${EMACS_LISPPREFIX}/gnus/canlock.elc
-${EMACS_LISPPREFIX}/gnus/compface.el
-${EMACS_LISPPREFIX}/gnus/compface.elc
-${FOR_xemacs}${EMACS_LISPPREFIX}/gnus/custom-load.el
-${FOR_xemacs}${EMACS_LISPPREFIX}/gnus/custom-load.elc
-${EMACS_LISPPREFIX}/gnus/deuglify.el
-${EMACS_LISPPREFIX}/gnus/deuglify.elc
-${EMACS_LISPPREFIX}/gnus/dig.el
-${EMACS_LISPPREFIX}/gnus/dig.elc
-${EMACS_LISPPREFIX}/gnus/dns.el
-${EMACS_LISPPREFIX}/gnus/dns.elc
-${EMACS_LISPPREFIX}/gnus/earcon.el
-${EMACS_LISPPREFIX}/gnus/earcon.elc
-${EMACS_LISPPREFIX}/gnus/flow-fill.el
-${EMACS_LISPPREFIX}/gnus/flow-fill.elc
-${EMACS_LISPPREFIX}/gnus/format-spec.el
-${EMACS_LISPPREFIX}/gnus/format-spec.elc
-${EMACS_LISPPREFIX}/gnus/gnus-agent.el
-${EMACS_LISPPREFIX}/gnus/gnus-agent.elc
-${EMACS_LISPPREFIX}/gnus/gnus-art.el
-${EMACS_LISPPREFIX}/gnus/gnus-art.elc
-${EMACS_LISPPREFIX}/gnus/gnus-async.el
-${EMACS_LISPPREFIX}/gnus/gnus-async.elc
-${EMACS_LISPPREFIX}/gnus/gnus-audio.el
-${EMACS_LISPPREFIX}/gnus/gnus-audio.elc
-${EMACS_LISPPREFIX}/gnus/gnus-bcklg.el
-${EMACS_LISPPREFIX}/gnus/gnus-bcklg.elc
-${EMACS_LISPPREFIX}/gnus/gnus-cache.el
-${EMACS_LISPPREFIX}/gnus/gnus-cache.elc
-${EMACS_LISPPREFIX}/gnus/gnus-cite.el
-${EMACS_LISPPREFIX}/gnus/gnus-cite.elc
-${EMACS_LISPPREFIX}/gnus/gnus-cus.el
-${EMACS_LISPPREFIX}/gnus/gnus-cus.elc
-${EMACS_LISPPREFIX}/gnus/gnus-delay.el
-${EMACS_LISPPREFIX}/gnus/gnus-delay.elc
-${EMACS_LISPPREFIX}/gnus/gnus-demon.el
-${EMACS_LISPPREFIX}/gnus/gnus-demon.elc
-${EMACS_LISPPREFIX}/gnus/gnus-diary.el
-${EMACS_LISPPREFIX}/gnus/gnus-diary.elc
-${EMACS_LISPPREFIX}/gnus/gnus-dired.el
-${EMACS_LISPPREFIX}/gnus/gnus-dired.elc
-${EMACS_LISPPREFIX}/gnus/gnus-draft.el
-${EMACS_LISPPREFIX}/gnus/gnus-draft.elc
-${EMACS_LISPPREFIX}/gnus/gnus-dup.el
-${EMACS_LISPPREFIX}/gnus/gnus-dup.elc
-${EMACS_LISPPREFIX}/gnus/gnus-eform.el
-${EMACS_LISPPREFIX}/gnus/gnus-eform.elc
-${EMACS_LISPPREFIX}/gnus/gnus-ems.el
-${EMACS_LISPPREFIX}/gnus/gnus-ems.elc
-${EMACS_LISPPREFIX}/gnus/gnus-fun.el
-${EMACS_LISPPREFIX}/gnus/gnus-fun.elc
-${EMACS_LISPPREFIX}/gnus/gnus-gl.el
-${EMACS_LISPPREFIX}/gnus/gnus-gl.elc
-${EMACS_LISPPREFIX}/gnus/gnus-group.el
-${EMACS_LISPPREFIX}/gnus/gnus-group.elc
-${EMACS_LISPPREFIX}/gnus/gnus-int.el
-${EMACS_LISPPREFIX}/gnus/gnus-int.elc
-${EMACS_LISPPREFIX}/gnus/gnus-kill.el
-${EMACS_LISPPREFIX}/gnus/gnus-kill.elc
-${EMACS_LISPPREFIX}/gnus/gnus-load.el
-${EMACS_LISPPREFIX}/gnus/gnus-load.elc
-${EMACS_LISPPREFIX}/gnus/gnus-logic.el
-${EMACS_LISPPREFIX}/gnus/gnus-logic.elc
-${FOR_emacs}${EMACS_LISPPREFIX}/gnus/gnus-mh.el
-${FOR_emacs}${EMACS_LISPPREFIX}/gnus/gnus-mh.elc
-${EMACS_LISPPREFIX}/gnus/gnus-ml.el
-${EMACS_LISPPREFIX}/gnus/gnus-ml.elc
-${EMACS_LISPPREFIX}/gnus/gnus-mlspl.el
-${EMACS_LISPPREFIX}/gnus/gnus-mlspl.elc
-${EMACS_LISPPREFIX}/gnus/gnus-move.el
-${EMACS_LISPPREFIX}/gnus/gnus-move.elc
-${EMACS_LISPPREFIX}/gnus/gnus-msg.el
-${EMACS_LISPPREFIX}/gnus/gnus-msg.elc
-${EMACS_LISPPREFIX}/gnus/gnus-nocem.el
-${EMACS_LISPPREFIX}/gnus/gnus-nocem.elc
-${EMACS_LISPPREFIX}/gnus/gnus-picon.el
-${EMACS_LISPPREFIX}/gnus/gnus-picon.elc
-${EMACS_LISPPREFIX}/gnus/gnus-range.el
-${EMACS_LISPPREFIX}/gnus/gnus-range.elc
-${EMACS_LISPPREFIX}/gnus/gnus-registry.el
-${EMACS_LISPPREFIX}/gnus/gnus-registry.elc
-${EMACS_LISPPREFIX}/gnus/gnus-salt.el
-${EMACS_LISPPREFIX}/gnus/gnus-salt.elc
-${EMACS_LISPPREFIX}/gnus/gnus-score.el
-${EMACS_LISPPREFIX}/gnus/gnus-score.elc
-${EMACS_LISPPREFIX}/gnus/gnus-setup.el
-${EMACS_LISPPREFIX}/gnus/gnus-setup.elc
-${EMACS_LISPPREFIX}/gnus/gnus-sieve.el
-${EMACS_LISPPREFIX}/gnus/gnus-sieve.elc
-${EMACS_LISPPREFIX}/gnus/gnus-soup.el
-${EMACS_LISPPREFIX}/gnus/gnus-soup.elc
-${EMACS_LISPPREFIX}/gnus/gnus-spec.el
-${EMACS_LISPPREFIX}/gnus/gnus-spec.elc
-${EMACS_LISPPREFIX}/gnus/gnus-srvr.el
-${EMACS_LISPPREFIX}/gnus/gnus-srvr.elc
-${EMACS_LISPPREFIX}/gnus/gnus-start.el
-${EMACS_LISPPREFIX}/gnus/gnus-start.elc
-${EMACS_LISPPREFIX}/gnus/gnus-sum.el
-${EMACS_LISPPREFIX}/gnus/gnus-sum.elc
-${EMACS_LISPPREFIX}/gnus/gnus-topic.el
-${EMACS_LISPPREFIX}/gnus/gnus-topic.elc
-${EMACS_LISPPREFIX}/gnus/gnus-undo.el
-${EMACS_LISPPREFIX}/gnus/gnus-undo.elc
-${EMACS_LISPPREFIX}/gnus/gnus-util.el
-${EMACS_LISPPREFIX}/gnus/gnus-util.elc
-${EMACS_LISPPREFIX}/gnus/gnus-uu.el
-${EMACS_LISPPREFIX}/gnus/gnus-uu.elc
-${EMACS_LISPPREFIX}/gnus/gnus-vm.el
-${EMACS_LISPPREFIX}/gnus/gnus-vm.elc
-${EMACS_LISPPREFIX}/gnus/gnus-win.el
-${EMACS_LISPPREFIX}/gnus/gnus-win.elc
-${FOR_xemacs}${EMACS_LISPPREFIX}/gnus/gnus-xmas.el
-${FOR_xemacs}${EMACS_LISPPREFIX}/gnus/gnus-xmas.elc
-${EMACS_LISPPREFIX}/gnus/gnus.el
-${EMACS_LISPPREFIX}/gnus/gnus.elc
-${EMACS_LISPPREFIX}/gnus/hex-util.el
-${EMACS_LISPPREFIX}/gnus/hex-util.elc
-${EMACS_LISPPREFIX}/gnus/html2text.el
-${EMACS_LISPPREFIX}/gnus/html2text.elc
-${EMACS_LISPPREFIX}/gnus/ietf-drums.el
-${EMACS_LISPPREFIX}/gnus/ietf-drums.elc
-${EMACS_LISPPREFIX}/gnus/imap.el
-${EMACS_LISPPREFIX}/gnus/imap.elc
-${EMACS_LISPPREFIX}/gnus/legacy-gnus-agent.el
-${EMACS_LISPPREFIX}/gnus/legacy-gnus-agent.elc
-${EMACS_LISPPREFIX}/gnus/mail-parse.el
-${EMACS_LISPPREFIX}/gnus/mail-parse.elc
-${EMACS_LISPPREFIX}/gnus/mail-prsvr.el
-${EMACS_LISPPREFIX}/gnus/mail-prsvr.elc
-${EMACS_LISPPREFIX}/gnus/mail-source.el
-${EMACS_LISPPREFIX}/gnus/mail-source.elc
-${EMACS_LISPPREFIX}/gnus/mailcap.el
-${EMACS_LISPPREFIX}/gnus/mailcap.elc
-${EMACS_LISPPREFIX}/gnus/message.el
-${EMACS_LISPPREFIX}/gnus/message.elc
-${FOR_xemacs}${EMACS_LISPPREFIX}/gnus/messagexmas.el
-${FOR_xemacs}${EMACS_LISPPREFIX}/gnus/messagexmas.elc
-${EMACS_LISPPREFIX}/gnus/messcompat.el
-${EMACS_LISPPREFIX}/gnus/messcompat.elc
-${EMACS_LISPPREFIX}/gnus/mm-bodies.el
-${EMACS_LISPPREFIX}/gnus/mm-bodies.elc
-${EMACS_LISPPREFIX}/gnus/mm-decode.el
-${EMACS_LISPPREFIX}/gnus/mm-decode.elc
-${EMACS_LISPPREFIX}/gnus/mm-encode.el
-${EMACS_LISPPREFIX}/gnus/mm-encode.elc
-${EMACS_LISPPREFIX}/gnus/mm-extern.el
-${EMACS_LISPPREFIX}/gnus/mm-extern.elc
-${EMACS_LISPPREFIX}/gnus/mm-partial.el
-${EMACS_LISPPREFIX}/gnus/mm-partial.elc
-${EMACS_LISPPREFIX}/gnus/mm-url.el
-${EMACS_LISPPREFIX}/gnus/mm-url.elc
-${EMACS_LISPPREFIX}/gnus/mm-util.el
-${EMACS_LISPPREFIX}/gnus/mm-util.elc
-${EMACS_LISPPREFIX}/gnus/mm-uu.el
-${EMACS_LISPPREFIX}/gnus/mm-uu.elc
-${EMACS_LISPPREFIX}/gnus/mm-view.el
-${EMACS_LISPPREFIX}/gnus/mm-view.elc
-${EMACS_LISPPREFIX}/gnus/mml-sec.el
-${EMACS_LISPPREFIX}/gnus/mml-sec.elc
-${EMACS_LISPPREFIX}/gnus/mml-smime.el
-${EMACS_LISPPREFIX}/gnus/mml-smime.elc
-${EMACS_LISPPREFIX}/gnus/mml.el
-${EMACS_LISPPREFIX}/gnus/mml.elc
-${EMACS_LISPPREFIX}/gnus/mml1991.el
-${EMACS_LISPPREFIX}/gnus/mml1991.elc
-${EMACS_LISPPREFIX}/gnus/mml2015.el
-${EMACS_LISPPREFIX}/gnus/mml2015.elc
-${EMACS_LISPPREFIX}/gnus/netrc.el
-${EMACS_LISPPREFIX}/gnus/netrc.elc
-${EMACS_LISPPREFIX}/gnus/nnagent.el
-${EMACS_LISPPREFIX}/gnus/nnagent.elc
-${EMACS_LISPPREFIX}/gnus/nnbabyl.el
-${EMACS_LISPPREFIX}/gnus/nnbabyl.elc
-${EMACS_LISPPREFIX}/gnus/nndb.el
-${EMACS_LISPPREFIX}/gnus/nndb.elc
-${EMACS_LISPPREFIX}/gnus/nndiary.el
-${EMACS_LISPPREFIX}/gnus/nndiary.elc
-${EMACS_LISPPREFIX}/gnus/nndir.el
-${EMACS_LISPPREFIX}/gnus/nndir.elc
-${EMACS_LISPPREFIX}/gnus/nndoc.el
-${EMACS_LISPPREFIX}/gnus/nndoc.elc
-${EMACS_LISPPREFIX}/gnus/nndraft.el
-${EMACS_LISPPREFIX}/gnus/nndraft.elc
-${EMACS_LISPPREFIX}/gnus/nneething.el
-${EMACS_LISPPREFIX}/gnus/nneething.elc
-${EMACS_LISPPREFIX}/gnus/nnfolder.el
-${EMACS_LISPPREFIX}/gnus/nnfolder.elc
-${EMACS_LISPPREFIX}/gnus/nngateway.el
-${EMACS_LISPPREFIX}/gnus/nngateway.elc
-${EMACS_LISPPREFIX}/gnus/nnheader.el
-${EMACS_LISPPREFIX}/gnus/nnheader.elc
-${FOR_xemacs}${EMACS_LISPPREFIX}/gnus/nnheaderxm.el
-${FOR_xemacs}${EMACS_LISPPREFIX}/gnus/nnheaderxm.elc
-${EMACS_LISPPREFIX}/gnus/nnimap.el
-${EMACS_LISPPREFIX}/gnus/nnimap.elc
-${EMACS_LISPPREFIX}/gnus/nnkiboze.el
-${EMACS_LISPPREFIX}/gnus/nnkiboze.elc
-${EMACS_LISPPREFIX}/gnus/nnlistserv.el
-${EMACS_LISPPREFIX}/gnus/nnlistserv.elc
-${EMACS_LISPPREFIX}/gnus/nnmail.el
-${EMACS_LISPPREFIX}/gnus/nnmail.elc
-${EMACS_LISPPREFIX}/gnus/nnmaildir.el
-${EMACS_LISPPREFIX}/gnus/nnmaildir.elc
-${EMACS_LISPPREFIX}/gnus/nnmbox.el
-${EMACS_LISPPREFIX}/gnus/nnmbox.elc
-${EMACS_LISPPREFIX}/gnus/nnmh.el
-${EMACS_LISPPREFIX}/gnus/nnmh.elc
-${EMACS_LISPPREFIX}/gnus/nnml.el
-${EMACS_LISPPREFIX}/gnus/nnml.elc
-${EMACS_LISPPREFIX}/gnus/nnnil.el
-${EMACS_LISPPREFIX}/gnus/nnnil.elc
-${EMACS_LISPPREFIX}/gnus/nnoo.el
-${EMACS_LISPPREFIX}/gnus/nnoo.elc
-${EMACS_LISPPREFIX}/gnus/nnrss.el
-${EMACS_LISPPREFIX}/gnus/nnrss.elc
-${EMACS_LISPPREFIX}/gnus/nnslashdot.el
-${EMACS_LISPPREFIX}/gnus/nnslashdot.elc
-${EMACS_LISPPREFIX}/gnus/nnsoup.el
-${EMACS_LISPPREFIX}/gnus/nnsoup.elc
-${EMACS_LISPPREFIX}/gnus/nnspool.el
-${EMACS_LISPPREFIX}/gnus/nnspool.elc
-${EMACS_LISPPREFIX}/gnus/nntp.el
-${EMACS_LISPPREFIX}/gnus/nntp.elc
-${FOR_xemacs}${EMACS_LISPPREFIX}/gnus/nnultimate.el
-${FOR_xemacs}${EMACS_LISPPREFIX}/gnus/nnultimate.elc
-${EMACS_LISPPREFIX}/gnus/nnvirtual.el
-${EMACS_LISPPREFIX}/gnus/nnvirtual.elc
-${EMACS_LISPPREFIX}/gnus/nnwarchive.el
-${EMACS_LISPPREFIX}/gnus/nnwarchive.elc
-${EMACS_LISPPREFIX}/gnus/nnweb.el
-${EMACS_LISPPREFIX}/gnus/nnweb.elc
-${FOR_xemacs}${EMACS_LISPPREFIX}/gnus/nnwfm.el
-${FOR_xemacs}${EMACS_LISPPREFIX}/gnus/nnwfm.elc
-${EMACS_LISPPREFIX}/gnus/parse-time.el
-${EMACS_LISPPREFIX}/gnus/parse-time.elc
-${EMACS_LISPPREFIX}/gnus/pgg-def.el
-${EMACS_LISPPREFIX}/gnus/pgg-def.elc
-${EMACS_LISPPREFIX}/gnus/pgg-gpg.el
-${EMACS_LISPPREFIX}/gnus/pgg-gpg.elc
-${EMACS_LISPPREFIX}/gnus/pgg-parse.el
-${EMACS_LISPPREFIX}/gnus/pgg-parse.elc
-${EMACS_LISPPREFIX}/gnus/pgg-pgp.el
-${EMACS_LISPPREFIX}/gnus/pgg-pgp.elc
-${EMACS_LISPPREFIX}/gnus/pgg-pgp5.el
-${EMACS_LISPPREFIX}/gnus/pgg-pgp5.elc
-${EMACS_LISPPREFIX}/gnus/pgg.el
-${EMACS_LISPPREFIX}/gnus/pgg.elc
-${EMACS_LISPPREFIX}/gnus/pop3.el
-${EMACS_LISPPREFIX}/gnus/pop3.elc
-${EMACS_LISPPREFIX}/gnus/qp.el
-${EMACS_LISPPREFIX}/gnus/qp.elc
-${EMACS_LISPPREFIX}/gnus/rfc1843.el
-${EMACS_LISPPREFIX}/gnus/rfc1843.elc
-${EMACS_LISPPREFIX}/gnus/rfc2045.el
-${EMACS_LISPPREFIX}/gnus/rfc2045.elc
-${EMACS_LISPPREFIX}/gnus/rfc2047.el
-${EMACS_LISPPREFIX}/gnus/rfc2047.elc
-${EMACS_LISPPREFIX}/gnus/rfc2104.el
-${EMACS_LISPPREFIX}/gnus/rfc2104.elc
-${EMACS_LISPPREFIX}/gnus/rfc2231.el
-${EMACS_LISPPREFIX}/gnus/rfc2231.elc
-${EMACS_LISPPREFIX}/gnus/score-mode.el
-${EMACS_LISPPREFIX}/gnus/score-mode.elc
-${EMACS_LISPPREFIX}/gnus/sha1.el
-${EMACS_LISPPREFIX}/gnus/sha1.elc
-${EMACS_LISPPREFIX}/gnus/sieve-manage.el
-${EMACS_LISPPREFIX}/gnus/sieve-manage.elc
-${EMACS_LISPPREFIX}/gnus/sieve-mode.el
-${EMACS_LISPPREFIX}/gnus/sieve-mode.elc
-${EMACS_LISPPREFIX}/gnus/sieve.el
-${EMACS_LISPPREFIX}/gnus/sieve.elc
-${EMACS_LISPPREFIX}/gnus/smiley.el
-${EMACS_LISPPREFIX}/gnus/smiley.elc
-${EMACS_LISPPREFIX}/gnus/smime.el
-${EMACS_LISPPREFIX}/gnus/smime.elc
-${EMACS_LISPPREFIX}/gnus/spam-report.el
-${EMACS_LISPPREFIX}/gnus/spam-report.elc
-${EMACS_LISPPREFIX}/gnus/spam-stat.el
-${EMACS_LISPPREFIX}/gnus/spam-stat.elc
-${EMACS_LISPPREFIX}/gnus/spam.el
-${EMACS_LISPPREFIX}/gnus/spam.elc
-${EMACS_LISPPREFIX}/gnus/starttls.el
-${EMACS_LISPPREFIX}/gnus/starttls.elc
-${EMACS_LISPPREFIX}/gnus/time-date.el
-${EMACS_LISPPREFIX}/gnus/time-date.elc
-${EMACS_LISPPREFIX}/gnus/tls.el
-${EMACS_LISPPREFIX}/gnus/tls.elc
-${EMACS_LISPPREFIX}/gnus/utf7.el
-${EMACS_LISPPREFIX}/gnus/utf7.elc
-${EMACS_LISPPREFIX}/gnus/uudecode.el
-${EMACS_LISPPREFIX}/gnus/uudecode.elc
-${FOR_xemacs}${EMACS_LISPPREFIX}/gnus/webmail.el
-${FOR_xemacs}${EMACS_LISPPREFIX}/gnus/webmail.elc
-${EMACS_LISPPREFIX}/gnus/yenc.el
-${EMACS_LISPPREFIX}/gnus/yenc.elc
-@dirrm ${EMACS_LISPPREFIX}/gnus
-@dirrm share/doc/gnus/info
-@dirrm share/doc/gnus
-@dirrm share/gnus/images/smilies
-@dirrm share/gnus/images/gnus
-@dirrm share/gnus/images
-@dirrm share/gnus
diff --git a/mail/gnus/distinfo b/mail/gnus/distinfo
deleted file mode 100644
index 71980314adc..00000000000
--- a/mail/gnus/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.6 2006/11/10 17:57:51 perry Exp $
-
-SHA1 (gnus-5.10.8.tar.gz) = 58ca5ca174140bc824b5e9533a869ae1d3596dc1
-RMD160 (gnus-5.10.8.tar.gz) = 4a2fdea20961d7a714670b59f4d34864ebcaa930
-Size (gnus-5.10.8.tar.gz) = 2496529 bytes
-SHA1 (patch-aa) = f8e6a69610745e16c2fdf319294cf6931e31fe70
diff --git a/mail/gnus/patches/patch-aa b/mail/gnus/patches/patch-aa
deleted file mode 100644
index f0f2277d95e..00000000000
--- a/mail/gnus/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/11/10 17:57:51 perry Exp $
-
-NetBSD doesn't have a sha1sum, use digest instead
-
---- lisp/sha1.el.orig 2006-02-07 23:18:30.000000000 -0500
-+++ lisp/sha1.el
-@@ -73,7 +73,7 @@
- :type 'integer
- :group 'sha1)
-
--(defcustom sha1-program '("sha1sum")
-+(defcustom sha1-program '("digest" "sha1")
- "*Name of program to compute SHA1.
- It must be a string \(program name\) or list of strings \(name and its args\)."
- :type '(repeat string)
diff --git a/mail/gotmail/DESCR b/mail/gotmail/DESCR
deleted file mode 100644
index 86f44fa7995..00000000000
--- a/mail/gotmail/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Gotmail is a script to download mail from hotmail.com without user
-interaction. It's probably best run from a cron job. It can delete
-messages, download only-new messages, mark messages read (or not),
-forward to procmail, forward to another address, or send through SMTP.
diff --git a/mail/gotmail/MESSAGE b/mail/gotmail/MESSAGE
deleted file mode 100644
index a5d890fc808..00000000000
--- a/mail/gotmail/MESSAGE
+++ /dev/null
@@ -1,11 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2005/10/31 20:34:19 minskim Exp $
-
-Hotmail periodically makes small changes in the way its site works, and
-corresponding changes are made to Gotmail as expeditiously as possible.
-However, there may be periods of time during which Gotmail will not work,
-due to these changes. You may need to upgrade to a newer version. Please
-be patient, and don't rely on Gotmail being in working condition at
-all times.
-
-===========================================================================
diff --git a/mail/gotmail/Makefile b/mail/gotmail/Makefile
deleted file mode 100644
index cc2d343ded9..00000000000
--- a/mail/gotmail/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2007/01/07 09:13:58 rillig Exp $
-#
-
-DISTNAME= gotmail-0.8.6
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gotmail/}
-
-MAINTAINER= pancake@phreaker.net
-HOMEPAGE= http://sourceforge.net/projects/gotmail
-COMMENT= Script to download mail from hotmail.com
-
-DEPENDS+= curl-[0-9]*:../../www/curl
-DEPENDS+= p5-URI>=1.03:../../www/p5-URI
-DEPENDS+= p5-Net-[0-9]*:../../net/p5-Net
-
-USE_TOOLS+= perl:run
-REPLACE_PERL= ${WRKSRC}/gotmail.in
-
-PKG_SYSCONFSUBDIR= gotmail
-
-EGDIR= ${PREFIX}/share/examples/gotmail
-CONF_FILES= ${EGDIR}/sample.gotmailrc \
- ${PKG_SYSCONFDIR}/sample.gotmailrc
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/gotmail ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gotmail
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gotmail
- ${INSTALL_DATA} ${WRKSRC}/sample.gotmailrc ${EGDIR}
- ${INSTALL_MAN} ${WRKSRC}/gotmail.1 ${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/gotmail/PLIST b/mail/gotmail/PLIST
deleted file mode 100644
index a668a82beb6..00000000000
--- a/mail/gotmail/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/31 20:34:19 minskim Exp $
-bin/gotmail
-man/man1/gotmail.1
-share/doc/gotmail/README
-share/examples/gotmail/sample.gotmailrc
-@dirrm share/examples/gotmail
-@dirrm share/doc/gotmail
diff --git a/mail/gotmail/distinfo b/mail/gotmail/distinfo
deleted file mode 100644
index 5eb90ec99d4..00000000000
--- a/mail/gotmail/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/31 20:34:19 minskim Exp $
-
-SHA1 (gotmail-0.8.6.tar.gz) = 880a4a91115fd8c5e6a33e05eab1e3f43fbfb587
-RMD160 (gotmail-0.8.6.tar.gz) = d9c3afd568a3d19bf50f6128d9293f7bb4780f9f
-Size (gotmail-0.8.6.tar.gz) = 35212 bytes
diff --git a/mail/greetdelay/DESCR b/mail/greetdelay/DESCR
deleted file mode 100644
index 9fe48cdc641..00000000000
--- a/mail/greetdelay/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-greetdelay is a program to introduce a small delay before an SMTP
-greeting. It can also optionally enforce RFC 2821's recommendation
-that SMTP clients not send any commands before receiving the greeting
-message.
diff --git a/mail/greetdelay/Makefile b/mail/greetdelay/Makefile
deleted file mode 100644
index c842da18c70..00000000000
--- a/mail/greetdelay/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2007/01/30 22:09:06 schmonz Exp $
-#
-
-DISTNAME= greetdelay-0.03
-CATEGORIES= mail
-MASTER_SITES= ${HOMEPAGE}
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://alkemio.org/software/greetdelay/
-COMMENT= Introduces a small delay before an SMTP greeting
-
-BUILD_TARGET= default
-
-USE_TOOLS+= nroff
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
-
-do-install:
- cd ${WRKSRC}; \
- cp greetdelay ${PREFIX}/bin; \
- cp greetdelay.0 ${PREFIX}/${PKGMANDIR}/cat1; \
- cp greetdelay.1 ${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/greetdelay/PLIST b/mail/greetdelay/PLIST
deleted file mode 100644
index 3bd96a4601d..00000000000
--- a/mail/greetdelay/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/12/29 10:49:25 schmonz Exp $
-bin/greetdelay
-man/cat1/greetdelay.0
-man/man1/greetdelay.1
diff --git a/mail/greetdelay/distinfo b/mail/greetdelay/distinfo
deleted file mode 100644
index 22a74111c67..00000000000
--- a/mail/greetdelay/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2007/01/30 22:09:06 schmonz Exp $
-
-SHA1 (greetdelay-0.03.tar.gz) = c97a452acdd8cf3cf285f99baab829d89d3836f6
-RMD160 (greetdelay-0.03.tar.gz) = 203e5130689346e94f5038bae008cd3494c4a8a7
-Size (greetdelay-0.03.tar.gz) = 1370 bytes
diff --git a/mail/grepmail/DESCR b/mail/grepmail/DESCR
deleted file mode 100644
index 48227e3e7da..00000000000
--- a/mail/grepmail/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-grepmail searches a normal or gzip'ed mailbox for a given regular
-expression and outputs the emails that match it. It also supports
-searches constrained by date and other factors.
diff --git a/mail/grepmail/Makefile b/mail/grepmail/Makefile
deleted file mode 100644
index 8bbab7f0503..00000000000
--- a/mail/grepmail/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2006/10/15 10:43:36 obache Exp $
-
-DISTNAME= grepmail-5.3032
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=grepmail/}
-
-MAINTAINER= david@fundy.net
-HOMEPAGE= http://grepmail.sourceforge.net/
-COMMENT= mbox formatted file search utility
-
-DEPENDS+= p5-Date-Manip-[0-9]*:../../devel/p5-Date-Manip
-DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
-DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate
-DEPENDS+= p5-Mail-Mbox-MessageParser>=1.4001:../../mail/p5-Mail-Mbox-MessageParser
-
-PERL5_PACKLIST= auto/grepmail/.packlist
-MAKE_PARAMS+= < /dev/null
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/grepmail/PLIST b/mail/grepmail/PLIST
deleted file mode 100644
index 13013344e48..00000000000
--- a/mail/grepmail/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/10/31 08:18:40 seb Exp $
diff --git a/mail/grepmail/distinfo b/mail/grepmail/distinfo
deleted file mode 100644
index 4f4c5fd0a15..00000000000
--- a/mail/grepmail/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.10 2006/10/15 10:43:36 obache Exp $
-
-SHA1 (grepmail-5.3032.tar.gz) = 94b98bce7f361e03d640d5c5ae550a32c3572a2f
-RMD160 (grepmail-5.3032.tar.gz) = a6e17930b7e37e25f1f0ed052b389cb261b45178
-Size (grepmail-5.3032.tar.gz) = 527481 bytes
diff --git a/mail/hypermail/DESCR b/mail/hypermail/DESCR
deleted file mode 100644
index 1fe2dcba570..00000000000
--- a/mail/hypermail/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Hypermail is a program that takes a file of mail messages in UNIX mailbox
-format and generates a set of cross-referenced HTML documents.
-
-This version of hypermail has substantial support for attachments and for
-splitting archives into subdirectories. It also allows an administrator to
-customize the header and footers to match their local needs. This allows
-you to have hypermail facilities better integrated into your web site.
diff --git a/mail/hypermail/Makefile b/mail/hypermail/Makefile
deleted file mode 100644
index 53a7b82cedc..00000000000
--- a/mail/hypermail/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/06/20 22:14:46 minskim Exp $
-#
-
-DISTNAME= hypermail-2.1.8
-CATEGORIES= mail www
-MASTER_SITES= http://www.hypermail.org/dist/
-
-MAINTAINER= grant@NetBSD.org
-HOMEPAGE= http://www.hypermail.org/
-COMMENT= Creates indexed, threaded HTML archives of email
-
-GNU_CONFIGURE= yes
-USE_TOOLS+= yacc
-
-CONFIGURE_ARGS+= --with-gdbm=${BUILDLINK_PREFIX.gdbm}
-CONFIGURE_ARGS+= --with-htmldir=${PREFIX}/share/doc/html/hypermail
-
-.include "../../databases/gdbm/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/hypermail/PLIST b/mail/hypermail/PLIST
deleted file mode 100644
index ea6f896def9..00000000000
--- a/mail/hypermail/PLIST
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/10/20 10:10:47 grant Exp $
-bin/hypermail
-bin/msg2archive
-bin/rdmsg
-man/man1/hypermail.1
-man/man4/hmrc.4
-share/doc/html/hypermail/archive_search.html
-share/doc/html/hypermail/customizing.html
-share/doc/html/hypermail/hmrc.html
-share/doc/html/hypermail/hr.yellow.png
-share/doc/html/hypermail/hypermail-faq.html
-share/doc/html/hypermail/hypermail.html
-share/doc/html/hypermail/hypermail.png
-share/doc/html/hypermail/stars.png
-@exec ${MKDIR} %D/share/doc/html/hypermail/images
-@dirrm share/doc/html/hypermail/images
-@dirrm share/doc/html/hypermail
diff --git a/mail/hypermail/distinfo b/mail/hypermail/distinfo
deleted file mode 100644
index 37e4e3174c8..00000000000
--- a/mail/hypermail/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 09:59:22 agc Exp $
-
-SHA1 (hypermail-2.1.8.tar.gz) = acb357832c52c91e43f58d13e20c0599440d3df9
-RMD160 (hypermail-2.1.8.tar.gz) = 377bab9c7028cb684be1bfcbed70ae2ba777255c
-Size (hypermail-2.1.8.tar.gz) = 1238173 bytes
-SHA1 (patch-aa) = c67e4a22cddee828d2c2039f1e4ca2a667ce48b8
-SHA1 (patch-ac) = 0b173d255d0b6b4024ece4ce7fc4ea85ce6c2322
-SHA1 (patch-ad) = ec9220c81d8f8831ac66b1f9d4979523e631ddeb
-SHA1 (patch-ae) = 4e0f1054ead76f8cbff4eaceac926ff664c6a7ff
diff --git a/mail/hypermail/patches/patch-aa b/mail/hypermail/patches/patch-aa
deleted file mode 100644
index 41a982d2bd3..00000000000
--- a/mail/hypermail/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/06/17 12:54:49 grant Exp $
-
---- configure.orig 2003-02-14 11:11:16.000000000 +1100
-+++ configure
-@@ -544,14 +544,6 @@ fi
-
-
-
--LDFLAGS=""
--LIBS=""
--EXTRA_LIBS=""
--INCLUDES=""
--GDBM_INCLUDE=""
--GDBM_LIB=""
--FNV_DEP=""
--SUBDIRS="src/pcre"
-
-
- ac_aux_dir=
diff --git a/mail/hypermail/patches/patch-ac b/mail/hypermail/patches/patch-ac
deleted file mode 100644
index 20002635b20..00000000000
--- a/mail/hypermail/patches/patch-ac
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2004/10/20 10:10:47 grant Exp $
-
---- src/Makefile.in.orig 2003-07-04 08:23:07.000000000 +1000
-+++ src/Makefile.in
-@@ -24,15 +24,15 @@ CC=@CC@
- # Installation program to use
- INSTALL_PROG=@INSTALL@
-
--SPLINTFLAGS=-Ipcre
-+SPLINTFLAGS=
-
- #WNOERROR=-Werror
- #WARNINGS=$(WNOERROR) -ansi -pedantic -Wall -Wtraditional -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Dlint
-
--CFLAGS=@CFLAGS@ @INCLUDES@ -Ipcre -DTRIO_MINIMAL $(WARNINGS)
-+CFLAGS=@CFLAGS@ @INCLUDES@ -DTRIO_MINIMAL $(WARNINGS)
- YACC=@YACC@
- NETLIBS=@LIBS@
--LDFLAGS=@LDFLAGS@ -Lpcre/.libs
-+LDFLAGS=@LDFLAGS@
- MISC_LIBS= -lm -lpcre
- OPT_LIBS=@EXTRA_LIBS@
-
-@@ -58,7 +58,7 @@ MAILOBJS= mail.o ../libcgi/libcgi.a
- .c.o:
- $(CC) -c $(CFLAGS) $<
-
--all: pcre/.libs/libpcre.a @FNV_DEP@ hypermail$(SUFFIX) mail$(SUFFIX) lang$(SUFFIX)
-+all: @FNV_DEP@ hypermail$(SUFFIX) mail$(SUFFIX) lang$(SUFFIX)
-
- pcre/.libs/libpcre.a:
- @cd pcre; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)"
diff --git a/mail/hypermail/patches/patch-ad b/mail/hypermail/patches/patch-ad
deleted file mode 100644
index 37ebf723f3e..00000000000
--- a/mail/hypermail/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/10/20 10:10:47 grant Exp $
-
---- src/proto.h.orig 2003-07-04 09:00:18.000000000 +1000
-+++ src/proto.h
-@@ -94,7 +94,9 @@ char *PushByte(struct Push *, char);
- char *PushString(struct Push *, const char *);
- char *PushNString(struct Push *, const char *, int);
-
-+#ifndef HAVE_STRCASESTR
- char *strcasestr (char *, const char *);
-+#endif
- char *strsav(const char *);
- char *strreplace(char *, char *);
- void strcpymax(char *, const char *, int);
diff --git a/mail/hypermail/patches/patch-ae b/mail/hypermail/patches/patch-ae
deleted file mode 100644
index b54f589d292..00000000000
--- a/mail/hypermail/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/10/20 10:10:47 grant Exp $
-
---- Makefile.in.orig 2003-02-14 05:57:37.000000000 +1100
-+++ Makefile.in
-@@ -28,9 +28,9 @@ INSTALL_PROG=@INSTALL@
-
- # Compiler to use
- CC=@CC@
--CFLAGS=@CFLAGS@ @INCLUDES@ -Ipcre -DTRIO_MINIMAL $(WARNINGS)
-+CFLAGS=@CFLAGS@ @INCLUDES@ -DTRIO_MINIMAL $(WARNINGS)
- LIBS=@LIBS@
--LDFLAGS=@LDFLAGS@ -Lpcre
-+LDFLAGS=@LDFLAGS@
-
- all: hypermail support
-
diff --git a/mail/ifile-procmail/DESCR b/mail/ifile-procmail/DESCR
deleted file mode 100644
index c0eb98bac10..00000000000
--- a/mail/ifile-procmail/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This package contains shell scripts that allows ifile to be used in standard
-UNIX e-mail environment with procmail and mbox mailboxes.
diff --git a/mail/ifile-procmail/Makefile b/mail/ifile-procmail/Makefile
deleted file mode 100644
index 59396cab422..00000000000
--- a/mail/ifile-procmail/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:09:55 joerg Exp $
-#
-
-DISTNAME= ifile.procmail-0.3
-PKGNAME= ${DISTNAME:S/./-/}
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= http://Xtrmntr.org/ORBman/download/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= salo@NetBSD.org
-HOMEPAGE= http://Xtrmntr.org/ORBman/ifile.procmail.html
-COMMENT= Set of scripts for ifile used in procmail environment
-
-DEPENDS+= ifile>=1.2.1:../../mail/ifile
-DEPENDS+= procmail>=3.22:../../mail/procmail
-
-WRKSRC= ${WRKDIR}/${DISTNAME}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if empty(OPSYS:M*BSD)
-DEPENDS+= mktemp>=1.4:../../sysutils/mktemp
-.endif
-
-NO_BUILD= YES
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ifile
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ifile
- for f in `${LS} ${WRKSRC}/bin` ; do \
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/$$f ${PREFIX}/bin ; \
- done
- ${INSTALL_DATA} ${WRKSRC}/README.new ${PREFIX}/share/doc/ifile/README
- ${INSTALL_DATA} ${WRKSRC}/sample.procmailrc ${PREFIX}/share/examples/ifile
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/ifile-procmail/PLIST b/mail/ifile-procmail/PLIST
deleted file mode 100644
index 5532057d277..00000000000
--- a/mail/ifile-procmail/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/13 09:46:55 salo Exp $
-bin/ifile.inject-learn.header
-bin/ifile.inject.header
-bin/ifile.learn.mailbox
-bin/ifile.learn.message
-bin/ifile.relearn.message
-bin/ifile.reset
-bin/ifile.test-learn.message
-bin/ifile.test.mailbox
-bin/ifile.test.message
-bin/ifile.unlearn.message
-share/doc/ifile/README
-share/examples/ifile/sample.procmailrc
-@dirrm share/examples/ifile
-@dirrm share/doc/ifile
diff --git a/mail/ifile-procmail/distinfo b/mail/ifile-procmail/distinfo
deleted file mode 100644
index 116238575d1..00000000000
--- a/mail/ifile-procmail/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:23 agc Exp $
-
-SHA1 (ifile.procmail-0.3.tgz) = 33a00107e046deee14f93dbfe691a9161adbeb0d
-RMD160 (ifile.procmail-0.3.tgz) = 0c5029f1bf415d1112f2e3f75de47afacf9f8202
-Size (ifile.procmail-0.3.tgz) = 4092 bytes
diff --git a/mail/ifile/DESCR b/mail/ifile/DESCR
deleted file mode 100644
index 4ab575bfbfa..00000000000
--- a/mail/ifile/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-ifile is a general mail filtering system which uses a modern-day text learning
-algorithm to intelligently filter mail according to the way the user tends to
-organize mail.
-
-ifile is different from other mail filtering programs in three major ways:
-
- 1. ifile does not require the user to generate a set of rules in order to
- successfully filter mail
- 2. ifile uses the entire content of messages for filtering purposes
- 3. ifile learns as the user moves incorrectly filtered messages to new
- mailboxes
-
-ifile is not dependent upon any specific mail system and should be adaptable
-to any system which allows an outside program to perform mail filtering.
diff --git a/mail/ifile/Makefile b/mail/ifile/Makefile
deleted file mode 100644
index 13c6fbfc9d3..00000000000
--- a/mail/ifile/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:09:55 joerg Exp $
-#
-
-DISTNAME= ifile-1.3.4
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= http://www.nongnu.org/ifile/
-DIST_SUBDIR= ${PKGNAME_NOREV}
-
-MAINTAINER= salo@NetBSD.org
-HOMEPAGE= http://www.nongnu.org/ifile/
-COMMENT= Intelligent mail filtering system
-
-GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/ifile/PLIST b/mail/ifile/PLIST
deleted file mode 100644
index 2ff45f03427..00000000000
--- a/mail/ifile/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/13 09:39:15 salo Exp $
-bin/ifile
-man/man1/ifile.1
diff --git a/mail/ifile/distinfo b/mail/ifile/distinfo
deleted file mode 100644
index 51a5f6652da..00000000000
--- a/mail/ifile/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 09:59:23 agc Exp $
-
-SHA1 (ifile-1.3.4/ifile-1.3.4.tar.gz) = c8ef75cfe8f25af65b3384e016b7fd2d324346b0
-RMD160 (ifile-1.3.4/ifile-1.3.4.tar.gz) = ac13f9b8ba99319be61764ffb9492cc9405b3ea7
-Size (ifile-1.3.4/ifile-1.3.4.tar.gz) = 187742 bytes
-SHA1 (patch-aa) = c61f441f9bcae546fcebe351be02cad9f1e3b00a
diff --git a/mail/ifile/patches/patch-aa b/mail/ifile/patches/patch-aa
deleted file mode 100644
index f5f91f82c7b..00000000000
--- a/mail/ifile/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/07/25 15:25:14 salo Exp $
-
---- argp/argp.h.orig Tue Jun 10 16:09:27 2003
-+++ argp/argp.h Fri Jul 25 16:47:12 2003
-@@ -352,7 +352,7 @@
- #define ARGP_NO_EXIT 0x20
-
- /* Use the gnu getopt `long-only' rules for parsing arguments. */
--#define ARGP_LONG_ONLY 0x40
-+#define ARGP_LONG_ONLY 0x00
-
- /* Turns off any message-printing/exiting options. */
- #define ARGP_SILENT (ARGP_NO_EXIT | ARGP_NO_ERRS | ARGP_NO_HELP)
diff --git a/mail/imap-uw-utils/DESCR b/mail/imap-uw-utils/DESCR
deleted file mode 100644
index 2d87d9c0e80..00000000000
--- a/mail/imap-uw-utils/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-This distribution contains two unsupported programs, icat and ifrom,
-which may be of use to some sites.
-
- icat "cat" a mailbox from an IMAP source
- ifrom one line per message summary of IMAP mailbox
-
-There were once other programs in this distribution as well:
-
-The old chkmail, imapcopy, imapxfer, mbxcopy, mbxcreat, and mbxcvt
-programs have been replaced with the mailutil program, which is
-included in the mail/imap-uw package.
-
-The dmail, mlock, and tmail programs are also bundled in the mail/imap-uw
-package.
diff --git a/mail/imap-uw-utils/Makefile b/mail/imap-uw-utils/Makefile
deleted file mode 100644
index 632d1318315..00000000000
--- a/mail/imap-uw-utils/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2007/01/07 09:13:58 rillig Exp $
-
-DISTNAME= imap-utils
-PKGNAME= imap-uw-utils-20050108
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.cac.washington.edu/imap/
-EXTRACT_SUFX= .tar.Z
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.washington.edu/imap/
-COMMENT= UW IMAP mailbox utilities
-
-DIST_SUBDIR= ${PKGNAME_NOREV}
-
-BUILDLINK_API_DEPENDS.imap-uw+= imap-uw>=2004c1nb1
-
-SRCDIRS= icat ifrom
-
-CFLAGS+= -I${BUILDLINK_PREFIX.imap-uw}/include/c-client
-LIBS+= -lc-client -lssl -lcrypto
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-build:
- @for prog in ${SRCDIRS}; do \
- ${ECHO} "==> Building $${prog}"; \
- cd ${WRKSRC}/$${prog}; \
- ${CC} ${CFLAGS} ${LDFLAGS} -o $${prog} $${prog}.c ${LIBS}; \
- done
-
-do-install:
- @for prog in ${SRCDIRS}; do \
- ${ECHO} "==> Installing $${prog}"; \
- cd ${WRKSRC}/$${prog}; \
- ${INSTALL_PROGRAM} $${prog} ${PREFIX}/bin; \
- ${INSTALL_MAN} $${prog}.1 ${PREFIX}/${PKGMANDIR}/man1; \
- done
-
-.include "../../mail/imap-uw/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/imap-uw-utils/PLIST b/mail/imap-uw-utils/PLIST
deleted file mode 100644
index df31ac37933..00000000000
--- a/mail/imap-uw-utils/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/03/06 14:37:15 adrianp Exp $
-bin/icat
-bin/ifrom
-man/man1/icat.1
-man/man1/ifrom.1
diff --git a/mail/imap-uw-utils/distinfo b/mail/imap-uw-utils/distinfo
deleted file mode 100644
index fa99a94a4c3..00000000000
--- a/mail/imap-uw-utils/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/03/06 14:37:15 adrianp Exp $
-
-SHA1 (imap-uw-utils-20050108/imap-utils.tar.Z) = 0453d669d4208b1c7a8101393654f551aee06b96
-RMD160 (imap-uw-utils-20050108/imap-utils.tar.Z) = eb00b3f90aad728be9df581514e076ed002e4bca
-Size (imap-uw-utils-20050108/imap-utils.tar.Z) = 14720 bytes
diff --git a/mail/imap-uw/DESCR b/mail/imap-uw/DESCR
deleted file mode 100644
index 396c4441c81..00000000000
--- a/mail/imap-uw/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-The UW imapd is the reference implementation of the IMAP4 protocol for
-interactive remote retrieval of mail and storage of mail folders. Also
-included are POP2 and POP3 servers and an IMAP protocol tester (mtest).
-
-The Pine mail program includes an IMAP4 client driver, as does Netscape
-version 4 and above.
diff --git a/mail/imap-uw/MESSAGE b/mail/imap-uw/MESSAGE
deleted file mode 100644
index 5fff7ccfd33..00000000000
--- a/mail/imap-uw/MESSAGE
+++ /dev/null
@@ -1,18 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2006/07/26 20:00:27 jlam Exp $
-
-Add the following to /etc/services (if not already there):
-
- imap 143/tcp # Internet Message Access Protocol
- imap 143/udp
-
-Add the following to /etc/inetd.conf:
-
- imap stream tcp nowait root ${PREFIX}/libexec/imapd imapd
- pop2 stream tcp nowait root ${PREFIX}/libexec/ipop2d ipop2d
- pop3 stream tcp nowait root ${PREFIX}/libexec/ipop3d ipop3d
-
-You will need to make inetd reload its configuration for the changes to
-take effect.
-
-===========================================================================
diff --git a/mail/imap-uw/MESSAGE.ssl b/mail/imap-uw/MESSAGE.ssl
deleted file mode 100644
index 301a77f88eb..00000000000
--- a/mail/imap-uw/MESSAGE.ssl
+++ /dev/null
@@ -1,23 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.ssl,v 1.1 2006/07/26 20:00:27 jlam Exp $
-
-Add the following to /etc/services (if not already there):
-
- imaps 993/tcp # imap4 protocol over TLS/SSL
- imaps 993/udp # imap4 protocol over TLS/SSL
- pop3s 995/tcp # pop3 protocol over TLS/SSL (was spop3)
- pop3s 995/udp # pop3 protocol over TLS/SSL (was spop3)
-
-Add the following to /etc/inetd.conf:
-
- imaps stream tcp nowait root ${PREFIX}/libexec/imapd imapd
- pop3s stream tcp nowait root ${PREFIX}/libexec/ipop3d ipop3d
-
-The imapd daemon looks for the following files to use SSL:
-
- ${SSLCERTS}/imapd.pem (certificate)
- ${SSLKEYS}/imapd.pem (private key)
-
-and similarly for the ipopd daemon.
-
-===========================================================================
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
deleted file mode 100644
index 52922d4388a..00000000000
--- a/mail/imap-uw/Makefile
+++ /dev/null
@@ -1,143 +0,0 @@
-# $NetBSD: Makefile,v 1.116 2007/03/21 19:39:08 jwise Exp $
-#
-# ATTENTION:
-# The Kerberos support in this software is known to be problematic. If you
-# upgrade this package you *must* test it on a system with Kerberos libraries
-# but not running Kerberos before committing the changes.
-
-DISTNAME= imap-2004g
-PKGNAME= ${DISTNAME:S/-/-uw-/}
-PKGREVISION= 2
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.cac.washington.edu/imap/
-EXTRACT_SUFX= .tar.Z
-
-MAINTAINER= jwise@NetBSD.org
-HOMEPAGE= http://www.washington.edu/imap/
-COMMENT= University of Washington's IMAP, POP2, and POP3 servers
-
-USE_LIBTOOL= yes
-MAKE_ENV+= LIBTOOL=libtool
-MAKE_ENV+= LTCOMPILE="libtool --mode=compile"
-MAKE_ENV+= LTLINK="libtool --mode=link"
-LTINSTALL_PROGRAM= ${SETENV} ${MAKE_ENV} ${LIBTOOL} --mode=install ${INSTALL_PROGRAM}
-LTINSTALL_LIB= ${SETENV} ${MAKE_ENV} ${LIBTOOL} --mode=install ${INSTALL_LIB}
-
-.include "../../mk/bsd.prefs.mk"
-
-# Each platform has its own special target in the imap Makefiles.
-OPSYSVARS+= BUILD_TARGET
-BUILD_TARGET.SunOS= gso
-.if ${OPSYS} == Linux && exists(/usr/include/security/pam_appl.h)
-BUILD_TARGET.Linux= lnp
-.else
-BUILD_TARGET.Linux= slx
-.endif
-BUILD_TARGET.Darwin= osx
-.if ${OPSYS} == "IRIX"
-. if ${OS_VERSION} >= 6.5
-BUILD_TARGET.IRIX= sg6
-. else
-BUILD_TARGET.IRIX= sgi
-. endif
-.endif
-BUILD_TARGET.OSF1= osf
-BUILD_TARGET.OpenBSD= bso
-.if ${OPSYS} == NetBSD && exists(/usr/include/security/pam_appl.h)
-BUILD_TARGET.NetBSD= nep
-.endif
-BUILD_TARGET.*= neb
-MESSAGE_SRC= ${PKGDIR}/MESSAGE
-
-.include "options.mk"
-
-# The defaults for these values are set in pkgsrc/mk/defaults/mk.conf.
-#IMAP_UW_CCLIENT_MBOX_FMT?= unix
-#IMAP_UW_MAILSPOOLHOME?= .Mailbox
-BUILD_DEFS+= IMAP_UW_CCLIENT_MBOX_FMT IMAP_UW_MAILSPOOLHOME
-
-CCLIENT_LIB= libc-client.la
-CCLIENT_PICLIB= libc-client_pic.a
-CCLIENT_MAJOR= 4
-CCLIENT_MINOR= 3
-MAKE_ENV+= CCLIENT_MAJOR=${CCLIENT_MAJOR:Q}
-MAKE_ENV+= CCLIENT_MINOR=${CCLIENT_MINOR:Q}
-
-EXTRASPECIALS+= CREATEPROTO=${IMAP_UW_CCLIENT_MBOX_FMT:Q}proto
-
-MAKE_FLAGS+= EXTRALDFLAGS=${LDFLAGS:Q}
-MAKE_FLAGS+= EXTRACFLAGS=${CFLAGS:Q}
-MAKE_FLAGS+= EXTRASPECIALS=${EXTRASPECIALS:Q}
-
-SUBST_CLASSES+= mbox
-SUBST_STAGE.mbox= do-configure
-SUBST_FILES.mbox= src/osdep/unix/env_unix.c
-.if defined(IMAP_USE_MAILSPOOLHOME)
-SUBST_SED.mbox= -e 's|@SPOOLDIR@|myhomedir ()|' \
- -e 's|@MAILBOX@|"${IMAP_UW_MAILSPOOLHOME}"|'
-.else
-SUBST_SED.mbox= -e 's|@SPOOLDIR@|MAILSPOOL|' \
- -e 's|@MAILBOX@|myusername ()|'
-.endif
-
-SUBST_CLASSES+= man
-SUBST_STAGE.man= post-build
-SUBST_FILES.man= src/imapd/imapd.8 src/ipopd/ipopd.8
-SUBST_SED.man= -e "s|/usr/etc/imapd|${PREFIX}/libexec/imapd|g" \
- -e "s|/etc/rimapd|${PREFIX}/sbin/rimapd|g" \
- -e "s|/usr/etc/ipop2d|${PREFIX}/libexec/ipop2d|g" \
- -e "s|/usr/etc/ipop3d|${PREFIX}/libexec/ipop3d|g"
-
-INSTALLATION_DIRS+= bin lib libexec sbin \
- ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
-
-# Generate _pic.a library from shared objects.
-post-build:
- cd ${WRKSRC}/c-client; \
- ${LIBTOOL} --mode=link ${CC} -o ${CCLIENT_PICLIB:.a=.la} *.lo
-
-do-install: install-headers install-lib install-doc
- ${LTINSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec
- ${LTINSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${PREFIX}/libexec
- ${LTINSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop3d ${PREFIX}/libexec
- ${LTINSTALL_PROGRAM} ${WRKSRC}/mtest/mtest ${PREFIX}/sbin
- ${LN} -sf ../libexec/imapd ${PREFIX}/sbin/rimapd
- ${INSTALL_MAN} ${WRKSRC}/src/imapd/imapd.8 ${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_MAN} ${WRKSRC}/src/ipopd/ipopd.8 ${PREFIX}/${PKGMANDIR}/man8
- ${LN} -sf ipopd.8 ${PREFIX}/${PKGMANDIR}/man8/ipop2d.8
- ${LN} -sf ipopd.8 ${PREFIX}/${PKGMANDIR}/man8/ipop3d.8
- ${LTINSTALL_PROGRAM} ${WRKSRC}/mailutil/mailutil ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${PREFIX}/${PKGMANDIR}/man1
- ${LTINSTALL_PROGRAM} ${WRKSRC}/dmail/dmail ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/src/dmail/dmail.1 ${PREFIX}/${PKGMANDIR}/man1
- ${LTINSTALL_PROGRAM} ${WRKSRC}/mlock/mlock ${PREFIX}/bin
- ${LTINSTALL_PROGRAM} ${WRKSRC}/tmail/tmail ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${PREFIX}/${PKGMANDIR}/man1
-
-.PHONY: install-headers install-lib install-doc
-install-headers:
- ${INSTALL_DATA_DIR} ${PREFIX}/include/c-client
- ${CAT} ${PKGDIR}/PLIST | \
- while read entry; do \
- case "$$entry" in \
- include/c-client/*) \
- src="${WRKSRC}/c-client/`${BASENAME} $$entry`"; \
- dest="${PREFIX}/$$entry"; \
- ${INSTALL_DATA} $$src $$dest; \
- esac; \
- done
-
-install-lib:
- ${LTINSTALL_LIB} ${WRKSRC}/c-client/${CCLIENT_LIB} ${PREFIX}/lib
- ${INSTALL_LIB} ${WRKSRC}/c-client/.libs/${CCLIENT_PICLIB} ${PREFIX}/lib
- ${RANLIB} ${PREFIX}/lib/${CCLIENT_PICLIB}
-
-DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
-install-doc:
- ${INSTALL_DATA_DIR} ${DOCDIR}
- ${CP} -R ${WRKSRC}/docs/* ${DOCDIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR}
- ${FIND} ${DOCDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
- ${FIND} ${DOCDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/imap-uw/PLIST b/mail/imap-uw/PLIST
deleted file mode 100644
index 7cbd17670b1..00000000000
--- a/mail/imap-uw/PLIST
+++ /dev/null
@@ -1,95 +0,0 @@
-@comment $NetBSD: PLIST,v 1.12 2006/07/26 20:00:27 jlam Exp $
-bin/dmail
-bin/mailutil
-bin/mlock
-bin/tmail
-include/c-client/c-client.h
-include/c-client/env.h
-include/c-client/env_unix.h
-include/c-client/flocksim.h
-include/c-client/flstring.h
-include/c-client/fs.h
-include/c-client/ftl.h
-include/c-client/imap4r1.h
-include/c-client/linkage.c
-include/c-client/linkage.h
-include/c-client/mail.h
-include/c-client/misc.h
-include/c-client/netmsg.h
-include/c-client/newsrc.h
-include/c-client/nl.h
-include/c-client/nntp.h
-include/c-client/osdep.h
-include/c-client/rfc822.h
-include/c-client/smtp.h
-include/c-client/tcp.h
-include/c-client/utf8.h
-lib/libc-client.la
-lib/libc-client_pic.a
-libexec/imapd
-libexec/ipop2d
-libexec/ipop3d
-man/man1/dmail.1
-man/man1/mailutil.1
-man/man1/tmail.1
-man/man8/imapd.8
-man/man8/ipop2d.8
-man/man8/ipop3d.8
-man/man8/ipopd.8
-sbin/mtest
-sbin/rimapd
-share/doc/imap-uw/BUILD
-share/doc/imap-uw/CONFIG
-share/doc/imap-uw/FAQ.html
-share/doc/imap-uw/FAQ.txt
-share/doc/imap-uw/IPv6.txt
-share/doc/imap-uw/RELNOTES
-share/doc/imap-uw/SSLBUILD
-share/doc/imap-uw/Y2K
-share/doc/imap-uw/bugs.txt
-share/doc/imap-uw/calendar.txt
-share/doc/imap-uw/commndmt.txt
-share/doc/imap-uw/draft/README
-share/doc/imap-uw/draft/compare.txt
-share/doc/imap-uw/draft/i18n.txt
-share/doc/imap-uw/draft/sort.txt
-share/doc/imap-uw/drivers.txt
-share/doc/imap-uw/formats.txt
-share/doc/imap-uw/imaprc.txt
-share/doc/imap-uw/internal.txt
-share/doc/imap-uw/locking.txt
-share/doc/imap-uw/md5.txt
-share/doc/imap-uw/naming.txt
-share/doc/imap-uw/rfc/rfc1731.txt
-share/doc/imap-uw/rfc/rfc1732.txt
-share/doc/imap-uw/rfc/rfc1733.txt
-share/doc/imap-uw/rfc/rfc2061.txt
-share/doc/imap-uw/rfc/rfc2062.txt
-share/doc/imap-uw/rfc/rfc2086.txt
-share/doc/imap-uw/rfc/rfc2087.txt
-share/doc/imap-uw/rfc/rfc2088.txt
-share/doc/imap-uw/rfc/rfc2177.txt
-share/doc/imap-uw/rfc/rfc2180.txt
-share/doc/imap-uw/rfc/rfc2192.txt
-share/doc/imap-uw/rfc/rfc2193.txt
-share/doc/imap-uw/rfc/rfc2195.txt
-share/doc/imap-uw/rfc/rfc2221.txt
-share/doc/imap-uw/rfc/rfc2222.txt
-share/doc/imap-uw/rfc/rfc2234.txt
-share/doc/imap-uw/rfc/rfc2245.txt
-share/doc/imap-uw/rfc/rfc2342.txt
-share/doc/imap-uw/rfc/rfc2359.txt
-share/doc/imap-uw/rfc/rfc2595.txt
-share/doc/imap-uw/rfc/rfc2683.txt
-share/doc/imap-uw/rfc/rfc2971.txt
-share/doc/imap-uw/rfc/rfc3348.txt
-share/doc/imap-uw/rfc/rfc3501.txt
-share/doc/imap-uw/rfc/rfc3502.txt
-share/doc/imap-uw/rfc/rfc3503.txt
-share/doc/imap-uw/rfc/rfc3516.txt
-share/doc/imap-uw/rfc/rfc3656.txt
-share/doc/imap-uw/rfc/rfc3691.txt
-@dirrm share/doc/imap-uw/rfc
-@dirrm share/doc/imap-uw/draft
-@dirrm share/doc/imap-uw
-@dirrm include/c-client
diff --git a/mail/imap-uw/buildlink3.mk b/mail/imap-uw/buildlink3.mk
deleted file mode 100644
index 0611835b5bc..00000000000
--- a/mail/imap-uw/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/26 20:00:27 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-IMAP_UW_BUILDLINK3_MK:= ${IMAP_UW_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= imap-uw
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nimap-uw}
-BUILDLINK_PACKAGES+= imap-uw
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}imap-uw
-
-.if !empty(IMAP_UW_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.imap-uw+= imap-uw>=2004
-BUILDLINK_ABI_DEPENDS.imap-uw+= imap-uw>=2004enb1
-BUILDLINK_PKGSRCDIR.imap-uw?= ../../mail/imap-uw
-.endif # IMAP_UW_BUILDLINK3_MK
-
-.include "../../security/openssl/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
deleted file mode 100644
index 50ada3c58a0..00000000000
--- a/mail/imap-uw/distinfo
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: distinfo,v 1.31 2006/09/11 13:44:27 tron Exp $
-
-SHA1 (imap-2004g.tar.Z) = 791a8bb247ca51ce0a4c32e814a2f736c2bcf066
-RMD160 (imap-2004g.tar.Z) = a016a06ba073e879d2574a6395ce1074ea74c687
-Size (imap-2004g.tar.Z) = 2246713 bytes
-SHA1 (patch-aa) = e18ec6b1674e71865a8aabe41b5da24c572edcb5
-SHA1 (patch-ab) = fbe43bfc811058433936e6eb61bfc7d69f819e45
-SHA1 (patch-ac) = 802b456555f6e79f60444cfe32d42e053d73cef8
-SHA1 (patch-ad) = e4b64935d0af726d3771489df411454788722727
-SHA1 (patch-ae) = 2e33641db5081e0f15e612db98f841591d5b2dd7
-SHA1 (patch-af) = 5800937da2881849508c9012bc268e5acd2fff3e
-SHA1 (patch-ag) = 452fcfc1bd17d3cc65e5012db56d37af25bcf3b6
-SHA1 (patch-ah) = 06d780220e21b4dd4b601f66efb6e73ee95991e2
-SHA1 (patch-ai) = c495ed39fbc01e1d8b05f6acd3d11394978f9b43
-SHA1 (patch-aj) = 607286c1fd5eb97a07ffb812387f6a005aaee9c5
-SHA1 (patch-ak) = c798b2aad17091526c667a552839cfe1ec0e23c9
-SHA1 (patch-al) = 2915edc654c185311e09cef571b443c4a9ff7e3c
-SHA1 (patch-am) = 0aea2cbe98da312740e678355b11fc964a822cda
-SHA1 (patch-ao) = 777b30793ea2e1f33be14e34d837f1f0cc5d0d67
-SHA1 (patch-ap) = ce224812b0744a699e5e07916ca04510bf62da25
-SHA1 (patch-aq) = 7cf038fcb8e072fa46604ac0ac8c02c0d6d3608e
-SHA1 (patch-ar) = 6c7cc6c03b87af90866230624c476c7868e323fe
-SHA1 (patch-as) = 3760b2126f761be4d09c807f7d21b0ed7b1b89bb
-SHA1 (patch-at) = aeb907f8a9a2438490ecd9dc0251b396b4507968
-SHA1 (patch-au) = 88c14e0f2aa61c34f0255d09f6d00e30328f5c82
-SHA1 (patch-av) = 24043b6d1ed9c4cc9a72735caf82ad5a08ff3ee6
-SHA1 (patch-aw) = 46d108d26b9cc414bb2b3b5f5c5325a3d210bf5e
-SHA1 (patch-ax) = 136eebbdac13434659583e370443ab2033969ae3
-SHA1 (patch-ay) = 6004d14891d3f7004af834d2e4b217369e2f6ee1
-SHA1 (patch-az) = 6372149e6fec8ffc5091ef5dcca959884c720d1b
-SHA1 (patch-ba) = 64b89d377501861ddeecaf58f845132b95ac8f75
-SHA1 (patch-bb) = 220bfb5885dd73cf3375b26bda6be1ea2d39d069
-SHA1 (patch-bc) = b3cd7d728de313cd00af2d9c99cadc2478006232
-SHA1 (patch-bd) = 2dbffe2f11d1c0c2b05eabe3fc976c230e821709
-SHA1 (patch-be) = 032ae39806995e27aba5ab67089a467d3fbe5597
-SHA1 (patch-bf) = 42eee80df6095a7ca0141306743786f6f44545f8
-SHA1 (patch-bg) = 778318297c8a5af995286e447c23503790152bb9
diff --git a/mail/imap-uw/hacks.mk b/mail/imap-uw/hacks.mk
deleted file mode 100644
index a781c361e59..00000000000
--- a/mail/imap-uw/hacks.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2006/07/26 20:00:27 jlam Exp $
-
-.include "../../mk/compiler.mk"
-
-### [Thu Jan 23 01:28:36 2003 UTC : dmcmahill]
-### On PowerPC, building with optimisation with GCC causes an "attempt
-### to free unreference scalar". Remove optimisation flags as a
-### workaround until GCC is fixed.
-###
-.if !empty(CC_VERSION:Mgcc*) && !empty(MACHINE_PLATFORM:MNetBSD-*-alpha)
-PKG_HACKS+= alpha-codegen
-BUILDLINK_TRANSFORM+= rename:-O[0-9]*:-O
-.endif
diff --git a/mail/imap-uw/options.mk b/mail/imap-uw/options.mk
deleted file mode 100644
index ad394cc12c3..00000000000
--- a/mail/imap-uw/options.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2006/07/26 20:00:27 jlam Exp $
-
-.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.imap-uw
-PKG_SUPPORTED_OPTIONS+= imapuw-cleartextpwd imapuw-whoson inet6 ssl
-PKG_SUGGESTED_OPTIONS+= imapuw-cleartextpwd ssl
-
-# On NetBSD 1.x, using the native Kerberos 5 implementation causes
-# interoperability problems with OpenSSL 0.9.7 and above.
-#
-.if !empty(MACHINE_PLATFORM:MNetBSD-1.*)
-CHECK_BUILTIN.heimdal:= yes
-. include "../../security/heimdal/builtin.mk"
-CHECK_BUILTIN.heimdal:= no
-. if !empty(USE_BUILTIN.heimdal:M[nN][oO])
-PKG_SUPPORTED_OPTIONS+= kerberos
-. endif
-.else
-PKG_SUPPORTED_OPTIONS+= kerberos
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Support both IPv6 and IPv4 connections.
-###
-.if !empty(PKG_OPTIONS:Minet6)
-MAKE_FLAGS+= IP=6
-.else
-MAKE_FLAGS+= IP=4
-.endif
-
-###
-### Support GSSAPI authentication via Kerberos 5.
-###
-.if !empty(PKG_OPTIONS:Mkerberos)
-. include "../../mk/krb5.buildlink3.mk"
-MAKE_ENV+= KRB5_TYPE=${KRB5_TYPE}
-MAKE_FLAGS+= EXTRAAUTHENTICATORS=gss
-EXTRASPECIALS+= GSSDIR=${KRB5BASE}
-CFLAGS.heimdal= -DHEIMDAL_KRB5
-CFLAGS+= ${CFLAGS.${KRB5_TYPE}}
-.endif
-
-###
-### Support using WHOSON for authentication.
-###
-.if !empty(PKG_OPTIONS:Mimapuw-whoson)
-. include "../../net/whoson/buildlink3.mk"
-LDFLAGS+= -lwhoson
-CFLAGS+= -DUSE_WHOSON
-.endif
-
-###
-### Support SSL/TLS connections.
-###
-.if !empty(PKG_OPTIONS:Mssl)
-. include "../../security/openssl/buildlink3.mk"
-. if !empty(PKG_OPTIONS:Mimapuw-cleartextpwd)
-MAKE_FLAGS+= SSLTYPE=unix # plaintext auth
-. else
-MAKE_FLAGS+= SSLTYPE=nopwd # plaintext auth only over SSL/TLS
-. endif
-MESSAGE_SRC+= ${PKGDIR}/MESSAGE.ssl
-MESSAGE_SUBST+= SSLCERTS=${SSLCERTS:Q}
-MESSAGE_SUBST+= SSLKEYS=${SSLKEYS:Q}
-
-EXTRASPECIALS+= SSLDIR=${SSLBASE:Q}
-EXTRASPECIALS+= SSLCERTS=${SSLCERTS:Q}
-EXTRASPECIALS+= SSLKEYS=${SSLKEYS:Q}
-.else
-MAKE_FLAGS+= SSLTYPE=none # no SSL/TLS
-.endif
diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa
deleted file mode 100644
index 3068afeb1fc..00000000000
--- a/mail/imap-uw/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.18 2006/09/11 13:44:27 tron Exp $
-
---- Makefile.orig 2005-04-30 21:50:20.000000000 +0100
-+++ Makefile 2006-09-11 14:18:20.000000000 +0100
-@@ -296,7 +296,7 @@
-
- # Note on SCO you may have to set LN to "ln".
-
--a32 a41 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul hpp hpx lnp lyn mct mnt neb nec nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos uw2: an
-+a32 a41 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul hpp hpx lnp lyn mct mnt neb nec nep nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos uw2: an
- $(BUILD) BUILDTYPE=$@
-
- # If you use sv4, you may find that it works to move it to use the an process.
-@@ -474,9 +474,6 @@
- @echo + In order to rectify this problem, you MUST build with:
- @echo ++ SSLTYPE=$(SSLTYPE).nopwd
- @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-- @echo
-- @echo Do you want to continue this build anyway? Type y or n please:
-- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
-
- sslnone:
- @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -489,9 +486,6 @@
- @echo ++ SSLTYPE=nopwd
- @echo + You must also have OpenSSL or equivalent installed.
- @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-- @echo
-- @echo Do you want to continue this build anyway? Type y or n please:
-- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
-
-
- # C compiler types
diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab
deleted file mode 100644
index 7840e2dc203..00000000000
--- a/mail/imap-uw/patches/patch-ab
+++ /dev/null
@@ -1,90 +0,0 @@
-$NetBSD: patch-ab,v 1.21 2006/09/11 13:44:27 tron Exp $
-
---- src/osdep/unix/Makefile.orig 2005-04-30 21:51:13.000000000 +0100
-+++ src/osdep/unix/Makefile 2006-09-11 14:19:56.000000000 +0100
-@@ -124,7 +124,7 @@
-
- # Normally no need to change any of these
-
--ARCHIVE=c-client.a
-+ARCHIVE=libc-client.la
- BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o siglocal.o \
- dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
- rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-@@ -403,9 +403,9 @@
- SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
- ACTIVEFILE=/usr/share/news/active \
- RSHPATH=/usr/bin/rsh \
-- BASECFLAGS="-g $(GCCOPTLEVEL)" \
-+ BASECFLAGS="" \
- BASELDFLAGS="-lsocket -lnsl -lgen" \
-- RANLIB=true CC=gcc
-+ RANLIB=true
-
- gsu: # GCC SUN-OS
- $(BUILD) `$(CAT) SPECIALS` OS=sun \
-@@ -495,9 +495,9 @@
- $(BUILD) `$(CAT) SPECIALS` OS=bsi \
- CRXTYPE=nfs \
- SPOOLDIR=/var \
-- ACTIVEFILE=/var/db/news/active \
-+ ACTIVEFILE=/var/news/db/active \
- RSHPATH=/usr/bin/rsh \
-- BASECFLAGS="-g -O -pipe" \
-+ BASECFLAGS="-pipe" \
- BASELDFLAGS="-lcrypt"
-
- nec: # NEC UX
-@@ -510,6 +510,16 @@
- BASELDFLAGS="-lsocket -lnsl -lgen" \
- RANLIB=true CC=/usr/abiccs/bin/cc
-
-+nep: # NetBSD with PAM
-+ $(BUILD) `$(CAT) SPECIALS` OS=bsi \
-+ CHECKPW=pam \
-+ CRXTYPE=nfs \
-+ SPOOLDIR=/var \
-+ ACTIVEFILE=/var/news/db/active \
-+ RSHPATH=/usr/bin/rsh \
-+ BASECFLAGS="-pipe" \
-+ BASELDFLAGS="-lpam"
-+
- nto: # QNX Neutrino RTP
- $(BUILD) `$(CAT) SPECIALS` OS=$@ \
- CRXTYPE=nfs \
-@@ -549,7 +559,7 @@
- $(BUILD) `$(CAT) SPECIALS` OS=$@ \
- CRXTYPE=nfs \
- SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
-- BASECFLAGS="-g -O -Wno-pointer-sign"
-+ BASECFLAGS="-Wno-pointer-sign"
-
- ptx: # PTX
- $(BUILD) `$(CAT) SPECIALS` OS=$@ \
-@@ -811,7 +821,7 @@
- @$(SH) ARCHIVE
-
- .c.o:
-- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
-+ $(LTCOMPILE) `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
-
-
- # Cleanup
-@@ -869,7 +879,7 @@
- @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
- @echo is not installed on your system. Either install OpenSSL first
- @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
-- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
-+ $(LTCOMPILE) `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
-
- osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
- $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
-@@ -924,7 +934,7 @@
- -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
- -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
- echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
-- echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
-+ echo "$(LTLINK) $(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info $(CCLIENT_MAJOR):$(CCLIENT_MINOR) \`$(CAT) LDFLAGS\`" > ARCHIVE
- echo $(OS) > OSTYPE
- ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
- ./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
diff --git a/mail/imap-uw/patches/patch-ac b/mail/imap-uw/patches/patch-ac
deleted file mode 100644
index 889aa10010e..00000000000
--- a/mail/imap-uw/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2006/07/26 20:00:27 jlam Exp $
-
---- src/mailutil/Makefile.orig 2002-11-18 19:41:46.000000000 -0500
-+++ src/mailutil/Makefile
-@@ -19,7 +19,7 @@
-
-
- C = ../c-client
--CCLIENTLIB = $C/c-client.a
-+CCLIENTLIB = $C/libc-client.la
- SHELL = /bin/sh
-
- # Get local definitions from c-client directory
-@@ -29,7 +29,7 @@ CFLAGS = -I$C `cat $C/CFLAGS`
- LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
-
- mailutil: $(CCLIENTLIB) mailutil.o
-- $(CC) $(CFLAGS) -o mailutil mailutil.o $(LDFLAGS)
-+ $(LTLINK) $(CC) $(CFLAGS) -o mailutil mailutil.o $(LDFLAGS)
-
- mailutil.o: $C/mail.h $C/misc.h $C/osdep.h
-
diff --git a/mail/imap-uw/patches/patch-ad b/mail/imap-uw/patches/patch-ad
deleted file mode 100644
index 79163224251..00000000000
--- a/mail/imap-uw/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2006/07/26 20:00:27 jlam Exp $
-
---- src/dmail/Makefile.orig 2002-11-18 19:43:31.000000000 -0500
-+++ src/dmail/Makefile
-@@ -18,7 +18,7 @@
-
-
- C = ../c-client
--CCLIENTLIB = $C/c-client.a
-+CCLIENTLIB = $C/libc-client.la
- SHELL = /bin/sh
-
- # Get local definitions from c-client directory
-@@ -28,7 +28,7 @@ CFLAGS = -I$C `cat $C/CFLAGS`
- LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
-
- dmail: $(CCLIENTLIB) dmail.o
-- $(CC) $(CFLAGS) -o dmail dmail.o $(LDFLAGS)
-+ $(LTLINK) $(CC) $(CFLAGS) -o dmail dmail.o $(LDFLAGS)
-
- dmail.o: $C/mail.h $C/misc.h $C/osdep.h
-
diff --git a/mail/imap-uw/patches/patch-ae b/mail/imap-uw/patches/patch-ae
deleted file mode 100644
index c17bf1315e0..00000000000
--- a/mail/imap-uw/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.16 2006/07/26 20:00:27 jlam Exp $
-
---- src/tmail/Makefile.orig 2002-11-18 19:45:14.000000000 -0500
-+++ src/tmail/Makefile
-@@ -18,7 +18,7 @@
-
-
- C = ../c-client
--CCLIENTLIB = $C/c-client.a
-+CCLIENTLIB = $C/libc-client.la
- SHELL = /bin/sh
-
- # Get local definitions from c-client directory
-@@ -28,7 +28,7 @@ CFLAGS = -I$C `cat $C/CFLAGS`
- LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
-
- tmail: $(CCLIENTLIB) tmail.o
-- $(CC) $(CFLAGS) -o tmail tmail.o $(LDFLAGS)
-+ $(LTLINK) $(CC) $(CFLAGS) -o tmail tmail.o $(LDFLAGS)
-
- tmail.o: $C/mail.h $C/misc.h $C/osdep.h
-
diff --git a/mail/imap-uw/patches/patch-af b/mail/imap-uw/patches/patch-af
deleted file mode 100644
index 198b4cc5046..00000000000
--- a/mail/imap-uw/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.6 2006/07/26 20:00:27 jlam Exp $
-
---- src/osdep/unix/kerb_mit.c.orig 2003-10-17 12:39:42.000000000 -0400
-+++ src/osdep/unix/kerb_mit.c
-@@ -18,9 +18,15 @@
- * CPYRIGHT, included with this Distribution.
- */
-
-+#ifdef HEIMDAL_KRB5
-+#include <gssapi/gssapi.h>
-+#include <krb5/krb5.h>
-+#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE
-+#else
- #define PROTOTYPE(x) x
- #include <gssapi/gssapi_generic.h>
- #include <gssapi/gssapi_krb5.h>
-+#endif
-
-
- long kerberos_server_valid (void);
diff --git a/mail/imap-uw/patches/patch-ag b/mail/imap-uw/patches/patch-ag
deleted file mode 100644
index e51b23a5416..00000000000
--- a/mail/imap-uw/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2005/12/03 00:52:54 joerg Exp $
-
---- src/osdep/unix/os_bsi.c.orig 2005-12-02 23:38:04.000000000 +0000
-+++ src/osdep/unix/os_bsi.c
-@@ -30,7 +30,6 @@
- #include <netdb.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno; /* just in case */
- #include <pwd.h>
- #include "misc.h"
-
diff --git a/mail/imap-uw/patches/patch-ah b/mail/imap-uw/patches/patch-ah
deleted file mode 100644
index e0e69af4394..00000000000
--- a/mail/imap-uw/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.7 2005/12/03 00:52:54 joerg Exp $
-
---- src/osdep/unix/dummy.c.orig 2005-12-02 23:44:29.000000000 +0000
-+++ src/osdep/unix/dummy.c
-@@ -22,7 +22,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno; /* just in case */
- #include "mail.h"
- #include "osdep.h"
- #include <pwd.h>
diff --git a/mail/imap-uw/patches/patch-ai b/mail/imap-uw/patches/patch-ai
deleted file mode 100644
index bcd6c2bc8b8..00000000000
--- a/mail/imap-uw/patches/patch-ai
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2004/05/13 18:14:34 adam Exp $
-
---- src/mtest/mtest.c.orig 2004-05-01 17:22:07.000000000 +0000
-+++ src/mtest/mtest.c
-@@ -33,6 +33,11 @@
-
- /* Excellent reasons to hate ifdefs, and why my real code never uses them */
-
-+#if defined(__NetBSD__) /* NetBSD no longer defines unix. */
-+# undef unix
-+# define unix 1
-+#endif
-+
- #ifndef unix
- # define unix 0
- #endif
diff --git a/mail/imap-uw/patches/patch-aj b/mail/imap-uw/patches/patch-aj
deleted file mode 100644
index 239fb5a2aa6..00000000000
--- a/mail/imap-uw/patches/patch-aj
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aj,v 1.12 2006/07/26 20:00:27 jlam Exp $
-
---- src/osdep/unix/Makefile.gss.orig 2003-03-04 22:29:59.000000000 -0500
-+++ src/osdep/unix/Makefile.gss
-@@ -21,11 +21,13 @@
- # Extended flags needed for additional authenticators. You may need to modify.
-
- GSSDIR=/usr/local
--GSSCFLAGS= -I$(GSSDIR)/include -DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name
-+GSSCFLAGS= -I$(GSSDIR)/include -I$(GSSDIR)/include/krb5
- GSSOLDLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err
- GSSNEWLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
-
- gss: # GSSAPI Kerberos V flags
- echo $(GSSCFLAGS) >> OSCFLAGS
-- sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS
-+ sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' > LDFLAGS.gss1
-+ sh -c '(test -z "$(KRB5_CONFIG)") || $(KRB5_CONFIG) --libs gssapi' > LDFLAGS.gss2
-+ sh -c '(test -z "$(KRB5_CONFIG)") && cat LDFLAGS.gss1 || cat LDFLAGS.gss2' >> LDFLAGS
- echo "#include \"kerb_mit.c\"" >> auths.c
diff --git a/mail/imap-uw/patches/patch-ak b/mail/imap-uw/patches/patch-ak
deleted file mode 100644
index 5c6dfc4a4e0..00000000000
--- a/mail/imap-uw/patches/patch-ak
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2005/08/12 19:47:17 tv Exp $
-
---- src/osdep/unix/ckp_gss.c.orig 2005-06-05 19:43:50.000000000 -0400
-+++ src/osdep/unix/ckp_gss.c 2005-08-12 15:08:39.000000000 -0400
-@@ -30,6 +30,7 @@
- {
- char tmp[MAILTMPLEN];
- krb5_context ctx;
-+ krb5_error error;
- krb5_timestamp now;
- krb5_principal service;
- krb5_creds *crd = (krb5_creds *) memset (fs_get (sizeof (krb5_creds)),0,
-@@ -39,7 +40,9 @@
- /* make service name */
- sprintf (tmp,"%s@%s",(char *) mail_parameters (NIL,GET_SERVICENAME,NIL),
- tcp_serverhost ());
-- krb5_init_context (&ctx); /* get a context */
-+ error = krb5_init_context (&ctx); /* get a context */
-+ if (error)
-+ return NIL;
- /* get time, client and server principals */
- if (!krb5_timeofday (ctx,&now) &&
- !krb5_parse_name (ctx,pw->pw_name,&crd->client) &&
diff --git a/mail/imap-uw/patches/patch-al b/mail/imap-uw/patches/patch-al
deleted file mode 100644
index 497d3cf26dd..00000000000
--- a/mail/imap-uw/patches/patch-al
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-al,v 1.6 2006/07/26 20:00:27 jlam Exp $
-
---- src/c-client/auth_gss.c.orig 2005-05-03 20:24:03.000000000 -0400
-+++ src/c-client/auth_gss.c
-@@ -18,6 +18,14 @@
- * CPYRIGHT, included with this Distribution.
- */
-
-+#ifdef HEIMDAL_KRB5
-+#include <gssapi/gssapi.h>
-+#include <krb5/krb5.h>
-+#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE
-+#else
-+#include <gssapi/gssapi_generic.h>
-+#include <gssapi/gssapi_krb5.h>
-+#endif
-
- long auth_gssapi_valid (void);
- long auth_gssapi_client (authchallenge_t challenger,authrespond_t responder,
-@@ -56,15 +64,32 @@ long auth_gssapi_valid (void)
- OM_uint32 smn;
- gss_buffer_desc buf;
- gss_name_t name;
-+ krb5_context ctx;
-+ krb5_keytab kt;
-+ krb5_kt_cursor csr;
-+
-+ /* make a context */
-+ if (krb5_init_context (&ctx))
-+ return NIL;
- /* make service name */
- sprintf (tmp,"%s@%s",(char *) mail_parameters (NIL,GET_SERVICENAME,NIL),
- mylocalhost ());
- buf.length = strlen (buf.value = tmp);
- /* see if can build a name */
- if (gss_import_name (&smn,&buf,GSS_C_NT_HOSTBASED_SERVICE,&name) !=
-- GSS_S_COMPLETE) return NIL;
-- /* remove server method if no keytab */
-- if (!kerberos_server_valid ()) auth_gss.server = NIL;
-+ GSS_S_COMPLETE) {
-+ krb5_free_context (ctx); /* finished with context */
-+ return NIL;
-+ }
-+
-+ /* get default keytab */
-+ if (!krb5_kt_default (ctx,&kt)) {
-+ /* can do server if have good keytab */
-+ if (!krb5_kt_start_seq_get (ctx,kt,&csr))
-+ auth_gss.server = auth_gssapi_server;
-+ krb5_kt_close (ctx,kt); /* finished with keytab */
-+ }
-+ krb5_free_context (ctx); /* finished with context */
- gss_release_name (&smn,&name);/* finished with name */
- return LONGT;
- }
diff --git a/mail/imap-uw/patches/patch-am b/mail/imap-uw/patches/patch-am
deleted file mode 100644
index 14b4c35a903..00000000000
--- a/mail/imap-uw/patches/patch-am
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-am,v 1.5 2006/07/26 20:00:27 jlam Exp $
-
---- src/osdep/unix/env_unix.c.orig 2004-09-13 17:31:19.000000000 -0400
-+++ src/osdep/unix/env_unix.c
-@@ -21,6 +21,9 @@
- #include <grp.h>
- #include <signal.h>
- #include <sys/wait.h>
-+#ifdef USE_WHOSON
-+#include <whoson.h>
-+#endif /* USE_WHOSON */
-
- /* c-client environment parameters */
-
-@@ -567,7 +570,15 @@ long server_login (char *user,char *pwd,
- else if (disablePlaintext) err = "disabled";
- else if (!(authuser && *authuser)) pw = valpwd (user,pwd,argc,argv);
- else if (valpwd (authuser,pwd,argc,argv)) pw = pwuser (user);
-- if (pw && pw_login (pw,authuser,pw->pw_name,NIL,argc,argv)) return T;
-+ if (pw && pw_login (pw,authuser,pw->pw_name,NIL,argc,argv)) {
-+#ifdef USE_WHOSON
-+ struct sockaddr_in sin;
-+ int sinlen = sizeof (struct sockaddr_in);
-+ if (getpeername(0,(struct sockaddr *) &sin,&sinlen) == 0)
-+ wso_login(inet_ntoa(sin.sin_addr),user,NULL,0);
-+#endif
-+ return T;
-+ }
- syslog (level|LOG_AUTH,"Login %s user=%.64s auth=%.64s host=%.80s",err,
- user,(authuser && *authuser) ? authuser : user,tcp_clienthost ());
- sleep (3); /* slow down possible cracker */
-@@ -830,7 +841,8 @@ char *sysinbox ()
- {
- char tmp[MAILTMPLEN];
- if (!sysInbox) { /* initialize if first time */
-- sprintf (tmp,"%s/%s",MAILSPOOL,myusername ());
-+ /* Substitute SPOOLDIR and MAILBOX appropriately for pkgsrc. */
-+ sprintf (tmp,"%s/%s",@SPOOLDIR@,@MAILBOX@);
- sysInbox = cpystr (tmp); /* system inbox is from mail spool */
- }
- return sysInbox;
diff --git a/mail/imap-uw/patches/patch-ao b/mail/imap-uw/patches/patch-ao
deleted file mode 100644
index a86a3cae1ac..00000000000
--- a/mail/imap-uw/patches/patch-ao
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2005/12/03 00:52:54 joerg Exp $
-
---- src/c-client/netmsg.c.orig 2005-12-02 23:46:56.000000000 +0000
-+++ src/c-client/netmsg.c
-@@ -21,7 +21,6 @@
-
- #include <stdio.h>
- #include <errno.h>
--extern int errno; /* just in case */
- #include "mail.h"
- #include "osdep.h"
- #include "misc.h"
diff --git a/mail/imap-uw/patches/patch-ap b/mail/imap-uw/patches/patch-ap
deleted file mode 100644
index 76535505c5a..00000000000
--- a/mail/imap-uw/patches/patch-ap
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2005/12/03 00:52:54 joerg Exp $
-
---- src/osdep/unix/unix.c.orig 2005-12-02 23:51:06.000000000 +0000
-+++ src/osdep/unix/unix.c
-@@ -34,7 +34,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno; /* just in case */
- #include <signal.h>
- #include "mail.h"
- #include "osdep.h"
diff --git a/mail/imap-uw/patches/patch-aq b/mail/imap-uw/patches/patch-aq
deleted file mode 100644
index d9767a540b4..00000000000
--- a/mail/imap-uw/patches/patch-aq
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2005/12/03 00:52:54 joerg Exp $
-
---- src/osdep/unix/mbx.c.orig 2005-12-02 23:52:39.000000000 +0000
-+++ src/osdep/unix/mbx.c
-@@ -29,7 +29,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno; /* just in case */
- #include "mail.h"
- #include "osdep.h"
- #include <pwd.h>
diff --git a/mail/imap-uw/patches/patch-ar b/mail/imap-uw/patches/patch-ar
deleted file mode 100644
index e5ef1baba85..00000000000
--- a/mail/imap-uw/patches/patch-ar
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2005/12/03 00:52:54 joerg Exp $
-
---- src/osdep/unix/mmdf.c.orig 2005-12-02 23:59:15.000000000 +0000
-+++ src/osdep/unix/mmdf.c
-@@ -22,7 +22,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno; /* just in case */
- #include <signal.h>
- #include "mail.h"
- #include "osdep.h"
diff --git a/mail/imap-uw/patches/patch-as b/mail/imap-uw/patches/patch-as
deleted file mode 100644
index e4fb5e41454..00000000000
--- a/mail/imap-uw/patches/patch-as
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-as,v 1.1 2005/12/03 00:52:54 joerg Exp $
-
---- src/osdep/unix/tenex.c.orig 2005-12-03 00:01:26.000000000 +0000
-+++ src/osdep/unix/tenex.c
-@@ -34,7 +34,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno; /* just in case */
- #include "mail.h"
- #include "osdep.h"
- #include <sys/stat.h>
diff --git a/mail/imap-uw/patches/patch-at b/mail/imap-uw/patches/patch-at
deleted file mode 100644
index 5053269ade8..00000000000
--- a/mail/imap-uw/patches/patch-at
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-at,v 1.1 2005/12/03 00:52:54 joerg Exp $
-
---- src/osdep/unix/mtx.c.orig 2005-12-03 00:05:28.000000000 +0000
-+++ src/osdep/unix/mtx.c
-@@ -29,7 +29,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno; /* just in case */
- #include "mail.h"
- #include "osdep.h"
- #include <pwd.h>
diff --git a/mail/imap-uw/patches/patch-au b/mail/imap-uw/patches/patch-au
deleted file mode 100644
index aa897012f11..00000000000
--- a/mail/imap-uw/patches/patch-au
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-au,v 1.1 2005/12/03 00:52:54 joerg Exp $
-
---- src/osdep/unix/news.c.orig 2005-12-03 00:09:50.000000000 +0000
-+++ src/osdep/unix/news.c
-@@ -22,7 +22,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno; /* just in case */
- #include "mail.h"
- #include "osdep.h"
- #include <sys/stat.h>
diff --git a/mail/imap-uw/patches/patch-av b/mail/imap-uw/patches/patch-av
deleted file mode 100644
index 1daf1b41666..00000000000
--- a/mail/imap-uw/patches/patch-av
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-av,v 1.1 2005/12/03 00:52:54 joerg Exp $
-
---- src/osdep/unix/phile.c.orig 2005-12-03 00:15:34.000000000 +0000
-+++ src/osdep/unix/phile.c
-@@ -22,7 +22,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno; /* just in case */
- #include <signal.h>
- #include "mail.h"
- #include "osdep.h"
diff --git a/mail/imap-uw/patches/patch-aw b/mail/imap-uw/patches/patch-aw
deleted file mode 100644
index 28c608a231d..00000000000
--- a/mail/imap-uw/patches/patch-aw
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2005/12/03 00:52:54 joerg Exp $
-
---- src/osdep/unix/mh.c.orig 2005-12-03 00:28:43.000000000 +0000
-+++ src/osdep/unix/mh.c
-@@ -22,7 +22,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno; /* just in case */
- #include "mail.h"
- #include "osdep.h"
- #include <pwd.h>
diff --git a/mail/imap-uw/patches/patch-ax b/mail/imap-uw/patches/patch-ax
deleted file mode 100644
index b8f1d833d11..00000000000
--- a/mail/imap-uw/patches/patch-ax
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2005/12/03 00:52:54 joerg Exp $
-
---- src/osdep/unix/mx.c.orig 2005-12-03 00:43:02.000000000 +0000
-+++ src/osdep/unix/mx.c
-@@ -22,7 +22,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno; /* just in case */
- #include "mail.h"
- #include "osdep.h"
- #include <pwd.h>
diff --git a/mail/imap-uw/patches/patch-ay b/mail/imap-uw/patches/patch-ay
deleted file mode 100644
index 5833c5030b3..00000000000
--- a/mail/imap-uw/patches/patch-ay
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2005/12/03 00:52:55 joerg Exp $
-
---- src/ipopd/ipop2d.c.orig 2005-12-03 00:45:23.000000000 +0000
-+++ src/ipopd/ipop2d.c
-@@ -24,7 +24,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno; /* just in case */
- #include <signal.h>
- #include <time.h>
- #include "c-client.h"
diff --git a/mail/imap-uw/patches/patch-az b/mail/imap-uw/patches/patch-az
deleted file mode 100644
index 44769875263..00000000000
--- a/mail/imap-uw/patches/patch-az
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-az,v 1.1 2005/12/03 00:52:55 joerg Exp $
-
---- src/tmail/tmail.c.orig 2005-12-03 00:46:07.000000000 +0000
-+++ src/tmail/tmail.c
-@@ -21,7 +21,6 @@
- #include <stdio.h>
- #include <pwd.h>
- #include <errno.h>
--extern int errno; /* just in case */
- #include <sysexits.h>
- #include <sys/file.h>
- #include <sys/stat.h>
diff --git a/mail/imap-uw/patches/patch-ba b/mail/imap-uw/patches/patch-ba
deleted file mode 100644
index 9fd85a47df3..00000000000
--- a/mail/imap-uw/patches/patch-ba
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2005/12/03 00:52:55 joerg Exp $
-
---- src/ipopd/ipop3d.c.orig 2005-12-03 00:46:31.000000000 +0000
-+++ src/ipopd/ipop3d.c
-@@ -23,7 +23,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno; /* just in case */
- #include <signal.h>
- #include <time.h>
- #include "c-client.h"
diff --git a/mail/imap-uw/patches/patch-bb b/mail/imap-uw/patches/patch-bb
deleted file mode 100644
index 9cc7d28a375..00000000000
--- a/mail/imap-uw/patches/patch-bb
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2005/12/03 00:52:55 joerg Exp $
-
---- src/mailutil/mailutil.c.orig 2005-12-03 00:46:42.000000000 +0000
-+++ src/mailutil/mailutil.c
-@@ -21,7 +21,6 @@
-
- #include <stdio.h>
- #include <errno.h>
--extern int errno; /* just in case */
- #include "mail.h"
- #include "osdep.h"
- #include "misc.h"
diff --git a/mail/imap-uw/patches/patch-bc b/mail/imap-uw/patches/patch-bc
deleted file mode 100644
index 2950c5c53bd..00000000000
--- a/mail/imap-uw/patches/patch-bc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2005/12/03 00:52:55 joerg Exp $
-
---- src/imapd/imapd.c.orig 2005-12-03 00:46:59.000000000 +0000
-+++ src/imapd/imapd.c
-@@ -23,7 +23,6 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno; /* just in case */
- #include <signal.h>
- #include <time.h>
- #include "c-client.h"
diff --git a/mail/imap-uw/patches/patch-bd b/mail/imap-uw/patches/patch-bd
deleted file mode 100644
index ed3201787b5..00000000000
--- a/mail/imap-uw/patches/patch-bd
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2005/12/03 00:52:55 joerg Exp $
-
---- src/dmail/dmail.c.orig 2005-12-03 00:47:14.000000000 +0000
-+++ src/dmail/dmail.c
-@@ -21,7 +21,6 @@
- #include <stdio.h>
- #include <pwd.h>
- #include <errno.h>
--extern int errno; /* just in case */
- #include <sysexits.h>
- #include <sys/file.h>
- #include <sys/stat.h>
diff --git a/mail/imap-uw/patches/patch-be b/mail/imap-uw/patches/patch-be
deleted file mode 100644
index 2737608ce21..00000000000
--- a/mail/imap-uw/patches/patch-be
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-be,v 1.1 2006/07/26 20:00:27 jlam Exp $
-
---- src/imapd/Makefile.orig 2004-06-29 17:26:28.000000000 -0400
-+++ src/imapd/Makefile
-@@ -45,7 +45,7 @@ SHELL= /bin/sh
- # Get local definitions from c-client directory
-
- C = ../c-client
--CCLIENTLIB = $C/c-client.a
-+CCLIENTLIB = $C/libc-client.la
- CC = `cat $C/CCTYPE`
- CFLAGS = -I$C `cat $C/CFLAGS` $(NSBD) $(ENBD) -DANOFILE=\"$(ANO)\" \
- -DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \
-@@ -55,7 +55,7 @@ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
- all: imapd
-
- imapd: $(CCLIENTLIB) imapd.o
-- $(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS)
-+ $(LTLINK) $(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS)
-
- imapd.o: $C/mail.h $C/misc.h $C/osdep.h
-
diff --git a/mail/imap-uw/patches/patch-bf b/mail/imap-uw/patches/patch-bf
deleted file mode 100644
index 130c255d7c4..00000000000
--- a/mail/imap-uw/patches/patch-bf
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2006/07/26 20:00:27 jlam Exp $
-
---- src/ipopd/Makefile.orig 2000-10-24 19:55:07.000000000 -0400
-+++ src/ipopd/Makefile
-@@ -19,7 +19,7 @@
-
-
- C = ../c-client
--CCLIENTLIB = $C/c-client.a
-+CCLIENTLIB = $C/libc-client.la
- SHELL = /bin/sh
-
- # Get local definitions from c-client directory
-@@ -31,10 +31,10 @@ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
- ipopd: ipop2d ipop3d
-
- ipop2d: $(CCLIENTLIB) ipop2d.o
-- $(CC) $(CFLAGS) -o ipop2d ipop2d.o $(LDFLAGS)
-+ $(LTLINK) $(CC) $(CFLAGS) -o ipop2d ipop2d.o $(LDFLAGS)
-
- ipop3d: $(CCLIENTLIB) ipop3d.o
-- $(CC) $(CFLAGS) -o ipop3d ipop3d.o $(LDFLAGS)
-+ $(LTLINK) $(CC) $(CFLAGS) -o ipop3d ipop3d.o $(LDFLAGS)
-
- ipop2d.o: $C/mail.h $C/misc.h $C/osdep.h
-
diff --git a/mail/imap-uw/patches/patch-bg b/mail/imap-uw/patches/patch-bg
deleted file mode 100644
index a58d65b0ab6..00000000000
--- a/mail/imap-uw/patches/patch-bg
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-bg,v 1.1 2006/07/26 20:00:27 jlam Exp $
-
---- src/mtest/Makefile.orig 2000-10-24 19:55:39.000000000 -0400
-+++ src/mtest/Makefile
-@@ -19,7 +19,7 @@
-
-
- C = ../c-client
--CCLIENTLIB = $C/c-client.a
-+CCLIENTLIB = $C/libc-client.la
- SHELL = /bin/sh
-
- # Get local definitions from c-client directory
-@@ -31,7 +31,7 @@ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
- all: mtest
-
- mtest: $(CCLIENTLIB) mtest.o
-- $(CC) $(CFLAGS) -o mtest mtest.o $(LDFLAGS)
-+ $(LTLINK) $(CC) $(CFLAGS) -o mtest mtest.o $(LDFLAGS)
-
- mtest.o: $C/mail.h $C/misc.h $C/osdep.h $C/rfc822.h $C/smtp.h $C/nntp.h
-
diff --git a/mail/imapfilter/DESCR b/mail/imapfilter/DESCR
deleted file mode 100644
index 6ea2fcfb554..00000000000
--- a/mail/imapfilter/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-IMAPFilter is a mail filtering utility. It connects to remote mail
-servers using the Internet Message Access Protocol (IMAP). Based on
-the user defined filters it checks messages residing on a remote IMAP
-mailbox and processes them in various ways.
diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
deleted file mode 100644
index 72429606be4..00000000000
--- a/mail/imapfilter/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2006/08/14 22:36:12 wiz Exp $
-
-DISTNAME= imapfilter-1.2.2
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= http://imapfilter.hellug.gr/source/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://imapfilter.hellug.gr/
-COMMENT= Mail filtering utility for the IMAP
-
-LDFLAGS.SunOS+= -lsocket -lnsl
-
-INSTALLATION_DIRS= share/examples/imapfilter
-
-post-install:
-.for f in sample.config.lua sample.extend.lua
- ${INSTALL_DATA} ${WRKSRC}/${f} \
- ${PREFIX}/share/examples/imapfilter
-.endfor
-
-.include "../../lang/lua/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/imapfilter/PLIST b/mail/imapfilter/PLIST
deleted file mode 100644
index bd2d73a76a6..00000000000
--- a/mail/imapfilter/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/05/23 20:52:09 seb Exp $
-bin/imapfilter
-man/man1/imapfilter.1
-man/man5/imapfilter_config.5
-share/examples/imapfilter/sample.config.lua
-share/examples/imapfilter/sample.extend.lua
-share/imapfilter/auxiliary.lua
-share/imapfilter/interface.lua
-@dirrm share/imapfilter
-@dirrm share/examples/imapfilter
diff --git a/mail/imapfilter/distinfo b/mail/imapfilter/distinfo
deleted file mode 100644
index e4029bc3193..00000000000
--- a/mail/imapfilter/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.15 2006/08/14 22:36:12 wiz Exp $
-
-SHA1 (imapfilter-1.2.2.tar.bz2) = a033cb7128cba0cd9cb514e55743f84ad7608ecd
-RMD160 (imapfilter-1.2.2.tar.bz2) = 0bbe32f16ab956a8a736d9e072829d7974186cf3
-Size (imapfilter-1.2.2.tar.bz2) = 32625 bytes
-SHA1 (patch-aa) = 0dd1536013f6f8422125fa7fa184e7994acc73c9
diff --git a/mail/imapfilter/patches/patch-aa b/mail/imapfilter/patches/patch-aa
deleted file mode 100644
index 464ff369663..00000000000
--- a/mail/imapfilter/patches/patch-aa
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2006/08/14 22:36:12 wiz Exp $
-
---- Makefile.orig 2006-08-01 12:11:34.000000000 +0000
-+++ Makefile
-@@ -1,20 +1,13 @@
--DESTDIR = /usr/local
--BINDIR = /usr/local/bin
--SHAREDIR = /usr/local/share/imapfilter
--MANDIR = /usr/local/man
--
--INCDIRS = -I/usr/local/include
--LIBDIRS = -L/usr/local/lib
--
--MYCFLAGS = -Wall -O
--MYLDFLAGS =
-+DESTDIR = $(PREFIX)
-+BINDIR = $(PREFIX)/bin
-+SHAREDIR = $(PREFIX)/share/imapfilter
-+MANDIR = $(PREFIX)/$(PKGMANDIR)
-
- DEFS = -DMAKEFILE_SHAREDIR='"$(SHAREDIR)"'
-
--CFLAGS = $(MYCFLAGS) $(DEFS) $(INCDIRS)
--LDFLAGS = $(MYLDFLAGS) $(LIBDIRS)
-+CFLAGS+= $(DEFS)
-
--LIBS = -lm -llua -llualib -lssl -lcrypto
-+LIBS = -lm -llua -lssl -lcrypto
-
- MAN_BIN = imapfilter.1
- MAN_CONFIG = imapfilter_config.5
-@@ -30,7 +23,7 @@ OBJ = auth.o buffer.o cert.o core.o file
- all: $(BIN)
-
- $(BIN): $(OBJ)
-- $(CC) -o $(BIN) $(LDFLAGS) $(OBJ) $(LIBS)
-+ $(CC) -o $(BIN) $(LDFLAGS) $(CFLAGS) $(OBJ) $(LIBS)
-
- $(OBJ): imapfilter.h
- buffer.o imap.o imapfilter.o namespace.o request.o response.o: buffer.h
-@@ -42,19 +35,15 @@ auth.o cert.o imap.o imapfilter.o log.o
- imapfilter.o: version.h
-
- install: $(BIN)
-- if test ! -d $(BINDIR); then mkdir -p $(BINDIR); fi
-- cp -f $(BIN) $(BINDIR) && chmod 0755 $(BINDIR)/$(BIN)
-- if test ! -d $(SHAREDIR); then mkdir -p $(SHAREDIR); fi
-- cp -f $(INTERFACE_LUA) $(SHAREDIR) && \
-- chmod 0644 $(SHAREDIR)/$(INTERFACE_LUA)
-- cp -f $(AUXILIARY_LUA) $(SHAREDIR) && \
-- chmod 0644 $(SHAREDIR)/$(AUXILIARY_LUA)
-- if test ! -d $(MANDIR)/man1; then mkdir -p $(MANDIR)/man1; fi
-- cp -f $(MAN_BIN) $(MANDIR)/man1 && \
-- chmod 0644 $(MANDIR)/man1/$(MAN_BIN)
-- if test ! -d $(MANDIR)/man5; then mkdir -p $(MANDIR)/man5; fi
-- cp -f $(MAN_CONFIG) $(MANDIR)/man5 && \
-- chmod 0644 $(MANDIR)/man5/$(MAN_CONFIG)
-+ $(BSD_INSTALL_PROGRAM_DIR) $(BINDIR)
-+ $(BSD_INSTALL_PROGRAM) $(BIN) $(BINDIR)/$(BIN)
-+ $(BSD_INSTALL_DATA_DIR) $(SHAREDIR)
-+ $(BSD_INSTALL_DATA) $(INTERFACE_LUA) $(SHAREDIR)/$(INTERFACE_LUA)
-+ $(BSD_INSTALL_DATA) $(AUXILIARY_LUA) $(SHAREDIR)/$(AUXILIARY_LUA)
-+ $(BSD_INSTALL_MAN_DIR) $(MANDIR)/man1
-+ $(BSD_INSTALL_MAN) $(MAN_BIN) $(MANDIR)/man1/$(MAN_BIN)
-+ $(BSD_INSTALL_MAN_DIR) $(MANDIR)/man5
-+ $(BSD_INSTALL_MAN) $(MAN_CONFIG) $(MANDIR)/man5/$(MAN_CONFIG)
-
- deinstall:
- rm -f $(BINDIR)/$(BIN) $(SHAREDIR)/$(INTERFACE_LUA) \
diff --git a/mail/imapproxy/DESCR b/mail/imapproxy/DESCR
deleted file mode 100644
index 7b2b6760517..00000000000
--- a/mail/imapproxy/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-ImapProxy is a caching IMAP proxy daemon designed to be used with
-Horde/IMP. The program forwards all traffic between the client and the
-server, but keeps the connection to the server alive after the client logs
-out. When the same user attempts to log in again, the proxy will use the
-cached username/password pair to authenticate the client, and tie the new
-client to the old server connection (which was kept alive).
diff --git a/mail/imapproxy/Makefile b/mail/imapproxy/Makefile
deleted file mode 100644
index dbda93a9077..00000000000
--- a/mail/imapproxy/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2007/03/04 11:29:58 wiz Exp $
-#
-
-DISTNAME= imapproxy-1.0
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://web.archive.org/web/20030816021412/http://www.kuleuven.net/projects/imapproxy/
-# http://www.imapproxy.org/ ?
-COMMENT= Simple connection caching IMAP proxy daemon
-
-GNU_CONFIGURE= YES
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/imapproxy ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/imapproxy
-.for doc in BUGS COPYING ChangeLog FAQ INSTALL README THANKS TODO
- ${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/imapproxy
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/imapproxy/PLIST b/mail/imapproxy/PLIST
deleted file mode 100644
index 7f5965c2db8..00000000000
--- a/mail/imapproxy/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/09 03:17:20 rh Exp $
-bin/imapproxy
-share/doc/imapproxy/BUGS
-share/doc/imapproxy/COPYING
-share/doc/imapproxy/ChangeLog
-share/doc/imapproxy/FAQ
-share/doc/imapproxy/INSTALL
-share/doc/imapproxy/README
-share/doc/imapproxy/THANKS
-share/doc/imapproxy/TODO
-@dirrm share/doc/imapproxy
diff --git a/mail/imapproxy/distinfo b/mail/imapproxy/distinfo
deleted file mode 100644
index 856a418d09c..00000000000
--- a/mail/imapproxy/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/08/06 18:55:46 schwarz Exp $
-
-SHA1 (imapproxy-1.0.tar.gz) = 844acba24633430d15cb9b3a586164aef5051583
-RMD160 (imapproxy-1.0.tar.gz) = 0e0ab29c476c55a09229a21c0cbdc05e8ef885cd
-Size (imapproxy-1.0.tar.gz) = 75668 bytes
-SHA1 (patch-aa) = 2148477ad9e5e3c50854cba3b042220d469c5ace
-SHA1 (patch-ab) = 745129d5bf2d5e950d6bfb9c8178f1f626b6f4e5
-SHA1 (patch-ac) = 8f005441354b5728988c6a1e8164a3d17c31f81b
-SHA1 (patch-ad) = 502840ba54d72ffacc0418e691b5e2fbd3668f50
diff --git a/mail/imapproxy/patches/patch-aa b/mail/imapproxy/patches/patch-aa
deleted file mode 100644
index 36fd5cf2d94..00000000000
--- a/mail/imapproxy/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/09 03:17:20 rh Exp $
-
---- Makefile.in.orig Wed Aug 7 17:11:00 2002
-+++ Makefile.in
-@@ -33,8 +33,7 @@ OBJS=network.o output.o database.o split
- TARGET=imapproxy
-
- CC = @CC@
--CFLAGS = -O3 -I./include
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = @CPPFLAGS@ -I./include
- LIBS = @LIBS@
-
- all: $(OBJS)
diff --git a/mail/imapproxy/patches/patch-ab b/mail/imapproxy/patches/patch-ab
deleted file mode 100644
index ea456f96bc6..00000000000
--- a/mail/imapproxy/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/01/08 16:00:41 joerg Exp $
-
---- network.c.orig 2006-01-08 15:48:57.000000000 +0000
-+++ network.c
-@@ -19,10 +19,10 @@
- */
-
-
-+#include <sys/types.h>
- #include <stdio.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
--#include <sys/types.h>
- #include <string.h>
- #include <netdb.h>
- #include <unistd.h>
diff --git a/mail/imapproxy/patches/patch-ac b/mail/imapproxy/patches/patch-ac
deleted file mode 100644
index eed62e00ddc..00000000000
--- a/mail/imapproxy/patches/patch-ac
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/08/06 18:55:46 schwarz Exp $
-
---- configfile.c.orig 2006-08-06 19:27:25.000000000 +0200
-+++ configfile.c 2006-08-06 20:41:51.000000000 +0200
-@@ -19,6 +19,7 @@
- */
-
-
-+#include <sys/types.h>
- #include <stdio.h>
- #include <string.h>
- #include <strings.h>
-@@ -95,7 +96,7 @@
-
- int check_and_set_log_facility(char *var,char *val)
- {
--#ifdef SOLARIS /* Solaris */
-+#if defined(SOLARIS) || defined(__sgi) /* Solaris or IRIX */
- char *values[] = { "LOG_AUTH", "LOG_CRON", "LOG_DAEMON", "LOG_KERN",
- "LOG_LOCAL0", "LOG_LOCAL1", "LOG_LOCAL2", "LOG_LOCAL3", "LOG_LOCAL4",
- "LOG_LOCAL5", "LOG_LOCAL6", "LOG_LOCAL7", "LOG_LPR", "LOG_MAIL", "LOG_NEWS",
-@@ -113,7 +114,7 @@
- LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4,
- LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7, LOG_LPR, LOG_MAIL, LOG_NEWS,
- LOG_SYSLOG, LOG_USER, LOG_UUCP };
--#endif /* Solaris */
-+#endif /* Solaris or IRIX */
-
- int i = 0;
-
-@@ -482,7 +483,7 @@
-
- char *log_facility_to_str(int x)
- {
--#ifdef SOLARIS /* Solaris */
-+#if defined(SOLARIS) || defined(__sgi) /* Solaris or IRIX */
- char *values[] = { "LOG_AUTH", "LOG_CRON", "LOG_DAEMON", "LOG_KERN",
- "LOG_LOCAL0", "LOG_LOCAL1", "LOG_LOCAL2", "LOG_LOCAL3", "LOG_LOCAL4",
- "LOG_LOCAL5", "LOG_LOCAL6", "LOG_LOCAL7", "LOG_LPR", "LOG_MAIL", "LOG_NEWS",
-@@ -500,7 +501,7 @@
- LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4,
- LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7, LOG_LPR, LOG_MAIL, LOG_NEWS,
- LOG_SYSLOG, LOG_USER, LOG_UUCP };
--#endif /* Solaris */
-+#endif /* Solaris or IRIX */
-
- int i = 0;
-
diff --git a/mail/imapproxy/patches/patch-ad b/mail/imapproxy/patches/patch-ad
deleted file mode 100644
index 1cd9247ed86..00000000000
--- a/mail/imapproxy/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/08/06 18:55:46 schwarz Exp $
-
---- database.c.orig 2006-08-06 19:25:38.000000000 +0200
-+++ database.c 2006-08-06 20:42:21.000000000 +0200
-@@ -19,6 +19,7 @@
- */
-
-
-+#include <sys/types.h>
- #include <string.h>
- #include <strings.h>
- #include <stdlib.h>
diff --git a/mail/imapsync/DESCR b/mail/imapsync/DESCR
deleted file mode 100644
index cbf1c9d2d70..00000000000
--- a/mail/imapsync/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-imapsync is a tool for facilitating incremental recursive IMAP
-transfers from one mailbox to another. It is useful for mailbox
-migration, and reduces the amount of data transferred by only
-copying messages that are not present on both servers. Read, unread,
-and deleted flags are preserved, and the process can be stopped
-and resumed. The original messages can optionally be deleted after
-a successful transfer.
diff --git a/mail/imapsync/Makefile b/mail/imapsync/Makefile
deleted file mode 100644
index ec961e13f8d..00000000000
--- a/mail/imapsync/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/08/10 11:18:16 abs Exp $
-#
-
-DISTNAME= imapsync-1.182
-CATEGORIES= mail
-MASTER_SITES= http://www.linux-france.org/prj/imapsync/dist/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= abs@NetBSD.org
-HOMEPAGE= http://www.linux-france.org/prj/imapsync/dist/
-COMMENT= Incremental recursive IMAP transfer tool
-
-DEPENDS+= p5-Digest-HMAC-[0-9]*:../../security/p5-Digest-HMAC
-DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
-DEPENDS+= p5-IO-Socket-SSL-[0-9]*:../../security/p5-IO-Socket-SSL
-DEPENDS+= p5-Mail-IMAPClient>=2.2.9:../../mail/p5-Mail-IMAPClient
-DEPENDS+= p5-Term-ReadKey-[0-9]*:../../devel/p5-Term-ReadKey
-
-NO_BUILD= YES
-USE_TOOLS+= perl:run
-REPLACE_PERL+= imapsync
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/imapsync ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/imapsync
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/imapsync/PLIST b/mail/imapsync/PLIST
deleted file mode 100644
index b0a340cbd05..00000000000
--- a/mail/imapsync/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/08/10 11:18:16 abs Exp $
-bin/imapsync
-share/doc/imapsync
diff --git a/mail/imapsync/distinfo b/mail/imapsync/distinfo
deleted file mode 100644
index 67e8ba8a88b..00000000000
--- a/mail/imapsync/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/08/10 11:18:16 abs Exp $
-
-SHA1 (imapsync-1.182.tgz) = b246f22fbbd064d6161b1b7b788e4aefdabb11f7
-RMD160 (imapsync-1.182.tgz) = 3d03286a324d8f3497b548edb9427db3f1407feb
-Size (imapsync-1.182.tgz) = 116507 bytes
diff --git a/mail/imp/DESCR b/mail/imp/DESCR
deleted file mode 100644
index 2ab31503ce7..00000000000
--- a/mail/imp/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-IMP is a set of PHP scripts that implement an IMAP/POP based webmail system.
-Assuming you have an account on a server that supports IMAP/POP, you can use
-an installation of IMP to check your mail from anywhere that you have web
-access.
diff --git a/mail/imp/MESSAGE b/mail/imp/MESSAGE
deleted file mode 100644
index 7a6c9fc3fbb..00000000000
--- a/mail/imp/MESSAGE
+++ /dev/null
@@ -1,21 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.7 2006/06/16 09:24:36 adrianp Exp $
-
-Please refer to the file:
-
- ${PREFIX}/share/doc/imp/INSTALL
-
-on how to setup your IMP installation. You need to at least edit
-
- ${PREFIX}/share/horde/config/registry.php
-
-to enable IMP in the horde framework. You will also need to configure IMP
-by using the Horde administrative interface.
-
-Finally you will also need to make IMP accessible through your HTTP server. If
-you are running Apache and ap-php, then you can add the following lines
-to httpd.conf:
-
- Include ${PKG_SYSCONFDIR}/imp.conf
-
-===========================================================================
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
deleted file mode 100644
index b1c7f5ccd71..00000000000
--- a/mail/imp/Makefile
+++ /dev/null
@@ -1,102 +0,0 @@
-# $NetBSD: Makefile,v 1.41 2007/03/18 12:15:48 adrianp Exp $
-
-DISTNAME= imp-h3-${IMPVER}
-PKGNAME= imp-${IMPVER}
-CATEGORIES= mail www
-MASTER_SITES= http://ftp.horde.org/pub/imp/ \
- ftp://ftp.horde.org/pub/imp/
-
-MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://www.horde.org/imp/
-COMMENT= Internet Messaging Program
-
-CONFLICTS+= imp-3.*
-
-DEPENDS+= horde>=3.0.2:../../www/horde
-DEPENDS+= ${PHP_PKG_PREFIX}-imap>4.3.3:../../mail/php-imap
-DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail-[0-9]*:../../mail/pear-Mail
-
-.include "../../mk/bsd.prefs.mk"
-
-DOCDIR= ${PREFIX}/share/doc/imp
-EGDIR= ${PREFIX}/share/examples/imp
-HORDEDIR= ${PREFIX}/share/horde
-IMPDIR= ${HORDEDIR}/imp
-IMPVER= 4.1.4
-PAXDIRS= lib locale po scripts templates themes
-BUILD_DEFS+= APACHE_USER
-
-MESSAGE_SUBST+= IMPDIR=${IMPDIR:Q}
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-
-PKG_SYSCONFSUBDIR?= httpd
-
-CONF_FILES= ${EGDIR}/imp.conf ${PKG_SYSCONFDIR}/imp.conf
-CONF_FILES+= ${IMPDIR}/config/servers.php.dist \
- ${IMPDIR}/config/servers.php
-CONF_FILES_PERMS+= ${IMPDIR}/config/conf.xml.dist \
- ${IMPDIR}/config/conf.xml \
- ${APACHE_USER} ${ROOT_GROUP} 0440
-CONF_FILES_PERMS+= ${IMPDIR}/config/filter.txt.dist \
- ${IMPDIR}/config/filter.txt \
- ${APACHE_USER} ${ROOT_GROUP} 0440
-CONF_FILES_PERMS+= ${IMPDIR}/config/header.txt.dist \
- ${IMPDIR}/config/header.txt \
- ${APACHE_USER} ${ROOT_GROUP} 0440
-CONF_FILES_PERMS+= ${IMPDIR}/config/menu.php.dist \
- ${IMPDIR}/config/menu.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
-CONF_FILES_PERMS+= ${IMPDIR}/config/mime_drivers.php.dist \
- ${IMPDIR}/config/mime_drivers.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
-CONF_FILES_PERMS+= ${IMPDIR}/config/motd.php.dist \
- ${IMPDIR}/config/motd.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
-CONF_FILES_PERMS+= ${IMPDIR}/config/prefs.php.dist \
- ${IMPDIR}/config/prefs.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
-CONF_FILES_PERMS+= ${IMPDIR}/config/trailer.txt.dist \
- ${IMPDIR}/config/trailer.txt \
- ${APACHE_USER} ${ROOT_GROUP} 0440
-
-SUBST_CLASSES+= files
-SUBST_STAGE.files= post-build
-SUBST_FILES.files= imp.conf.dist
-SUBST_SED.files= -e "s|@IMPDIR@|${IMPDIR}|g"
-SUBST_MESSAGE.files= Fixing configuration files.
-
-.include "options.mk"
-
-do-build:
- ${CP} ${FILESDIR}/imp.conf.dist ${WRKSRC}/imp.conf.dist
- ${CP} ${WRKSRC}/config/conf.xml ${WRKSRC}/config/conf.xml.dist
- ${FIND} ${WRKSRC} -name .htaccess -print | ${XARGS} ${RM} -f
-
-do-install:
- ${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA_DIR} ${IMPDIR}
- ${INSTALL_DATA_DIR} ${IMPDIR}/config
- ${INSTALL_DATA} ${WRKSRC}/imp.conf.dist ${EGDIR}/imp.conf
- ${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCDIR}
-
-. for d in ${PAXDIRS}
- ${INSTALL_DATA_DIR} ${IMPDIR}/${d}
-. endfor
-
-. for d in ${PAXDIRS}
- cd ${WRKSRC}/${d} && ${PAX} -rwpam . ${IMPDIR}/${d}
-. endfor
-
- ${INSTALL_DATA} ${WRKSRC}/config/*.dist ${IMPDIR}/config
- ${INSTALL_DATA} ${WRKSRC}/*.php ${IMPDIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${IMPDIR}
- ${FIND} ${IMPDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
- ${FIND} ${IMPDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
- ${CHOWN} ${APACHE_USER}:${ROOT_GROUP} ${IMPDIR}/config
- ${CHMOD} 0750 ${IMPDIR}/config
-
-.include "../../lang/php/phpversion.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/imp/PLIST b/mail/imp/PLIST
deleted file mode 100644
index 7b686b306a3..00000000000
--- a/mail/imp/PLIST
+++ /dev/null
@@ -1,502 +0,0 @@
-@comment $NetBSD: PLIST,v 1.10 2006/06/16 09:24:36 adrianp Exp $
-share/doc/imp/CHANGES
-share/doc/imp/COPYING
-share/doc/imp/CREDITS
-share/doc/imp/INSTALL
-share/doc/imp/README
-share/doc/imp/RELEASE_NOTES
-share/doc/imp/TODO
-share/doc/imp/UPGRADING
-share/examples/imp/imp.conf
-share/horde/imp/acl.php
-share/horde/imp/attachment.php
-share/horde/imp/compose.php
-share/horde/imp/config/conf.xml.dist
-share/horde/imp/config/filter.txt.dist
-share/horde/imp/config/header.php.dist
-share/horde/imp/config/menu.php.dist
-share/horde/imp/config/mime_drivers.php.dist
-share/horde/imp/config/motd.php.dist
-share/horde/imp/config/prefs.php.dist
-share/horde/imp/config/servers.php.dist
-share/horde/imp/config/trailer.txt.dist
-share/horde/imp/contacts.php
-share/horde/imp/expand.php
-share/horde/imp/fetchmail.php
-share/horde/imp/fetchmailprefs.php
-share/horde/imp/filterprefs.php
-share/horde/imp/folders.php
-share/horde/imp/index.php
-share/horde/imp/lib/Auth/imp.php
-share/horde/imp/lib/Block/summary.php
-share/horde/imp/lib/Block/tree_folders.php
-share/horde/imp/lib/Compose.php
-share/horde/imp/lib/Crypt/PGP.php
-share/horde/imp/lib/Crypt/SMIME.php
-share/horde/imp/lib/Fetchmail.php
-share/horde/imp/lib/Fetchmail/imap.php
-share/horde/imp/lib/Filter.php
-share/horde/imp/lib/Folder.php
-share/horde/imp/lib/IMAP.php
-share/horde/imp/lib/IMAP/Client.php
-share/horde/imp/lib/IMAP/Search.php
-share/horde/imp/lib/IMAP/Sort.php
-share/horde/imp/lib/IMAP/Thread.php
-share/horde/imp/lib/IMAP/Tree.php
-share/horde/imp/lib/IMP.php
-share/horde/imp/lib/Identity/imp.php
-share/horde/imp/lib/MIME/Contents.php
-share/horde/imp/lib/MIME/Headers.php
-share/horde/imp/lib/MIME/Viewer/alternative.php
-share/horde/imp/lib/MIME/Viewer/appledouble.php
-share/horde/imp/lib/MIME/Viewer/enriched.php
-share/horde/imp/lib/MIME/Viewer/html.php
-share/horde/imp/lib/MIME/Viewer/images.php
-share/horde/imp/lib/MIME/Viewer/itip.php
-share/horde/imp/lib/MIME/Viewer/multipart.php
-share/horde/imp/lib/MIME/Viewer/notification.php
-share/horde/imp/lib/MIME/Viewer/partial.php
-share/horde/imp/lib/MIME/Viewer/pgp.php
-share/horde/imp/lib/MIME/Viewer/pkcs7.php
-share/horde/imp/lib/MIME/Viewer/plain.php
-share/horde/imp/lib/MIME/Viewer/related.php
-share/horde/imp/lib/MIME/Viewer/rfc822.php
-share/horde/imp/lib/MIME/Viewer/status.php
-share/horde/imp/lib/MIME/Viewer/tnef.php
-share/horde/imp/lib/MIME/Viewer/zip.php
-share/horde/imp/lib/Mailbox.php
-share/horde/imp/lib/Maillog.php
-share/horde/imp/lib/Maintenance/Task/delete_attachments_monthly.php
-share/horde/imp/lib/Maintenance/Task/delete_sentmail_monthly.php
-share/horde/imp/lib/Maintenance/Task/fetchmail_login.php
-share/horde/imp/lib/Maintenance/Task/purge_trash.php
-share/horde/imp/lib/Maintenance/Task/rename_sentmail_monthly.php
-share/horde/imp/lib/Maintenance/Task/tos_agreement.php
-share/horde/imp/lib/Maintenance/imp.php
-share/horde/imp/lib/Message.php
-share/horde/imp/lib/Notification/Listener/status.php
-share/horde/imp/lib/Quota.php
-share/horde/imp/lib/Quota/command.php
-share/horde/imp/lib/Quota/courier.php
-share/horde/imp/lib/Quota/cyrus.php
-share/horde/imp/lib/Quota/logfile.php
-share/horde/imp/lib/Quota/mdaemon.php
-share/horde/imp/lib/Quota/mercury32.php
-share/horde/imp/lib/Search.php
-share/horde/imp/lib/Session.php
-share/horde/imp/lib/Spam.php
-share/horde/imp/lib/api.php
-share/horde/imp/lib/base.php
-share/horde/imp/lib/prefs.php
-share/horde/imp/lib/version.php
-share/horde/imp/locale/ar_OM/LC_MESSAGES/imp.mo
-share/horde/imp/locale/ar_SY/LC_MESSAGES/imp.mo
-share/horde/imp/locale/bg_BG/LC_MESSAGES/imp.mo
-share/horde/imp/locale/bs_BA/LC_MESSAGES/imp.mo
-share/horde/imp/locale/ca_ES/LC_MESSAGES/imp.mo
-share/horde/imp/locale/ca_ES/help.xml
-share/horde/imp/locale/cs_CZ/LC_MESSAGES/imp.mo
-share/horde/imp/locale/cs_CZ/help.xml
-share/horde/imp/locale/da_DK/LC_MESSAGES/imp.mo
-share/horde/imp/locale/da_DK/help.xml
-share/horde/imp/locale/de_DE/LC_MESSAGES/imp.mo
-share/horde/imp/locale/de_DE/help.xml
-share/horde/imp/locale/el_GR/LC_MESSAGES/imp.mo
-share/horde/imp/locale/el_GR/help.xml
-share/horde/imp/locale/en_US/help.xml
-share/horde/imp/locale/es_ES/LC_MESSAGES/imp.mo
-share/horde/imp/locale/es_ES/help.xml
-share/horde/imp/locale/et_EE/LC_MESSAGES/imp.mo
-share/horde/imp/locale/et_EE/help.xml
-share/horde/imp/locale/fa_IR/LC_MESSAGES/imp.mo
-share/horde/imp/locale/fa_IR/help.xml
-share/horde/imp/locale/fi_FI/LC_MESSAGES/imp.mo
-share/horde/imp/locale/fi_FI/help.xml
-share/horde/imp/locale/fr_FR/LC_MESSAGES/imp.mo
-share/horde/imp/locale/fr_FR/help.xml
-share/horde/imp/locale/gl_ES/LC_MESSAGES/imp.mo
-share/horde/imp/locale/he_IL/LC_MESSAGES/imp.mo
-share/horde/imp/locale/hu_HU/LC_MESSAGES/imp.mo
-share/horde/imp/locale/hu_HU/help.xml
-share/horde/imp/locale/id_ID/LC_MESSAGES/imp.mo
-share/horde/imp/locale/is_IS/LC_MESSAGES/imp.mo
-share/horde/imp/locale/it_IT/LC_MESSAGES/imp.mo
-share/horde/imp/locale/it_IT/help.xml
-share/horde/imp/locale/ja_JP/LC_MESSAGES/imp.mo
-share/horde/imp/locale/km_KH/LC_MESSAGES/imp.mo
-share/horde/imp/locale/ko_KR/LC_MESSAGES/imp.mo
-share/horde/imp/locale/ko_KR/help.xml
-share/horde/imp/locale/lt_LT/LC_MESSAGES/imp.mo
-share/horde/imp/locale/lv_LV/LC_MESSAGES/imp.mo
-share/horde/imp/locale/mk_MK/LC_MESSAGES/imp.mo
-share/horde/imp/locale/nb_NO/LC_MESSAGES/imp.mo
-share/horde/imp/locale/nb_NO/help.xml
-share/horde/imp/locale/nl_NL/LC_MESSAGES/imp.mo
-share/horde/imp/locale/nl_NL/help.xml
-share/horde/imp/locale/nn_NO/LC_MESSAGES/imp.mo
-share/horde/imp/locale/pl_PL/LC_MESSAGES/imp.mo
-share/horde/imp/locale/pl_PL/help.xml
-share/horde/imp/locale/pt_BR/LC_MESSAGES/imp.mo
-share/horde/imp/locale/pt_BR/help.xml
-share/horde/imp/locale/pt_PT/LC_MESSAGES/imp.mo
-share/horde/imp/locale/pt_PT/help.xml
-share/horde/imp/locale/ro_RO/LC_MESSAGES/imp.mo
-share/horde/imp/locale/ru_RU/LC_MESSAGES/imp.mo
-share/horde/imp/locale/ru_RU/help.xml
-share/horde/imp/locale/sk_SK/LC_MESSAGES/imp.mo
-share/horde/imp/locale/sk_SK/help.xml
-share/horde/imp/locale/sl_SI/LC_MESSAGES/imp.mo
-share/horde/imp/locale/sv_SE/LC_MESSAGES/imp.mo
-share/horde/imp/locale/sv_SE/help.xml
-share/horde/imp/locale/th_TH/LC_MESSAGES/imp.mo
-share/horde/imp/locale/tr_TR/LC_MESSAGES/imp.mo
-share/horde/imp/locale/tr_TR/help.xml
-share/horde/imp/locale/uk_UA/LC_MESSAGES/imp.mo
-share/horde/imp/locale/uk_UA/help.xml
-share/horde/imp/locale/zh_CN/LC_MESSAGES/imp.mo
-share/horde/imp/locale/zh_CN/help.xml
-share/horde/imp/locale/zh_TW/LC_MESSAGES/imp.mo
-share/horde/imp/locale/zh_TW/help.xml
-share/horde/imp/login.php
-share/horde/imp/mailbox.php
-share/horde/imp/message.php
-share/horde/imp/pgp.php
-share/horde/imp/po/README
-share/horde/imp/po/ar_OM.po
-share/horde/imp/po/ar_SY.po
-share/horde/imp/po/bg_BG.po
-share/horde/imp/po/bs_BA.po
-share/horde/imp/po/ca_ES.po
-share/horde/imp/po/cs_CZ.po
-share/horde/imp/po/da_DK.po
-share/horde/imp/po/de_DE.po
-share/horde/imp/po/el_GR.po
-share/horde/imp/po/es_ES.po
-share/horde/imp/po/et_EE.po
-share/horde/imp/po/fa_IR.po
-share/horde/imp/po/fi_FI.po
-share/horde/imp/po/fr_FR.po
-share/horde/imp/po/gl_ES.po
-share/horde/imp/po/he_IL.po
-share/horde/imp/po/hu_HU.po
-share/horde/imp/po/id_ID.po
-share/horde/imp/po/imp.pot
-share/horde/imp/po/is_IS.po
-share/horde/imp/po/it_IT.po
-share/horde/imp/po/ja_JP.po
-share/horde/imp/po/km_KH.po
-share/horde/imp/po/ko_KR.po
-share/horde/imp/po/lt_LT.po
-share/horde/imp/po/lv_LV.po
-share/horde/imp/po/mk_MK.po
-share/horde/imp/po/nb_NO.po
-share/horde/imp/po/nl_NL.po
-share/horde/imp/po/nn_NO.po
-share/horde/imp/po/pl_PL.po
-share/horde/imp/po/pt_BR.po
-share/horde/imp/po/pt_PT.po
-share/horde/imp/po/ro_RO.po
-share/horde/imp/po/ru_RU.po
-share/horde/imp/po/sk_SK.po
-share/horde/imp/po/sl_SI.po
-share/horde/imp/po/sv_SE.po
-share/horde/imp/po/th_TH.po
-share/horde/imp/po/tr_TR.po
-share/horde/imp/po/uk_UA.po
-share/horde/imp/po/zh_CN.po
-share/horde/imp/po/zh_TW.po
-share/horde/imp/recompose.php
-share/horde/imp/redirect.php
-share/horde/imp/saveimage.php
-share/horde/imp/scripts/Imp.reg
-share/horde/imp/scripts/custom_login.php
-share/horde/imp/search.php
-share/horde/imp/smime.php
-share/horde/imp/spelling.php
-share/horde/imp/stationery.php
-share/horde/imp/templates/acl/acl.inc
-share/horde/imp/templates/common-header.inc
-share/horde/imp/templates/compose/attachments.inc
-share/horde/imp/templates/compose/attachments.js
-share/horde/imp/templates/compose/compose.inc
-share/horde/imp/templates/compose/compose.js
-share/horde/imp/templates/compose/compose_expand.js
-share/horde/imp/templates/compose/encrypt_list.inc
-share/horde/imp/templates/compose/expand.inc
-share/horde/imp/templates/compose/recompose.inc
-share/horde/imp/templates/compose/redirect.inc
-share/horde/imp/templates/compose/spelling.inc
-share/horde/imp/templates/compose/spelling.js
-share/horde/imp/templates/compose/success.inc
-share/horde/imp/templates/contacts/contacts.inc
-share/horde/imp/templates/fetchmail/account_select.inc
-share/horde/imp/templates/fetchmail/driver_select.inc
-share/horde/imp/templates/fetchmail/fetchmail.inc
-share/horde/imp/templates/fetchmail/manage.inc
-share/horde/imp/templates/fetchmail/top.inc
-share/horde/imp/templates/filters/notactive.inc
-share/horde/imp/templates/filters/prefs.inc
-share/horde/imp/templates/folders/actions.inc
-share/horde/imp/templates/folders/folders.html
-share/horde/imp/templates/folders/folders_confirm.html
-share/horde/imp/templates/folders/foot.inc
-share/horde/imp/templates/folders/head.inc
-share/horde/imp/templates/folders/import.inc
-share/horde/imp/templates/javascript/addressesBlocks.js
-share/horde/imp/templates/javascript/folders.js
-share/horde/imp/templates/javascript/popup.js
-share/horde/imp/templates/login/login.inc
-share/horde/imp/templates/mailbox/actions.inc
-share/horde/imp/templates/mailbox/actions_deleted.inc
-share/horde/imp/templates/mailbox/alert.inc
-share/horde/imp/templates/mailbox/empty_mailbox.inc
-share/horde/imp/templates/mailbox/footer.inc
-share/horde/imp/templates/mailbox/header.inc
-share/horde/imp/templates/mailbox/javascript.inc
-share/horde/imp/templates/mailbox/legend.inc
-share/horde/imp/templates/mailbox/mailbox.html
-share/horde/imp/templates/mailbox/message_footers.inc
-share/horde/imp/templates/mailbox/message_headers.inc
-share/horde/imp/templates/mailbox/navbar.inc
-share/horde/imp/templates/mailbox/searchfolder.inc
-share/horde/imp/templates/menu.inc
-share/horde/imp/templates/message/headers.inc
-share/horde/imp/templates/message/javascript.inc
-share/horde/imp/templates/message/message.inc
-share/horde/imp/templates/message/navbar_actions.inc
-share/horde/imp/templates/message/navbar_navigate.inc
-share/horde/imp/templates/message/navbar_top.inc
-share/horde/imp/templates/pgp/import_key.inc
-share/horde/imp/templates/pgp/notactive.inc
-share/horde/imp/templates/pgp/passphrase.inc
-share/horde/imp/templates/pgp/pgp.inc
-share/horde/imp/templates/prefs/defaultsearchselect.inc
-share/horde/imp/templates/prefs/encryptselect.inc
-share/horde/imp/templates/prefs/folderselect.inc
-share/horde/imp/templates/prefs/initialpageselect.inc
-share/horde/imp/templates/prefs/sentmailselect.inc
-share/horde/imp/templates/prefs/sourceselect.inc
-share/horde/imp/templates/prefs/spamselect.inc
-share/horde/imp/templates/prefs/trashselect.inc
-share/horde/imp/templates/quota/quota.inc
-share/horde/imp/templates/saveimage/saveimage.inc
-share/horde/imp/templates/search/fields.inc
-share/horde/imp/templates/search/header.inc
-share/horde/imp/templates/search/javascript.inc
-share/horde/imp/templates/search/main.inc
-share/horde/imp/templates/smime/import_key.inc
-share/horde/imp/templates/smime/notactive.inc
-share/horde/imp/templates/smime/passphrase.inc
-share/horde/imp/templates/smime/smime.inc
-share/horde/imp/templates/stationery/prefs.inc
-share/horde/imp/templates/thread/thread.html
-share/horde/imp/test.php
-share/horde/imp/themes/azur/screen.css
-share/horde/imp/themes/bluemoon/screen.css
-share/horde/imp/themes/bluewhite/screen.css
-share/horde/imp/themes/brown/screen.css
-share/horde/imp/themes/burntorange/screen.css
-share/horde/imp/themes/cherry/screen.css
-share/horde/imp/themes/cornflower/screen.css
-share/horde/imp/themes/gennevilliers/screen.css
-share/horde/imp/themes/graphics/addressbook_add.png
-share/horde/imp/themes/graphics/addressbook_browse.png
-share/horde/imp/themes/graphics/apple.png
-share/horde/imp/themes/graphics/attachment.png
-share/horde/imp/themes/graphics/audio/theetone.wav
-share/horde/imp/themes/graphics/compose.png
-share/horde/imp/themes/graphics/empty_spam.png
-share/horde/imp/themes/graphics/empty_trash.png
-share/horde/imp/themes/graphics/encrypted.png
-share/horde/imp/themes/graphics/expand.png
-share/horde/imp/themes/graphics/favicon.ico
-share/horde/imp/themes/graphics/fetchmail.png
-share/horde/imp/themes/graphics/filters.png
-share/horde/imp/themes/graphics/folders/drafts.png
-share/horde/imp/themes/graphics/folders/folder.png
-share/horde/imp/themes/graphics/folders/folder_open.png
-share/horde/imp/themes/graphics/folders/inbox.png
-share/horde/imp/themes/graphics/folders/sent.png
-share/horde/imp/themes/graphics/folders/trash.png
-share/horde/imp/themes/graphics/imp.png
-share/horde/imp/themes/graphics/mail_answered.png
-share/horde/imp/themes/graphics/mail_deleted.png
-share/horde/imp/themes/graphics/mail_draft.png
-share/horde/imp/themes/graphics/mail_flagged.png
-share/horde/imp/themes/graphics/mail_forwarded.png
-share/horde/imp/themes/graphics/mail_personal.png
-share/horde/imp/themes/graphics/mail_priority_high.png
-share/horde/imp/themes/graphics/mail_priority_low.png
-share/horde/imp/themes/graphics/mail_unseen.png
-share/horde/imp/themes/graphics/manage_attachments.png
-share/horde/imp/themes/graphics/mime/binary.png
-share/horde/imp/themes/graphics/mime/compressed.png
-share/horde/imp/themes/graphics/mime/encryption.png
-share/horde/imp/themes/graphics/mime/html.png
-share/horde/imp/themes/graphics/mime/image.png
-share/horde/imp/themes/graphics/mime/itip.png
-share/horde/imp/themes/graphics/mime/mail.png
-share/horde/imp/themes/graphics/mime/text.png
-share/horde/imp/themes/graphics/newmail.png
-share/horde/imp/themes/graphics/shared.png
-share/horde/imp/themes/graphics/signed.png
-share/horde/imp/themes/graphics/spacer_red.png
-share/horde/imp/themes/graphics/spellcheck.png
-share/horde/imp/themes/green/screen.css
-share/horde/imp/themes/grey/screen.css
-share/horde/imp/themes/lavander/screen.css
-share/horde/imp/themes/luc/screen.css
-share/horde/imp/themes/lucblue/screen.css
-share/horde/imp/themes/postnuke/screen.css
-share/horde/imp/themes/rtl.css
-share/horde/imp/themes/screen.css
-share/horde/imp/themes/simplex/screen.css
-share/horde/imp/themes/sun/screen.css
-share/horde/imp/thread.php
-share/horde/imp/view.php
-@dirrm share/horde/imp/themes/sun
-@dirrm share/horde/imp/themes/simplex
-@dirrm share/horde/imp/themes/postnuke
-@dirrm share/horde/imp/themes/lucblue
-@dirrm share/horde/imp/themes/luc
-@dirrm share/horde/imp/themes/lavander
-@dirrm share/horde/imp/themes/grey
-@dirrm share/horde/imp/themes/green
-@dirrm share/horde/imp/themes/graphics/audio
-@dirrm share/horde/imp/themes/graphics/mime
-@dirrm share/horde/imp/themes/graphics/folders
-@dirrm share/horde/imp/themes/graphics
-@dirrm share/horde/imp/themes/gennevilliers
-@dirrm share/horde/imp/themes/cornflower
-@dirrm share/horde/imp/themes/cherry
-@dirrm share/horde/imp/themes/burntorange
-@dirrm share/horde/imp/themes/brown
-@dirrm share/horde/imp/themes/bluewhite
-@dirrm share/horde/imp/themes/bluemoon
-@dirrm share/horde/imp/themes/azur
-@dirrm share/horde/imp/themes
-@dirrm share/horde/imp/templates/stationery
-@dirrm share/horde/imp/templates/saveimage
-@dirrm share/horde/imp/templates/thread
-@dirrm share/horde/imp/templates/smime
-@dirrm share/horde/imp/templates/search
-@dirrm share/horde/imp/templates/quota
-@dirrm share/horde/imp/templates/prefs
-@dirrm share/horde/imp/templates/pgp
-@dirrm share/horde/imp/templates/message
-@dirrm share/horde/imp/templates/mailbox
-@dirrm share/horde/imp/templates/login
-@dirrm share/horde/imp/templates/javascript
-@dirrm share/horde/imp/templates/folders
-@dirrm share/horde/imp/templates/filters
-@dirrm share/horde/imp/templates/fetchmail
-@dirrm share/horde/imp/templates/contacts
-@dirrm share/horde/imp/templates/compose
-@dirrm share/horde/imp/templates/acl
-@dirrm share/horde/imp/templates
-@dirrm share/horde/imp/scripts
-@dirrm share/horde/imp/po
-@dirrm share/horde/imp/locale/zh_TW/LC_MESSAGES
-@dirrm share/horde/imp/locale/zh_TW
-@dirrm share/horde/imp/locale/zh_CN/LC_MESSAGES
-@dirrm share/horde/imp/locale/zh_CN
-@dirrm share/horde/imp/locale/uk_UA/LC_MESSAGES
-@dirrm share/horde/imp/locale/uk_UA
-@dirrm share/horde/imp/locale/tr_TR/LC_MESSAGES
-@dirrm share/horde/imp/locale/tr_TR
-@dirrm share/horde/imp/locale/th_TH/LC_MESSAGES
-@dirrm share/horde/imp/locale/th_TH
-@dirrm share/horde/imp/locale/sv_SE/LC_MESSAGES
-@dirrm share/horde/imp/locale/sv_SE
-@dirrm share/horde/imp/locale/sl_SI/LC_MESSAGES
-@dirrm share/horde/imp/locale/sl_SI
-@dirrm share/horde/imp/locale/sk_SK/LC_MESSAGES
-@dirrm share/horde/imp/locale/sk_SK
-@dirrm share/horde/imp/locale/ru_RU/LC_MESSAGES
-@dirrm share/horde/imp/locale/ru_RU
-@dirrm share/horde/imp/locale/ro_RO/LC_MESSAGES
-@dirrm share/horde/imp/locale/ro_RO
-@dirrm share/horde/imp/locale/pt_PT/LC_MESSAGES
-@dirrm share/horde/imp/locale/pt_PT
-@dirrm share/horde/imp/locale/pt_BR/LC_MESSAGES
-@dirrm share/horde/imp/locale/pt_BR
-@dirrm share/horde/imp/locale/pl_PL/LC_MESSAGES
-@dirrm share/horde/imp/locale/pl_PL
-@dirrm share/horde/imp/locale/nn_NO/LC_MESSAGES
-@dirrm share/horde/imp/locale/nn_NO
-@dirrm share/horde/imp/locale/nl_NL/LC_MESSAGES
-@dirrm share/horde/imp/locale/nl_NL
-@dirrm share/horde/imp/locale/nb_NO/LC_MESSAGES
-@dirrm share/horde/imp/locale/nb_NO
-@dirrm share/horde/imp/locale/mk_MK/LC_MESSAGES
-@dirrm share/horde/imp/locale/mk_MK
-@dirrm share/horde/imp/locale/lv_LV/LC_MESSAGES
-@dirrm share/horde/imp/locale/lv_LV
-@dirrm share/horde/imp/locale/lt_LT/LC_MESSAGES
-@dirrm share/horde/imp/locale/lt_LT
-@dirrm share/horde/imp/locale/ko_KR/LC_MESSAGES
-@dirrm share/horde/imp/locale/ko_KR
-@dirrm share/horde/imp/locale/ja_JP/LC_MESSAGES
-@dirrm share/horde/imp/locale/ja_JP
-@dirrm share/horde/imp/locale/it_IT/LC_MESSAGES
-@dirrm share/horde/imp/locale/it_IT
-@dirrm share/horde/imp/locale/is_IS/LC_MESSAGES
-@dirrm share/horde/imp/locale/is_IS
-@dirrm share/horde/imp/locale/id_ID/LC_MESSAGES
-@dirrm share/horde/imp/locale/id_ID
-@dirrm share/horde/imp/locale/hu_HU/LC_MESSAGES
-@dirrm share/horde/imp/locale/hu_HU
-@dirrm share/horde/imp/locale/gl_ES/LC_MESSAGES
-@dirrm share/horde/imp/locale/gl_ES
-@dirrm share/horde/imp/locale/fr_FR/LC_MESSAGES
-@dirrm share/horde/imp/locale/fr_FR
-@dirrm share/horde/imp/locale/fi_FI/LC_MESSAGES
-@dirrm share/horde/imp/locale/fi_FI
-@dirrm share/horde/imp/locale/fa_IR/LC_MESSAGES
-@dirrm share/horde/imp/locale/fa_IR
-@dirrm share/horde/imp/locale/et_EE/LC_MESSAGES
-@dirrm share/horde/imp/locale/et_EE
-@dirrm share/horde/imp/locale/es_ES/LC_MESSAGES
-@dirrm share/horde/imp/locale/es_ES
-@dirrm share/horde/imp/locale/en_US
-@dirrm share/horde/imp/locale/el_GR/LC_MESSAGES
-@dirrm share/horde/imp/locale/el_GR
-@dirrm share/horde/imp/locale/de_DE/LC_MESSAGES
-@dirrm share/horde/imp/locale/de_DE
-@dirrm share/horde/imp/locale/da_DK/LC_MESSAGES
-@dirrm share/horde/imp/locale/da_DK
-@dirrm share/horde/imp/locale/cs_CZ/LC_MESSAGES
-@dirrm share/horde/imp/locale/cs_CZ
-@dirrm share/horde/imp/locale/ca_ES/LC_MESSAGES
-@dirrm share/horde/imp/locale/ca_ES
-@dirrm share/horde/imp/locale/bs_BA/LC_MESSAGES
-@dirrm share/horde/imp/locale/bs_BA
-@dirrm share/horde/imp/locale/bg_BG/LC_MESSAGES
-@dirrm share/horde/imp/locale/bg_BG
-@dirrm share/horde/imp/locale/ar_SY/LC_MESSAGES
-@dirrm share/horde/imp/locale/ar_SY
-@dirrm share/horde/imp/locale/ar_OM/LC_MESSAGES
-@dirrm share/horde/imp/locale/ar_OM
-@dirrm share/horde/imp/locale/km_KH/LC_MESSAGES
-@dirrm share/horde/imp/locale/km_KH
-@dirrm share/horde/imp/locale/he_IL/LC_MESSAGES
-@dirrm share/horde/imp/locale/he_IL
-@dirrm share/horde/imp/locale
-@dirrm share/horde/imp/lib/Quota
-@dirrm share/horde/imp/lib/Notification/Listener
-@dirrm share/horde/imp/lib/Notification
-@dirrm share/horde/imp/lib/Maintenance/Task
-@dirrm share/horde/imp/lib/Maintenance
-@dirrm share/horde/imp/lib/MIME/Viewer
-@dirrm share/horde/imp/lib/MIME
-@dirrm share/horde/imp/lib/Identity
-@dirrm share/horde/imp/lib/IMAP
-@dirrm share/horde/imp/lib/Fetchmail
-@dirrm share/horde/imp/lib/Crypt
-@dirrm share/horde/imp/lib/Block
-@dirrm share/horde/imp/lib/Auth
-@dirrm share/horde/imp/lib
-@unexec ${RMDIR} %D/share/horde/imp/config 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/horde/imp 2>/dev/null || ${TRUE}
-@dirrm share/examples/imp
-@dirrm share/doc/imp
diff --git a/mail/imp/distinfo b/mail/imp/distinfo
deleted file mode 100644
index f27826fa001..00000000000
--- a/mail/imp/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.17 2007/03/18 12:15:48 adrianp Exp $
-
-SHA1 (imp-h3-4.1.4.tar.gz) = ad79c04752ad9f56ab1b5fbbd62f23809ef84c4e
-RMD160 (imp-h3-4.1.4.tar.gz) = f09c32f0c274651068ec1ed56f1142612ccefa51
-Size (imp-h3-4.1.4.tar.gz) = 4204260 bytes
diff --git a/mail/imp/files/imp.conf.dist b/mail/imp/files/imp.conf.dist
deleted file mode 100644
index 33a61b239b1..00000000000
--- a/mail/imp/files/imp.conf.dist
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD: imp.conf.dist,v 1.3 2006/06/16 09:24:36 adrianp Exp $
-#
-# IMP configuration file fragment for Apache
-
-<IfModule mod_alias.c>
- Alias /imp/ "@IMPDIR@/"
-</IfModule>
-
-<Directory "@IMPDIR@">
- DirectoryIndex index.php
- <IfModule mod_php4.c>
- php_flag file_uploads On
- php_flag upload_max_filesize 5M
- </IfModule>
-</Directory>
-
-# For security, don't serve pages from the IMP configuration and library
-# directories.
-#
-<Directory "@IMPDIR@/config">
- Order deny,allow
- Deny from all
-</Directory>
-<Directory "@IMPDIR@/lib">
- Order deny,allow
- Deny from all
-</Directory>
-<Directory "@IMPDIR@/locale">
- Order deny,allow
- Deny from all
-</Directory>
-<Directory "@IMPDIR@/po">
- Order deny,allow
- Deny from all
-</Directory>
-<Directory "@IMPDIR@/scripts">
- Order deny,allow
- Deny from all
-</Directory>
-<Directory "@IMPDIR@/templates">
- Order deny,allow
- Deny from all
-</Directory>
diff --git a/mail/imp/options.mk b/mail/imp/options.mk
deleted file mode 100644
index 2dc1a19709d..00000000000
--- a/mail/imp/options.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2006/06/16 09:25:30 adrianp Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.imp
-PKG_SUPPORTED_OPTIONS= ispell aspell gnupg
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Use aspell with IMP
-###
-.if !empty(PKG_OPTIONS:Maspell)
-DEPENDS+= aspell-[0-9]*:../../textproc/aspell
-.endif
-
-###
-### Use ispell with IMP
-###
-.if !empty(PKG_OPTIONS:Mispell)
-DEPENDS+= ispell-base-[0-9]*:../../textproc/ispell-base
-.endif
-
-###
-### Use gnupg with IMP
-###
-.if !empty(PKG_OPTIONS:Mgnupg)
-DEPENDS+= gnupg-[0-9]*:../../security/gnupg
-.endif
diff --git a/mail/incm/DESCR b/mail/incm/DESCR
deleted file mode 100644
index 54588fb995a..00000000000
--- a/mail/incm/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-A small tool to incorporate new mail from a mail spool file or from
-a maildir.
diff --git a/mail/incm/Makefile b/mail/incm/Makefile
deleted file mode 100644
index 13fcc83b8b4..00000000000
--- a/mail/incm/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:00 jlam Exp $
-#
-
-DISTNAME= incm-0.5
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.mew.org/pub/Mew/release/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.mew.org/
-COMMENT= Tool to get mail from mbox file or maildir
-
-CONFLICTS= mew-[0-9]*
-
-GNU_CONFIGURE= YES
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/incm ${PREFIX}/bin/
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Interix"
-. include "../../pkgtools/libnbcompat/buildlink3.mk" # for utimes()
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/incm/PLIST b/mail/incm/PLIST
deleted file mode 100644
index 1e5e772e3f3..00000000000
--- a/mail/incm/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/08 15:27:00 yyamano Exp $
-bin/incm
diff --git a/mail/incm/distinfo b/mail/incm/distinfo
deleted file mode 100644
index 53085490893..00000000000
--- a/mail/incm/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:23 agc Exp $
-
-SHA1 (incm-0.5.tar.gz) = d9ba7de0566f98ba057f12fbf7d71303700ff0c0
-RMD160 (incm-0.5.tar.gz) = c1e5c75b2bf7759aef3a3a0bed97d1d7d8f782ca
-Size (incm-0.5.tar.gz) = 18530 bytes
diff --git a/mail/ingo/DESCR b/mail/ingo/DESCR
deleted file mode 100644
index 7a4656f8e1d..00000000000
--- a/mail/ingo/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Ingo, the "Email Filter Rules Manager", started as a frontend for the Sieve
-filter language, and is now a generic and complete filter rule frontend that
-currently is able to create Sieve, procmail, maildrop, and IMAP filter rules.
-The IMAP filter driver translates the filter rules on demand to IMAP commands,
-executed via PHP's IMAP extension and has replaced IMP's internal filtering
-code. It is now the default filtering agent in IMP H3 (4.x).
diff --git a/mail/ingo/MESSAGE b/mail/ingo/MESSAGE
deleted file mode 100644
index a9842d3876e..00000000000
--- a/mail/ingo/MESSAGE
+++ /dev/null
@@ -1,21 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2006/03/31 22:06:34 adrianp Exp $
-
-Please refer to the file:
-
- ${PREFIX}/share/doc/ingo/INSTALL
-
-on how to setup your Ingo installation. You need to at least edit
-
- ${PREFIX}/share/horde/config/registry.php
-
-to enable Ingo in the horde framework. You will also need to configure Ingo
-by using the Horde administrative interface.
-
-Finally you will also need to make Ingo accessible through your HTTP server.
-If you are running Apache and ap-php, then you can add the following lines
-to httpd.conf:
-
- Include ${PKG_SYSCONFDIR}/ingo.conf
-
-===========================================================================
diff --git a/mail/ingo/Makefile b/mail/ingo/Makefile
deleted file mode 100644
index 2b642183b65..00000000000
--- a/mail/ingo/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2007/03/18 12:09:33 adrianp Exp $
-
-DISTNAME= ingo-h3-${INGOVER}
-PKGNAME= ingo-${INGOVER}
-CATEGORIES= mail www
-MASTER_SITES= http://ftp.horde.org/pub/ingo/ \
- ftp://ftp.horde.org/pub/ingo/
-
-MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://www.horde.org/ingo/
-COMMENT= Horde based generic and complete mail filter rule frontend
-
-DEPENDS+= horde>=3.0.0:../../www/horde
-
-.include "../../mk/bsd.prefs.mk"
-
-DOCDIR= ${PREFIX}/share/doc/ingo
-EGDIR= ${PREFIX}/share/examples/ingo
-HORDEDIR= ${PREFIX}/share/horde
-INGODIR= ${HORDEDIR}/ingo
-INGOVER= 1.1.3
-PAXDIRS= lib locale po scripts templates themes
-
-MESSAGE_SUBST+= INGODIR=${INGODIR:Q}
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-
-PKG_SYSCONFSUBDIR?= httpd
-USE_PKGINSTALL= YES
-
-SUBST_CLASSES+= files
-SUBST_STAGE.files= post-build
-SUBST_FILES.files= ingo.conf.dist
-SUBST_SED.files= -e "s|@INGODIR@|${INGODIR}|g"
-SUBST_MESSAGE.files= Fixing configuration files.
-
-CONF_FILES= ${EGDIR}/ingo.conf ${PKG_SYSCONFDIR}/ingo.conf
-CONF_FILES_PERMS+= ${INGODIR}/config/conf.xml.dist \
- ${INGODIR}/config/conf.xml \
- ${APACHE_USER} ${ROOT_GROUP} 0440
-CONF_FILES_PERMS+= ${INGODIR}/config/backends.php.dist \
- ${INGODIR}/config/backends.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
-CONF_FILES_PERMS+= ${INGODIR}/config/fields.php.dist \
- ${INGODIR}/config/fields.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
-CONF_FILES_PERMS+= ${INGODIR}/config/prefs.php.dist \
- ${INGODIR}/config/prefs.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
-
-.include "options.mk"
-
-do-build:
- @${CP} ${FILESDIR}/ingo.conf.dist ${WRKSRC}/ingo.conf.dist
- @${CP} ${WRKSRC}/config/conf.xml ${WRKSRC}/config/conf.xml.dist
- @${FIND} ${WRKSRC} -name .htaccess -print | ${XARGS} ${RM} -f
-
-do-install:
- ${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA_DIR} ${INGODIR}
- ${INSTALL_DATA_DIR} ${INGODIR}/config
- ${INSTALL_DATA} ${WRKSRC}/ingo.conf.dist ${EGDIR}/ingo.conf
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/INSTALL ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/RELEASE_NOTES ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/UPGRADING ${DOCDIR}
-
-. for d in ${PAXDIRS}
- ${INSTALL_DATA_DIR} ${INGODIR}/${d:Q}
-. endfor
-
-. for d in ${PAXDIRS}
- @cd ${WRKSRC}/${d:Q} && ${PAX} -rwpma . ${INGODIR}/${d:Q}
-. endfor
-
- ${INSTALL_DATA} ${WRKSRC}/config/*.dist ${INGODIR}/config
- ${INSTALL_DATA} ${WRKSRC}/*.php ${INGODIR}
- @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INGODIR}
- @${FIND} ${INGODIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
- @${FIND} ${INGODIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
- @${CHOWN} ${APACHE_USER}:${SHAREGRP} ${INGODIR}/config
- @${CHMOD} 0750 ${INGODIR}/config
-
-.include "../../lang/php/phpversion.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/ingo/PLIST b/mail/ingo/PLIST
deleted file mode 100644
index 1d108b5db63..00000000000
--- a/mail/ingo/PLIST
+++ /dev/null
@@ -1,199 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2007/03/18 12:09:33 adrianp Exp $
-share/doc/ingo/INSTALL
-share/doc/ingo/README
-share/doc/ingo/RELEASE_NOTES
-share/doc/ingo/UPGRADING
-share/examples/ingo/ingo.conf
-share/horde/ingo/blacklist.php
-share/horde/ingo/config/backends.php.dist
-share/horde/ingo/config/conf.xml.dist
-share/horde/ingo/config/fields.php.dist
-share/horde/ingo/config/prefs.php.dist
-share/horde/ingo/filters.php
-share/horde/ingo/forward.php
-share/horde/ingo/index.php
-share/horde/ingo/lib/Block/overview.php
-share/horde/ingo/lib/Driver.php
-share/horde/ingo/lib/Driver/ldap.php
-share/horde/ingo/lib/Driver/null.php
-share/horde/ingo/lib/Driver/timsieved.php
-share/horde/ingo/lib/Driver/vfs.php
-share/horde/ingo/lib/IMAP/Search.php
-share/horde/ingo/lib/Ingo.php
-share/horde/ingo/lib/Script.php
-share/horde/ingo/lib/Script/imap.php
-share/horde/ingo/lib/Script/maildrop.php
-share/horde/ingo/lib/Script/procmail.php
-share/horde/ingo/lib/Script/sieve.php
-share/horde/ingo/lib/Session.php
-share/horde/ingo/lib/Storage.php
-share/horde/ingo/lib/Storage/prefs.php
-share/horde/ingo/lib/api.php
-share/horde/ingo/lib/base.php
-share/horde/ingo/lib/version.php
-share/horde/ingo/locale/cs_CZ/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/da_DK/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/de_DE/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/de_DE/help.xml
-share/horde/ingo/locale/ca_ES/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/ca_ES/help.xml
-share/horde/ingo/locale/el_GR/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/en_US/help.xml
-share/horde/ingo/locale/es_ES/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/es_ES/help.xml
-share/horde/ingo/locale/et_EE/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/fi_FI/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/fi_FI/help.xml
-share/horde/ingo/locale/fr_FR/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/fr_FR/help.xml
-share/horde/ingo/locale/hu_HU/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/it_IT/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/ko_KR/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/lt_LT/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/lv_LV/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/lv_LV/help.xml
-share/horde/ingo/locale/nb_NO/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/nl_NL/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/pl_PL/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/pt_BR/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/pt_PT/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/ro_RO/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/sl_SI/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/sv_SE/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/tr_TR/LC_MESSAGES/ingo.mo
-share/horde/ingo/locale/zh_TW/LC_MESSAGES/ingo.mo
-share/horde/ingo/po/README
-share/horde/ingo/po/ca_ES.po
-share/horde/ingo/po/cs_CZ.po
-share/horde/ingo/po/da_DK.po
-share/horde/ingo/po/de_DE.po
-share/horde/ingo/po/el_GR.po
-share/horde/ingo/po/es_ES.po
-share/horde/ingo/po/et_EE.po
-share/horde/ingo/po/fi_FI.po
-share/horde/ingo/po/fr_FR.po
-share/horde/ingo/po/hu_HU.po
-share/horde/ingo/po/ingo.pot
-share/horde/ingo/po/it_IT.po
-share/horde/ingo/po/ko_KR.po
-share/horde/ingo/po/lt_LT.po
-share/horde/ingo/po/lv_LV.po
-share/horde/ingo/po/nb_NO.po
-share/horde/ingo/po/nl_NL.po
-share/horde/ingo/po/pl_PL.po
-share/horde/ingo/po/pt_BR.po
-share/horde/ingo/po/pt_PT.po
-share/horde/ingo/po/ro_RO.po
-share/horde/ingo/po/sl_SI.po
-share/horde/ingo/po/sv_SE.po
-share/horde/ingo/po/tr_TR.po
-share/horde/ingo/po/zh_TW.po
-share/horde/ingo/rule.php
-share/horde/ingo/script.php
-share/horde/ingo/scripts/convert_imp_filters.php
-share/horde/ingo/templates/blacklist/blacklist.inc
-share/horde/ingo/templates/common-header.inc
-share/horde/ingo/templates/filters/filter-none.inc
-share/horde/ingo/templates/filters/filter.html
-share/horde/ingo/templates/filters/footer.inc
-share/horde/ingo/templates/filters/header.inc
-share/horde/ingo/templates/filters/settings.inc
-share/horde/ingo/templates/forward/forward.inc
-share/horde/ingo/templates/javascript/new_folder.js
-share/horde/ingo/templates/menu.inc
-share/horde/ingo/templates/rule/filter.inc
-share/horde/ingo/templates/rule/footer.inc
-share/horde/ingo/templates/rule/header.inc
-share/horde/ingo/templates/script/activate.inc
-share/horde/ingo/templates/script/footer.inc
-share/horde/ingo/templates/script/header.inc
-share/horde/ingo/templates/script/script.inc
-share/horde/ingo/templates/vacation/vacation.inc
-share/horde/ingo/templates/whitelist/whitelist.inc
-share/horde/ingo/test.php
-share/horde/ingo/themes/graphics/blacklist.png
-share/horde/ingo/themes/graphics/copy.png
-share/horde/ingo/themes/graphics/disable.png
-share/horde/ingo/themes/graphics/enable.png
-share/horde/ingo/themes/graphics/favicon.ico
-share/horde/ingo/themes/graphics/forward.png
-share/horde/ingo/themes/graphics/ingo.png
-share/horde/ingo/themes/graphics/script.png
-share/horde/ingo/themes/graphics/vacation.png
-share/horde/ingo/themes/graphics/whitelist.png
-share/horde/ingo/themes/screen.css
-share/horde/ingo/vacation.php
-share/horde/ingo/whitelist.php
-@dirrm share/examples/ingo
-@dirrm share/horde/ingo/themes/graphics
-@dirrm share/horde/ingo/themes
-@dirrm share/horde/ingo/templates/whitelist
-@dirrm share/horde/ingo/templates/vacation
-@dirrm share/horde/ingo/templates/script
-@dirrm share/horde/ingo/templates/rule
-@dirrm share/horde/ingo/templates/javascript
-@dirrm share/horde/ingo/templates/forward
-@dirrm share/horde/ingo/templates/filters
-@dirrm share/horde/ingo/templates/blacklist
-@dirrm share/horde/ingo/templates
-@dirrm share/horde/ingo/scripts
-@dirrm share/horde/ingo/po
-@dirrm share/horde/ingo/locale/zh_TW/LC_MESSAGES
-@dirrm share/horde/ingo/locale/zh_TW
-@dirrm share/horde/ingo/locale/tr_TR/LC_MESSAGES
-@dirrm share/horde/ingo/locale/tr_TR
-@dirrm share/horde/ingo/locale/sv_SE/LC_MESSAGES
-@dirrm share/horde/ingo/locale/sv_SE
-@dirrm share/horde/ingo/locale/sl_SI/LC_MESSAGES
-@dirrm share/horde/ingo/locale/sl_SI
-@dirrm share/horde/ingo/locale/ro_RO/LC_MESSAGES
-@dirrm share/horde/ingo/locale/ro_RO
-@dirrm share/horde/ingo/locale/pt_PT/LC_MESSAGES
-@dirrm share/horde/ingo/locale/pt_PT
-@dirrm share/horde/ingo/locale/pt_BR/LC_MESSAGES
-@dirrm share/horde/ingo/locale/pt_BR
-@dirrm share/horde/ingo/locale/pl_PL/LC_MESSAGES
-@dirrm share/horde/ingo/locale/pl_PL
-@dirrm share/horde/ingo/locale/nl_NL/LC_MESSAGES
-@dirrm share/horde/ingo/locale/nl_NL
-@dirrm share/horde/ingo/locale/nb_NO/LC_MESSAGES
-@dirrm share/horde/ingo/locale/nb_NO
-@dirrm share/horde/ingo/locale/lv_LV/LC_MESSAGES
-@dirrm share/horde/ingo/locale/lv_LV
-@dirrm share/horde/ingo/locale/lt_LT/LC_MESSAGES
-@dirrm share/horde/ingo/locale/lt_LT
-@dirrm share/horde/ingo/locale/ko_KR/LC_MESSAGES
-@dirrm share/horde/ingo/locale/ko_KR
-@dirrm share/horde/ingo/locale/it_IT/LC_MESSAGES
-@dirrm share/horde/ingo/locale/it_IT
-@dirrm share/horde/ingo/locale/hu_HU/LC_MESSAGES
-@dirrm share/horde/ingo/locale/hu_HU
-@dirrm share/horde/ingo/locale/fr_FR/LC_MESSAGES
-@dirrm share/horde/ingo/locale/fr_FR
-@dirrm share/horde/ingo/locale/fi_FI/LC_MESSAGES
-@dirrm share/horde/ingo/locale/fi_FI
-@dirrm share/horde/ingo/locale/el_GR/LC_MESSAGES
-@dirrm share/horde/ingo/locale/el_GR/
-@dirrm share/horde/ingo/locale/es_ES/LC_MESSAGES
-@dirrm share/horde/ingo/locale/es_ES
-@dirrm share/horde/ingo/locale/et_EE/LC_MESSAGES
-@dirrm share/horde/ingo/locale/et_EE/
-@dirrm share/horde/ingo/locale/en_US
-@dirrm share/horde/ingo/locale/de_DE/LC_MESSAGES
-@dirrm share/horde/ingo/locale/de_DE
-@dirrm share/horde/ingo/locale/da_DK/LC_MESSAGES
-@dirrm share/horde/ingo/locale/da_DK
-@dirrm share/horde/ingo/locale/cs_CZ/LC_MESSAGES
-@dirrm share/horde/ingo/locale/cs_CZ
-@dirrm share/horde/ingo/locale/ca_ES/LC_MESSAGES
-@dirrm share/horde/ingo/locale/ca_ES
-@dirrm share/horde/ingo/locale
-@dirrm share/horde/ingo/lib/Storage
-@dirrm share/horde/ingo/lib/Script
-@dirrm share/horde/ingo/lib/IMAP
-@dirrm share/horde/ingo/lib/Driver
-@dirrm share/horde/ingo/lib/Block
-@dirrm share/horde/ingo/lib
-@unexec ${RMDIR} %D/share/horde/ingo/config 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/horde/ingo 2>/dev/null || ${TRUE}
-@dirrm share/doc/ingo
diff --git a/mail/ingo/distinfo b/mail/ingo/distinfo
deleted file mode 100644
index ea5aa127f4c..00000000000
--- a/mail/ingo/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2007/03/18 12:09:33 adrianp Exp $
-
-SHA1 (ingo-h3-1.1.3.tar.gz) = 3fbfc9a72a26e4e4016edee39cfe3d1610551859
-RMD160 (ingo-h3-1.1.3.tar.gz) = b1582021e41155188f3608019e1864c6bb08cdda
-Size (ingo-h3-1.1.3.tar.gz) = 1356658 bytes
diff --git a/mail/ingo/files/ingo.conf.dist b/mail/ingo/files/ingo.conf.dist
deleted file mode 100644
index 2fbbd904659..00000000000
--- a/mail/ingo/files/ingo.conf.dist
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: ingo.conf.dist,v 1.1.1.1 2006/03/31 22:06:34 adrianp Exp $
-#
-# Ingo configuration file fragment for Apache
-
-# For security, don't serve pages from the Ingo configuration and library
-# directories.
-#
-<Directory "@INGODIR@/config">
- Order deny,allow
- Deny from all
-</Directory>
-<Directory "@INGODIR@/lib">
- Order deny,allow
- Deny from all
-</Directory>
-<Directory "@INGODIR@/locale">
- Order deny,allow
- Deny from all
-</Directory>
-<Directory "@INGODIR@/po">
- Order deny,allow
- Deny from all
-</Directory>
-<Directory "@INGODIR@/scripts">
- Order deny,allow
- Deny from all
-</Directory>
-<Directory "@INGODIR@/templates">
- Order deny,allow
- Deny from all
-</Directory>
diff --git a/mail/ingo/options.mk b/mail/ingo/options.mk
deleted file mode 100644
index dcb5eabe4ee..00000000000
--- a/mail/ingo/options.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: options.mk,v 1.5 2006/08/11 16:32:21 adrianp Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.ingo
-PKG_SUPPORTED_OPTIONS= sieve imap maildrop procmail
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Bring in support for the sieve filtering language
-###
-.if !empty(PKG_OPTIONS:Msieve)
-DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_Sieve>=1.0.0:../../net/pear-Net_Sieve
-.endif
-
-###
-### Bring in support for an IMAP server
-###
-.if !empty(PKG_OPTIONS:Mimap)
-DEPENDS+= ${PHP_PKG_PREFIX}-imap>4.3.3:../../mail/php-imap
-.endif
-
-###
-### maildrop support needs the PHP FTP extension
-###
-.if !empty(PKG_OPTIONS:Mmaildrop)
-DEPENDS+= ${PHP_PKG_PREFIX}-ftp>4.3.3:../../net/php-ftp
-.endif
-
-###
-### procmail support needs the PHP FTP extension
-###
-.if !empty(PKG_OPTIONS:Mprocmail)
-DEPENDS+= ${PHP_PKG_PREFIX}-ftp>4.3.3:../../net/php-ftp
-.endif
diff --git a/mail/isync/DESCR b/mail/isync/DESCR
deleted file mode 100644
index 7e9519dbe46..00000000000
--- a/mail/isync/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-isync is a command line utility for synchronizing a remote IMAP mailbox
-with a local maildir-style mailbox. This is useful for working in
-disconnected mode, such as on a laptop. Modifications made locally and
-remotely are synchronized so that no message status flags are lost.
diff --git a/mail/isync/Makefile b/mail/isync/Makefile
deleted file mode 100644
index c5b1a568985..00000000000
--- a/mail/isync/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2007/01/18 18:26:21 tonio Exp $
-#
-
-DISTNAME= isync-1.0.3
-PKGREVISION= 1
-CATEGORIES= mail net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=isync/}
-
-MAINTAINER= tonio@NetBSD.org
-HOMEPAGE= http://isync.sourceforge.net/
-COMMENT= Synchronize a maildir with an imap server
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-INSTALLATION_DIRS+= share/examples/isync
-
-GNU_CONFIGURE= YES
-
-CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl}
-LDFLAGS+= -lcrypto
-
-.include "../../security/openssl/buildlink3.mk"
-.include "../../databases/db4/buildlink3.mk"
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/src/mbsyncrc.sample \
- ${PREFIX}/share/examples/isync/mbsyncrc.sample
- ${INSTALL_DATA} ${WRKSRC}/src/compat/isyncrc.sample \
- ${PREFIX}/share/examples/isync/isyncrc.sample
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/isync/PLIST b/mail/isync/PLIST
deleted file mode 100644
index c6f5b94e752..00000000000
--- a/mail/isync/PLIST
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2005/10/29 17:12:59 kristerw Exp $
-bin/get-cert
-bin/isync
-bin/mbsync
-bin/mdconvert
-man/man1/isync.1
-man/man1/mbsync.1
-man/man1/mdconvert.1
-share/doc/isync/AUTHORS
-share/doc/isync/ChangeLog
-share/doc/isync/NEWS
-share/doc/isync/README
-share/doc/isync/TODO
-share/examples/isync/isyncrc.sample
-share/examples/isync/mbsyncrc.sample
-@dirrm share/examples/isync
-@dirrm share/doc/isync
diff --git a/mail/isync/distinfo b/mail/isync/distinfo
deleted file mode 100644
index 79894e7b221..00000000000
--- a/mail/isync/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.8 2007/01/18 18:26:21 tonio Exp $
-
-SHA1 (isync-1.0.3.tar.gz) = 21500bb486ea0b8e9eae680f835a5a58ffe6a0d3
-RMD160 (isync-1.0.3.tar.gz) = c1ed6e3691eebbe97a57247102afb6794556bdb2
-Size (isync-1.0.3.tar.gz) = 169840 bytes
-SHA1 (patch-aa) = 5ac207f7d7b634673e60ce34cc9a921846d205da
-SHA1 (patch-ab) = bee5b091f89a670b584b73ef58774ae992bb6637
-SHA1 (patch-ac) = d06d1444f66eaeab1fdf22e1aa2f1b9184abccfa
-SHA1 (patch-ad) = c4a86de19b3004752dc51da9453b702945fe6578
-SHA1 (patch-ae) = 2fddc575e8824ecbbb4b8c51a56193840b43d647
diff --git a/mail/isync/patches/patch-aa b/mail/isync/patches/patch-aa
deleted file mode 100644
index fc564fe7b7e..00000000000
--- a/mail/isync/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/04/24 09:31:54 adrianp Exp $
-
---- src/Makefile.am.orig 2005-03-05 21:49:31.000000000 +0100
-+++ src/Makefile.am 2005-03-05 21:49:55.000000000 +0100
-@@ -6,11 +6,11 @@
- bin_PROGRAMS = mbsync mdconvert
-
- mbsync_SOURCES = main.c sync.c config.c util.c drv_imap.c drv_maildir.c
--mbsync_LDADD = -ldb $(SSL_LIBS) $(SOCK_LIBS)
-+mbsync_LDADD = -ldb4 $(SSL_LIBS) $(SOCK_LIBS)
- noinst_HEADERS = isync.h
-
- mdconvert_SOURCES = mdconvert.c
--mdconvert_LDADD = -ldb
-+mdconvert_LDADD = -ldb4
-
- man_MANS = mbsync.1 mdconvert.1
- EXTRA_DIST = mbsyncrc.sample $(man_MANS)
diff --git a/mail/isync/patches/patch-ab b/mail/isync/patches/patch-ab
deleted file mode 100644
index 887a3258d45..00000000000
--- a/mail/isync/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/04/24 09:31:54 adrianp Exp $
-
---- src/Makefile.in.orig 2005-03-05 21:49:24.000000000 +0100
-+++ src/Makefile.in 2005-03-05 21:49:44.000000000 +0100
-@@ -165,10 +165,10 @@
- @with_compat_TRUE@compat_dir = compat
- SUBDIRS = $(compat_dir)
- mbsync_SOURCES = main.c sync.c config.c util.c drv_imap.c drv_maildir.c
--mbsync_LDADD = -ldb $(SSL_LIBS) $(SOCK_LIBS)
-+mbsync_LDADD = -ldb4 $(SSL_LIBS) $(SOCK_LIBS)
- noinst_HEADERS = isync.h
- mdconvert_SOURCES = mdconvert.c
--mdconvert_LDADD = -ldb
-+mdconvert_LDADD = -ldb4
- man_MANS = mbsync.1 mdconvert.1
- EXTRA_DIST = mbsyncrc.sample $(man_MANS)
- all: all-recursive
diff --git a/mail/isync/patches/patch-ac b/mail/isync/patches/patch-ac
deleted file mode 100644
index c478d0791de..00000000000
--- a/mail/isync/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/04/24 09:31:54 adrianp Exp $
-
---- src/compat/Makefile.am.orig 2005-03-05 21:50:09.000000000 +0100
-+++ src/compat/Makefile.am 2005-03-05 21:50:18.000000000 +0100
-@@ -1,7 +1,7 @@
- bin_PROGRAMS = isync
-
- isync_SOURCES = main.c config.c convert.c util.c
--isync_LDADD = -ldb
-+isync_LDADD = -ldb4
- noinst_HEADERS = isync.h
-
- man_MANS = isync.1
diff --git a/mail/isync/patches/patch-ad b/mail/isync/patches/patch-ad
deleted file mode 100644
index 50fbf687230..00000000000
--- a/mail/isync/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/04/24 09:31:54 adrianp Exp $
-
---- src/compat/Makefile.in.orig 2005-03-05 21:50:06.000000000 +0100
-+++ src/compat/Makefile.in 2005-03-05 21:50:33.000000000 +0100
-@@ -152,7 +152,7 @@
- with_compat_FALSE = @with_compat_FALSE@
- with_compat_TRUE = @with_compat_TRUE@
- isync_SOURCES = main.c config.c convert.c util.c
--isync_LDADD = -ldb
-+isync_LDADD = -ldb4
- noinst_HEADERS = isync.h
- man_MANS = isync.1
- EXTRA_DIST = isyncrc.sample $(man_MANS)
diff --git a/mail/isync/patches/patch-ae b/mail/isync/patches/patch-ae
deleted file mode 100644
index 75e1617f07e..00000000000
--- a/mail/isync/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2007/01/18 18:26:21 tonio Exp $
-
---- src/config.c.orig 2006-11-01 07:54:31.000000000 +0100
-+++ src/config.c
-@@ -252,7 +252,7 @@ int
- load_config( const char *where, int pseudo )
- {
- conffile_t cfile;
-- store_conf_t *store, **storeapp = &stores, **sptarg;
-+ store_conf_t *store = NULL, **storeapp = &stores, **sptarg;
- channel_conf_t *channel, **channelapp = &channels;
- group_conf_t *group, **groupapp = &groups;
- string_list_t *chanlist, **chanlistapp;
diff --git a/mail/ja-mh/DESCR b/mail/ja-mh/DESCR
deleted file mode 100644
index 93fd4d0f3fa..00000000000
--- a/mail/ja-mh/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This is the MH mail user agent (reader/sender) with Japanese patches,
-a command line based mail reader that is powerful and extensible. MH
-is an excellent choice for people who receive and process a LOT of mail.
diff --git a/mail/ja-mh/Makefile b/mail/ja-mh/Makefile
deleted file mode 100644
index 70a45378ed5..00000000000
--- a/mail/ja-mh/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2006/10/04 21:47:16 wiz Exp $
-
-DISTNAME= mh-6.8.4-JP-3.05
-PKGNAME= ja-mh6-3.05
-PKGREVISION= 1
-CATEGORIES= japanese mail
-MASTER_SITES= ftp://ftp.chem.eng.himeji-tech.ac.jp/pub/net/mh/
-
-PATCH_SITES= ftp://ftp.chem.eng.himeji-tech.ac.jp/pub/net/mh/mh-6.8.4-JP-3.05-patch/
-PATCHFILES= mh-6.8.4-JP-3.05-20030114.patch.gz \
- mh-6.8.4-JP-3.05-20030326.patch.gz \
- mh-6.8.4-JP-3.05-20031023.patch.gz \
- mh-6.8.4-JP-3.05-20031106.patch.gz
-
-MAINTAINER= tech-pkg-ja@jp.NetBSD.org
-HOMEPAGE= http://media.laic.u-hyogo.ac.jp/%7Ehayashi/internet/mh-plus.html
-COMMENT= Rand MH mail handling system + Japanese patches
-
-DEPENDS+= ja-less>=332:../../misc/ja-less
-
-CONFLICTS= nmh-[0-9]* ja-mh-*_JP_*
-
-.include "../../mk/bsd.prefs.mk"
-
-MANCOMPRESSED= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --enable-batchmode
-CONFIGURE_ARGS+= --libexecdir=${PREFIX:Q}/libexec/mh
-CONFIGURE_ARGS+= --enable-jmandir=${PREFIX:Q}/${PKGMANDIR:Q}/ja_JP.EUC
-CONFIGURE_ARGS+= --enable-apop=${PREFIX:Q}/etc/pop.auth
-CONFIGURE_ARGS+= --enable-rpop
-
-post-install:
- ${LN} -sf libmh.so.3.2 ${PREFIX}/lib/libmh.so.3
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/ja-mh/PLIST b/mail/ja-mh/PLIST
deleted file mode 100644
index 7e329de28e3..00000000000
--- a/mail/ja-mh/PLIST
+++ /dev/null
@@ -1,177 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/11/29 05:09:42 taca Exp $
-bin/ali
-bin/anno
-bin/bbc
-bin/burst
-bin/comp
-bin/dist
-bin/folder
-bin/folders
-bin/forw
-bin/inc
-bin/mark
-bin/mhmail
-bin/mhn
-bin/mhparam
-bin/mhpath
-bin/msgchk
-bin/msh
-bin/next
-bin/packf
-bin/pgped
-bin/pgpshow
-bin/pick
-bin/prev
-bin/prompter
-bin/refile
-bin/repl
-bin/rmf
-bin/rmm
-bin/scan
-bin/send
-bin/show
-bin/sortm
-bin/vmh
-bin/whatnow
-bin/whom
-lib/libmh.so
-lib/libmh.so.3
-lib/libmh.so.3.2
-libexec/mh/MailAliases
-libexec/mh/ap
-libexec/mh/components
-libexec/mh/conflict
-libexec/mh/digestcomps
-libexec/mh/distcomps
-libexec/mh/dp
-libexec/mh/fmtdump
-libexec/mh/forwcomps
-libexec/mh/install-mh
-libexec/mh/mhl
-libexec/mh/mhl.body
-libexec/mh/mhl.digest
-libexec/mh/mhl.format
-libexec/mh/mhl.forward
-libexec/mh/mhl.headers
-libexec/mh/mhn_defaults
-libexec/mh/mtstailor
-libexec/mh/packmbox
-libexec/mh/post
-libexec/mh/rcvdist
-libexec/mh/rcvdistcomps
-libexec/mh/rcvpack
-libexec/mh/rcvstore
-libexec/mh/rcvtty
-libexec/mh/replcomps
-libexec/mh/scan.default
-libexec/mh/scan.mailx
-libexec/mh/scan.size
-libexec/mh/scan.time
-libexec/mh/scan.timely
-libexec/mh/slocal
-libexec/mh/spost
-libexec/mh/tmac.h
-libexec/mh/viamail
-man/ja_JP.EUC/man1/ali.1
-man/ja_JP.EUC/man1/anno.1
-man/ja_JP.EUC/man1/bbc.1
-man/ja_JP.EUC/man1/burst.1
-man/ja_JP.EUC/man1/comp.1
-man/ja_JP.EUC/man1/dist.1
-man/ja_JP.EUC/man1/folder.1
-man/ja_JP.EUC/man1/forw.1
-man/ja_JP.EUC/man1/inc.1
-man/ja_JP.EUC/man1/mark.1
-man/ja_JP.EUC/man1/mh-chart.1
-man/ja_JP.EUC/man1/mh.1
-man/ja_JP.EUC/man1/mhl.1
-man/ja_JP.EUC/man1/mhmail.1
-man/ja_JP.EUC/man1/mhn.1
-man/ja_JP.EUC/man1/mhook.1
-man/ja_JP.EUC/man1/mhparam.1
-man/ja_JP.EUC/man1/mhpath.1
-man/ja_JP.EUC/man1/msgchk.1
-man/ja_JP.EUC/man1/msh.1
-man/ja_JP.EUC/man1/next.1
-man/ja_JP.EUC/man1/packf.1
-man/ja_JP.EUC/man1/pgped.1
-man/ja_JP.EUC/man1/pick.1
-man/ja_JP.EUC/man1/prev.1
-man/ja_JP.EUC/man1/prompter.1
-man/ja_JP.EUC/man1/rcvstore.1
-man/ja_JP.EUC/man1/refile.1
-man/ja_JP.EUC/man1/repl.1
-man/ja_JP.EUC/man1/rmf.1
-man/ja_JP.EUC/man1/rmm.1
-man/ja_JP.EUC/man1/scan.1
-man/ja_JP.EUC/man1/send.1
-man/ja_JP.EUC/man1/show.1
-man/ja_JP.EUC/man1/slocal.1
-man/ja_JP.EUC/man1/sortm.1
-man/ja_JP.EUC/man1/vmh.1
-man/ja_JP.EUC/man1/whatnow.1
-man/ja_JP.EUC/man1/whom.1
-man/ja_JP.EUC/man5/mh-alias.5
-man/ja_JP.EUC/man5/mh-format.5
-man/ja_JP.EUC/man5/mh-mail.5
-man/ja_JP.EUC/man5/mh-profile.5
-man/ja_JP.EUC/man5/mh-sequence.5
-man/ja_JP.EUC/man5/mh-tailor.5
-man/ja_JP.EUC/man8/ap.8
-man/ja_JP.EUC/man8/conflict.8
-man/ja_JP.EUC/man8/dp.8
-man/ja_JP.EUC/man8/fmtdump.8
-man/ja_JP.EUC/man8/install-mh.8
-man/ja_JP.EUC/man8/post.8
-man/man1/ali.1
-man/man1/anno.1
-man/man1/bbc.1
-man/man1/burst.1
-man/man1/comp.1
-man/man1/dist.1
-man/man1/folder.1
-man/man1/forw.1
-man/man1/inc.1
-man/man1/mark.1
-man/man1/mh-chart.1
-man/man1/mh.1
-man/man1/mhl.1
-man/man1/mhmail.1
-man/man1/mhn.1
-man/man1/mhook.1
-man/man1/mhparam.1
-man/man1/mhpath.1
-man/man1/msgchk.1
-man/man1/msh.1
-man/man1/next.1
-man/man1/packf.1
-man/man1/pgped.1
-man/man1/pick.1
-man/man1/prev.1
-man/man1/prompter.1
-man/man1/rcvstore.1
-man/man1/refile.1
-man/man1/repl.1
-man/man1/rmf.1
-man/man1/rmm.1
-man/man1/scan.1
-man/man1/send.1
-man/man1/show.1
-man/man1/slocal.1
-man/man1/sortm.1
-man/man1/vmh.1
-man/man1/whatnow.1
-man/man1/whom.1
-man/man5/mh-alias.5
-man/man5/mh-format.5
-man/man5/mh-mail.5
-man/man5/mh-profile.5
-man/man5/mh-sequence.5
-man/man5/mh-tailor.5
-man/man8/ap.8
-man/man8/conflict.8
-man/man8/dp.8
-man/man8/fmtdump.8
-man/man8/install-mh.8
-man/man8/post.8
-@dirrm libexec/mh
diff --git a/mail/ja-mh/distinfo b/mail/ja-mh/distinfo
deleted file mode 100644
index 3f6c2fd1fd9..00000000000
--- a/mail/ja-mh/distinfo
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: distinfo,v 1.10 2006/07/21 16:43:56 minskim Exp $
-
-SHA1 (mh-6.8.4-JP-3.05.tar.gz) = cb531f80be4326cd56d33d6fa9efba4d2d63d0ce
-RMD160 (mh-6.8.4-JP-3.05.tar.gz) = a092a9447370a09f770121baa2ae7eced130ff0f
-Size (mh-6.8.4-JP-3.05.tar.gz) = 1574689 bytes
-SHA1 (mh-6.8.4-JP-3.05-20030114.patch.gz) = 6d4e6535465e5ffd5b9b5eef8d96cfcb1f947470
-RMD160 (mh-6.8.4-JP-3.05-20030114.patch.gz) = f22d6f37bcd79bddf893c0f42d714fc01647dfe1
-Size (mh-6.8.4-JP-3.05-20030114.patch.gz) = 313 bytes
-SHA1 (mh-6.8.4-JP-3.05-20030326.patch.gz) = b360d5baf5831c21bb1748395df04fa88fc25523
-RMD160 (mh-6.8.4-JP-3.05-20030326.patch.gz) = 76652634bd148f6f4c264fe97abfb9b3fb0aafc2
-Size (mh-6.8.4-JP-3.05-20030326.patch.gz) = 273 bytes
-SHA1 (mh-6.8.4-JP-3.05-20031023.patch.gz) = ae59493092d33ae294994017b913aa064dcb66f2
-RMD160 (mh-6.8.4-JP-3.05-20031023.patch.gz) = 0ab496c93e0d1184c583ed770880cbd96cff2afd
-Size (mh-6.8.4-JP-3.05-20031023.patch.gz) = 307 bytes
-SHA1 (mh-6.8.4-JP-3.05-20031106.patch.gz) = daaf41afb5e83143dceb5ae6444e26f1f9ca5bf8
-RMD160 (mh-6.8.4-JP-3.05-20031106.patch.gz) = b0585c5c5aebdafa619e129917f0b7d7db987b02
-Size (mh-6.8.4-JP-3.05-20031106.patch.gz) = 311 bytes
-SHA1 (patch-aa) = 59b734fb27a8a5ccea529044bf5bd2f09965be85
-SHA1 (patch-ab) = d322f0400d065bc4152f681969ea858dfc2d87a9
-SHA1 (patch-ac) = ea10c3b0b230932a256fd9069b0aab34c7de92bb
-SHA1 (patch-ad) = 64d97e58ae75179f4be6222279aa6a470e37ac00
-SHA1 (patch-ae) = 7b39981a32d4a74bc7bd7c4b9a51300c73ff381a
-SHA1 (patch-af) = 3d477e8febb0af5605b8570bf03d77e1dbf64ab8
-SHA1 (patch-ag) = 863812f108d4d25b44c62996a50aafa8dbed2880
-SHA1 (patch-ah) = 6dcd2fffe854da65ecbf2ec4817d5f66ec7ca92e
-SHA1 (patch-ai) = 4f6e6ff7fa4b331d16edd27cff565eb022813443
-SHA1 (patch-aj) = 3fb227132f1556a864bd892fea30a2cdf99968e8
-SHA1 (patch-ak) = 97f021754702266996a05f8a665cd5dcc9168f60
-SHA1 (patch-al) = b91ccc3db1f1b889c9cd7d9c74b31a9c8f1b8993
-SHA1 (patch-am) = 5b94f3831692c3a23dd86b0a5cc4842712318ff2
-SHA1 (patch-ao) = 903d65929397ee283beb6aec93e08c32794dc709
-SHA1 (patch-ap) = 7c4069eb87ddca9d1d294b57681d51a393eab3f0
-SHA1 (patch-aq) = 7410ea8359575a89fb489403ab0ab76ff0c24a26
-SHA1 (patch-ar) = 7b3f65a4ff93c428dc4def0d4e3fe993bae7266b
-SHA1 (patch-as) = 786c7bf7988806023d9fd5a2ced5a9d31550ff54
-SHA1 (patch-at) = 5594d3beac4e911cfa3ff277d4ae034a6dccdccb
-SHA1 (patch-au) = 3788f6ca9362a97323cc6bf0f942f2ba949e1c46
-SHA1 (patch-av) = 14d79f16dcc7f5fe76caec499c9043fbc6874d06
-SHA1 (patch-aw) = 8cfee271b0549e6886e29ae74e4e547dccc20230
-SHA1 (patch-ax) = d0b559c1d9f72c413ca8764ddf0794a086c19307
-SHA1 (patch-ay) = f62ad194e1bf70054ff833c094206f7754478a6f
-SHA1 (patch-az) = de12b9fc05d022a9850108541378f25249918182
-SHA1 (patch-ba) = 4e0880360e484f6b74c45870e97f6f89d3a87a76
-SHA1 (patch-bb) = a7ec0a5f4f96ca2e945dc1d133322852ec1d46dd
-SHA1 (patch-bc) = 44fc56c7bccca8c8d7c77a1a7eecfd2391228402
-SHA1 (patch-bd) = 448da6011564280649930b43fbf0d793030012b7
-SHA1 (patch-be) = a72a8a4e251a1329cc86d60b24cf7977c5f5482b
-SHA1 (patch-bf) = 6510f0ac0b88c1f08622948ba070f450cbcf02e1
-SHA1 (patch-bg) = 46a1d43ad4496ee2f4d031751f13ba48c4e492d4
-SHA1 (patch-bh) = f40cc4c0859f5e1bad7daabab99a33249561c061
-SHA1 (patch-bi) = c00381964adedd04613429c6adc9d9a91aac50b7
-SHA1 (patch-bj) = 609aaee6ceaf77b254f863e0b8a822b94f8bd481
diff --git a/mail/ja-mh/patches/patch-aa b/mail/ja-mh/patches/patch-aa
deleted file mode 100644
index d6fc4dc3bf0..00000000000
--- a/mail/ja-mh/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/03/15 14:05:52 wiz Exp $
-
---- h/md5.h.orig 1999-02-09 12:30:00.000000000 +0100
-+++ h/md5.h
-@@ -13,6 +13,8 @@ The following makes PROTOTYPES default t
- #define PROTOTYPES 0
- #endif
-
-+#include <inttypes.h>
-+
- /* POINTER defines a generic pointer type */
- typedef unsigned char *POINTER;
-
-@@ -20,11 +22,7 @@ typedef unsigned char *POINTER;
- typedef unsigned short int UINT2;
-
- /* UINT4 defines a four byte word */
--#ifndef __alpha
--typedef unsigned long int UINT4;
--#else
--typedef unsigned int UINT4;
--#endif
-+typedef uint32_t UINT4;
-
- /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
- If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
diff --git a/mail/ja-mh/patches/patch-ab b/mail/ja-mh/patches/patch-ab
deleted file mode 100644
index f71f72011b3..00000000000
--- a/mail/ja-mh/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/04/11 15:08:38 joerg Exp $
-
---- zotnet/mts/client.c.orig 2006-04-11 13:04:19.000000000 +0000
-+++ zotnet/mts/client.c
-@@ -52,7 +52,6 @@ static Key_schedule schedule;
-
- /* */
-
--extern int errno;
- #if !defined(BSD44) && !defined(__GNU_LIBRARY__)
- extern int sys_nerr;
- extern char *sys_errlist[];
-@@ -361,7 +360,7 @@ int net;
-
- #if !defined(SOLARIS) && !defined(linux) && !defined(__bsdi__) && \
- !defined(OSF1) && !defined(__osf__) && !defined(__FreeBSD__) && \
-- !defined(__NetBSD__) && !defined(__OpenBSD__)
-+ !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
- #ifndef DG
- #ifndef __alpha
- u_long inet_addr ();
diff --git a/mail/ja-mh/patches/patch-ac b/mail/ja-mh/patches/patch-ac
deleted file mode 100644
index 5f6484c7fc0..00000000000
--- a/mail/ja-mh/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/04/11 15:08:38 joerg Exp $
-
---- configure.orig 2001-06-14 16:41:51.000000000 +0000
-+++ configure
-@@ -1393,18 +1393,10 @@ case "$host_os" in
- SOLARIS=`echo "$host_os" | $AWK -F. '{printf "SOLARIS=2%02d%02d",$2,$3}'`
- SETEUID=`echo "$host_os" | $AWK -F. '$2>=3{printf "SETEUID"}'`
- ;;
-- freebsd* | netbsd*)
-+ freebsd* | netbsd* | dragonfly*)
- if test "$use_sharedlib" != no
- then
- sharedlib=fbsd
-- if test -x /usr/bin/objformat
-- then
-- if test x`/usr/bin/objformat` = xelf
-- then
-- sharedlib=gnuelf
-- make_mhconfig='CFLAGS="-O -DMHSLIB_NOMINVER"'
-- fi
-- fi
- echo __ELF__ | $CC -E - | grep -q __ELF__ || sharedlib=gnuelf
- slflags="-fpic"
- slibdir=$libdir
diff --git a/mail/ja-mh/patches/patch-ad b/mail/ja-mh/patches/patch-ad
deleted file mode 100644
index 1da3b2fd07a..00000000000
--- a/mail/ja-mh/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2006/04/11 15:08:38 joerg Exp $
-
---- sbr/discard.c.orig 2006-04-11 13:20:41.000000000 +0000
-+++ sbr/discard.c
-@@ -61,7 +61,7 @@ FILE *io;
- #endif /* SYS5 */
- #endif /* POSIX */
-
--#ifdef _FSTDIO
-+#if defined(_FSTDIO) || defined(__DragonFly__)
- fpurge (io);
- #else
- #ifdef _STDIO_USES_IOSTREAM
diff --git a/mail/ja-mh/patches/patch-ae b/mail/ja-mh/patches/patch-ae
deleted file mode 100644
index 3e03ed0c3e9..00000000000
--- a/mail/ja-mh/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2006/04/11 15:08:38 joerg Exp $
-
---- sbr/m_draft.c.orig 2006-04-11 13:13:52.000000000 +0000
-+++ sbr/m_draft.c
-@@ -10,9 +10,6 @@ static char ident[] = "@(#)$Id: m_draft.
- #include <sys/stat.h>
-
-
--extern int errno;
--
--
- char *m_draft (folder, msg, use, isdf)
- register char *folder,
- *msg;
diff --git a/mail/ja-mh/patches/patch-af b/mail/ja-mh/patches/patch-af
deleted file mode 100644
index be9a84329eb..00000000000
--- a/mail/ja-mh/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.3 2006/04/11 15:08:38 joerg Exp $
-
---- sbr/m_getdefs.c.orig 2006-04-11 13:14:22.000000000 +0000
-+++ sbr/m_getdefs.c
-@@ -13,9 +13,6 @@ static char ident[] = "@(#)$Id: m_getdef
- #include <sys/stat.h>
- #include <pwd.h>
-
--
--extern int errno;
--
- #ifndef __STDC__
- #ifdef SYS5
- struct passwd *getpwuid ();
diff --git a/mail/ja-mh/patches/patch-ag b/mail/ja-mh/patches/patch-ag
deleted file mode 100644
index 10fb8bd58c7..00000000000
--- a/mail/ja-mh/patches/patch-ag
+++ /dev/null
@@ -1,110 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2006/04/11 15:08:38 joerg Exp $
-
---- sbr/m_getfld.c.orig 2001-06-13 14:21:02.000000000 +0000
-+++ sbr/m_getfld.c
-@@ -186,6 +186,9 @@ static int (*eom_action) () = NULL;
- #define _cnt _r /* Retch */
- #define _filbuf __srget /* Puke */
- #endif
-+#ifdef __DragonFly__)
-+#define _filbuf __srget /* Puke */
-+#endif
-
- /* */
-
-@@ -302,6 +305,9 @@ register FILE *iob;
- bp = sp = (unsigned char *) iob->_IO_read_ptr - 1;
- j = (cnt = ((long) iob->_IO_read_end - (long) iob->_IO_read_ptr) + 1) < i?
- cnt: i;
-+#elif defined(__DragonFly__)
-+ bp = sp = (unsigned char *) ((struct __FILE_public *)iob)->_p - 1;
-+ j = (cnt = ((struct __FILE_public *)iob)->_r+1) < i ? cnt : i;
- #else
- bp = sp = (unsigned char *) iob->_ptr - 1;
- j = (cnt = iob->_cnt+1) < i ? cnt : i;
-@@ -332,6 +338,9 @@ register FILE *iob;
- } else {
- #ifdef _STDIO_USES_IOSTREAM
- iob->_IO_read_ptr = bp + 1;
-+#elif defined(__DragonFly__)
-+ ((struct __FILE_public *)iob)->_p = bp + 1;
-+ ((struct __FILE_public *)iob)->_r = cnt - 1;
- #else
- iob->_ptr = bp + 1;
- iob->_cnt = cnt - 1;
-@@ -377,6 +386,8 @@ register FILE *iob;
- #ifdef _STDIO_USES_IOSTREAM
- cnt = (long) iob->_IO_read_end - (long) iob->_IO_read_ptr;
- bp = (unsigned char *) --iob->_IO_read_ptr;
-+#elif defined(__DragonFly__)
-+ cnt = ((struct __FILE_public *)iob)->_r++; bp = (unsigned char *) --((struct __FILE_public *)iob)->_p;
- #else
- cnt = iob->_cnt++; bp = (unsigned char *) --iob->_ptr;
- #endif
-@@ -390,6 +401,10 @@ register FILE *iob;
- j = ep - (unsigned char *) iob->_IO_read_ptr;
- (void) bcopy( iob->_IO_read_ptr, cp, j);
- iob->_IO_read_ptr = ep;
-+#elif defined(__DragonFly__)
-+ j = ep - (unsigned char *) ((struct __FILE_public *)iob)->_p;
-+ (void) bcopy( ((struct __FILE_public *)iob)->_p, cp, j);
-+ ((struct __FILE_public *)iob)->_p = ep; ((struct __FILE_public *)iob)->_r -= j;
- #else
- j = ep - (unsigned char *) iob->_ptr;
- (void) bcopy( iob->_ptr, cp, j);
-@@ -407,6 +422,9 @@ register FILE *iob;
- #ifdef _STDIO_USES_IOSTREAM
- c += bp - (unsigned char *) iob->_IO_read_ptr;
- (void) bcopy( iob->_IO_read_ptr, cp, c);
-+#elif defined(__DragonFly__)
-+ c += bp - (unsigned char *) ((struct __FILE_public *)iob)->_p;
-+ (void) bcopy( ((struct __FILE_public *)iob)->_p, cp, c);
- #else
- c += bp - (unsigned char *) iob->_ptr;
- (void) bcopy( iob->_ptr, cp, c);
-@@ -416,6 +434,8 @@ register FILE *iob;
- /* the dest buffer is full */
- #ifdef _STDIO_USES_IOSTREAM
- iob->_IO_read_ptr += c;
-+#elif defined(__DragonFly__)
-+ ((struct __FILE_public *)iob)->_r -= c; ((struct __FILE_public *)iob)->_p += c;
- #else
- iob->_cnt -= c; iob->_ptr += c;
- #endif
-@@ -434,6 +454,8 @@ register FILE *iob;
- iob->_IO_read_ptr = iob->_IO_read_end;
- c = __underflow((struct _IO_FILE *) iob);
- iob->_IO_read_ptr++; /* NOT automatic! */
-+#elif defined(__DragonFly__)
-+ *cp++ = j = *(((struct __FILE_public *)iob)->_p + c);
- #else
- *cp++ = j = *(iob->_ptr + c);
- #ifdef FILBUF_ADJ
-@@ -467,6 +489,8 @@ register FILE *iob;
- if (c != EOF)
- #ifdef _STDIO_USES_IOSTREAM
- --iob->_IO_read_ptr;
-+#elif defined(__DragonFly__)
-+ --((struct __FILE_public *)iob)->_p, ++((struct __FILE_public *)iob)->_r;
- #else
- --iob->_ptr, ++iob->_cnt;
- #endif
-@@ -488,6 +512,8 @@ register FILE *iob;
- #ifdef _STDIO_USES_IOSTREAM
- bp = (unsigned char *) --iob->_IO_read_ptr;
- cnt = (long) iob->_IO_read_end - (long) iob->_IO_read_ptr;
-+#elif defined(__DragonFly__)
-+ bp = (unsigned char *) --((struct __FILE_public *)iob)->_p; cnt = ++((struct __FILE_public *)iob)->_r;
- #else
- bp = (unsigned char *) --iob->_ptr; cnt = ++iob->_cnt;
- #endif
-@@ -549,6 +575,9 @@ register FILE *iob;
- (void) bcopy( bp, buf, c );
- #ifdef _STDIO_USES_IOSTREAM
- iob->_IO_read_ptr += c;
-+#elif defined(__DragonFly__)
-+ ((struct __FILE_public *)iob)->_r -= c;
-+ ((struct __FILE_public *)iob)->_p += c;
- #else
- iob->_cnt -= c;
- iob->_ptr += c;
diff --git a/mail/ja-mh/patches/patch-ah b/mail/ja-mh/patches/patch-ah
deleted file mode 100644
index 7607e50a976..00000000000
--- a/mail/ja-mh/patches/patch-ah
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2006/04/11 15:08:38 joerg Exp $
-
---- sbr/makedir.c.orig 2006-04-11 13:36:24.000000000 +0000
-+++ sbr/makedir.c
-@@ -14,10 +14,11 @@ static char ident[] = "@(#)$Id: makedir.
- #include "../h/mh.h"
- #include <stdio.h>
-
-+#include <errno.h>
-+
- #if defined (BSD42) || defined(SVR4) || \
- defined (hpux) || defined(sgi) || defined(__osf__) || defined(ncr) || \
- defined (_AIX) || defined(AUX) || defined(linux) || defined(__CYGWIN32__)
--#include <errno.h>
- #include <sys/param.h>
- #include <sys/file.h>
- #endif /* BSD42 ... */
-@@ -29,8 +30,6 @@ static char ident[] = "@(#)$Id: makedir.
- #include <unistd.h>
- #endif
-
--extern int errno;
--
- makedir (dir)
- register char *dir;
- {
diff --git a/mail/ja-mh/patches/patch-ai b/mail/ja-mh/patches/patch-ai
deleted file mode 100644
index 0457fb5095a..00000000000
--- a/mail/ja-mh/patches/patch-ai
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2006/04/11 15:08:38 joerg Exp $
-
---- sbr/ruserpass.c.orig 2006-04-11 13:37:37.000000000 +0000
-+++ sbr/ruserpass.c
-@@ -25,9 +25,10 @@ static char sccsid[] = "@(#)ruserpass.c
- #include <ctype.h>
- #include <pwd.h>
- #include <errno.h>
-+#include <string.h>
-+#include <stdlib.h>
-
--char *malloc(), *index(), *getenv(), *getpass(), *getlogin();
--char *strcpy();
-+char *index(), *getpass(), *getlogin();
- static FILE *cfile;
-
- #ifndef MAXHOSTNAMELEN
-@@ -66,7 +67,6 @@ ruserpass(host, aname, apass)
- char myname[MAXHOSTNAMELEN], *mydomain;
- int t, i, c, usedefault = 0;
- struct stat stb;
-- extern int errno;
-
- hdir = getenv("HOME");
- if (hdir == NULL)
diff --git a/mail/ja-mh/patches/patch-aj b/mail/ja-mh/patches/patch-aj
deleted file mode 100644
index 52f629e2e15..00000000000
--- a/mail/ja-mh/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2006/04/11 15:08:38 joerg Exp $
-
---- sbr/advertise.c.orig 2006-04-11 13:42:29.000000000 +0000
-+++ sbr/advertise.c
-@@ -15,10 +15,7 @@ static char ident[] = "@(#)$Id: advertis
- output... More importantly though, it's a sexy syscall()...
- */
-
--#ifdef __CYGWIN32__
- #include <errno.h>
--#endif
--extern int errno;
- #if !defined(BSD44) && !defined(__GNU_LIBRARY__) /* in <stdio.h> */
- extern int sys_nerr;
- extern char *sys_errlist[];
diff --git a/mail/ja-mh/patches/patch-ak b/mail/ja-mh/patches/patch-ak
deleted file mode 100644
index 6b34eb473ec..00000000000
--- a/mail/ja-mh/patches/patch-ak
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2006/04/11 15:08:38 joerg Exp $
-
---- uip/annosbr.c.orig 2006-04-11 13:45:01.000000000 +0000
-+++ uip/annosbr.c
-@@ -11,7 +11,6 @@ static char ident[] = "@(#)$Id: annosbr.
- #include <sys/stat.h>
-
-
--extern int errno;
- off_t lseek ();
- static annosbr();
-
diff --git a/mail/ja-mh/patches/patch-al b/mail/ja-mh/patches/patch-al
deleted file mode 100644
index 52d168d4900..00000000000
--- a/mail/ja-mh/patches/patch-al
+++ /dev/null
@@ -1,173 +0,0 @@
-$NetBSD: patch-al,v 1.3 2006/04/11 15:08:38 joerg Exp $
-
---- uip/vmh.c.orig 2006-04-11 14:16:00.000000000 +0000
-+++ uip/vmh.c
-@@ -113,13 +113,20 @@ void __cputchar __P((int));
- #define SMALLMOVE 1
- #define LARGEMOVE 10
-
-+#ifndef A_CHARTEXT
-+#define A_CHARTEXT 0xff
-+#endif
-
- #define XYZ /* XXX */
-
--#if (defined(__FreeBSD__) && __FreeBSD__ >= 5) || (defined(linux))
-+#if (defined(__FreeBSD__) && __FreeBSD__ >= 5) || (defined(linux)) || defined(__DragonFly__)
- struct ldat
- {
-+#ifdef __DragonFly__
-+ char *text;
-+#else
- NCURSES_CH_T *text;
-+#endif
- NCURSES_SIZE_T firstchar;
- NCURSES_SIZE_T lastchar;
- NCURSES_SIZE_T oldindex;
-@@ -222,6 +229,15 @@ static struct ltchars ltc;
- #endif
- #endif /* TIOCGLTC */
-
-+#ifdef __NetBSD__
-+static char *tc_CE, *tc_CM, *tc_SO, *tc_SE, *tc_US, *tc_UE;
-+#define CE tc_CE
-+#define CM tc_CM
-+#define SO tc_SO
-+#define SE tc_SE
-+#define US tc_US
-+#define UE tc_UE
-+#endif
-
- #if !defined(SYS5) && !defined(BSD44) && !defined(TERMINFO)
- int _putchar ();
-@@ -239,7 +255,6 @@ static TYPESIG TSTPser ();
-
-
- /* MISCELLANY */
--extern int errno;
- #if !defined(BSD44) && !defined(__GNU_LIBRARY__)
- extern int sys_nerr;
- extern char *sys_errlist[];
-@@ -348,7 +363,11 @@ static vmh () {
- wclrtoeol (Command);
- wrefresh (Command);
-
-- switch (WINgetstr (Command, buffer)) {
-+#ifndef JAPAN
-+ switch (WINgetstr (Command, buffer, sizeof(buffer))) {
-+#else
-+ switch (WINgetstr (Command, (unsigned char *)buffer, sizeof(buffer))) {
-+#endif
- case NOTOK:
- break;
-
-@@ -808,6 +827,9 @@ static int WINinit (nprog) {
- sideground ();
-
- #ifndef TERMINFO
-+#ifdef __NetBSD__
-+ CM = getcap("cm");
-+#endif
- if (CM == NULL)
- #else /* TERMINFO */
- if (cursor_address == NULL) /* assume mtr wanted "cm", not "CM" */
-@@ -822,6 +844,15 @@ static int WINinit (nprog) {
- #ifndef TERMINFO
- if (tgetflag ("xt") || tgetnum ("sg") > 0)
- SO = SE = US = UE = NULL;
-+#ifdef __NetBSD__
-+ else {
-+ SO = getcap("so");
-+ SE = getcap("se");
-+ US = getcap("us");
-+ UE = getcap("ue");
-+ }
-+ CE = getcap("ce");
-+#endif
- #else /* TERMINFO */
- /*
- * If termcap mapped directly to terminfo, we'd use the following:
-@@ -862,21 +893,36 @@ static int WINinit (nprog) {
-
- /* */
-
--static int WINgetstr (w, buffer)
-+static int WINgetstr (w, buffer, size)
- register WINDOW *w;
-+#ifndef JAPAN
- char *buffer;
-+#else /* JAPAN */
-+unsigned char *buffer;
-+#endif /* JAPAN */
-+size_t size;
- {
- register int c;
-+#ifndef JAPAN
- register char *bp;
-+#else /* JAPAN */
-+ register unsigned char *bp;
-+#endif /* JAPAN */
-
- bp = buffer;
- *bp = 0;
-+ --size;
-
- for (;;) {
-- switch (c = wgetch (w) & 0xff) {
-- case ERR:
-- adios (NULLCP, "wgetch lost");
-+ c = wgetch(w);
-+ if (c == ERR)
-+ adios (NULLCP, "wgetch lost");
-+ if (bp - buffer >= size &&
-+ !(c == intrc || c == EOFC || c == ERASE || c == KILL ||
-+ c == WERASC || c == '\r' || c == '\n'))
-+ continue;
-
-+ switch (c &= A_CHARTEXT) {
- case '\f':
- wrefresh (curscr);
- break;
-@@ -1382,7 +1428,7 @@ WINDOW *w;
- lp -> l_buf[i] = w -> lines[getcury(w)] -> line[i].ch;
- #else
- wmove(w, getcury(w), i);
-- lp -> l_buf[i] = winch(w); /* 8bit ?? */
-+ lp -> l_buf[i] = winch(w) & A_CHARTEXT;
- #endif
- }
- lp -> l_buf[getmaxx(w)] = '\0';
-@@ -1413,8 +1459,12 @@ WINDOW *w;
- }
- #endif /* __NCURSES_H */
- for (cp = lp -> l_buf + strlen (lp -> l_buf) - 1; cp >= lp -> l_buf; cp--)
-+#ifndef JAPAN
- if (isspace (*cp))
-- *cp = 0;
-+#else /* JAPAN */
-+ if (isspace ((unsigned char)(*cp)))
-+#endif /* JAPAN */
-+ *cp = '\0';
- else
- break;
-
-@@ -1579,7 +1629,9 @@ static TTYoff () {
-
- INTR = intrc;
- #ifndef SYS5
-+#ifndef __NetBSD__
- (void) ioctl (fileno (stdin), TIOCSETC, (char *) &tc);
-+#endif
- #else /* SYS5 */
- #if defined(TCGETATTR) && !defined(TCSETA) && defined(TCSANOW)
- (void) tcsetattr (fileno (stdin), TCSANOW, &sg);
-@@ -1591,6 +1643,9 @@ static TTYoff () {
- leaveok (curscr, TRUE);
- mvcur (0, COLS - 1, LINES - 1, 0);
- endwin ();
-+#ifdef __NetBSD__
-+ (void) ioctl (fileno (stdin), TIOCSETC, (char *) &tc);
-+#endif
- if (tty_ready == DONE) {
- #ifndef TERMINFO
- if (CE)
diff --git a/mail/ja-mh/patches/patch-am b/mail/ja-mh/patches/patch-am
deleted file mode 100644
index 1bf0896cf83..00000000000
--- a/mail/ja-mh/patches/patch-am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-am,v 1.3 2006/04/11 15:08:38 joerg Exp $
-
---- conf/config/mts.c.orig 2006-04-11 13:46:53.000000000 +0000
-+++ conf/config/mts.c
-@@ -33,10 +33,7 @@ static char ident[] = "@(#)$Id: mts.c,v
-
- #define NULLCP ((char *) 0)
-
--#ifdef __CYGWIN32__
- #include <errno.h>
--#endif
--extern int errno;
-
- static char *tailor_value ();
-
diff --git a/mail/ja-mh/patches/patch-ao b/mail/ja-mh/patches/patch-ao
deleted file mode 100644
index 80b24e3f71c..00000000000
--- a/mail/ja-mh/patches/patch-ao
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2006/04/11 15:08:38 joerg Exp $
-
---- zotnet/mts/lock.c.orig 2006-04-11 13:49:57.000000000 +0000
-+++ zotnet/mts/lock.c
-@@ -77,10 +77,7 @@ static char ident[] = "@(#)$Id: lock.c,v
- #define FLOCK /* LOCKF will override this, if defined */
- #endif
-
--#ifdef __CYGWIN32__
- #include <errno.h>
--#endif
--extern int errno;
-
- #ifdef LOCKONLY
- #ifndef MMDFONLY
diff --git a/mail/ja-mh/patches/patch-ap b/mail/ja-mh/patches/patch-ap
deleted file mode 100644
index 51856ba19fe..00000000000
--- a/mail/ja-mh/patches/patch-ap
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ap,v 1.3 2006/04/11 15:08:38 joerg Exp $
-
---- uip/folder.c.orig 2006-04-11 14:21:12.000000000 +0000
-+++ uip/folder.c
-@@ -74,8 +74,6 @@ static struct swit switches[] = {
-
- /* */
-
--extern int errno;
--
- static int fshort = 0;
- static int fcreat = 0;
- static int fpack = 0;
-@@ -572,7 +570,7 @@ register char *name;
- }
- while (dp = readdir (dd))
- if (strcmp (dp -> d_name, ".") && strcmp (dp -> d_name, "..")) {
--#if defined(SYS5DIR) && !defined(hpux) && !defined(__CYGWIN32__)
-+#if defined(SYS5DIR) && !defined(hpux) && !defined(__CYGWIN32__) && !defined(__DragonFly__)
- if (cp + dp -> d_reclen + 2 >= name + BUFSIZ)
- #else /* SYS5DIR && !hpux && !__CYGWIN32__ */
- if (cp + strlen (dp -> d_name) + 2 >= name + BUFSIZ)
diff --git a/mail/ja-mh/patches/patch-aq b/mail/ja-mh/patches/patch-aq
deleted file mode 100644
index 659c851e431..00000000000
--- a/mail/ja-mh/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.3 2006/04/11 15:08:38 joerg Exp $
-
---- uip/inc.c.orig 2006-04-11 14:22:52.000000000 +0000
-+++ uip/inc.c
-@@ -142,8 +142,6 @@ static struct swit switches[] = {
-
- /* */
-
--extern int errno;
--
- #ifdef POP
- int snoop = 0;
- extern char response[];
diff --git a/mail/ja-mh/patches/patch-ar b/mail/ja-mh/patches/patch-ar
deleted file mode 100644
index 93fe4f4ddd7..00000000000
--- a/mail/ja-mh/patches/patch-ar
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ar,v 1.3 2006/04/11 15:08:38 joerg Exp $
-
---- uip/scansbr.c.orig 2006-04-11 14:23:48.000000000 +0000
-+++ uip/scansbr.c
-@@ -253,6 +253,8 @@ register FILE *inb;
- while (state == BODY) {
- #ifdef _STDIO_USES_IOSTREAM
- if (scnout->_IO_write_ptr == scnout->_IO_write_end) {
-+#elif defined(__DragonFly__)
-+ if (((struct __FILE_public *)scnout)->_r <= 0) {
- #else
- if (scnout->_cnt <= 0) {
- #endif
-@@ -264,6 +266,11 @@ register FILE *inb;
- (long)scnout->_IO_write_ptr-(long)scnout->_IO_write_end,
- inb);
- scnout->_IO_write_ptr += msg_count;
-+#elif defined(__DragonFly__)
-+ state = m_getfld( state, name, ((struct __FILE_public *)scnout)->_p,
-+ -(((struct __FILE_public *)scnout)->_r), inb );
-+ ((struct __FILE_public *)scnout)->_r -= msg_count;
-+ ((struct __FILE_public *)scnout)->_p += msg_count;
- #else
- state = m_getfld( state, name, scnout->_ptr,
- -(scnout->_cnt), inb );
diff --git a/mail/ja-mh/patches/patch-as b/mail/ja-mh/patches/patch-as
deleted file mode 100644
index 79a8f5ad893..00000000000
--- a/mail/ja-mh/patches/patch-as
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-as,v 1.2 2004/11/29 05:09:43 taca Exp $
-
---- sbr/concat.c.orig 1993-12-01 13:01:21.000000000 +0900
-+++ sbr/concat.c
-@@ -2,34 +2,40 @@
-
- #include "../h/mh.h"
- #include <stdio.h>
--#include <varargs.h>
-+#include <stdarg.h>
-
-
- /* VARARGS */
-
--char *concat (va_alist)
--va_dcl
-+char *concat (char *first, ...)
- {
- register char *cp,
- *dp,
- *sp;
- register unsigned len;
-- register va_list list;
-+ va_list list;
-
- len = 1;
-- va_start (list);
-- while (cp = va_arg (list, char *))
-- len += strlen (cp);
-- va_end (list);
-+ if (first) {
-+ len += strlen(first);
-+ va_start (list, first);
-+ while (cp = va_arg (list, char *))
-+ len += strlen (cp);
-+ va_end (list);
-+ }
-
- dp = sp = malloc (len);
- if (dp == NULL)
- adios (NULLCP, "unable to allocate string storage");
-
-- va_start (list);
-- while (cp = va_arg (list, char *))
-- sp = copy (cp, sp);
-- va_end (list);
-+ *sp = '\0';
-+ if (first) {
-+ sp = copy (first, sp);
-+ va_start (list, first);
-+ while (cp = va_arg (list, char *))
-+ sp = copy (cp, sp);
-+ va_end (list);
-+ }
-
- return dp;
- }
diff --git a/mail/ja-mh/patches/patch-at b/mail/ja-mh/patches/patch-at
deleted file mode 100644
index b93fe80a1e2..00000000000
--- a/mail/ja-mh/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.1 2004/11/21 18:52:36 kristerw Exp $
-
---- h/mh.h.orig Sun Nov 21 19:31:18 2004
-+++ h/mh.h Sun Nov 21 19:33:05 2004
-@@ -253,7 +253,7 @@
- int atooi ();
- char **brkstring ();
- void closefds ();
--char *concat ();
-+char *concat (char *first, ...);
- char *copy ();
- char **copyip ();
- void cpydata ();
diff --git a/mail/ja-mh/patches/patch-au b/mail/ja-mh/patches/patch-au
deleted file mode 100644
index 0a9d44fa361..00000000000
--- a/mail/ja-mh/patches/patch-au
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-au,v 1.1 2004/11/29 05:09:43 taca Exp $
-
---- conf/makefiles/uip.orig 2001-05-30 23:57:47.000000000 +0900
-+++ conf/makefiles/uip
-@@ -140,7 +140,7 @@ LD = LD_LIBRARY_PATH=../sbr @(MHCOMPILER
- LD = LD_LIBRARY_PATH=../sbr @(MHCOMPILER)
- @END: FBSDSHLIB
- @BEGIN: GELFSHLIB
--LD = @(MHCOMPILER) -L../sbr
-+LD = @(MHCOMPILER) -L../sbr -L../mts -L../zotnet
- @END: GELFSHLIB
- @END: SHAREDLIB
- @BEGIN: OPTIM
-@@ -166,6 +166,10 @@ LDLIBES = ../config/config.o \
- @BEGIN: SUN4SHLIB
- -Bdynamic \
- @END: SUN4SHLIB
-+@BEGIN: GELFSHLIB
-+ @(SLDFLAG) -lmh$(SLIBVER) -lmts -lzot
-+IGNORED_LDLIBES = \
-+@END: GELFSHLIB
- @(SLDFLAG) -lmh$(SLIBVER) ../mts/libmts.a ../zotnet/libzot.a
- LDLIBS = $(LDLIBES) ../config/version.o $(LDOPTLIB)
- LDLIBS_POST = $(LDLIBES) ../config/version.o $(LDOPTLIB_POST)
diff --git a/mail/ja-mh/patches/patch-av b/mail/ja-mh/patches/patch-av
deleted file mode 100644
index 128096f2407..00000000000
--- a/mail/ja-mh/patches/patch-av
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-av,v 1.3 2006/04/11 15:08:38 joerg Exp $
-
---- uip/dropsbr.c.orig 1998-04-23 21:02:00.000000000 +0000
-+++ uip/dropsbr.c
-@@ -20,6 +20,9 @@ static char ident[] = "@(#)$Id: dropsbr.
- #undef NULLVP
- #include <netinet/in.h>
- #else
-+#ifdef ntohl
-+#undef ntohl
-+#endif
- #define ntohl(n) (n)
- #endif
-
-@@ -33,8 +36,6 @@ static int mbx_style = MMDF;
-
- static int mbx_create(), mbx_chk(), map_open();
-
--extern int errno;
--
- off_t lseek ();
-
- /* */
diff --git a/mail/ja-mh/patches/patch-aw b/mail/ja-mh/patches/patch-aw
deleted file mode 100644
index 3aaadb4e556..00000000000
--- a/mail/ja-mh/patches/patch-aw
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2004/11/29 05:09:43 taca Exp $
-
---- conf/makefiles/MH-Makefile.orig 1999-02-09 20:30:00.000000000 +0900
-+++ conf/makefiles/MH-Makefile
-@@ -6,5 +6,5 @@
- ##############################################################################
-
--MAKE = make DESTDIR=$(DESTDIR) $(MFLAGS) -k
-+MAKE = make DESTDIR=$(DESTDIR) $(MFLAGS)
- SHELL = /bin/sh
-
-@@ -50,9 +50,9 @@ SHELL = /bin/sh
- ALL = config sbr mts zotnet uip support doc
-
--all:; for d in $(ALL); do (cd $$d; $(MAKE) all); done
-+all:; for d in $(ALL); do (set -e; cd $$d; $(MAKE) all); done
-
--depend:; for d in $(ALL); do (cd $$d; $(MAKE) depend); done
-+depend:; for d in $(ALL); do (set -e; cd $$d; $(MAKE) depend); done
-
--lint:; for d in $(ALL); do (cd $$d; $(MAKE) lint); done
-+lint:; for d in $(ALL); do (set -e; cd $$d; $(MAKE) lint); done
-
- compat-v7: all
diff --git a/mail/ja-mh/patches/patch-ax b/mail/ja-mh/patches/patch-ax
deleted file mode 100644
index 7348d42ca69..00000000000
--- a/mail/ja-mh/patches/patch-ax
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2006/04/11 15:08:38 joerg Exp $
-
---- uip/popsbr.c.orig 2006-04-11 14:26:31.000000000 +0000
-+++ uip/popsbr.c
-@@ -27,10 +27,7 @@ static char ident[] = "@(#)$Id: popsbr.c
- #define TRM "."
- #define TRMLEN (sizeof TRM - 1)
-
--#ifdef __CYGWIN32__
- #include <errno.h>
--#endif
--extern int errno;
- #if !defined(BSD44) && !defined(__GNU_LIBRARY__)
- extern int sys_nerr;
- extern char *sys_errlist[];
diff --git a/mail/ja-mh/patches/patch-ay b/mail/ja-mh/patches/patch-ay
deleted file mode 100644
index 1d8c1267128..00000000000
--- a/mail/ja-mh/patches/patch-ay
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2006/04/11 15:08:38 joerg Exp $
-
---- uip/mhn.c.orig 2006-04-11 14:27:13.000000000 +0000
-+++ uip/mhn.c
-@@ -219,7 +219,6 @@ static char *errs = NULL;
- static char *tmp;
-
-
--extern int errno;
- #if !defined(BSD44) && !defined(__GNU_LIBRARY__)
- extern int sys_nerr;
- extern char *sys_errlist[];
diff --git a/mail/ja-mh/patches/patch-az b/mail/ja-mh/patches/patch-az
deleted file mode 100644
index cf28cb3dc95..00000000000
--- a/mail/ja-mh/patches/patch-az
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-az,v 1.1 2006/04/11 15:08:38 joerg Exp $
-
---- uip/ftpsbr.c.orig 2006-04-11 14:28:22.000000000 +0000
-+++ uip/ftpsbr.c
-@@ -66,10 +66,7 @@ struct hostent *gethostbystring ();
-
- /* */
-
--#ifdef __CYGWIN32__
- #include <errno.h>
--#endif
--extern int errno;
- #if !defined(BSD44) && !defined(__GNU_LIBRARY__)
- extern int sys_nerr;
- extern char *sys_errlist[];
diff --git a/mail/ja-mh/patches/patch-ba b/mail/ja-mh/patches/patch-ba
deleted file mode 100644
index e7d5e738de5..00000000000
--- a/mail/ja-mh/patches/patch-ba
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2006/04/11 15:08:38 joerg Exp $
-
---- uip/mshcmds.c.orig 2006-04-11 14:28:57.000000000 +0000
-+++ uip/mshcmds.c
-@@ -29,9 +29,6 @@ static char ident[] = "@(#)$Id: mshcmds.
-
- /* */
-
--extern int errno;
--
-- /* BURST */
- static char delim3[] = "-------";/* from burst.c */
-
-
-@@ -3529,7 +3526,6 @@ char *proc,
- (void) strcpy (tmpfil, m_scratch ("", invo_name));
- if ((out = fopen (tmpfil, "w")) == NULL) {
- int olderr;
-- extern int errno;
- char newfil[80];
-
- olderr = errno;
diff --git a/mail/ja-mh/patches/patch-bb b/mail/ja-mh/patches/patch-bb
deleted file mode 100644
index 03b3b906e0a..00000000000
--- a/mail/ja-mh/patches/patch-bb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2006/04/11 15:08:38 joerg Exp $
-
---- uip/vmhsbr.c.orig 2006-04-11 14:43:36.000000000 +0000
-+++ uip/vmhsbr.c
-@@ -24,10 +24,7 @@ static FILE *fp = NULL;
- static int PEERrfd = NOTOK;
- static int PEERwfd = NOTOK;
-
--#ifdef __CYGWIN32__
- #include <errno.h>
--#endif
--extern int errno;
- #if !defined(BSD44) && !defined(__GNU_LIBRARY__)
- extern int sys_nerr;
- extern char *sys_errlist[];
diff --git a/mail/ja-mh/patches/patch-bc b/mail/ja-mh/patches/patch-bc
deleted file mode 100644
index ab05eb970fc..00000000000
--- a/mail/ja-mh/patches/patch-bc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2006/04/11 15:08:38 joerg Exp $
-
---- uip/packf.c.orig 2006-04-11 14:44:10.000000000 +0000
-+++ uip/packf.c
-@@ -27,9 +27,6 @@ static struct swit switches[] = {
-
- /* */
-
--extern int errno;
--
--
- static int md = NOTOK;
-
- char *file = NULL;
diff --git a/mail/ja-mh/patches/patch-bd b/mail/ja-mh/patches/patch-bd
deleted file mode 100644
index 6efc193af3b..00000000000
--- a/mail/ja-mh/patches/patch-bd
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2006/04/11 15:08:38 joerg Exp $
-
---- uip/prompter.c.orig 2006-04-11 14:45:09.000000000 +0000
-+++ uip/prompter.c
-@@ -68,9 +68,6 @@ static struct swit switches[] = {
-
- /* */
-
--extern int errno;
--
--
- #ifndef SYS5
- #define ERASE sg.sg_erase
- #define KILL sg.sg_kill
diff --git a/mail/ja-mh/patches/patch-be b/mail/ja-mh/patches/patch-be
deleted file mode 100644
index 86e2f0b766a..00000000000
--- a/mail/ja-mh/patches/patch-be
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-be,v 1.1 2006/04/11 15:08:38 joerg Exp $
-
---- uip/refile.c.orig 2006-04-11 14:45:44.000000000 +0000
-+++ uip/refile.c
-@@ -47,9 +47,6 @@ static struct swit switches[] = {
-
- /* */
-
--extern int errno;
--
--
- static char maildir[BUFSIZ];
-
-
diff --git a/mail/ja-mh/patches/patch-bf b/mail/ja-mh/patches/patch-bf
deleted file mode 100644
index 404c4568e4b..00000000000
--- a/mail/ja-mh/patches/patch-bf
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2006/04/11 15:08:38 joerg Exp $
-
---- uip/scan.c.orig 2006-04-11 14:46:19.000000000 +0000
-+++ uip/scan.c
-@@ -50,7 +50,6 @@ static struct swit switches[] = {
-
- /* */
-
--extern int errno;
- #ifdef LBL /* global for sbr/formatsbr.c - yech! */
- extern struct msgs *fmt_current_folder;
- #endif
diff --git a/mail/ja-mh/patches/patch-bg b/mail/ja-mh/patches/patch-bg
deleted file mode 100644
index a2226b1c05a..00000000000
--- a/mail/ja-mh/patches/patch-bg
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bg,v 1.1 2006/04/11 15:08:38 joerg Exp $
-
---- uip/send.c.orig 2006-04-11 14:47:09.000000000 +0000
-+++ uip/send.c
-@@ -162,10 +162,6 @@ extern int verbsw;
- extern char *altmsg; /* .. */
- extern char *annotext;
- extern char *distfile;
--
--
--extern int errno;
--
- /* */
-
- /* ARGSUSED */
diff --git a/mail/ja-mh/patches/patch-bh b/mail/ja-mh/patches/patch-bh
deleted file mode 100644
index 764ae8b2b90..00000000000
--- a/mail/ja-mh/patches/patch-bh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bh,v 1.1 2006/04/11 15:08:38 joerg Exp $
-
---- uip/bbc.c.orig 2006-04-11 14:50:44.000000000 +0000
-+++ uip/bbc.c
-@@ -112,8 +112,6 @@ struct bbcount {
-
- /* */
-
--extern int errno;
--
- static int changed = 0;
- static int oops = 0;
- static int quitting = 0;
diff --git a/mail/ja-mh/patches/patch-bi b/mail/ja-mh/patches/patch-bi
deleted file mode 100644
index c2254ce160e..00000000000
--- a/mail/ja-mh/patches/patch-bi
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bi,v 1.1 2006/04/11 15:08:39 joerg Exp $
-
---- uip/rcvstore.c.orig 2006-04-11 14:51:32.000000000 +0000
-+++ uip/rcvstore.c
-@@ -43,10 +43,7 @@ static struct swit switches[] = {
-
- /* */
-
--extern int errno;
--
--static char *tmpfilenam = NULLCP;
--/* */
-+static char *tmpfilenam = NULLCP; /* */
-
- /* ARGSUSED */
-
diff --git a/mail/ja-mh/patches/patch-bj b/mail/ja-mh/patches/patch-bj
deleted file mode 100644
index f041b522f02..00000000000
--- a/mail/ja-mh/patches/patch-bj
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-bj,v 1.1 2006/07/21 16:43:57 minskim Exp $
-
---- h/strings.h.orig 2001-04-02 10:35:24.000000000 +0000
-+++ h/strings.h
-@@ -35,7 +35,7 @@
- char *index ();
- char *mktemp ();
- char *rindex ();
--#ifndef SPRINTFTYPE
-+#if !defined(SPRINTFTYPE) && !defined(linux)
- #ifndef ncr /* NCR compiler complains about re-declaration */
- char *sprintf (); /* I guess this is the new standard */
- #endif
-@@ -47,7 +47,7 @@ SPRINTFTYPE sprintf ();
- char *strcat ();
- int strcmp ();
- char *strcpy ();
--#ifndef hpux
-+#if !defined(hpux) && !defined(linux)
- int strlen ();
- #endif
- char *strncat ();
-@@ -55,7 +55,7 @@ int strncmp ();
- char *strncpy ();
- #endif
-
--#if !defined(SVR4) && !defined(__386BSD__) && !defined(BSD44)
-+#if !defined(SVR4) && !defined(__386BSD__) && !defined(BSD44) && !defined(linux)
- char *getenv ();
- char *calloc (), *malloc (), *realloc ();
- #endif /* SVR4 */
diff --git a/mail/ja-squirrelmail/DESCR b/mail/ja-squirrelmail/DESCR
deleted file mode 100644
index 26167c2535b..00000000000
--- a/mail/ja-squirrelmail/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-This is SquirrelMail with Japanese localization and own patches.
-
-SquirrelMail is a standards-based webmail package written in PHP4. It
-includes built-in pure PHP support for the IMAP and SMTP protocols, and all
-pages render in pure HTML 4.0 (with no Javascript) for maximum compatibility
-across browsers. It has very few requirements and is very easy to configure
-and install. SquirrelMail has a all the functionality you would want from an
-email client, including strong MIME support, address books, and folder
-manipulation.
diff --git a/mail/ja-squirrelmail/MESSAGE b/mail/ja-squirrelmail/MESSAGE
deleted file mode 100644
index 42b2437a0d4..00000000000
--- a/mail/ja-squirrelmail/MESSAGE
+++ /dev/null
@@ -1,29 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2006/05/05 02:46:54 taca Exp $
-
-In order to use ja-squirrelmail package, you need to install these
-packages, too:
-
- mail/squirrelmail-decode
- mail/squirrelmail-locales
-
-Please run the SquirrelMail configuration script:
-
- cd ${SMDIR}/config && ./conf.pl
-
-to customize the SquirrelMail webmail system for your site.
-
-You will need to make SquirrelMail accessible through your HTTP server.
-If you are running Apache and ap-php, then you may either symlink
-
- ${SMDIR}
-
-into DocumentRoot, or add the following line to httpd.conf:
-
- Include ${PKG_SYSCONFDIR}/squirrelmail.conf
-
-to make IMAP accounts accessible through:
-
- http://www.example.com/squirrelmail/
-
-===========================================================================
diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile
deleted file mode 100644
index 11166b9ba58..00000000000
--- a/mail/ja-squirrelmail/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-# $NetBSD: Makefile,v 1.37 2007/01/07 09:13:58 rillig Exp $
-
-DISTNAME= squirrelmail-1.4.9a
-PKGNAME= ja-${DISTNAME}
-CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
-EXTRACT_SUFX= .tar.bz2
-
-#PATCH_SITES= http://www.yamaai-tech.com/~masato/Download/
-PATCH_SITES= ftp://ftp.back-street.net/pub/squirrelmail/
-PATCHFILES= squirrelmail-1.4.9a-ja-patch \
- squirrelmail-1.4.9a-lite.patch
-
-MAINTAINER= martti@NetBSD.org
-HOMEPAGE= http://www.squirrelmail.jp/
-COMMENT= PHP webmail package with Japanese localization
-
-CONFLICTS= sq-attachment-handlers-[0-9]*
-CONFLICTS+= sq-squirrelspell-[0-9]*
-CONFLICTS+= squirrelmail-[0-9]*
-
-DEPENDS+= ${PHP_PKG_PREFIX}-gettext>=4.3.3:../../devel/php-gettext
-DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring
-
-USE_LANGUAGES= # empty
-NO_BUILD= yes
-USE_TOOLS+= perl:run
-REPLACE_PERL+= config/conf.pl
-BUILD_DEFS+= APACHE_GROUP APACHE_USER VARBASE
-
-.include "../../mk/bsd.prefs.mk"
-
-PKG_SYSCONFSUBDIR?= httpd
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-
-EGDIR= ${PREFIX}/share/examples/squirrelmail
-SMDIR= ${PREFIX}/share/squirrelmail
-DATADIR= ${VARBASE}/spool/squirrelmail
-ATTACHMENTS_DIR= ${DATADIR}/attachments
-USER_PREFS_DIR= ${DATADIR}/data
-
-MESSAGE_SUBST+= SMDIR=${SMDIR:Q}
-FILES_SUBST+= SMDIR=${SMDIR:Q}
-
-CONF_FILES= ${SMDIR:Q}/config/config_default.php \
- ${SMDIR:Q}/config/config.php
-CONF_FILES+= ${SMDIR:Q}/data/default_pref \
- ${DATADIR:Q}/data/default_pref
-CONF_FILES+= ${EGDIR:Q}/squirrelmail.conf \
- ${PKG_SYSCONFDIR:Q}/squirrelmail.conf
-
-REQD_DIRS+= ${SMDIR:Q} ${SMDIR:Q}/config
-
-OWN_DIRS= ${DATADIR}
-OWN_DIRS_PERMS= ${ATTACHMENTS_DIR} ${ROOT_USER} ${APACHE_GROUP} 730
-OWN_DIRS_PERMS+= ${USER_PREFS_DIR} ${APACHE_USER} ${APACHE_GROUP} 755
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= ${WRKDIR:Q}/squirrelmail.conf.dist
-SUBST_FILES.paths+= config/config_default.php
-SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+= -e 's,@ATTACHMENTS_DIR@,${ATTACHMENTS_DIR},g'
-SUBST_SED.paths+= -e 's,@USER_PREFS_DIR@,${USER_PREFS_DIR},g'
-SUBST_SED.paths+= -e 's,@SMDIR@,${SMDIR},g'
-SUBST_STAGE.paths= post-patch
-
-post-extract:
- ${CP} ${FILESDIR:Q}/squirrelmail.conf.dist \
- ${WRKDIR:Q}/squirrelmail.conf.dist
-
-pre-configure:
- ${FIND} ${WRKSRC:Q} \( -name "*.orig*" -o -name ".cvsignore" \) -print | ${XARGS} ${RM} -f
-
-do-install:
- ${INSTALL_DATA_DIR} ${EGDIR:Q}
- ${INSTALL_DATA_DIR} ${SMDIR:Q}
- ${INSTALL_DATA} ${WRKDIR:Q}/squirrelmail.conf.dist ${EGDIR:Q}/squirrelmail.conf
- ${CP} -R ${WRKSRC:Q}/* ${SMDIR:Q}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SMDIR}
- ${FIND} ${SMDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
- ${FIND} ${SMDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
- ${CHMOD} a+x ${SMDIR:Q}/config/conf.pl
- ${INSTALL_DATA} ${WRKSRC:Q}/data/index.php ${USER_PREFS_DIR:Q}/
- ${INSTALL_DATA} ${WRKSRC:Q}/data/.htaccess ${USER_PREFS_DIR:Q}/
- ${MV} ${PREFIX}/share/squirrelmail/contrib/conf.pl.8 \
- ${PREFIX}/${PKGMANDIR}/man8/squirrelmail-conf.pl.8
-
-.include "../../lang/php/phpversion.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/ja-squirrelmail/PLIST b/mail/ja-squirrelmail/PLIST
deleted file mode 100644
index 5c169ef140e..00000000000
--- a/mail/ja-squirrelmail/PLIST
+++ /dev/null
@@ -1,478 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2006/12/06 15:26:26 taca Exp $
-man/man8/squirrelmail-conf.pl.8
-share/examples/squirrelmail/squirrelmail.conf
-share/squirrelmail/AUTHORS
-share/squirrelmail/COPYING
-share/squirrelmail/ChangeLog
-share/squirrelmail/INSTALL
-share/squirrelmail/README
-share/squirrelmail/ReleaseNotes
-share/squirrelmail/UPGRADE
-share/squirrelmail/class/deliver/Deliver.class.php
-share/squirrelmail/class/deliver/Deliver_IMAP.class.php
-share/squirrelmail/class/deliver/Deliver_SMTP.class.php
-share/squirrelmail/class/deliver/Deliver_SendMail.class.php
-share/squirrelmail/class/deliver/index.php
-share/squirrelmail/class/helper/VCard.class.php
-share/squirrelmail/class/helper/index.php
-share/squirrelmail/class/html.class.php
-share/squirrelmail/class/index.php
-share/squirrelmail/class/mime.class.php
-share/squirrelmail/class/mime/AddressStructure.class.php
-share/squirrelmail/class/mime/ContentType.class.php
-share/squirrelmail/class/mime/Disposition.class.php
-share/squirrelmail/class/mime/Language.class.php
-share/squirrelmail/class/mime/Message.class.php
-share/squirrelmail/class/mime/MessageHeader.class.php
-share/squirrelmail/class/mime/Rfc822Header.class.php
-share/squirrelmail/class/mime/SMimeMessage.class.php
-share/squirrelmail/class/mime/index.php
-share/squirrelmail/config/conf.pl
-share/squirrelmail/config/config_default.php
-share/squirrelmail/config/config_local.php
-share/squirrelmail/config/index.php
-share/squirrelmail/configure
-share/squirrelmail/contrib/RPM/config.php.redhat
-share/squirrelmail/contrib/RPM/squirrelmail.conf
-share/squirrelmail/contrib/RPM/squirrelmail.cron
-share/squirrelmail/contrib/RPM/squirrelmail.spec
-share/squirrelmail/contrib/decrypt_headers.php
-share/squirrelmail/contrib/squirrelmail.mailto.NT2KXP.reg
-share/squirrelmail/contrib/squirrelmail.mailto.Win9x.reg
-share/squirrelmail/contrib/squirrelmail.mailto.reg
-share/squirrelmail/data/.htaccess
-share/squirrelmail/data/default_pref
-share/squirrelmail/data/index.php
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.0.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.1.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.2.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.3.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.4.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.5.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.6.txt
-share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.0.txt
-share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.1.txt
-share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.2.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.0.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.1.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.2.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3a.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.4.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.5.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.6.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.7.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.8.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.9.txt
-share/squirrelmail/doc/authentication.txt
-share/squirrelmail/doc/db-backend.txt
-share/squirrelmail/doc/ie_ssl.txt
-share/squirrelmail/doc/index.html
-share/squirrelmail/doc/presets.txt
-share/squirrelmail/doc/russian_apache.txt
-share/squirrelmail/doc/security.txt
-share/squirrelmail/doc/themes.txt
-share/squirrelmail/doc/translating.txt
-share/squirrelmail/doc/translating_help.txt
-share/squirrelmail/functions/abook_database.php
-share/squirrelmail/functions/abook_ldap_server.php
-share/squirrelmail/functions/abook_local_file.php
-share/squirrelmail/functions/addressbook.php
-share/squirrelmail/functions/attachment_common.php
-share/squirrelmail/functions/auth.php
-share/squirrelmail/functions/constants.php
-share/squirrelmail/functions/date.php
-share/squirrelmail/functions/db_prefs.php
-share/squirrelmail/functions/decode/cp1250.php
-share/squirrelmail/functions/decode/cp1251.php
-share/squirrelmail/functions/decode/cp1252.php
-share/squirrelmail/functions/decode/cp1253.php
-share/squirrelmail/functions/decode/cp1254.php
-share/squirrelmail/functions/decode/cp1255.php
-share/squirrelmail/functions/decode/cp1256.php
-share/squirrelmail/functions/decode/cp1257.php
-share/squirrelmail/functions/decode/cp1258.php
-share/squirrelmail/functions/decode/cp855.php
-share/squirrelmail/functions/decode/cp866.php
-share/squirrelmail/functions/decode/index.php
-share/squirrelmail/functions/decode/iso_8859_1.php
-share/squirrelmail/functions/decode/iso_8859_10.php
-share/squirrelmail/functions/decode/iso_8859_11.php
-share/squirrelmail/functions/decode/iso_8859_13.php
-share/squirrelmail/functions/decode/iso_8859_14.php
-share/squirrelmail/functions/decode/iso_8859_15.php
-share/squirrelmail/functions/decode/iso_8859_16.php
-share/squirrelmail/functions/decode/iso_8859_2.php
-share/squirrelmail/functions/decode/iso_8859_3.php
-share/squirrelmail/functions/decode/iso_8859_4.php
-share/squirrelmail/functions/decode/iso_8859_5.php
-share/squirrelmail/functions/decode/iso_8859_6.php
-share/squirrelmail/functions/decode/iso_8859_7.php
-share/squirrelmail/functions/decode/iso_8859_8.php
-share/squirrelmail/functions/decode/iso_8859_9.php
-share/squirrelmail/functions/decode/iso_ir_111.php
-share/squirrelmail/functions/decode/koi8_r.php
-share/squirrelmail/functions/decode/koi8_u.php
-share/squirrelmail/functions/decode/ns_4551_1.php
-share/squirrelmail/functions/decode/tis_620.php
-share/squirrelmail/functions/decode/us_ascii.php
-share/squirrelmail/functions/decode/utf_8.php
-share/squirrelmail/functions/display_messages.php
-share/squirrelmail/functions/encode/cp1251.php
-share/squirrelmail/functions/encode/cp1255.php
-share/squirrelmail/functions/encode/cp1256.php
-share/squirrelmail/functions/encode/index.php
-share/squirrelmail/functions/encode/iso_8859_1.php
-share/squirrelmail/functions/encode/iso_8859_15.php
-share/squirrelmail/functions/encode/iso_8859_2.php
-share/squirrelmail/functions/encode/iso_8859_7.php
-share/squirrelmail/functions/encode/iso_8859_9.php
-share/squirrelmail/functions/encode/koi8_r.php
-share/squirrelmail/functions/encode/koi8_u.php
-share/squirrelmail/functions/encode/tis_620.php
-share/squirrelmail/functions/encode/us_ascii.php
-share/squirrelmail/functions/encode/utf_8.php
-share/squirrelmail/functions/file_prefs.php
-share/squirrelmail/functions/forms.php
-share/squirrelmail/functions/gettext.php
-share/squirrelmail/functions/global.php
-share/squirrelmail/functions/html.php
-share/squirrelmail/functions/i18n.php
-share/squirrelmail/functions/identity.php
-share/squirrelmail/functions/imap.php
-share/squirrelmail/functions/imap_general.php
-share/squirrelmail/functions/imap_mailbox.php
-share/squirrelmail/functions/imap_messages.php
-share/squirrelmail/functions/imap_search.php
-share/squirrelmail/functions/imap_utf7_local.php
-share/squirrelmail/functions/index.php
-share/squirrelmail/functions/mailbox_display.php
-share/squirrelmail/functions/mime.php
-share/squirrelmail/functions/options.php
-share/squirrelmail/functions/page_header.php
-share/squirrelmail/functions/plugin.php
-share/squirrelmail/functions/prefs.php
-share/squirrelmail/functions/strings.php
-share/squirrelmail/functions/tree.php
-share/squirrelmail/functions/url_parser.php
-share/squirrelmail/help/en_US/FAQ.hlp
-share/squirrelmail/help/en_US/addresses.hlp
-share/squirrelmail/help/en_US/basic.hlp
-share/squirrelmail/help/en_US/compose.hlp
-share/squirrelmail/help/en_US/folders.hlp
-share/squirrelmail/help/en_US/main_folder.hlp
-share/squirrelmail/help/en_US/options.hlp
-share/squirrelmail/help/en_US/read_mail.hlp
-share/squirrelmail/help/en_US/search.hlp
-share/squirrelmail/help/index.php
-share/squirrelmail/images/blank.png
-share/squirrelmail/images/delitem.png
-share/squirrelmail/images/down_pointer.png
-share/squirrelmail/images/draft.png
-share/squirrelmail/images/folder.png
-share/squirrelmail/images/inbox.png
-share/squirrelmail/images/index.php
-share/squirrelmail/images/minus.png
-share/squirrelmail/images/plus.png
-share/squirrelmail/images/sec_remove_eng.png
-share/squirrelmail/images/senti.png
-share/squirrelmail/images/sm_logo.png
-share/squirrelmail/images/sort_none.png
-share/squirrelmail/images/up_pointer.png
-share/squirrelmail/include/index.php
-share/squirrelmail/include/load_prefs.php
-share/squirrelmail/include/options/display.php
-share/squirrelmail/include/options/folder.php
-share/squirrelmail/include/options/index.php
-share/squirrelmail/include/options/personal.php
-share/squirrelmail/include/validate.php
-share/squirrelmail/index.php
-share/squirrelmail/locale/README.locales
-share/squirrelmail/locale/index.php
-share/squirrelmail/locale/timezones.cfg
-share/squirrelmail/plugins/README.plugins
-share/squirrelmail/plugins/abook_take/README
-share/squirrelmail/plugins/abook_take/index.php
-share/squirrelmail/plugins/abook_take/setup.php
-share/squirrelmail/plugins/abook_take/take.php
-share/squirrelmail/plugins/administrator/INSTALL
-share/squirrelmail/plugins/administrator/auth.php
-share/squirrelmail/plugins/administrator/defines.php
-share/squirrelmail/plugins/administrator/index.php
-share/squirrelmail/plugins/administrator/options.php
-share/squirrelmail/plugins/administrator/setup.php
-share/squirrelmail/plugins/bug_report/INSTALL
-share/squirrelmail/plugins/bug_report/README
-share/squirrelmail/plugins/bug_report/bug_report.php
-share/squirrelmail/plugins/bug_report/index.php
-share/squirrelmail/plugins/bug_report/setup.php
-share/squirrelmail/plugins/calendar/README
-share/squirrelmail/plugins/calendar/calendar.php
-share/squirrelmail/plugins/calendar/calendar_data.php
-share/squirrelmail/plugins/calendar/day.php
-share/squirrelmail/plugins/calendar/event_create.php
-share/squirrelmail/plugins/calendar/event_delete.php
-share/squirrelmail/plugins/calendar/event_edit.php
-share/squirrelmail/plugins/calendar/functions.php
-share/squirrelmail/plugins/calendar/index.php
-share/squirrelmail/plugins/calendar/setup.php
-share/squirrelmail/plugins/delete_move_next/README
-share/squirrelmail/plugins/delete_move_next/index.php
-share/squirrelmail/plugins/delete_move_next/setup.php
-share/squirrelmail/plugins/filters/CHANGES
-share/squirrelmail/plugins/filters/README
-share/squirrelmail/plugins/filters/bulkquery/INSTALL
-share/squirrelmail/plugins/filters/bulkquery/Makefile
-share/squirrelmail/plugins/filters/bulkquery/README
-share/squirrelmail/plugins/filters/bulkquery/bq.in
-share/squirrelmail/plugins/filters/bulkquery/bq.out
-share/squirrelmail/plugins/filters/bulkquery/bulkquery.c
-share/squirrelmail/plugins/filters/bulkquery/index.php
-share/squirrelmail/plugins/filters/filters.php
-share/squirrelmail/plugins/filters/index.php
-share/squirrelmail/plugins/filters/options.php
-share/squirrelmail/plugins/filters/setup.php
-share/squirrelmail/plugins/filters/spamoptions.php
-share/squirrelmail/plugins/fortune/INSTALL
-share/squirrelmail/plugins/fortune/index.php
-share/squirrelmail/plugins/fortune/setup.php
-share/squirrelmail/plugins/index.php
-share/squirrelmail/plugins/info/README
-share/squirrelmail/plugins/info/functions.php
-share/squirrelmail/plugins/info/index.php
-share/squirrelmail/plugins/info/options.php
-share/squirrelmail/plugins/info/setup.php
-share/squirrelmail/plugins/listcommands/README
-share/squirrelmail/plugins/listcommands/index.php
-share/squirrelmail/plugins/listcommands/mailout.php
-share/squirrelmail/plugins/listcommands/setup.php
-share/squirrelmail/plugins/mail_fetch/README
-share/squirrelmail/plugins/mail_fetch/class.POP3.php
-share/squirrelmail/plugins/mail_fetch/fetch.php
-share/squirrelmail/plugins/mail_fetch/functions.php
-share/squirrelmail/plugins/mail_fetch/index.php
-share/squirrelmail/plugins/mail_fetch/options.php
-share/squirrelmail/plugins/mail_fetch/setup.php
-share/squirrelmail/plugins/message_details/index.php
-share/squirrelmail/plugins/message_details/message_details_bottom.php
-share/squirrelmail/plugins/message_details/message_details_main.php
-share/squirrelmail/plugins/message_details/message_details_top.php
-share/squirrelmail/plugins/message_details/setup.php
-share/squirrelmail/plugins/newmail/HISTORY
-share/squirrelmail/plugins/newmail/README
-share/squirrelmail/plugins/newmail/index.php
-share/squirrelmail/plugins/newmail/newmail.php
-share/squirrelmail/plugins/newmail/newmail_opt.php
-share/squirrelmail/plugins/newmail/setup.php
-share/squirrelmail/plugins/newmail/sounds/FanFair.wav
-share/squirrelmail/plugins/newmail/sounds/Friends.wav
-share/squirrelmail/plugins/newmail/sounds/MontyPython.wav
-share/squirrelmail/plugins/newmail/sounds/Notify.wav
-share/squirrelmail/plugins/newmail/sounds/index.php
-share/squirrelmail/plugins/newmail/testsound.php
-share/squirrelmail/plugins/sent_subfolders/index.php
-share/squirrelmail/plugins/sent_subfolders/setup.php
-share/squirrelmail/plugins/spamcop/README
-share/squirrelmail/plugins/spamcop/index.php
-share/squirrelmail/plugins/spamcop/options.php
-share/squirrelmail/plugins/spamcop/setup.php
-share/squirrelmail/plugins/spamcop/spamcop.php
-share/squirrelmail/plugins/squirrelspell/INSTALL
-share/squirrelmail/plugins/squirrelspell/doc/CRYPTO
-share/squirrelmail/plugins/squirrelspell/doc/ChangeLog
-share/squirrelmail/plugins/squirrelspell/doc/PRIVACY
-share/squirrelmail/plugins/squirrelspell/doc/README
-share/squirrelmail/plugins/squirrelspell/doc/UPGRADING
-share/squirrelmail/plugins/squirrelspell/doc/index.php
-share/squirrelmail/plugins/squirrelspell/index.php
-share/squirrelmail/plugins/squirrelspell/js/WHATISTHIS
-share/squirrelmail/plugins/squirrelspell/js/check_me.js
-share/squirrelmail/plugins/squirrelspell/js/crypto_settings.js
-share/squirrelmail/plugins/squirrelspell/js/decrypt_error.js
-share/squirrelmail/plugins/squirrelspell/js/index.php
-share/squirrelmail/plugins/squirrelspell/js/init.js
-share/squirrelmail/plugins/squirrelspell/modules/.htaccess
-share/squirrelmail/plugins/squirrelspell/modules/WHATISTHIS
-share/squirrelmail/plugins/squirrelspell/modules/check_me.mod
-share/squirrelmail/plugins/squirrelspell/modules/crypto.mod
-share/squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod
-share/squirrelmail/plugins/squirrelspell/modules/edit_dic.mod
-share/squirrelmail/plugins/squirrelspell/modules/enc_setup.mod
-share/squirrelmail/plugins/squirrelspell/modules/forget_me.mod
-share/squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod
-share/squirrelmail/plugins/squirrelspell/modules/index.php
-share/squirrelmail/plugins/squirrelspell/modules/init.mod
-share/squirrelmail/plugins/squirrelspell/modules/lang_change.mod
-share/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod
-share/squirrelmail/plugins/squirrelspell/modules/options_main.mod
-share/squirrelmail/plugins/squirrelspell/setup.php
-share/squirrelmail/plugins/squirrelspell/sqspell_config.php
-share/squirrelmail/plugins/squirrelspell/sqspell_functions.php
-share/squirrelmail/plugins/squirrelspell/sqspell_interface.php
-share/squirrelmail/plugins/squirrelspell/sqspell_options.php
-share/squirrelmail/plugins/translate/INSTALL
-share/squirrelmail/plugins/translate/README
-share/squirrelmail/plugins/translate/index.php
-share/squirrelmail/plugins/translate/options.php
-share/squirrelmail/plugins/translate/setup.php
-share/squirrelmail/po/compilepo
-share/squirrelmail/po/independent_strings.txt
-share/squirrelmail/po/index.php
-share/squirrelmail/po/mergepo
-share/squirrelmail/po/squirrelmail.pot
-share/squirrelmail/po/xgetpo
-share/squirrelmail/src/addrbook_popup.php
-share/squirrelmail/src/addrbook_search.php
-share/squirrelmail/src/addrbook_search_html.php
-share/squirrelmail/src/addressbook.php
-share/squirrelmail/src/compose.php
-share/squirrelmail/src/configtest.php
-share/squirrelmail/src/delete_message.php
-share/squirrelmail/src/download.php
-share/squirrelmail/src/empty_trash.php
-share/squirrelmail/src/folders.php
-share/squirrelmail/src/folders_create.php
-share/squirrelmail/src/folders_delete.php
-share/squirrelmail/src/folders_rename_do.php
-share/squirrelmail/src/folders_rename_getname.php
-share/squirrelmail/src/folders_subscribe.php
-share/squirrelmail/src/help.php
-share/squirrelmail/src/image.php
-share/squirrelmail/src/index.php
-share/squirrelmail/src/left_main.php
-share/squirrelmail/src/login.php
-share/squirrelmail/src/mailto.php
-share/squirrelmail/src/move_messages.php
-share/squirrelmail/src/options.php
-share/squirrelmail/src/options_highlight.php
-share/squirrelmail/src/options_identities.php
-share/squirrelmail/src/options_order.php
-share/squirrelmail/src/printer_friendly_bottom.php
-share/squirrelmail/src/printer_friendly_main.php
-share/squirrelmail/src/printer_friendly_top.php
-share/squirrelmail/src/read_body.php
-share/squirrelmail/src/redirect.php
-share/squirrelmail/src/right_main.php
-share/squirrelmail/src/search.php
-share/squirrelmail/src/signout.php
-share/squirrelmail/src/vcard.php
-share/squirrelmail/src/view_header.php
-share/squirrelmail/src/view_text.php
-share/squirrelmail/src/webmail.php
-share/squirrelmail/themes/README.themes
-share/squirrelmail/themes/alien_glow.php
-share/squirrelmail/themes/autumn.php
-share/squirrelmail/themes/autumn2.php
-share/squirrelmail/themes/black_bean_burrito_theme.php
-share/squirrelmail/themes/blue_grey_theme.php
-share/squirrelmail/themes/blue_on_blue.php
-share/squirrelmail/themes/bluesnews_theme.php
-share/squirrelmail/themes/bluesome.php
-share/squirrelmail/themes/bluesteel_theme.php
-share/squirrelmail/themes/christmas.php
-share/squirrelmail/themes/classic_blue.php
-share/squirrelmail/themes/classic_blue2.php
-share/squirrelmail/themes/css/comic-sans-08.css
-share/squirrelmail/themes/css/comic-sans-10.css
-share/squirrelmail/themes/css/comic-sans-12.css
-share/squirrelmail/themes/css/index.php
-share/squirrelmail/themes/css/sans-08.css
-share/squirrelmail/themes/css/sans-10.css
-share/squirrelmail/themes/css/sans-12.css
-share/squirrelmail/themes/css/serif-10.css
-share/squirrelmail/themes/css/serif-12.css
-share/squirrelmail/themes/css/tahoma-08.css
-share/squirrelmail/themes/css/tahoma-10.css
-share/squirrelmail/themes/css/tahoma-12.css
-share/squirrelmail/themes/css/verdana-08.css
-share/squirrelmail/themes/css/verdana-10.css
-share/squirrelmail/themes/css/verdana-12.css
-share/squirrelmail/themes/dark_green.php
-share/squirrelmail/themes/dark_grey_theme.php
-share/squirrelmail/themes/darkness.php
-share/squirrelmail/themes/deepocean2_theme.php
-share/squirrelmail/themes/deepocean_theme.php
-share/squirrelmail/themes/default_theme.php
-share/squirrelmail/themes/dompie_theme.php
-share/squirrelmail/themes/forest_theme.php
-share/squirrelmail/themes/greenhouse_effect.php
-share/squirrelmail/themes/high_contrast_theme.php
-share/squirrelmail/themes/ice_theme.php
-share/squirrelmail/themes/in_the_pink.php
-share/squirrelmail/themes/index.php
-share/squirrelmail/themes/kind_of_blue.php
-share/squirrelmail/themes/maize_theme.php
-share/squirrelmail/themes/methodical_theme.php
-share/squirrelmail/themes/midnight.php
-share/squirrelmail/themes/minimal_bw.php
-share/squirrelmail/themes/monostochastic.php
-share/squirrelmail/themes/netstyle_theme.php
-share/squirrelmail/themes/penguin.php
-share/squirrelmail/themes/plain_blue_theme.php
-share/squirrelmail/themes/powder_blue.php
-share/squirrelmail/themes/purple_theme.php
-share/squirrelmail/themes/random.php
-share/squirrelmail/themes/redmond.php
-share/squirrelmail/themes/sandstorm_theme.php
-share/squirrelmail/themes/seaspray_theme.php
-share/squirrelmail/themes/servery_theme.php
-share/squirrelmail/themes/shades_of_grey.php
-share/squirrelmail/themes/silver_steel_theme.php
-share/squirrelmail/themes/simple_green2.php
-share/squirrelmail/themes/simple_green_theme.php
-share/squirrelmail/themes/simple_purple.php
-share/squirrelmail/themes/slashdot_theme.php
-share/squirrelmail/themes/spice_of_life.php
-share/squirrelmail/themes/spice_of_life_dark.php
-share/squirrelmail/themes/spice_of_life_lite.php
-share/squirrelmail/themes/techno_blue.php
-share/squirrelmail/themes/turquoise.php
-share/squirrelmail/themes/wood_theme.php
-@dirrm share/squirrelmail/themes/css
-@dirrm share/squirrelmail/themes
-@dirrm share/squirrelmail/src
-@dirrm share/squirrelmail/po
-@dirrm share/squirrelmail/plugins/translate
-@dirrm share/squirrelmail/plugins/squirrelspell/modules
-@dirrm share/squirrelmail/plugins/squirrelspell/js
-@dirrm share/squirrelmail/plugins/squirrelspell/doc
-@dirrm share/squirrelmail/plugins/squirrelspell
-@dirrm share/squirrelmail/plugins/spamcop
-@dirrm share/squirrelmail/plugins/sent_subfolders
-@dirrm share/squirrelmail/plugins/newmail/sounds
-@dirrm share/squirrelmail/plugins/newmail
-@dirrm share/squirrelmail/plugins/message_details
-@dirrm share/squirrelmail/plugins/mail_fetch
-@dirrm share/squirrelmail/plugins/listcommands
-@dirrm share/squirrelmail/plugins/info
-@dirrm share/squirrelmail/plugins/fortune
-@dirrm share/squirrelmail/plugins/filters/bulkquery
-@dirrm share/squirrelmail/plugins/filters
-@dirrm share/squirrelmail/plugins/delete_move_next
-@dirrm share/squirrelmail/plugins/calendar
-@dirrm share/squirrelmail/plugins/bug_report
-@dirrm share/squirrelmail/plugins/administrator
-@dirrm share/squirrelmail/plugins/abook_take
-@dirrm share/squirrelmail/plugins
-@dirrm share/squirrelmail/locale
-@dirrm share/squirrelmail/include/options
-@dirrm share/squirrelmail/include
-@dirrm share/squirrelmail/images
-@dirrm share/squirrelmail/help/en_US
-@dirrm share/squirrelmail/help
-@dirrm share/squirrelmail/functions/encode
-@dirrm share/squirrelmail/functions/decode
-@dirrm share/squirrelmail/functions
-@dirrm share/squirrelmail/doc/ReleaseNotes/1.4
-@dirrm share/squirrelmail/doc/ReleaseNotes/1.3
-@dirrm share/squirrelmail/doc/ReleaseNotes/1.2
-@dirrm share/squirrelmail/doc/ReleaseNotes
-@dirrm share/squirrelmail/doc
-@dirrm share/squirrelmail/data
-@dirrm share/squirrelmail/contrib/RPM
-@dirrm share/squirrelmail/contrib
-@dirrm share/squirrelmail/class/mime
-@dirrm share/squirrelmail/class/helper
-@dirrm share/squirrelmail/class/deliver
-@dirrm share/squirrelmail/class
-@dirrm share/examples/squirrelmail
diff --git a/mail/ja-squirrelmail/distinfo b/mail/ja-squirrelmail/distinfo
deleted file mode 100644
index aa86521dc39..00000000000
--- a/mail/ja-squirrelmail/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.13 2006/12/06 15:26:26 taca Exp $
-
-SHA1 (squirrelmail-1.4.9a-ja-patch) = 3c03bd291a91e09955f50ea918d490b7390fb504
-RMD160 (squirrelmail-1.4.9a-ja-patch) = a4ea9a8f4d499e52bfd9422b7ea631b326da3aad
-Size (squirrelmail-1.4.9a-ja-patch) = 3211 bytes
-SHA1 (squirrelmail-1.4.9a-lite.patch) = acb933bde2d78dd4e2908414198c708246e03b3c
-RMD160 (squirrelmail-1.4.9a-lite.patch) = 48e4fe6eb20ec1f43e0634ba6215d9331c53bace
-Size (squirrelmail-1.4.9a-lite.patch) = 5136 bytes
-SHA1 (squirrelmail-1.4.9a.tar.bz2) = c9fc139c331cc99aa9bb54886106d2beccdd390a
-RMD160 (squirrelmail-1.4.9a.tar.bz2) = ccb4c0b4d74341862fecc4abe7f1fa63a4535984
-Size (squirrelmail-1.4.9a.tar.bz2) = 481601 bytes
-SHA1 (patch-aa) = 4dfcc0ae2c5088dd99974ff0d7ac5bb981eea134
diff --git a/mail/ja-squirrelmail/files/squirrelmail.conf.dist b/mail/ja-squirrelmail/files/squirrelmail.conf.dist
deleted file mode 100644
index 559dca9c432..00000000000
--- a/mail/ja-squirrelmail/files/squirrelmail.conf.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: squirrelmail.conf.dist,v 1.1.1.1 2004/06/06 14:32:11 taca Exp $
-#
-# SquirrelMail configuration file fragment for Apache
-
-<IfModule mod_alias.c>
- Alias /squirrelmail/ "@SMDIR@/"
-</IfModule>
-
-<Directory "@SMDIR@">
- Options Indexes MultiViews
- AllowOverride None
- Order allow,deny
- Allow from all
-</Directory>
diff --git a/mail/ja-squirrelmail/patches/patch-aa b/mail/ja-squirrelmail/patches/patch-aa
deleted file mode 100644
index 6253f460462..00000000000
--- a/mail/ja-squirrelmail/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/12/06 15:26:26 taca Exp $
-
---- config/config_default.php.orig 2006-12-05 00:29:29.000000000 +0900
-+++ config/config_default.php
-@@ -414,7 +414,7 @@ $default_sub_of_inbox = true;
- * false. (Cyrus works fine whether it's true OR false).
- * @global bool $show_contain_subfolders_option
- */
--$show_contain_subfolders_option = false;
-+$show_contain_subfolders_option = true;
-
- /**
- * These next two options set the defaults for the way that the
-@@ -459,7 +459,7 @@ $noselect_fix_enable = false;
- * $data_dir = SM_PATH . 'data/';
- * @global string $data_dir
- */
--$data_dir = SM_PATH . 'data/';
-+$data_dir = '@USER_PREFS_DIR@/';
-
- /**
- * Attachments directory
-@@ -477,7 +477,7 @@ $data_dir = SM_PATH . 'data/';
- * + It should probably be another directory than data_dir.
- * @global string $attachment_dir
- */
--$attachment_dir = $data_dir;
-+$attachment_dir = '@ATTACHMENTS_DIR@/';
-
- /**
- * Hash level used for data directory.
diff --git a/mail/jchkmail/DESCR b/mail/jchkmail/DESCR
deleted file mode 100644
index 9bb95856f66..00000000000
--- a/mail/jchkmail/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-J-chkmail is a mail filtering software using the API milter of sendmail
-(versions 8.12.0 and later). Yet another filter...
-
-j-chkmail intends to be a scalable integrated solution to fight against
-virus and spam.
-
-In both cases, the main idea of j-chkmail is to avoid content filtering,
-but to do behavior filtering.
diff --git a/mail/jchkmail/Makefile b/mail/jchkmail/Makefile
deleted file mode 100644
index 9c3ee78e940..00000000000
--- a/mail/jchkmail/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2006/04/11 11:12:21 manu Exp $
-#
-
-DISTNAME= jchkmail-1.3.1a
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= http://j-chkmail.ensmp.fr/download/
-
-MAINTAINER= manu@NetBSD.org
-HOMEPAGE= http://j-chkmail.ensmp.fr/
-COMMENT= Behavior-based virus and spam milter for Sendmail
-
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-
-CONFIGURE_ARGS+= --with-rc-dir=${PREFIX}/share/examples/rc.d \
- --with-conf-dir=${PKG_SYSCONFDIR:Q}
-
-EGDIR= ${PREFIX}/share/examples/jchkmail
-PKG_SYSCONFSUBDIR= jchkmail
-CONF_FILES+= ${EGDIR}/j-chkmail.cf ${PKG_SYSCONFDIR}/j-chkmail.cf
-CONF_FILES+= ${EGDIR}/j-local-users ${PKG_SYSCONFDIR}/j-local-users
-CONF_FILES+= ${EGDIR}/j-error-msg ${PKG_SYSCONFDIR}/j-error-msg
-CONF_FILES+= ${EGDIR}/j-nets ${PKG_SYSCONFDIR}/j-nets
-CONF_FILES+= ${EGDIR}/j-host-access ${PKG_SYSCONFDIR}/j-host-access
-CONF_FILES+= ${EGDIR}/j-user-access ${PKG_SYSCONFDIR}/j-user-access
-CONF_FILES+= ${EGDIR}/j-regex ${PKG_SYSCONFDIR}/j-regex
-RCD_SCRIPTS= jchkmail
-
-PTHREAD_AUTO_VARS= yes
-
-.include "../../mail/libmilter/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/jchkmail/PLIST b/mail/jchkmail/PLIST
deleted file mode 100644
index 0128615ad90..00000000000
--- a/mail/jchkmail/PLIST
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/11 11:12:21 manu Exp $
-bin/j-scanfile
-bin/j-printstats
-sbin/j-chkmail
-man/man1/j-printstats.1
-man/man1/j-scanfile.1
-man/man4/j-chkmail.cf.4
-man/man8/j-chkmail.8
-share/examples/jchkmail/j-chkmail.cf
-share/examples/jchkmail/j-local-users
-share/examples/jchkmail/j-error-msg
-share/examples/jchkmail/j-nets
-share/examples/jchkmail/j-host-access
-share/examples/jchkmail/j-user-access
-share/examples/jchkmail/j-regex
-share/examples/rc.d/jchkmail
-@dirrm share/examples/jchkmail
diff --git a/mail/jchkmail/distinfo b/mail/jchkmail/distinfo
deleted file mode 100644
index 7a19fc93ee1..00000000000
--- a/mail/jchkmail/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/04/11 11:12:21 manu Exp $
-
-SHA1 (jchkmail-1.3.1a.tar.gz) = 6cade163151a2c08d42082b971b55a11c33f47c6
-RMD160 (jchkmail-1.3.1a.tar.gz) = b707514f3a04d871f32db660be8b975577e1dbf3
-Size (jchkmail-1.3.1a.tar.gz) = 420432 bytes
-SHA1 (patch-aa) = b0c8c3483c2b65570547d79c59c0974b685d57bb
-SHA1 (patch-ab) = c629836b5dbab9282104a3c2731e379c56c5ea81
-SHA1 (patch-ac) = 8be29408b4fb665d3374fb6232b596d028d69e28
diff --git a/mail/jchkmail/patches/patch-aa b/mail/jchkmail/patches/patch-aa
deleted file mode 100644
index 5b8a01fb045..00000000000
--- a/mail/jchkmail/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/09/22 14:33:35 manu Exp $
---- bin/jchkmail.init.in.orig Tue Mar 11 11:38:43 2003
-+++ bin/jchkmail.init.in Mon Sep 22 14:49:05 2003
-@@ -1,20 +1,9 @@
- #!/bin/sh
- #
--# chkconfig: 2345 80 30
--# description: j-chkmail - Joe's j-chkmail
--# filtre de messagerie
--
--### BEGIN INIT INFO
--# Provides: j-chkmail
--# Required-Start: $remote_fs
--# Required-Stop:
--# X-UnitedLinux-Should-Start:
--# X-UnitedLinux-Should-Stop:
--# Default-Start: 3 5
--# Default-Stop:
--# Description: Start j-chmail (filtre mail)
--### END INIT INFO
-+# PROVIDES: jchkmail
-+# BEFORE: mail
-+# REQUIRE: LOGIN
-
- JCHKMAIL_HOME=@prefix@/sbin
-
- JCHKMAIL_BIN=j-chkmail
diff --git a/mail/jchkmail/patches/patch-ab b/mail/jchkmail/patches/patch-ab
deleted file mode 100644
index 5d7f41145ed..00000000000
--- a/mail/jchkmail/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/12/11 14:13:34 kristerw Exp $
-
---- src/j-sys.h.orig Sat Dec 11 15:03:16 2004
-+++ src/j-sys.h Sat Dec 11 15:03:37 2004
-@@ -239,7 +239,7 @@
- #endif
-
- #if !defined (HAVE_BOOL)
--typedef int bool;
-+#define bool int
- #endif
-
- #ifndef true
diff --git a/mail/jchkmail/patches/patch-ac b/mail/jchkmail/patches/patch-ac
deleted file mode 100644
index c652a91966e..00000000000
--- a/mail/jchkmail/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/04/11 11:12:21 manu Exp $
-
---- etc/Makefile.in.orig 2003-07-03 11:54:08.000000000 +0000
-+++ etc/Makefile.in
-@@ -125,13 +125,8 @@ uninstall-info-am:
- sysconfDATA_INSTALL = $(INSTALL_DATA)
- install-sysconfDATA: $(sysconf_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-- @list='$(sysconf_DATA)'; for p in $$list; do \
-- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \
-- $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
-- done
-+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/examples/jchkmail
-+ for f in ${sysconf_DATA:C/.org//}; do $(BSD_INSTALL_DATA) $$f.org $(DESTDIR)$(PREFIX)/share/examples/jchkmail/$$f; done
-
- uninstall-sysconfDATA:
- @$(NORMAL_UNINSTALL)
-@@ -218,7 +213,6 @@ info-am:
-
- install-data-am:
- @$(NORMAL_INSTALL)
-- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
-
- install-exec-am: install-sysconfDATA
diff --git a/mail/kbiff/DESCR b/mail/kbiff/DESCR
deleted file mode 100644
index e65db0326a8..00000000000
--- a/mail/kbiff/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-KBiff is a "biff" or new mail notification utility. It is highly configurable
-but very easy to use and setup. It tries to combine the best of the features
-of most of the "other" biff programs out there.
-
-KBiff supports all major mailbox formats: mbox (Berkely style), maildir, mh,
-POP3, IMAP4, and NNTP.
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
deleted file mode 100644
index 217d4d43885..00000000000
--- a/mail/kbiff/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.30 2007/02/22 19:26:41 wiz Exp $
-
-DISTNAME= kbiff-3.8
-PKGREVISION= 5
-CATEGORIES= devel kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kbiff/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= markd@NetBSD.org
-HOMEPAGE= http://www.granroth.org/kbiff/index.html
-COMMENT= Mail notification utility for KDE
-
-USE_TOOLS+= gmake
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-SHLIBTOOL_OVERRIDE= # empty
-
-BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/kbiff/PLIST b/mail/kbiff/PLIST
deleted file mode 100644
index 72a34326d71..00000000000
--- a/mail/kbiff/PLIST
+++ /dev/null
@@ -1,69 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2007/01/26 04:25:46 markd Exp $
-bin/kbiff
-lib/kbiff.la
-man/man1/kbiff.1
-share/doc/kde/HTML/de/kbiff/common
-share/doc/kde/HTML/de/kbiff/index.cache.bz2
-share/doc/kde/HTML/de/kbiff/index.docbook
-share/doc/kde/HTML/en/kbiff/common
-share/doc/kde/HTML/en/kbiff/index.cache.bz2
-share/doc/kde/HTML/en/kbiff/index.docbook
-share/doc/kde/HTML/en/kbiff/kbiff.png
-share/doc/kde/HTML/es/kbiff/common
-share/doc/kde/HTML/es/kbiff/index.cache.bz2
-share/doc/kde/HTML/es/kbiff/index.docbook
-share/doc/kde/HTML/fr/kbiff/common
-share/doc/kde/HTML/fr/kbiff/index.cache.bz2
-share/doc/kde/HTML/fr/kbiff/index.docbook
-share/icons/hicolor/16x16/apps/kbiff.png
-share/icons/hicolor/32x32/apps/kbiff.png
-share/icons/hicolor/48x48/apps/kbiff.png
-share/icons/locolor/16x16/apps/kbiff.png
-share/icons/locolor/32x32/apps/kbiff.png
-share/kde/applnk/Internet/kbiff.desktop
-share/kde/apps/kbiff/pics/delete.png
-share/kde/apps/kbiff/pics/mailbox.png
-share/kde/apps/kbiff/pics/mini-newmail.png
-share/kde/apps/kbiff/pics/mini-noconn.png
-share/kde/apps/kbiff/pics/mini-nomail.png
-share/kde/apps/kbiff/pics/mini-oldmail.png
-share/kde/apps/kbiff/pics/newmail.png
-share/kde/apps/kbiff/pics/noconn.png
-share/kde/apps/kbiff/pics/nomail.png
-share/kde/apps/kbiff/pics/oldmail.png
-share/kde/apps/kbiff/pics/playsound.png
-share/locale/br/LC_MESSAGES/kbiff.mo
-share/locale/cs/LC_MESSAGES/kbiff.mo
-share/locale/da/LC_MESSAGES/kbiff.mo
-share/locale/de/LC_MESSAGES/kbiff.mo
-share/locale/el/LC_MESSAGES/kbiff.mo
-share/locale/es/LC_MESSAGES/kbiff.mo
-share/locale/et/LC_MESSAGES/kbiff.mo
-share/locale/fi/LC_MESSAGES/kbiff.mo
-share/locale/fr/LC_MESSAGES/kbiff.mo
-share/locale/he/LC_MESSAGES/kbiff.mo
-share/locale/hr/LC_MESSAGES/kbiff.mo
-share/locale/hu/LC_MESSAGES/kbiff.mo
-share/locale/is/LC_MESSAGES/kbiff.mo
-share/locale/it/LC_MESSAGES/kbiff.mo
-share/locale/ja/LC_MESSAGES/kbiff.mo
-share/locale/nl/LC_MESSAGES/kbiff.mo
-share/locale/no/LC_MESSAGES/kbiff.mo
-share/locale/no_NY/LC_MESSAGES/kbiff.mo
-share/locale/pl/LC_MESSAGES/kbiff.mo
-share/locale/pt/LC_MESSAGES/kbiff.mo
-share/locale/pt_BR/LC_MESSAGES/kbiff.mo
-share/locale/ro/LC_MESSAGES/kbiff.mo
-share/locale/ru/LC_MESSAGES/kbiff.mo
-share/locale/sk/LC_MESSAGES/kbiff.mo
-share/locale/sl/LC_MESSAGES/kbiff.mo
-share/locale/sv/LC_MESSAGES/kbiff.mo
-share/locale/tr/LC_MESSAGES/kbiff.mo
-share/locale/uk/LC_MESSAGES/kbiff.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kbiff.mo
-@dirrm share/kde/apps/kbiff/pics
-@dirrm share/kde/apps/kbiff
-@dirrm share/doc/kde/HTML/fr/kbiff
-@dirrm share/doc/kde/HTML/es/kbiff
-@dirrm share/doc/kde/HTML/en/kbiff
-@dirrm share/doc/kde/HTML/de/kbiff
diff --git a/mail/kbiff/distinfo b/mail/kbiff/distinfo
deleted file mode 100644
index e9b846e0ea2..00000000000
--- a/mail/kbiff/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/12/10 22:07:01 markd Exp $
-
-SHA1 (kbiff-3.8.tar.bz2) = 7ec8d04c26d4e47278fa5fc34bd09a9157d8d28a
-RMD160 (kbiff-3.8.tar.bz2) = c2325f558d0d7926213f420cc40dd02dc36a1c2e
-Size (kbiff-3.8.tar.bz2) = 767864 bytes
-SHA1 (patch-aa) = b477880d9dab4ec023442e9cce416f19a5a0fb4a
-SHA1 (patch-ab) = 53565884f5aed49b8e2d4ad73f3145a95b85895e
diff --git a/mail/kbiff/patches/patch-aa b/mail/kbiff/patches/patch-aa
deleted file mode 100644
index 3563f7b1cd5..00000000000
--- a/mail/kbiff/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/12/10 22:07:01 markd Exp $
-
---- Makefile.in.orig 2005-09-11 10:09:56.000000000 +1200
-+++ Makefile.in
-@@ -319,7 +319,7 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
- $(AUTOMAKE) --foreign Makefile
- cd $(top_srcdir) && perl admin/am_edit Makefile.in
- .PRECIOUS: Makefile
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in
- @case '$?' in \
- *config.status*) \
- echo ' $(SHELL) ./config.status'; \
diff --git a/mail/kbiff/patches/patch-ab b/mail/kbiff/patches/patch-ab
deleted file mode 100644
index 7f458edfe37..00000000000
--- a/mail/kbiff/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/10/12 11:08:03 markd Exp $
-
---- configure.orig 2004-03-26 13:47:42.000000000 +1200
-+++ configure
-@@ -24088,7 +24088,7 @@ else
- use_ssl=yes
- fi;
-
--if test "$use_ssl" == "yes"; then
-+if test "$use_ssl" = "yes"; then
-
- cat >>confdefs.h <<\_ACEOF
- #define USE_SSL
-@@ -24105,7 +24105,7 @@ else
- use_ssl=yes
- fi;
-
--if test "$use_ssl" == "yes"; then
-+if test "$use_ssl" = "yes"; then
-
- cat >>confdefs.h <<\_ACEOF
- #define USE_SSL
diff --git a/mail/libesmtp/DESCR b/mail/libesmtp/DESCR
deleted file mode 100644
index 71f615b2b65..00000000000
--- a/mail/libesmtp/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-libESMTP is a library to manage posting (or submission of) electronic
-mail using SMTP to a preconfigured Mail Transport Agent (MTA).
-
-It may be used as part of a Mail User Agent (MUA) or another program that
-needs to post electronic mail but where mail functionality is not
-the program's primary purpose.
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
deleted file mode 100644
index 6b14aa9f1d7..00000000000
--- a/mail/libesmtp/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2006/02/08 18:29:17 drochner Exp $
-
-DISTNAME= libesmtp-1.0.4
-CATEGORIES= mail devel
-MASTER_SITES= http://www.stafford.uklinux.net/libesmtp/ \
- http://www.tobez.org/download/port-mirrors/mail/libesmtp/ \
- http://www.borgsdemons.com/distfiles/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= dolemite@wuli.nu
-HOMEPAGE= http://www.stafford.uklinux.net/libesmtp/
-COMMENT= Library to manage posting of electronic mail
-
-USE_TOOLS+= gmake
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-
-USE_OLD_DES_API= yes
-CONFIGURE_ARGS+= --enable-all
-CONFIGURE_ARGS+= --disable-isoc
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(LOWER_OPSYS:Mirix5*)
-CONFIGURE_ARGS+= --enable-emulate-getaddrinfo
-.endif
-
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/libesmtp/PLIST b/mail/libesmtp/PLIST
deleted file mode 100644
index 98c3b0e75af..00000000000
--- a/mail/libesmtp/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:41 jlam Exp $
-bin/libesmtp-config
-include/auth-client.h
-include/auth-plugin.h
-include/libesmtp.h
-lib/esmtp-plugins/sasl-cram-md5.la
-lib/esmtp-plugins/sasl-login.la
-lib/esmtp-plugins/sasl-ntlm.la
-lib/esmtp-plugins/sasl-plain.la
-lib/libesmtp.la
-@dirrm lib/esmtp-plugins
diff --git a/mail/libesmtp/buildlink3.mk b/mail/libesmtp/buildlink3.mk
deleted file mode 100644
index 7470a3011aa..00000000000
--- a/mail/libesmtp/buildlink3.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:57 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBESMTP_BUILDLINK3_MK:= ${LIBESMTP_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libesmtp
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibesmtp}
-BUILDLINK_PACKAGES+= libesmtp
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libesmtp
-
-.if !empty(LIBESMTP_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libesmtp+= libesmtp>=1.0rc1nb1
-BUILDLINK_ABI_DEPENDS.libesmtp?= libesmtp>=1.0.3nb2
-BUILDLINK_PKGSRCDIR.libesmtp?= ../../mail/libesmtp
-
-LIBESMTP= -lesmtp
-
-CONFIGURE_ENV+= LIBESMTP=${LIBESMTP:Q}
-MAKE_ENV+= LIBESMTP=${LIBESMTP:Q}
-
-.endif # LIBESMTP_BUILDLINK3_MK
-
-.include "../../security/openssl/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/libesmtp/distinfo b/mail/libesmtp/distinfo
deleted file mode 100644
index 78f5cd12672..00000000000
--- a/mail/libesmtp/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.11 2006/02/16 18:23:31 joerg Exp $
-
-SHA1 (libesmtp-1.0.4.tar.bz2) = cda45c437164ecfa4fd8cf24d0a056224fc29c6a
-RMD160 (libesmtp-1.0.4.tar.bz2) = 642d6dd18293672ae78abe0050f8d5ea37a4f44c
-Size (libesmtp-1.0.4.tar.bz2) = 351917 bytes
-SHA1 (patch-aa) = 2297acfb65d72024090e471b9a518de07bc5e001
-SHA1 (patch-ab) = cc027b93ae55b84c1b569ddcdd2644d4f63a33a5
-SHA1 (patch-ae) = b4ef8a1c015483824d1897c5ef72b8ed2a158860
diff --git a/mail/libesmtp/patches/patch-aa b/mail/libesmtp/patches/patch-aa
deleted file mode 100644
index 7f851a2af52..00000000000
--- a/mail/libesmtp/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/02/16 18:23:31 joerg Exp $
-
---- headers.c.orig 2006-02-16 18:13:04.000000000 +0000
-+++ headers.c
-@@ -33,6 +33,7 @@
- #include <unistd.h>
- #include <time.h>
- #include <errno.h>
-+#include <sys/time.h>
-
- #include <missing.h>
-
diff --git a/mail/libesmtp/patches/patch-ab b/mail/libesmtp/patches/patch-ab
deleted file mode 100644
index 534085c4c3c..00000000000
--- a/mail/libesmtp/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/09/22 13:01:25 cjep Exp $
-
---- libesmtp-config.in.orig Wed Dec 12 14:30:37 2001
-+++ libesmtp-config.in
-@@ -69,7 +69,7 @@
- ;;
-
- --libs)
-- echo @PTHREAD_LDFLAGS@ -L@libdir@ -lesmtp @LIBS@ @PTHREAD_LIBS@
-+ echo @PTHREAD_LDFLAGS@ -L@libdir@ -Wl,-R@libdir@ -lesmtp @LIBS@ @PTHREAD_LIBS@
- ;;
-
- --plugindir)
diff --git a/mail/libesmtp/patches/patch-ae b/mail/libesmtp/patches/patch-ae
deleted file mode 100644
index e853ef13b2e..00000000000
--- a/mail/libesmtp/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/12/18 16:05:11 grant Exp $
-
---- getaddrinfo.c.orig 2003-07-30 02:36:14.000000000 +1000
-+++ getaddrinfo.c
-@@ -36,6 +36,7 @@
- #include <ctype.h>
- #include <errno.h>
-
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
diff --git a/mail/libetpan/DESCR b/mail/libetpan/DESCR
deleted file mode 100644
index 4e375157982..00000000000
--- a/mail/libetpan/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-The purpose of this mail library is to provide a portable, efficient
-middleware for different kinds of mail access. When using the drivers
-interface, the interface is the same for all kinds of mail access,
-remote and local mailboxes.
-
-Current implemented drivers are mbox, MH, maildir, POP3, IMAP4rev1
-and NNTP.
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
deleted file mode 100644
index 2041ec9d05b..00000000000
--- a/mail/libetpan/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2007/01/09 15:46:37 smb Exp $
-#
-
-DISTNAME= libetpan-0.48
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libetpan/}
-
-MAINTAINER= dawszy@arhea.pl
-HOMEPAGE= http://libetpan.sourceforge.net/
-COMMENT= Really nice mail library
-
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-
-SUBST_CLASSES+= conf
-SUBST_STAGE.conf= pre-configure
-SUBST_FILES.conf= libetpan-config.in
-SUBST_SED.conf= -e "s|@COMPILERFLAGS@|${COMPILER_RPATH_FLAG}|g"
-SUBST_MESSAGE.conf= Fixing libetpan-config.
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/db4/buildlink3.mk"
-.include "../../security/cyrus-sasl/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/libetpan/PLIST b/mail/libetpan/PLIST
deleted file mode 100644
index 50b50037be7..00000000000
--- a/mail/libetpan/PLIST
+++ /dev/null
@@ -1,132 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2007/01/09 15:46:37 smb Exp $
-bin/libetpan-config
-include/libetpan.h
-include/libetpan/acl.h
-include/libetpan/acl_types.h
-include/libetpan/annotatemore.h
-include/libetpan/annotatemore_types.h
-include/libetpan/carray.h
-include/libetpan/charconv.h
-include/libetpan/chash.h
-include/libetpan/cinthash.h
-include/libetpan/clist.h
-include/libetpan/data_message_driver.h
-include/libetpan/dbdriver.h
-include/libetpan/dbdriver_message.h
-include/libetpan/dbdriver_types.h
-include/libetpan/dbstorage.h
-include/libetpan/generic_cache_types.h
-include/libetpan/hotmailstorage.h
-include/libetpan/imapdriver.h
-include/libetpan/imapdriver_cached.h
-include/libetpan/imapdriver_cached_message.h
-include/libetpan/imapdriver_message.h
-include/libetpan/imapdriver_types.h
-include/libetpan/imapstorage.h
-include/libetpan/libetpan-config.h
-include/libetpan/libetpan.h
-include/libetpan/libetpan_version.h
-include/libetpan/mail.h
-include/libetpan/maildir.h
-include/libetpan/maildir_types.h
-include/libetpan/maildirdriver.h
-include/libetpan/maildirdriver_cached.h
-include/libetpan/maildirdriver_cached_message.h
-include/libetpan/maildirdriver_message.h
-include/libetpan/maildirdriver_types.h
-include/libetpan/maildirstorage.h
-include/libetpan/maildriver.h
-include/libetpan/maildriver_errors.h
-include/libetpan/maildriver_types.h
-include/libetpan/maildriver_types_helper.h
-include/libetpan/mailengine.h
-include/libetpan/mailfolder.h
-include/libetpan/mailimap.h
-include/libetpan/mailimap_extension.h
-include/libetpan/mailimap_extension_types.h
-include/libetpan/mailimap_helper.h
-include/libetpan/mailimap_socket.h
-include/libetpan/mailimap_ssl.h
-include/libetpan/mailimap_types.h
-include/libetpan/mailimap_types_helper.h
-include/libetpan/mailimf.h
-include/libetpan/mailimf_types.h
-include/libetpan/mailimf_types_helper.h
-include/libetpan/mailimf_write_file.h
-include/libetpan/mailimf_write_generic.h
-include/libetpan/mailimf_write_mem.h
-include/libetpan/maillock.h
-include/libetpan/mailmbox.h
-include/libetpan/mailmbox_types.h
-include/libetpan/mailmessage.h
-include/libetpan/mailmessage_types.h
-include/libetpan/mailmh.h
-include/libetpan/mailmime.h
-include/libetpan/mailmime_content.h
-include/libetpan/mailmime_decode.h
-include/libetpan/mailmime_disposition.h
-include/libetpan/mailmime_types.h
-include/libetpan/mailmime_types_helper.h
-include/libetpan/mailmime_write_file.h
-include/libetpan/mailmime_write_generic.h
-include/libetpan/mailmime_write_mem.h
-include/libetpan/mailpop3.h
-include/libetpan/mailpop3_helper.h
-include/libetpan/mailpop3_socket.h
-include/libetpan/mailpop3_ssl.h
-include/libetpan/mailpop3_types.h
-include/libetpan/mailprivacy.h
-include/libetpan/mailprivacy_gnupg.h
-include/libetpan/mailprivacy_smime.h
-include/libetpan/mailprivacy_tools.h
-include/libetpan/mailprivacy_types.h
-include/libetpan/mailsem.h
-include/libetpan/mailsmtp.h
-include/libetpan/mailsmtp_helper.h
-include/libetpan/mailsmtp_socket.h
-include/libetpan/mailsmtp_ssl.h
-include/libetpan/mailsmtp_types.h
-include/libetpan/mailstorage.h
-include/libetpan/mailstorage_types.h
-include/libetpan/mailstream.h
-include/libetpan/mailstream_helper.h
-include/libetpan/mailstream_low.h
-include/libetpan/mailstream_socket.h
-include/libetpan/mailstream_ssl.h
-include/libetpan/mailstream_types.h
-include/libetpan/mailthread.h
-include/libetpan/mailthread_types.h
-include/libetpan/mboxdriver.h
-include/libetpan/mboxdriver_cached.h
-include/libetpan/mboxdriver_cached_message.h
-include/libetpan/mboxdriver_message.h
-include/libetpan/mboxdriver_types.h
-include/libetpan/mboxstorage.h
-include/libetpan/mhdriver.h
-include/libetpan/mhdriver_cached.h
-include/libetpan/mhdriver_cached_message.h
-include/libetpan/mhdriver_message.h
-include/libetpan/mhdriver_types.h
-include/libetpan/mhstorage.h
-include/libetpan/mime_message_driver.h
-include/libetpan/mmapstring.h
-include/libetpan/newsnntp.h
-include/libetpan/newsnntp_socket.h
-include/libetpan/newsnntp_ssl.h
-include/libetpan/newsnntp_types.h
-include/libetpan/nntpdriver.h
-include/libetpan/nntpdriver_cached.h
-include/libetpan/nntpdriver_cached_message.h
-include/libetpan/nntpdriver_message.h
-include/libetpan/nntpdriver_types.h
-include/libetpan/nntpstorage.h
-include/libetpan/pop3driver.h
-include/libetpan/pop3driver_cached.h
-include/libetpan/pop3driver_cached_message.h
-include/libetpan/pop3driver_message.h
-include/libetpan/pop3driver_types.h
-include/libetpan/pop3storage.h
-include/libetpan/uidplus.h
-include/libetpan/uidplus_types.h
-lib/libetpan.la
-@dirrm include/libetpan
diff --git a/mail/libetpan/buildlink3.mk b/mail/libetpan/buildlink3.mk
deleted file mode 100644
index acc48c4d369..00000000000
--- a/mail/libetpan/buildlink3.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.12 2007/01/09 15:46:37 smb Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBETPAN_BUILDLINK3_MK:= ${LIBETPAN_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libetpan
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibetpan}
-BUILDLINK_PACKAGES+= libetpan
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libetpan
-
-.if !empty(LIBETPAN_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libetpan+= libetpan>=0.38nb1
-BUILDLINK_ABI_DEPENDS.libetpan?= libetpan>=0.43
-BUILDLINK_ABI_DEPENDS.libetpan?= libetpan>=0.48
-BUILDLINK_PKGSRCDIR.libetpan?= ../../mail/libetpan
-.endif # LIBETPAN_BUILDLINK3_MK
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/db4/buildlink3.mk"
-.include "../../security/cyrus-sasl/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/libetpan/distinfo b/mail/libetpan/distinfo
deleted file mode 100644
index 1f2365ba8c1..00000000000
--- a/mail/libetpan/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.6 2007/01/09 15:46:37 smb Exp $
-
-SHA1 (libetpan-0.48.tar.gz) = 1b18831d72671c37382f3e3186552707f35c0a5a
-RMD160 (libetpan-0.48.tar.gz) = bf7190d3235df21a344eaf5f79e38b31f681f12a
-Size (libetpan-0.48.tar.gz) = 1018656 bytes
-SHA1 (patch-aa) = e783adf544c9a63df584815ee4b033249cecf0ff
-SHA1 (patch-ab) = 969db9d52a419c9557e3faad7fe17be91d96ab25
diff --git a/mail/libetpan/patches/patch-aa b/mail/libetpan/patches/patch-aa
deleted file mode 100644
index 9ae6ce9190b..00000000000
--- a/mail/libetpan/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/03/08 06:33:32 wiz Exp $
-
---- libetpan-config.in.orig 2006-03-08 02:14:34.000000000 +0100
-+++ libetpan-config.in
-@@ -47,8 +47,8 @@ while test $# -gt 0; do
- echo $includedir
- ;;
- --libs)
-- libdir=-L@libdir@
-- echo $libdir -letpan@LIBSUFFIX@ @LDFLAGS@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
-+ libdir="-L@libdir@ @COMPILERFLAGS@@libdir@"
-+ echo $libdir -letpan@LIBSUFFIX@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
- ;;
- *)
- echo "${usage}" 1>&2
diff --git a/mail/libetpan/patches/patch-ab b/mail/libetpan/patches/patch-ab
deleted file mode 100644
index 0d6e47f215f..00000000000
--- a/mail/libetpan/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Makefile.in.orig 2006-06-26 21:50:25.000000000 +1000
-+++ src/Makefile.in 2006-09-07 00:04:29.000000000 +1000
-@@ -14,8 +14,8 @@
- TARGET = libetpan@LIBSUFFIX@.la
-
- VERSINFO = @API_VERSION@
--CC = @CC@
--LDFLAGS = @LDFLAGS@ @LIBS@ @SSLLIBS@ @LIBICONV@ @DBLIB@ @GNUTLSLIB@ @SASLLIBS@
-+#CC = @CC@
-+LDFLAGS = @LIBS@ @SSLLIBS@ @LDFLAGS@ @LIBICONV@ @DBLIB@ @GNUTLSLIB@ @SASLLIBS@
-
- SUBLIBS = data-types/libdata-types.la \
- low-level/liblow-level.la \
diff --git a/mail/libmilter/DESCR b/mail/libmilter/DESCR
deleted file mode 100644
index 9b02bc1d1b2..00000000000
--- a/mail/libmilter/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-The sendmail Mail Filter API (Milter) is designed to allow third-party
-programs access to mail messages as they are being processed in order to
-filter meta-information and content.
-
-libmilter provides the implementation of this API.
diff --git a/mail/libmilter/Makefile b/mail/libmilter/Makefile
deleted file mode 100644
index 61ab347cc9f..00000000000
--- a/mail/libmilter/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2004/10/28 06:36:51 cube Exp $
-
-.include "../../mail/sendmail/Makefile.common"
-
-PKGNAME= libmilter-${DIST_VERS}
-COMMENT= Mail filter support library for sendmail
-
-post-patch: make-sendmail-siteconfig
-
-do-build:
- @(cd ${WRKSRC}/libmilter; ${SETENV} ${MAKE_ENV} ./Build)
-
-do-install:
- @(cd ${WRKSRC}/libmilter; ${SETENV} ${MAKE_ENV} ./Build INCLUDEDIR=${PREFIX}/include LIBDIR=${PREFIX}/lib install)
-
-PTHREAD_OPTS+= require
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
-
-# has to be below include for bsd.pkg.mk, else substition fails
-OBJDIR!= ${ECHO} obj.`${UNAME} -srm | ${TR} \ .`
diff --git a/mail/libmilter/PLIST b/mail/libmilter/PLIST
deleted file mode 100644
index 6f47518e211..00000000000
--- a/mail/libmilter/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/23 13:03:31 markd Exp $
-include/libmilter/mfapi.h
-include/libmilter/mfdef.h
-lib/libmilter.a
-@dirrm include/libmilter
diff --git a/mail/libmilter/buildlink3.mk b/mail/libmilter/buildlink3.mk
deleted file mode 100644
index db32e366562..00000000000
--- a/mail/libmilter/buildlink3.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:57 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBMILTER_BUILDLINK3_MK:= ${LIBMILTER_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libmilter
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmilter}
-BUILDLINK_PACKAGES+= libmilter
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmilter
-
-.if !empty(LIBMILTER_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libmilter+= libmilter>=8.13.1
-BUILDLINK_PKGSRCDIR.libmilter?= ../../mail/libmilter
-BUILDLINK_DEPMETHOD.libmilter?= build
-
-PTHREAD_OPTS+= require
-.endif # LIBMILTER_BUILDLINK3_MK
-
-.include "../../mk/pthread.buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/libmilter/builtin.mk b/mail/libmilter/builtin.mk
deleted file mode 100644
index a7553209741..00000000000
--- a/mail/libmilter/builtin.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: builtin.mk,v 1.5 2006/04/06 06:22:18 reed Exp $
-
-BUILTIN_PKG:= libmilter
-
-BUILTIN_FIND_LIBS:= milter
-BUILTIN_FIND_FILES_VAR:= H_LIBMILTER
-BUILTIN_FIND_FILES.H_LIBMILTER= /usr/include/libmilter/mfapi.h
-
-.include "../../mk/buildlink3/bsd.builtin.mk"
-
-###
-### Determine if there is a built-in implementation of the package and
-### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
-###
-.if !defined(IS_BUILTIN.libmilter)
-IS_BUILTIN.libmilter= no
-. if empty(H_LIBMILTER:M__nonexistent__) && \
- empty(H_LIBMILTER:M${LOCALBASE}/*) && \
- !empty(BUILTIN_LIB_FOUND.milter:M[yY][eE][sS])
-IS_BUILTIN.libmilter= yes
-. endif
-.endif
-MAKEVARS+= IS_BUILTIN.libmilter
-
-###
-### Determine whether we should use the built-in implementation if it
-### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
-###
-.if !defined(USE_BUILTIN.libmilter)
-. if ${PREFER.libmilter} == "pkgsrc"
-USE_BUILTIN.libmilter= no
-. else
-USE_BUILTIN.libmilter= ${IS_BUILTIN.libmilter}
-. if defined(BUILTIN_PKG.libmilter) && \
- !empty(IS_BUILTIN.libmilter:M[yY][eE][sS])
-USE_BUILTIN.libmilter= yes
-. for _dep_ in ${BUILDLINK_API_DEPENDS.libmilter}
-. if !empty(USE_BUILTIN.libmilter:M[yY][eE][sS])
-USE_BUILTIN.libmilter!= \
- if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libmilter:Q}; then \
- ${ECHO} yes; \
- else \
- ${ECHO} no; \
- fi
-. endif
-. endfor
-. endif
-. endif # PREFER.libmilter
-.endif
-MAKEVARS+= USE_BUILTIN.libmilter
diff --git a/mail/libspf-alt/DESCR b/mail/libspf-alt/DESCR
deleted file mode 100644
index 41dbec1efed..00000000000
--- a/mail/libspf-alt/DESCR
+++ /dev/null
@@ -1,20 +0,0 @@
-Libspf-alt is an implementation of the SPF specification as found at
-http://www.ietf.org/internet-drafts/draft-mengwong-spf-00.txt
-or doc/draft-mengwong-spf-00.txt
-
-Libspf-alt is in beta testing and should only be used in production
-systems with caution. It has not been widely compiled and tested on
-machines with different operating systems, CPU architectures, or
-network configurations. It has not been audited for security errors.
-It is new code, and should be treated as such.
-
-While libspf-alt is beta code, a lot of effort has been put into
-making it secure by design, and a great deal of effort has been put
-into the regression tests. Functions such as sprintf() are never
-used, things like snprintf() are used instead. There are few fixed
-sized buffers/arrays, instead, most data structures are dynamically
-allocated with the allocation sized recorded so I can check to make
-sure the buffer isn't overflowed. The return values from malloc() and
-other system calls are checked and handled as gracefully as possible.
-The valgrind program is regularly run to make sure that there are no
-memory leaks and reads/writes to invalid memory.
diff --git a/mail/libspf-alt/Makefile b/mail/libspf-alt/Makefile
deleted file mode 100644
index 309fa2e6a58..00000000000
--- a/mail/libspf-alt/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2006/10/04 21:47:16 wiz Exp $
-
-DISTNAME= libspf_alt-0.4.0
-PKGREVISION= 3
-CATEGORIES= mail
-MASTER_SITES= http://libspf2.org/
-
-MAINTAINER= manu@NetBSD.org
-HOMEPAGE= http://libspf2.org/
-COMMENT= Sender Permitted Framework (SPF) library
-
-BUILDLINK_API_DEPENDS.bind+= bind>=9.2.3nb3
-
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+=--with-bind=${BUILDLINK_PREFIX.bind}
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../net/bind9/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/libspf-alt/PLIST b/mail/libspf-alt/PLIST
deleted file mode 100644
index 9c64a836480..00000000000
--- a/mail/libspf-alt/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:42 jlam Exp $
-bin/spfquery
-bin/spfquery_static
-bin/spftest
-bin/spftest_static
-bin/spfd
-bin/spfd_static
-bin/spf_example
-bin/spf_example_static
-bin/spf_example_2mx
-bin/spf_example_2mx_static
-include/spf_alt/spf.h
-include/spf_alt/spf_lib_version.h
-include/spf_alt/spf_dns.h
-include/spf_alt/spf_dns_cache.h
-include/spf_alt/spf_dns_null.h
-include/spf_alt/spf_dns_resolv.h
-include/spf_alt/spf_dns_test.h
-include/spf_alt/spf_dns_zone.h
-@dirrm include/spf_alt
-lib/libspf_alt.la
diff --git a/mail/libspf-alt/buildlink3.mk b/mail/libspf-alt/buildlink3.mk
deleted file mode 100644
index 53bc698e008..00000000000
--- a/mail/libspf-alt/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:57 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBSPF_ALT_BUILDLINK3_MK:= ${LIBSPF_ALT_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libspf_alt
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibspf_alt}
-BUILDLINK_PACKAGES+= libspf_alt
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libspf_alt
-
-.if !empty(LIBSPF_ALT_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libspf_alt+= libspf_alt>=0.4.0nb1
-BUILDLINK_ABI_DEPENDS.libspf_alt+= libspf_alt>=0.4.0nb3
-BUILDLINK_PKGSRCDIR.libspf_alt?= ../../mail/libspf-alt
-.endif # LIBSPF_ALT_BUILDLINK3_MK
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../net/bind9/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/libspf-alt/distinfo b/mail/libspf-alt/distinfo
deleted file mode 100644
index 9a5e945292d..00000000000
--- a/mail/libspf-alt/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:23 agc Exp $
-
-SHA1 (libspf_alt-0.4.0.tar.gz) = ba269d7508daebf42e9e20720f410c9409207558
-RMD160 (libspf_alt-0.4.0.tar.gz) = 67a789cfbc4df391fd6938e81ce90e3b24264615
-Size (libspf_alt-0.4.0.tar.gz) = 598003 bytes
diff --git a/mail/libsylph/DESCR b/mail/libsylph/DESCR
deleted file mode 100644
index ece2e2d91c1..00000000000
--- a/mail/libsylph/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-LibSylph is an e-mail client library which is derived from Sylpheed.
-LibSylph is a lightweight but featureful library. It has many common e-mail
-related features and other useful functions, and you can utilize them from
-your application. Moreover you can create a new e-mail client by wrapping
-LibSylph with any UI.
diff --git a/mail/libsylph/Makefile b/mail/libsylph/Makefile
deleted file mode 100644
index 1f1df638243..00000000000
--- a/mail/libsylph/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/12/06 16:30:48 joerg Exp $
-#
-
-DISTNAME= libsylph-0.3.0
-CATEGORIES= mail
-MASTER_SITES= http://sylpheed.sraoss.jp/sylpheed/libsylph/alpha/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= xtraeme@NetBSD.org
-HOMEPAGE= http://sylpheed.sraoss.jp/
-COMMENT= E-Mail client library
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-
-USE_TOOLS+= lex pkg-config msgfmt
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/libsylph/PLIST b/mail/libsylph/PLIST
deleted file mode 100644
index 7a9f932ae47..00000000000
--- a/mail/libsylph/PLIST
+++ /dev/null
@@ -1,70 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/10/13 12:38:30 xtraeme Exp $
-include/sylph/account.h
-include/sylph/base64.h
-include/sylph/codeconv.h
-include/sylph/compose.h
-include/sylph/customheader.h
-include/sylph/defs.h
-include/sylph/displayheader.h
-include/sylph/enums.h
-include/sylph/filter.h
-include/sylph/folder.h
-include/sylph/html.h
-include/sylph/imap.h
-include/sylph/mbox.h
-include/sylph/md5.h
-include/sylph/md5_hmac.h
-include/sylph/mh.h
-include/sylph/news.h
-include/sylph/nntp.h
-include/sylph/pop.h
-include/sylph/prefs.h
-include/sylph/prefs_account.h
-include/sylph/prefs_common.h
-include/sylph/procheader.h
-include/sylph/procmime.h
-include/sylph/procmsg.h
-include/sylph/quoted-printable.h
-include/sylph/recv.h
-include/sylph/session.h
-include/sylph/smtp.h
-include/sylph/socket.h
-include/sylph/ssl.h
-include/sylph/stringtable.h
-include/sylph/sylmain.h
-include/sylph/unmime.h
-include/sylph/utils.h
-include/sylph/uuencode.h
-include/sylph/virtual.h
-include/sylph/xml.h
-lib/libsylph.la
-share/locale/bg/LC_MESSAGES/libsylph.mo
-share/locale/cs/LC_MESSAGES/libsylph.mo
-share/locale/da/LC_MESSAGES/libsylph.mo
-share/locale/de/LC_MESSAGES/libsylph.mo
-share/locale/el/LC_MESSAGES/libsylph.mo
-share/locale/es/LC_MESSAGES/libsylph.mo
-share/locale/et/LC_MESSAGES/libsylph.mo
-share/locale/fr/LC_MESSAGES/libsylph.mo
-share/locale/gl/LC_MESSAGES/libsylph.mo
-share/locale/hr/LC_MESSAGES/libsylph.mo
-share/locale/hu/LC_MESSAGES/libsylph.mo
-share/locale/it/LC_MESSAGES/libsylph.mo
-share/locale/ja/LC_MESSAGES/libsylph.mo
-share/locale/ko/LC_MESSAGES/libsylph.mo
-share/locale/lt/LC_MESSAGES/libsylph.mo
-share/locale/nl/LC_MESSAGES/libsylph.mo
-share/locale/pl/LC_MESSAGES/libsylph.mo
-share/locale/pt_BR/LC_MESSAGES/libsylph.mo
-share/locale/ro/LC_MESSAGES/libsylph.mo
-share/locale/ru/LC_MESSAGES/libsylph.mo
-share/locale/sk/LC_MESSAGES/libsylph.mo
-share/locale/sl/LC_MESSAGES/libsylph.mo
-share/locale/sr/LC_MESSAGES/libsylph.mo
-share/locale/sv/LC_MESSAGES/libsylph.mo
-share/locale/tr/LC_MESSAGES/libsylph.mo
-share/locale/uk/LC_MESSAGES/libsylph.mo
-share/locale/vi/LC_MESSAGES/libsylph.mo
-share/locale/zh_CN/LC_MESSAGES/libsylph.mo
-share/locale/zh_TW/LC_MESSAGES/libsylph.mo
-@dirrm include/sylph
diff --git a/mail/libsylph/buildlink3.mk b/mail/libsylph/buildlink3.mk
deleted file mode 100644
index 3191a58ed8b..00000000000
--- a/mail/libsylph/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/10/13 12:38:30 xtraeme Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBSYLPH_BUILDLINK3_MK:= ${LIBSYLPH_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= libsylph
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsylph}
-BUILDLINK_PACKAGES+= libsylph
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsylph
-
-.if ${LIBSYLPH_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libsylph+= libsylph>=0.3.0
-BUILDLINK_PKGSRCDIR.libsylph?= ../../mail/libsylph
-.endif # LIBSYLPH_BUILDLINK3_MK
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/libsylph/distinfo b/mail/libsylph/distinfo
deleted file mode 100644
index 845dfd67181..00000000000
--- a/mail/libsylph/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/10/13 12:38:30 xtraeme Exp $
-
-SHA1 (libsylph-0.3.0.tar.bz2) = 1f9eedeb8abf4a974cf54dcc29ca51965e31d291
-RMD160 (libsylph-0.3.0.tar.bz2) = cedf54c42ed571202a5900ada5ad3ee130cd03dd
-Size (libsylph-0.3.0.tar.bz2) = 1021084 bytes
diff --git a/mail/mail-notification/DESCR b/mail/mail-notification/DESCR
deleted file mode 100644
index 49b19a1863d..00000000000
--- a/mail/mail-notification/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-Mail Notification is a status icon (aka tray icon) that informs you if
-you have new mail.
-
-It works with system trays implementing the freedesktop.org System Tray
-Specification, such as the GNOME Panel Notification Area, the Xfce
-Notification Area and the KDE System Tray.
-
-Mail Notification features include:
-
-* Multiple mailbox support.
-* Mbox, MH, Maildir, Sylpheed, POP3, IMAP and Gmail support.
-* SASL authentication support.
-* APOP authentication support.
-* SSL/TLS support.
-* Automatic detection of mailbox format.
-* Immediate notification (the status icon is updated within seconds after
- a mailbox changes).
-* HIG 2.0 compliance.
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
deleted file mode 100644
index f07c5e3e7ea..00000000000
--- a/mail/mail-notification/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# $NetBSD: Makefile,v 1.32 2007/03/21 12:05:48 wiz Exp $
-#
-
-DISTNAME= mail-notification-3.0
-PKGREVISION= 2
-CATEGORIES= mail gnome
-MASTER_SITES= http://savannah.nongnu.org/download/mailnotify/
-
-MAINTAINER= gdt@NetBSD.org
-HOMEPAGE= http://www.nongnu.org/mailnotify/
-COMMENT= Status icon that provides new mail notifications
-
-GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake intltool msgfmt pkg-config
-USE_PKGLOCALEDIR= YES
-
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-
-GCONF2_SCHEMAS= mail-notification.schemas
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.mail-notification
-PKG_SUPPORTED_OPTIONS= inet6 sasl ssl
-PKG_SUGGESTED_OPTIONS= ssl
-
-.include "../../mk/bsd.options.mk"
-
-# Whether to add IPv6 support.
-.if empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
-# Whether to add SASL2 support.
-.if !empty(PKG_OPTIONS:Msasl)
-. include "../../security/cyrus-sasl/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-sasl
-.endif
-
-# Whether to add SSL support.
-.if !empty(PKG_OPTIONS:Mssl)
-. include "../../security/openssl/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-ssl
-.endif
-
-.include "../../devel/eel2/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../mail/gmime/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mail-notification/PLIST b/mail/mail-notification/PLIST
deleted file mode 100644
index f2557dddf5e..00000000000
--- a/mail/mail-notification/PLIST
+++ /dev/null
@@ -1,45 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2006/09/05 00:55:32 gdt Exp $
-bin/mail-notification
-lib/bonobo/servers/GNOME_MailNotification.server
-share/applications/mail-notification-properties.desktop
-share/applications/mail-notification.desktop
-share/gconf/schemas/mail-notification.schemas
-share/gnome/help/mail-notification/C/documentation-license.xml
-share/gnome/help/mail-notification/C/figures/mail.png
-share/gnome/help/mail-notification/C/figures/mailbox-emblem-error.png
-share/gnome/help/mail-notification/C/figures/mailbox-emblem-polled.png
-share/gnome/help/mail-notification/C/figures/mailbox-emblem-unknown.png
-share/gnome/help/mail-notification/C/mail-notification.xml
-share/gnome/help/mail-notification/C/software-license.xml
-share/locale/bg/LC_MESSAGES/mail-notification.mo
-share/locale/cs/LC_MESSAGES/mail-notification.mo
-share/locale/de/LC_MESSAGES/mail-notification.mo
-share/locale/fr/LC_MESSAGES/mail-notification.mo
-share/locale/ja/LC_MESSAGES/mail-notification.mo
-share/locale/nl/LC_MESSAGES/mail-notification.mo
-share/locale/pl/LC_MESSAGES/mail-notification.mo
-share/locale/pt/LC_MESSAGES/mail-notification.mo
-share/locale/pt_BR/LC_MESSAGES/mail-notification.mo
-share/locale/ru/LC_MESSAGES/mail-notification.mo
-share/locale/sr/LC_MESSAGES/mail-notification.mo
-share/locale/sr@Latn/LC_MESSAGES/mail-notification.mo
-share/locale/sv/LC_MESSAGES/mail-notification.mo
-share/mail-notification/ui/gmail.png
-share/mail-notification/ui/logo.png
-share/mail-notification/ui/mail-summary-popup.glade
-share/mail-notification/ui/mailbox-properties-dialog.glade
-share/mail-notification/ui/properties-dialog.glade
-share/omf/mail-notification/mail-notification-C.omf
-share/pixmaps/mail-notification.png
-@comment in xdg-dirs: @dirrm share/pixmaps
-@dirrm share/omf/mail-notification
-@comment in scrollkeeper: @dirrm share/omf
-@dirrm share/mail-notification/ui
-@dirrm share/mail-notification
-@dirrm share/gnome/help/mail-notification/C/figures
-@dirrm share/gnome/help/mail-notification/C
-@dirrm share/gnome/help/mail-notification
-@comment in gnome2-dirs: @dirrm share/gnome/help
-@comment in GConf2: @dirrm share/gconf/schemas
-@comment in xdg-dirs: @dirrm share/applications
-@comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/mail/mail-notification/distinfo b/mail/mail-notification/distinfo
deleted file mode 100644
index 68ec603e984..00000000000
--- a/mail/mail-notification/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.7 2006/09/05 00:55:32 gdt Exp $
-
-SHA1 (mail-notification-3.0.tar.gz) = efa84676134338d379df511a53044082ae296c6e
-RMD160 (mail-notification-3.0.tar.gz) = 6269a842458b525782595efdbd4a7f05fb77432b
-Size (mail-notification-3.0.tar.gz) = 914814 bytes
-SHA1 (patch-ad) = 9698b4e6551fcacd3fe4dea5a1227eb3b4c50f0c
-SHA1 (patch-ae) = f6b6eddb8739b77a9e9932a1d1cf77830268de08
-SHA1 (patch-af) = 29d4281671ef64d99e9367464137d50ebb9daee7
diff --git a/mail/mail-notification/patches/patch-ad b/mail/mail-notification/patches/patch-ad
deleted file mode 100644
index 6d523dd1811..00000000000
--- a/mail/mail-notification/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/08/03 00:39:24 rillig Exp $
-
-This is needed so that the preprocessor macros can be queried in
-mn-md5.h.
-
---- src/mn-md5.c.orig 2006-08-01 11:13:36.000000000 +0200
-+++ src/mn-md5.c 2006-08-01 11:13:47.255953537 +0200
-@@ -26,6 +26,8 @@
- * edited for clarity and style only.
- */
-
-+#include <config.h>
-+
- #include <sys/types.h>
- #include <string.h>
- #include <glib.h>
diff --git a/mail/mail-notification/patches/patch-ae b/mail/mail-notification/patches/patch-ae
deleted file mode 100644
index 6ae7695228b..00000000000
--- a/mail/mail-notification/patches/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/08/03 00:39:24 rillig Exp $
-
-Solaris 8 has <inttypes.h>, but not u_int32_t.
-
---- src/mn-md5.h.orig 2005-06-11 01:19:32.000000000 +0200
-+++ src/mn-md5.h 2006-08-01 11:18:34.558138839 +0200
-@@ -29,6 +29,12 @@
- #ifndef _MN_MD5_H
- #define _MN_MD5_H
-
-+#ifdef HAVE_INTTYPES_H
-+# include <inttypes.h>
-+# if defined(__sun) && !defined(u_int32_t)
-+# define u_int32_t uint32_t
-+# endif
-+#endif
- #include <sys/types.h>
-
- typedef struct
diff --git a/mail/mail-notification/patches/patch-af b/mail/mail-notification/patches/patch-af
deleted file mode 100644
index 7bc2cd15895..00000000000
--- a/mail/mail-notification/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/09/05 01:11:04 gdt Exp $
-
---- data/Makefile.in.orig 2006-06-14 03:46:13.000000000 -0400
-+++ data/Makefile.in
-@@ -282,7 +282,7 @@ target_vendor = @target_vendor@
- # gnome_cappletdir is defined by configure
- gnome_capplet_in_files = mail-notification-properties.desktop.in
- gnome_capplet_DATA = mail-notification-properties.desktop
--autostartdir = $(sysconfdir)/xdg/autostart
-+autostartdir = $(prefix)/share/applications
- autostart_in_files = mail-notification.desktop.in
- autostart_DATA = mail-notification.desktop
- serverdir = $(libdir)/bonobo/servers
diff --git a/mail/mailagent/DESCR b/mail/mailagent/DESCR
deleted file mode 100644
index 6e9cf2f4924..00000000000
--- a/mail/mailagent/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-Mailagent allows you to process your mail automatically. Given a set
-of lex-like rules, you are able to fill mails to specific folders,
-forward messages to a third person, pipe a message to a command or
-even post the message to a newsgroup. It is also possible to process
-messages containing some commands. The mailagent is not usually
-invoked manually but is rather called via the filter program, which is
-in turn invoked by sendmail.
-
-Most portion of this package is written in Perl and version 5.01M or
-higher is known to work nicely.
-
-You are advised to setup the path variable in your mailagent configuration
-to include the directory containing perl5 before /usr/bin to avoid getting
-a lot of warning message although they are harmless.
-
-See the man page for the detailed information.
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
deleted file mode 100644
index 38dd5b83240..00000000000
--- a/mail/mailagent/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2007/03/01 18:04:48 wiz Exp $
-
-DISTNAME= mailagent-3.0.73
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/by-module/by-authors\/id\/RAM/g}
-
-MAINTAINER= itojun@itojun.org
-COMMENT= Sophisticated automatic mail-processing tool
-
-USE_TOOLS+= perl:run
-
-NO_PACKAGE= Correct FQDN needs to be hardcoded
-INTERACTIVE_STAGE= configure
-
-HAS_CONFIGURE= yes
-CONFIGURE_SCRIPT= ./Configure
-CONFIGURE_ARGS+= -dres
-CONFIGURE_ARGS+= -Dperlpath=${PERL5:Q}
-CONFIGURE_ARGS+= -Dutmp='/var/run/utmp'
-CONFIGURE_ARGS+= -Dprefix=${PREFIX:Q}
-CONFIGURE_ARGS+= -Dmansrc=${PREFIX:Q}/man/man1
-CONFIGURE_ARGS+= -Dnotifypatches='false'
-MAKE_ENV+= PATH=`${DIRNAME} ${PERL5}`:${PATH:Q}
-INSTALL_TARGET= install install.man
-
-MAILAGENT_DOMAIN?= example.com
-MAILAGENT_EMAIL?= testuser@example.com
-MAILAGENT_FQDN?= test.example.com
-MAILAGENT_ORGANIZATION?= Example Company
-
-BUILD_DEFS+= MAILAGENT_DOMAIN MAILAGENT_EMAIL MAILAGENT_FQDN MAILAGENT_ORGANIZATION
-
-CF= ${WRKSRC}/config.sh
-
-pre-extract:
- if [ `${SH} -c umask` != 0022 ]; then \
- ${ECHO} "Please set umask to 022 before running make,"; \
- ${ECHO} "or mailagent will not build successfully."; \
- ${FALSE}; fi
- if [ `${ID} -u` = 0 ]; then \
- ${ECHO} "Do not build mailagent as root or it won't pass the sanity tests."; \
- ${FALSE}; fi
-
-pre-configure:
- ${ECHO} "#!/bin/sh" > ${CF}
- ${ECHO} "cf_email='${MAILAGENT_EMAIL}'" >> ${CF}
- ${ECHO} "d_flockonly='define'" >> ${CF}
- if [ `${ECHO} ${MAILAGENT_DOMAIN} | tr A-Z a-z` = `${ECHO} ${MAILAGENT_FQDN} | tr A-Z a-z` ]; then \
- ${ECHO} "d_hidnet='undef'" >> ${CF}; \
- ${ECHO} "hiddennet=''" >> ${CF}; \
- else \
- ${ECHO} "d_hidnet='define'" >> ${CF}; \
- ${ECHO} "hiddennet='${MAILAGENT_DOMAIN}'" >> ${CF}; \
- fi
- ${ECHO} "orgname='${MAILAGENT_ORGANIZATION}'" >> ${CF}
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mailagent
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mailagent/misc
- ${CP} -pR ${WRKSRC}/misc/* ${PREFIX}/share/examples/mailagent/misc
- ${LN} -fs ${PREFIX}/lib/mailagent/examples \
- ${PREFIX}/share/examples/mailagent/agent
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailagent/PLIST b/mail/mailagent/PLIST
deleted file mode 100644
index 6627f23788e..00000000000
--- a/mail/mailagent/PLIST
+++ /dev/null
@@ -1,93 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:20 zuntum Exp $
-bin/mailpatch
-bin/mailhelp
-bin/maillist
-bin/maildist
-bin/package
-bin/edusers
-bin/mailagent
-lib/mailagent/filter
-lib/mailagent/agenthelp
-lib/mailagent/commands
-lib/mailagent/distribs
-lib/mailagent/filter.sh
-lib/mailagent/mailagent.cf
-lib/mailagent/proglist
-lib/mailagent/chkagent.sh
-lib/mailagent/setup.cf
-lib/mailagent/compressors
-lib/mailagent/help/addauth
-lib/mailagent/help/approve
-lib/mailagent/help/delpower
-lib/mailagent/help/end
-lib/mailagent/help/getauth
-lib/mailagent/help/help
-lib/mailagent/help/newpower
-lib/mailagent/help/passwd
-lib/mailagent/help/password
-lib/mailagent/help/power
-lib/mailagent/help/release
-lib/mailagent/help/remauth
-lib/mailagent/help/set
-lib/mailagent/help/setauth
-lib/mailagent/help/user
-man/man1/mailhelp.1
-lib/mailagent/examples/README
-lib/mailagent/examples/daemon
-lib/mailagent/examples/mailfolders
-lib/mailagent/examples/mchk
-lib/mailagent/examples/mhinc
-lib/mailagent/examples/nocmds
-lib/mailagent/examples/profile
-lib/mailagent/examples/rules
-lib/mailagent/examples/vacation
-share/examples/mailagent/misc/README
-share/examples/mailagent/misc/fakesend/README
-share/examples/mailagent/misc/fakesend/fakesend.pl
-share/examples/mailagent/misc/fakesend/freplcomps
-share/examples/mailagent/misc/fakesend/mh_profile
-share/examples/mailagent/misc/getcost/README
-share/examples/mailagent/misc/getcost/getcost
-share/examples/mailagent/misc/getcost/rules
-share/examples/mailagent/misc/getcost/spamconfig
-share/examples/mailagent/misc/mime/README
-share/examples/mailagent/misc/mime/rules
-share/examples/mailagent/misc/mime/unmime
-share/examples/mailagent/misc/news/README
-share/examples/mailagent/misc/news/ml.map
-share/examples/mailagent/misc/news/newsgate
-share/examples/mailagent/misc/news/rules
-share/examples/mailagent/misc/pbounce/README
-share/examples/mailagent/misc/pbounce/mailagent.cf
-share/examples/mailagent/misc/pbounce/newcmd.cf
-share/examples/mailagent/misc/pbounce/patbounce.pl
-share/examples/mailagent/misc/pbounce/rules
-share/examples/mailagent/misc/shell/README
-share/examples/mailagent/misc/shell/server.cf
-share/examples/mailagent/misc/shell/shell
-share/examples/mailagent/misc/unkit/README
-share/examples/mailagent/misc/unkit/kitok.msg
-share/examples/mailagent/misc/unkit/mailagent.cf
-share/examples/mailagent/misc/unkit/newcmd.cf
-share/examples/mailagent/misc/unkit/rules
-share/examples/mailagent/misc/unkit/unkit.pl
-@exec /bin/ln -sf %D/lib/mailagent/examples %D/share/examples/mailagent/agent
-@unexec /bin/rm -f %D/share/examples/mailagent/agent
-@dirrm share/examples/mailagent/misc/unkit
-@dirrm share/examples/mailagent/misc/shell
-@dirrm share/examples/mailagent/misc/pbounce
-@dirrm share/examples/mailagent/misc/news
-@dirrm share/examples/mailagent/misc/mime
-@dirrm share/examples/mailagent/misc/getcost
-@dirrm share/examples/mailagent/misc/fakesend
-@dirrm share/examples/mailagent/misc
-@dirrm share/examples/mailagent
-@dirrm lib/mailagent/examples
-@dirrm lib/mailagent/help
-@dirrm lib/mailagent
-man/man1/edusers.1
-man/man1/mailagent.1
-man/man1/maildist.1
-man/man1/maillist.1
-man/man1/mailpatch.1
-man/man1/package.1
diff --git a/mail/mailagent/distinfo b/mail/mailagent/distinfo
deleted file mode 100644
index 98186d9dc49..00000000000
--- a/mail/mailagent/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:23 agc Exp $
-
-SHA1 (mailagent-3.0.73.tar.gz) = c8a0329d79c98cb25bb53c79f06fcd63df58c418
-RMD160 (mailagent-3.0.73.tar.gz) = 70b2804fdd0602a20cb5a9f3391d460f47972570
-Size (mailagent-3.0.73.tar.gz) = 533579 bytes
-SHA1 (patch-aa) = 83e2e7725f2f69fd5174c708d3e146f2a1db34e4
-SHA1 (patch-ac) = eb44cf215dd18fc6ea1179ef05251a1eb0d0cbf5
-SHA1 (patch-ag) = 2b7a56038d697f70f6aff2bd3538609a649f389d
-SHA1 (patch-ah) = 3c147f73ed410fe810b303da0be53d53f3ee5aa5
-SHA1 (patch-ai) = 5567148613abb872caff6b9869a4593f2ebdd5ec
-SHA1 (patch-aj) = cf12ed5cbc336c365cffde62476fe7c19e348766
-SHA1 (patch-ak) = b5f64263fda76827a1ed68b16f48f8970de3dd19
-SHA1 (patch-al) = db3f6453b5bc324587b967109dcc0e971ae51ac2
-SHA1 (patch-am) = e3857d6b364a3a22b9e82abb2c30297010a48a57
diff --git a/mail/mailagent/patches/patch-aa b/mail/mailagent/patches/patch-aa
deleted file mode 100644
index 9b8a901c694..00000000000
--- a/mail/mailagent/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2001/04/08 00:24:56 itojun Exp $
-
---- agent/filter/logfile.c.orig Sun Mar 18 03:31:21 2001
-+++ agent/filter/logfile.c Sun Apr 8 09:10:12 2001
-@@ -71,6 +71,9 @@
- #include <sys/fcntl.h> /* Try this one in last resort */
- #endif
- #endif
-+#ifdef I_SYS_PARAM
-+# include <sys/param.h>
-+#endif
-
- #include "confmagic.h"
-
diff --git a/mail/mailagent/patches/patch-ac b/mail/mailagent/patches/patch-ac
deleted file mode 100644
index 466601d646a..00000000000
--- a/mail/mailagent/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/04/08 00:24:56 itojun Exp $
-
---- agent/filter/io.c.orig Sun Mar 18 03:31:20 2001
-+++ agent/filter/io.c Sun Apr 8 09:11:37 2001
-@@ -130,6 +130,9 @@
- #ifdef I_SYS_IOCTL
- #include <sys/ioctl.h>
- #endif
-+#ifdef I_SYS_PARAM
-+#include <sys/param.h>
-+#endif
-
- /*
- * The following should be defined in <sys/stat.h>.
-@@ -724,7 +727,7 @@
- */
-
- char **envp; /* Environment pointer */
--#ifdef UNION_WAIT
-+#if defined(UNION_WAIT) && (!defined(BSD) || BSD < 199306)
- union wait status; /* Waiting status */
- #else
- int status; /* Status from command */
diff --git a/mail/mailagent/patches/patch-ag b/mail/mailagent/patches/patch-ag
deleted file mode 100644
index 132c900fca9..00000000000
--- a/mail/mailagent/patches/patch-ag
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ag,v 1.2 1999/12/26 17:35:43 itojun Exp $
-
-*** agent/edusers.SH.orig Thu Aug 10 15:34:55 1995
---- agent/edusers.SH Thu Jul 25 19:55:26 1996
-***************
-*** 17,22 ****
- echo "Extracting agent/edusers (with variable substitutions)"
- $spitshell >edusers <<!GROK!THIS!
- $startperl
-! eval "exec perl -S \$0 \$*"
- if \$running_under_some_shell;
-
---- 17,22 ----
- echo "Extracting agent/edusers (with variable substitutions)"
- $spitshell >edusers <<!GROK!THIS!
- $startperl
-! eval "exec $perlpath -S \$0 \$*"
- if \$running_under_some_shell;
-
diff --git a/mail/mailagent/patches/patch-ah b/mail/mailagent/patches/patch-ah
deleted file mode 100644
index 42f23c066f7..00000000000
--- a/mail/mailagent/patches/patch-ah
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ah,v 1.2 1999/12/26 17:35:43 itojun Exp $
-
-*** agent/maildist.SH.orig Wed Mar 22 05:51:25 1995
---- agent/maildist.SH Thu Jul 25 19:53:05 1996
-***************
-*** 17,22 ****
- echo "Extracting agent/maildist (with variable substitutions)"
- $spitshell >maildist <<!GROK!THIS!
- $startperl
-! eval "exec perl -S \$0 \$*"
- if \$running_under_some_shell;
-
---- 17,22 ----
- echo "Extracting agent/maildist (with variable substitutions)"
- $spitshell >maildist <<!GROK!THIS!
- $startperl
-! eval "exec $perlpath -S \$0 \$*"
- if \$running_under_some_shell;
-
diff --git a/mail/mailagent/patches/patch-ai b/mail/mailagent/patches/patch-ai
deleted file mode 100644
index ddf11ba1dbd..00000000000
--- a/mail/mailagent/patches/patch-ai
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ai,v 1.2 1999/12/26 17:35:43 itojun Exp $
-
-*** agent/mailhelp.SH.orig Wed Mar 22 05:51:24 1995
---- agent/mailhelp.SH Thu Jul 25 19:56:16 1996
-***************
-*** 17,22 ****
- echo "Extracting agent/mailhelp (with variable substitutions)"
- $spitshell >mailhelp <<!GROK!THIS!
- $startperl
-! eval "exec perl -S \$0 \$*"
- if \$running_under_some_shell;
-
---- 17,22 ----
- echo "Extracting agent/mailhelp (with variable substitutions)"
- $spitshell >mailhelp <<!GROK!THIS!
- $startperl
-! eval "exec $perlpath -S \$0 \$*"
- if \$running_under_some_shell;
-
diff --git a/mail/mailagent/patches/patch-aj b/mail/mailagent/patches/patch-aj
deleted file mode 100644
index 9effa3bf724..00000000000
--- a/mail/mailagent/patches/patch-aj
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aj,v 1.2 1999/12/26 17:35:43 itojun Exp $
-
-*** agent/maillist.SH.orig Thu Aug 10 15:38:06 1995
---- agent/maillist.SH Thu Jul 25 19:54:00 1996
-***************
-*** 17,22 ****
- echo "Extracting agent/maillist (with variable substitutions)"
- $spitshell >maillist <<!GROK!THIS!
- $startperl
-! eval "exec perl -S \$0 \$*"
- if \$running_under_some_shell;
-
---- 17,22 ----
- echo "Extracting agent/maillist (with variable substitutions)"
- $spitshell >maillist <<!GROK!THIS!
- $startperl
-! eval "exec $perlpath -S \$0 \$*"
- if \$running_under_some_shell;
-
diff --git a/mail/mailagent/patches/patch-ak b/mail/mailagent/patches/patch-ak
deleted file mode 100644
index 86395d79955..00000000000
--- a/mail/mailagent/patches/patch-ak
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ak,v 1.2 1999/12/26 17:35:43 itojun Exp $
-
-*** agent/mailpatch.SH.orig Wed Mar 22 05:51:24 1995
---- agent/mailpatch.SH Thu Jul 25 19:56:34 1996
-***************
-*** 17,22 ****
- echo "Extracting agent/mailpatch (with variable substitutions)"
- $spitshell >mailpatch <<!GROK!THIS!
- $startperl
-! eval "exec perl -S \$0 \$*"
- if \$running_under_some_shell;
-
---- 17,22 ----
- echo "Extracting agent/mailpatch (with variable substitutions)"
- $spitshell >mailpatch <<!GROK!THIS!
- $startperl
-! eval "exec $perlpath -S \$0 \$*"
- if \$running_under_some_shell;
-
diff --git a/mail/mailagent/patches/patch-al b/mail/mailagent/patches/patch-al
deleted file mode 100644
index ec7027d9480..00000000000
--- a/mail/mailagent/patches/patch-al
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-al,v 1.2 1999/12/26 17:35:43 itojun Exp $
-
-*** agent/package.SH.orig Thu Aug 10 15:34:35 1995
---- agent/package.SH Thu Jul 25 19:54:42 1996
-***************
-*** 17,22 ****
- echo "Extracting agent/package (with variable substitutions)"
- $spitshell >package <<!GROK!THIS!
- $startperl
-! eval "exec perl -S \$0 \$*"
- if \$running_under_some_shell;
-
---- 17,22 ----
- echo "Extracting agent/package (with variable substitutions)"
- $spitshell >package <<!GROK!THIS!
- $startperl
-! eval "exec $perlpath -S \$0 \$*"
- if \$running_under_some_shell;
-
diff --git a/mail/mailagent/patches/patch-am b/mail/mailagent/patches/patch-am
deleted file mode 100644
index 0e1e77b3169..00000000000
--- a/mail/mailagent/patches/patch-am
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-am,v 1.2 1999/12/26 17:35:43 itojun Exp $
-
-*** agent/magent.sh.orig Sat Sep 16 09:05:29 1995
---- agent/magent.sh Thu Jul 25 19:58:11 1996
-***************
-*** 17,23 ****
- echo "Extracting agent/magent (with variable substitutions)"
- $spitshell >magent <<!GROK!THIS!
- $startperl
-! eval 'exec perl -S \$0 "\$@"'
- if \$running_under_some_shell;
-
- # You'll need to set up a .forward file that feeds your mail to this script,
---- 17,23 ----
- echo "Extracting agent/magent (with variable substitutions)"
- $spitshell >magent <<!GROK!THIS!
- $startperl
-! eval 'exec $perlpath -S \$0 "\$@"'
- if \$running_under_some_shell;
-
- # You'll need to set up a .forward file that feeds your mail to this script,
diff --git a/mail/mailcrypt/DESCR b/mail/mailcrypt/DESCR
deleted file mode 100644
index f9595fe2695..00000000000
--- a/mail/mailcrypt/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-Mailcrypt is an Emacs Lisp package which provides a simple interface
-to public key cryptography with PGP. Mailcrypt makes strong
-cryptography a fully integrated part of your normal mail and news
-handling environment, and is an important part of a balanced
-breakfast.
-
-Features :
-
- * An interface to the usual PGP functions, including encryption,
- decryption, signature creation, signature verification, key
- addition, and key extraction
- * A passphrase cache with configurable timeout
- * Support for multiple secret keys
- * A flexible interface to anonymous remailers, including Mixmaster
- support
- * An automagic interface to the PGP public key servers through HTTP
diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
deleted file mode 100644
index 4637a8f91df..00000000000
--- a/mail/mailcrypt/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2006/04/05 16:41:34 jlam Exp $
-
-DISTNAME= mailcrypt-3.5.8
-PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION= 1
-CATEGORIES= mail security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mailcrypt/}
-
-MAINTAINER= sommerfeld@NetBSD.org
-HOMEPAGE= http://mailcrypt.sourceforge.net/
-COMMENT= Emacs frontend for PGP and GPG
-
-# What we would like to say here is: "we want GNU emacs"
-EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20
-
-GNU_CONFIGURE= yes
-MAKE_FLAGS+= lispdir=${EMACS_LISPPREFIX:Q}
-INFO_FILES= # PLIST
-
-.include "../../mk/emacs.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailcrypt/PLIST b/mail/mailcrypt/PLIST
deleted file mode 100644
index 29524e34af9..00000000000
--- a/mail/mailcrypt/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2006/04/05 16:41:34 jlam Exp $
-${EMACS_INFOPREFIX}/mailcrypt.info
-${EMACS_LISPPREFIX}/expect.el
-${EMACS_LISPPREFIX}/expect.elc
-${EMACS_LISPPREFIX}/mailcrypt.el
-${EMACS_LISPPREFIX}/mailcrypt.elc
-${EMACS_LISPPREFIX}/mc-gpg.el
-${EMACS_LISPPREFIX}/mc-gpg.elc
-${EMACS_LISPPREFIX}/mc-pgp.el
-${EMACS_LISPPREFIX}/mc-pgp.elc
-${EMACS_LISPPREFIX}/mc-pgp5.el
-${EMACS_LISPPREFIX}/mc-pgp5.elc
-${EMACS_LISPPREFIX}/mc-remail.el
-${EMACS_LISPPREFIX}/mc-remail.elc
-${EMACS_LISPPREFIX}/mc-setversion.el
-${EMACS_LISPPREFIX}/mc-setversion.elc
-${EMACS_LISPPREFIX}/mc-toplev.el
-${EMACS_LISPPREFIX}/mc-toplev.elc
diff --git a/mail/mailcrypt/distinfo b/mail/mailcrypt/distinfo
deleted file mode 100644
index 8d46aff00fc..00000000000
--- a/mail/mailcrypt/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:59:24 agc Exp $
-
-SHA1 (mailcrypt-3.5.8.tar.gz) = 5c107c74150113bdb9ddd76dccf1ad62eec3c296
-RMD160 (mailcrypt-3.5.8.tar.gz) = 95b6d90f0747d970407cf8ad7d6ba613fab7b4bd
-Size (mailcrypt-3.5.8.tar.gz) = 213415 bytes
-SHA1 (patch-aa) = 6b44ca1ad6c13df2a85602c360f07fd741a2a3bd
diff --git a/mail/maildrop/DESCR b/mail/maildrop/DESCR
deleted file mode 100644
index 4adaab173cd..00000000000
--- a/mail/maildrop/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-Maildrop is a replacement for your local mail delivery agent. maildrop
-reads a mail message from standard input, then delivers the message to your
-mailbox. maildrop knows how to deliver mail to mbox-style mailboxes, and
-maildirs. "maildir" is a mailbox format used by the Qmail MTA.
-
-Maildrop will optionally read instructions from a file, which describes
-how to filter incoming mail. Instructions can be provided having mail
-delivered to alternate mailboxes, or forwarded somewhere else. Unlike
-procmail, maildrop uses a structured filtering language.
-
-This package differs from a vanilla Maildrop installation in that the
-files are installed at locations that more closely correspond to a
-Courier installation.
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
deleted file mode 100644
index b622fc7d8de..00000000000
--- a/mail/maildrop/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# $NetBSD: Makefile,v 1.39 2007/02/22 19:26:41 wiz Exp $
-
-DISTNAME= maildrop-2.0.2
-CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= jlam@pkgsrc.org
-COMMENT= Courier mail delivery agent with filtering abilities
-HOMEPAGE= http://www.courier-mta.org/maildrop/
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-DEPENDS+= courier-maildir>=0.53.1:../../mail/courier-maildir
-
-USE_TOOLS+= gmake perl
-USE_LANGUAGES= c c++
-
-PKG_SUPPORTED_OPTIONS= authlib
-PKG_SUGGESTED_OPTIONS= authlib
-
-# PKGNAME is a parameter to the following file.
-PKGNAME= ${DISTNAME}
-.include "../../mail/courier-mta/Makefile.common"
-
-# These are the users that may invoke maildrop with the "-d user"
-# argument (mailbox delivery mode).
-#
-MAILDROP_TRUSTED_USERS?= ${ROOT_USER} ${COURIER_USER} qmaild
-
-CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --enable-maildirquota
-CONFIGURE_ARGS+= --enable-maildrop-uid=${ROOT_USER:Q}
-CONFIGURE_ARGS+= --enable-maildrop-gid=${COURIER_GROUP:Q}
-CONFIGURE_ARGS+= --enable-trusted-users=${MAILDROP_TRUSTED_USERS:Q}
-CONFIGURE_ARGS+= --enable-trusted-groups=${COURIER_GROUP:Q}
-CONFIGURE_ARGS+= --enable-syslog=1
-
-.if !empty(PKG_OPTIONS:Mauthlib)
-CONFIGURE_ARGS+= --enable-authlib
-. include "../../security/courier-authlib/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-authlib
-.endif
-
-REQD_DIRS= ${DOCDIR}
-SPECIAL_PERMS= bin/lockmail ${REAL_ROOT_USER} ${COURIER_GROUP} 755
-SPECIAL_PERMS+= bin/maildrop ${REAL_ROOT_USER} ${COURIER_GROUP} 4755
-
-.include "../../devel/sysexits/buildlink3.mk"
-
-INSTALLATION_DIRS= ${DOCDIR}/maildrop
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/README.postfix ${DESTDIR}${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/maildrop/maildroptips.html ${DESTDIR}${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/maildrop/README.html ${DESTDIR}${DOCDIR}/maildrop
- ${INSTALL_DATA} ${WRKSRC}/maildrop/makedat.html ${DESTDIR}${DOCDIR}
- ${INSTALL_MAN} ${WRKSRC}/maildrop/makedat.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/maildrop/PLIST b/mail/maildrop/PLIST
deleted file mode 100644
index c87d20b0c2a..00000000000
--- a/mail/maildrop/PLIST
+++ /dev/null
@@ -1,34 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/28 18:14:06 jlam Exp $
-bin/lockmail
-bin/mailbot
-bin/maildrop
-bin/makemime
-bin/reformail
-bin/reformime
-man/man1/lockmail.1
-man/man1/mailbot.1
-man/man1/maildrop.1
-man/man1/makedat.1
-man/man1/makemime.1
-man/man1/reformail.1
-man/man1/reformime.1
-man/man7/maildropex.7
-man/man7/maildropfilter.7
-man/man7/maildropgdbm.7
-share/doc/courier/README.postfix
-share/doc/courier/lockmail.html
-share/doc/courier/mailbot.html
-share/doc/courier/maildrop.html
-share/doc/courier/maildrop/README.html
-share/doc/courier/maildropex.html
-share/doc/courier/maildropfilter.html
-share/doc/courier/maildropgdbm.html
-share/doc/courier/maildroptips.html
-share/doc/courier/makedat.html
-share/doc/courier/makemime.html
-share/doc/courier/manpage.css
-share/doc/courier/reformail.html
-share/doc/courier/reformime.html
-share/doc/courier/rfc2045.html
-share/doc/courier/rfc822.html
-@dirrm share/doc/courier/maildrop
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
deleted file mode 100644
index 45bf681ef1b..00000000000
--- a/mail/maildrop/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.11 2006/04/28 18:14:06 jlam Exp $
-
-SHA1 (maildrop-2.0.2.tar.bz2) = a7f3ac17cd1e14256b047e36810d3e8ec6cb872e
-RMD160 (maildrop-2.0.2.tar.bz2) = 7b2bd7fc0b3d9e7f8cefd9236e7e387d9d5ae1ce
-Size (maildrop-2.0.2.tar.bz2) = 2139549 bytes
-SHA1 (patch-aa) = f7e09cb85bfd831fdbc719ce88b7d19542ecdf8c
-SHA1 (patch-ab) = 7d8c9080bb413dd926eadd8ec2a8d93b19bb21b7
-SHA1 (patch-ac) = 752cddcc61226c9c8baefb5ec45f4787b6923a9f
diff --git a/mail/maildrop/patches/patch-aa b/mail/maildrop/patches/patch-aa
deleted file mode 100644
index 9a7b293cb6e..00000000000
--- a/mail/maildrop/patches/patch-aa
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2006/04/28 18:14:06 jlam Exp $
-
---- Makefile.in.orig 2006-02-19 11:39:50.000000000 -0500
-+++ Makefile.in
-@@ -243,21 +243,18 @@ EXTRA_DIST = README.html INSTALL.html UP
- maildroptips.txt automake.fix COPYING.GPL manpage.css pgpkeys.txt
-
- scriptdir = $(pkgdatadir)/scripts
--htmldir = $(pkgdatadir)/html
-+htmldir = $(prefix)/share/doc/courier
- DELIVERQUOTAHTMLSOURCE = maildirquota.html deliverquota.html
--@INSTALL_DELIVERQUOTA_FALSE@DELIVERQUOTAHTML =
--@INSTALL_DELIVERQUOTA_TRUE@DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
--@INSTALL_DELIVERQUOTA_FALSE@DELIVERQUOTAMAN =
--@INSTALL_DELIVERQUOTA_TRUE@DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
--MAILDROPHTML = lockmail.html maildirmake.html maildropex.html \
-- maildir.html \
-+DELIVERQUOTAHTML =
-+#DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
-+DELIVERQUOTAMAN =
-+#DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
-+MAILDROPHTML = lockmail.html maildropex.html \
- maildropfilter.html maildropgdbm.html maildrop.html mailbot.html \
- makemime.html reformail.html reformime.html
-
--MAILDROPMAN = lockmail.1 maildirmake.1 maildrop.1 mailbot.1 maildropex.7 \
-- maildir.5 \
-- maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1 \
-- maildirquota.7 deliverquota.8
-+MAILDROPMAN = lockmail.1 maildrop.1 mailbot.1 maildropex.7 \
-+ maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1
-
- EXTRA_LTLIBRARIES = librfc822.la librfc2045.la
- @DEVEL_TRUE@DEVEL_MAN = rfc822.3 rfc2045.3
-@@ -1046,15 +1043,15 @@ uninstall-man: uninstall-man1 uninstall-
- # where deliverquota will be installed.
- # Create a soft link from bindir/deliverquota to libdir/bin/deliverquota
-
--@INSTALL_DELIVERQUOTA_TRUE@install-deliverquota:
--@INSTALL_DELIVERQUOTA_TRUE@ $(mkinstalldirs) $(DESTDIR)$(bindir)
--@INSTALL_DELIVERQUOTA_TRUE@ $(INSTALL_PROGRAM) maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota
--@INSTALL_DELIVERQUOTA_TRUE@ cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota
-+#install-deliverquota:
-+# $(mkinstalldirs) $(DESTDIR)$(bindir)
-+# $(INSTALL_PROGRAM) maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota
-+# cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota
-
- @INSTALL_DELIVERQUOTA_TRUE@uninstall-deliverquota:
- @INSTALL_DELIVERQUOTA_TRUE@ rm -f $(DESTDIR)$(bindir)/deliverquota
-
--@INSTALL_DELIVERQUOTA_FALSE@install-deliverquota:
-+install-deliverquota:
-
- @INSTALL_DELIVERQUOTA_FALSE@uninstall-deliverquota:
-
-@@ -1084,7 +1081,6 @@ install-maildrop:
- $(INSTALL_PROGRAM) maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \
- done
- $(INSTALL_PROGRAM) liblock/lockmail $(DESTDIR)$(bindir)/lockmail
-- $(INSTALL_PROGRAM) maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake
- $(INSTALL_PROGRAM) rfc2045/reformime $(DESTDIR)$(bindir)/reformime
- $(INSTALL_PROGRAM) rfc2045/makemime $(DESTDIR)$(bindir)/makemime
- . maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail
diff --git a/mail/maildrop/patches/patch-ab b/mail/maildrop/patches/patch-ab
deleted file mode 100644
index 96bddd17480..00000000000
--- a/mail/maildrop/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/04/28 18:14:06 jlam Exp $
-
---- maildrop/configure.orig 2006-02-19 11:40:09.000000000 -0500
-+++ maildrop/configure
-@@ -22605,7 +22605,7 @@ fi
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
--if test -d $srcdir/../courier
-+if true || test -d $srcdir/../courier
- then
- #
- # This version of maildrop is integrated into Courier mail server
-@@ -22742,7 +22742,7 @@ SPOOLDIR="$DIR"
-
- get_spooldir() {
-
--if test -d $srcdir/../courier
-+if true || test -d $srcdir/../courier
- then
- MBOX_RESET_GID=1
- SPOOLDIR="./Maildir"
-@@ -22810,7 +22810,7 @@ if test "${with_default_maildrop+set}" =
- else
- # Courier defaults to ./Maildir
-
-- if test -d $srcdir/../courier
-+ if true || test -d $srcdir/../courier
- then
- maildrop_cv_SYS_INSTALL_MBOXDIR=./Maildir
- fi
diff --git a/mail/maildrop/patches/patch-ac b/mail/maildrop/patches/patch-ac
deleted file mode 100644
index c24ac876b40..00000000000
--- a/mail/maildrop/patches/patch-ac
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/03/21 19:50:51 jlam Exp $
-
---- maildrop/main.C.orig 2005-05-12 11:23:54.000000000 -0400
-+++ maildrop/main.C
-@@ -616,6 +616,14 @@ Buffer value;
- {
- const char *p;
-
-+ /*
-+ * To allow one maildrop to be used by both courier MTA
-+ * and others, we require courier MTA to set COURIER_MTA
-+ * in the environment before running maildrop.
-+ */
-+ if (getenv("COURIER_MTA"))
-+ { /* COURIER_MTA */
-+
- if ((p=getenv("HOME")) && *p)
- maildrop.init_home=p;
-
-@@ -640,6 +648,8 @@ Buffer value;
-
- if ((p=getenv("MAILDIRQUOTA")) && *p)
- maildrop.init_quota=p;
-+
-+ } /* COURIER_MTA */
- }
- #endif
-
diff --git a/mail/mailfront/DESCR b/mail/mailfront/DESCR
deleted file mode 100644
index 683bca6908e..00000000000
--- a/mail/mailfront/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This is mailfront, a package containing customizeable network
-front-ends for mail servers. It contains complete SMTP, QMQP,
-QMTP, and POP3 front-ends as well as an authentication module for
-IMAP. The mail delivery front-ends also contain internal address
-filtering features.
diff --git a/mail/mailfront/Makefile b/mail/mailfront/Makefile
deleted file mode 100644
index 86f32e27566..00000000000
--- a/mail/mailfront/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2006/08/02 02:42:22 schmonz Exp $
-#
-
-DISTNAME= mailfront-0.98.1
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ${HOMEPAGE}
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://untroubled.org/mailfront/
-COMMENT= Mail server network protocol front-ends
-
-DEPENDS+= cvm-[0-9]*:../../security/cvm
-DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools
-DEPENDS_QMAIL= qmail>=1.03nb8:../../mail/qmail
-DEPENDS+= ${DEPENDS_QMAIL}
-
-DJB_RESTRICTED= NO
-DJB_MAKE_TARGETS= NO
-
-RCD_SCRIPTS= smtpfront
-
-.include "../../mk/bsd.prefs.mk"
-
-# Detect the PKG_SYSCONFDIR of the installed qmail, so we can create
-# config files there and refer to them from rc.d scripts.
-#
-.if !defined(PKG_SYSCONFDIR.mailfront)
-PKG_SYSCONFDIR.mailfront!= \
- ${PKG_INFO} -Q PKG_SYSCONFDIR \
- ${DEPENDS_QMAIL:C/:.*$//:Q} 2>/dev/null || \
- ${ECHO} "PKG_SYSCONFDIR.mailfront_not_set"
-. if empty(PKG_SYSCONFDIR.mailfront:M*not_set)
-MAKEVARS+= PKG_SYSCONFDIR.mailfront
-. endif
-.endif
-
-.include "../../devel/bglibs/buildlink3.mk"
-.include "../../security/cvm/buildlink3.mk"
-.include "../../mk/djbware.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailfront/PLIST b/mail/mailfront/PLIST
deleted file mode 100644
index 5f41913148a..00000000000
--- a/mail/mailfront/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/07/20 03:30:19 schmonz Exp $
-bin/imapfront-auth
-bin/pop3front-auth
-bin/pop3front-maildir
-bin/qmqpfront-echo
-bin/qmqpfront-qmail
-bin/qmtpfront-echo
-bin/qmtpfront-qmail
-bin/smtpfront-echo
-bin/smtpfront-qmail
-bin/smtpfront-reject
-share/examples/rc.d/smtpfront
diff --git a/mail/mailfront/distinfo b/mail/mailfront/distinfo
deleted file mode 100644
index 197f5617964..00000000000
--- a/mail/mailfront/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/08/02 02:42:22 schmonz Exp $
-
-SHA1 (mailfront-0.98.1.tar.gz) = 1d3e0e7ca4091226c9d154bfe4a08e879debae29
-RMD160 (mailfront-0.98.1.tar.gz) = 2cad77abb898c29db0768cbb2514d2a0e4905f68
-Size (mailfront-0.98.1.tar.gz) = 77812 bytes
-SHA1 (patch-aa) = 6b9b6c7d546cbadffc8dfee557ff2384ba8b1a45
diff --git a/mail/mailfront/files/smtpfront.sh b/mail/mailfront/files/smtpfront.sh
deleted file mode 100644
index b9692a5684f..00000000000
--- a/mail/mailfront/files/smtpfront.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: smtpfront.sh,v 1.1.1.1 2005/07/20 03:30:19 schmonz Exp $
-#
-
-# PROVIDE: smtpfront
-# REQUIRE: qmailsend cvm
-
-name="smtpfront"
-
-# User-settable rc.conf variables and their default values:
-: ${smtpfront_postenv:="CVM_LOOKUP_SECRET='' CVM_LOOKUP='cvm-local:@VARBASE@/run/cvm-qmail'"}
-: ${smtpfront_tcpflags:="-vRl0"}
-: ${smtpfront_tcphost:="0"}
-: ${smtpfront_tcpport:="25"}
-: ${smtpfront_datalimit:="2000000"}
-: ${smtpfront_pretcpserver:=""}
-: ${smtpfront_presmtpd:=""}
-: ${smtpfront_postsmtpd:=""}
-: ${smtpfront_log:="YES"}
-: ${smtpfront_logcmd:="logger -t nb${name} -p mail.info"}
-: ${smtpfront_nologcmd:="@LOCALBASE@/bin/multilog -*"}
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-rcvar=${name}
-required_files="@PKG_SYSCONFDIR@/control/concurrencyincoming"
-required_files="${required_files} @PKG_SYSCONFDIR@/tcp.smtp.cdb"
-required_files="${required_files} @PKG_SYSCONFDIR@/control/rcpthosts"
-command="@LOCALBASE@/bin/tcpserver"
-procname=${name}
-start_precmd="smtpfront_precmd"
-extra_commands="cdb"
-cdb_cmd="smtpfront_cdb"
-
-smtpfront_precmd()
-{
- # tcpserver(1) is akin to inetd(8), but runs one service per process.
- # We want to signal only the tcpserver process responsible for SMTP
- # service. Use argv0(1) to set procname to "smtpfront".
- if [ -f /etc/rc.subr ]; then
- checkyesno smtpfront_log || smtpfront_logcmd=${smtpfront_nologcmd}
- fi
- command="@SETENV@ - ${smtpfront_postenv} @LOCALBASE@/bin/softlimit -m ${smtpfront_datalimit} ${smtpfront_pretcpserver} @LOCALBASE@/bin/argv0 @LOCALBASE@/bin/tcpserver ${name} ${smtpfront_tcpflags} -x @PKG_SYSCONFDIR@/tcp.smtp.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencyincoming` -u `@ID@ -u qmaild ` -g `@ID@ -g qmaild` ${smtpfront_tcphost} ${smtpfront_tcpport} ${smtpfront_presmtpd} @LOCALBASE@/bin/smtpfront-qmail ${smtpfront_postsmtpd} 2>&1 | @LOCALBASE@/bin/setuidgid qmaill ${smtpfront_logcmd}"
- command_args="&"
- rc_flags=""
-}
-
-smtpfront_cdb()
-{
- @ECHO@ "Reloading @PKG_SYSCONFDIR@/tcp.smtp."
- @LOCALBASE@/bin/tcprules @PKG_SYSCONFDIR@/tcp.smtp.cdb @PKG_SYSCONFDIR@/tcp.smtp.tmp < @PKG_SYSCONFDIR@/tcp.smtp
- @CHMOD@ 644 @PKG_SYSCONFDIR@/tcp.smtp.cdb
-}
-
-if [ -f /etc/rc.subr ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- @ECHO_N@ " ${name}"
- smtpfront_precmd
- eval ${command} ${smtpfront_flags} ${command_args}
-fi
diff --git a/mail/mailfront/patches/patch-aa b/mail/mailfront/patches/patch-aa
deleted file mode 100644
index f8151617981..00000000000
--- a/mail/mailfront/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/08/02 02:42:22 schmonz Exp $
-
---- Makefile.orig 2006-07-18 17:52:22.000000000 -0400
-+++ Makefile
-@@ -59,7 +59,7 @@ load: conf-ld conf-bglibs
- ( bglibs=`head -n 1 conf-bglibs`; \
- echo '#!/bin/sh';\
- echo 'main="$$1"; shift';\
-- echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}' -lbg-sysdeps; \
-+ echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'" "-Wl,-R'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}' -lbg-sysdeps; \
- ) >load
- chmod 755 load
-
diff --git a/mail/mailgraph/DESCR b/mail/mailgraph/DESCR
deleted file mode 100644
index 20956b12aab..00000000000
--- a/mail/mailgraph/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Mailgraph is a very simple mail statistics RRDtool frontend for Postfix
-and Sendmail that produces daily, weekly, monthly and yearly graphs of
-received/sent and bounced/rejected mail.
diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile
deleted file mode 100644
index e990116284f..00000000000
--- a/mail/mailgraph/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/06/18 01:02:45 rillig Exp $
-#
-
-DISTNAME= mailgraph-1.12
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= http://people.ee.ethz.ch/~dws/software/mailgraph/pub/ \
- http://people.ee.ethz.ch/~dws/software/mailgraph/pub/old/
-
-MAINTAINER= kim@tac.nyc.ny.us
-HOMEPAGE= http://people.ee.ethz.ch/~dws/software/mailgraph/
-COMMENT= RRDtool frontend for mail statistics
-
-DEPENDS+= rrdtool-1*:../../databases/rrdtool
-DEPENDS+= p5-File-Tail-[0-9]*:../../misc/p5-File-Tail
-
-USE_TOOLS+= perl:run
-
-.include "../../mk/bsd.prefs.mk"
-
-DBDIR?= ${VARBASE}/db/${PKGBASE}
-
-MG_SCRIPTS= mailgraph.cgi mailgraph.pl
-
-REPLACE_PERL+= ${MG_SCRIPTS}
-
-RCD_SCRIPTS= mailgraph
-
-SUBST_CLASSES+= defs
-SUBST_STAGE.defs= pre-build
-SUBST_FILES.defs= ${MG_SCRIPTS}
-# Database
-SUBST_SED.defs+= -e 's,/var/log\([^/]\),${DBDIR}\1,g'
-SUBST_SED.defs+= -e 's,/var/log$$,${DBDIR},g'
-# Logfile
-SUBST_SED.defs+= -e 's,/var/log/syslog,${VARBASE}/log/maillog,g'
-#
-SUBST_MESSAGE.defs= Fixing defaults.
-
-INSTALLATION_DIRS= sbin
-
-do-build:
-
-do-configure:
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/libexec/cgi-bin
- ${INSTALL_SCRIPT} \
- ${WRKSRC}/mailgraph.cgi ${PREFIX}/libexec/cgi-bin/mailgraph.cgi
- ${INSTALL_SCRIPT} \
- ${WRKSRC}/mailgraph.pl ${PREFIX}/sbin/mailgraph
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mailgraph
-.for i in CHANGES COPYING README
- ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/mailgraph/${i}
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailgraph/PLIST b/mail/mailgraph/PLIST
deleted file mode 100644
index ae1a0264880..00000000000
--- a/mail/mailgraph/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/02/19 00:39:06 wiz Exp $
-libexec/cgi-bin/mailgraph.cgi
-sbin/mailgraph
-share/doc/mailgraph/CHANGES
-share/doc/mailgraph/COPYING
-share/doc/mailgraph/README
-share/examples/rc.d/mailgraph
-@dirrm share/doc/mailgraph
diff --git a/mail/mailgraph/distinfo b/mail/mailgraph/distinfo
deleted file mode 100644
index eb8c8c2d135..00000000000
--- a/mail/mailgraph/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/11/14 08:27:55 kleink Exp $
-
-SHA1 (mailgraph-1.12.tar.gz) = 08bbe7f6e66f1b14b40ce7da8caa716b6ee122e3
-RMD160 (mailgraph-1.12.tar.gz) = 37111b29e4519010f102c71306ba6b896082cb6f
-Size (mailgraph-1.12.tar.gz) = 20053 bytes
diff --git a/mail/mailgraph/files/mailgraph.sh b/mail/mailgraph/files/mailgraph.sh
deleted file mode 100644
index f2a3f698dc5..00000000000
--- a/mail/mailgraph/files/mailgraph.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: mailgraph.sh,v 1.2 2005/11/14 12:34:57 kleink Exp $
-#
-
-# PROVIDE: mailgraph
-# REQUIRE: DAEMON
-
-. /etc/rc.subr
-
-name="@PKGBASE@"
-rcvar=$name
-pidfile="@VARBASE@/run/${name}.pid"
-command_interpreter="@PERL5@"
-command="@PREFIX@/sbin/mailgraph"
-command_args="-d"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/mailman/DESCR b/mail/mailman/DESCR
deleted file mode 100644
index 0f751acad91..00000000000
--- a/mail/mailman/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Mailman is software to help manage electronic mail discussion lists,
-much like Majordomo or Smartmail. Mailman gives each mailing list a unique
-web page and allows users to subscribe, unsubscribe, and change their
-account options over the web. Even the list manager can administer his or
-her list entirely via the web. Mailman has most of the features that
-people want in a mailing list management system, including built-in
-archiving, mail-to-news gateways, spam filters, bounce detection, digest
-delivery, and so on. See the features page (http://www.list.org/features.html)
-for more detail.
diff --git a/mail/mailman/MESSAGE b/mail/mailman/MESSAGE
deleted file mode 100644
index 6fac068e9c0..00000000000
--- a/mail/mailman/MESSAGE
+++ /dev/null
@@ -1,24 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2006/04/10 20:33:12 bouyer Exp $
-
-Mailman needs to know your mail domain and Web server hostname. Edit
-${PREFIX}/lib/mailman/Mailman/mm_cfg.py and insert your hostname
-in place of "localhost" in DEFAULT_EMAIL_HOST and DEFAULT_URL_HOST.
-
-You will need to make mailman accessible through your HTTP server.
-If you are running Apache, then you may add the following line to httpd.conf:
-
- Include ${PKG_SYSCONFDIR}/mailman.conf
-
-to make mailman and its archive accessible through, respectively,
-
- http://www.domain.com/mailman/
- http://www.domain.com/pipermail/
-
-You will also need to add some crontab entries for the user ${MAILMAN_USER}.
-You can use ${EXECDIR}/cron/crontab.in as template.
-
-See the files in ${DOCDIR} for how to use mailman,
-especially the file ${DOCDIR}/mailman-install.txt
-
-===========================================================================
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
deleted file mode 100644
index 1b2f800b6eb..00000000000
--- a/mail/mailman/Makefile
+++ /dev/null
@@ -1,130 +0,0 @@
-# $NetBSD: Makefile,v 1.46 2006/09/25 18:56:44 bouyer Exp $
-
-DISTNAME= mailman-2.1.9
-CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mailman/}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= bouyer@NetBSD.org
-HOMEPAGE= http://www.list.org/
-COMMENT= The GNU Mailing List Manager
-
-.include "../../mk/bsd.prefs.mk"
-
-PKG_SYSCONFSUBDIR?= httpd
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-MESSAGE_SUBST+= DOCDIR=${DOCDIR}
-
-GNU_CONFIGURE= yes
-GNU_CONFIGURE_PREFIX= ${EXECDIR}
-
-MAKE_FLAGS+= DIRSETGID=${TRUE:Q}
-EXECDIR= ${PREFIX}/lib/mailman
-MAILMAN_DATADIR?= ${VARBASE}/db/mailman
-EGDIR= ${PREFIX}/share/examples/mailman
-DOCDIR= ${PREFIX}/share/doc/mailman
-MAILMAN_USER?= mailman
-MAILMAN_GROUP?= mailman
-MAILMAN_CGIGROUP?= ${APACHE_GROUP}
-MAILMAN_MAILGROUP?= daemon # group sendmail runs under;
- # use 'nobody' for postfix
-MAILMAN_CGIEXT?= .cgi
-
-MESSAGE_SUBST+= EXECDIR=${EXECDIR}
-MESSAGE_SUBST+= MAILMAN_USER=${MAILMAN_USER}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-PLIST_SUBST+= MAILMAN_CGIEXT=${MAILMAN_CGIEXT:S/none//}
-
-PKG_GROUPS= ${MAILMAN_GROUP}
-PKG_USERS= ${MAILMAN_USER}:${MAILMAN_GROUP}
-
-PKG_GECOS.${MAILMAN_USER}= Mailman user
-PKG_SHELL.${MAILMAN_USER}= ${SH}
-
-REQD_DIRS_PERMS+= ${EXECDIR} root ${MAILMAN_GROUP} 775
-OWN_DIRS_PERMS+= ${MAILMAN_DATADIR} ${MAILMAN_USER} ${MAILMAN_GROUP} 775
-MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/archives ${MAILMAN_USER} ${MAILMAN_GROUP} 775
-MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/archives/public ${MAILMAN_USER} ${MAILMAN_GROUP} 775
-MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/archives/private ${MAILMAN_USER} ${MAILMAN_GROUP} 771
-MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/data ${MAILMAN_USER} ${MAILMAN_GROUP} 775
-MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/lists ${MAILMAN_USER} ${MAILMAN_GROUP} 775
-MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/locks ${MAILMAN_USER} ${MAILMAN_GROUP} 775
-MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/logs ${MAILMAN_USER} ${MAILMAN_GROUP} 775
-MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/qfiles ${MAILMAN_USER} ${MAILMAN_GROUP} 775
-MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/spam ${MAILMAN_USER} ${MAILMAN_GROUP} 775
-
-CONF_FILES+= ${EGDIR}/mailman.conf ${PKG_SYSCONFDIR}/mailman.conf
-CONF_FILES+= ${EXECDIR}/Mailman/mm_cfg.py.dist ${EXECDIR}/Mailman/mm_cfg.py
-
-RCD_SCRIPTS= mailman
-
-INSTALL_TEMPLATES+= ${FILESDIR}/INSTALL
-DEINSTALL_TEMPLATES+= ${FILESDIR}/DEINSTALL
-
-PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
-PYTHON_PATCH_SCRIPTS+= Mailman/Archiver/pipermail.py
-PYTHON_PATCH_SCRIPTS+= Mailman/Post.py
-PYTHON_PATCH_SCRIPTS+= admin/bin/faq2ht.py
-PYTHON_PATCH_SCRIPTS+= admin/bin/mm2do
-PYTHON_PATCH_SCRIPTS+= admin/www/reset_pw.py
-PYTHON_PATCH_SCRIPTS+= bin/msgfmt.py
-
-CONFIGURE_ARGS+= --with-cgi-gid=${MAILMAN_CGIGROUP:Q}
-.if ${MAILMAN_CGIEXT} != "none"
-CONFIGURE_ARGS+= --with-cgi-ext=${MAILMAN_CGIEXT:Q}
-.endif
-CONFIGURE_ARGS+= --with-groupname=${MAILMAN_GROUP:Q}
-CONFIGURE_ARGS+= --with-mail-gid=${MAILMAN_MAILGROUP:Q}
-CONFIGURE_ARGS+= --with-python=${PYTHONBIN:Q}
-CONFIGURE_ARGS+= --with-username=${MAILMAN_USER:Q}
-CONFIGURE_ARGS+= --with-var-prefix=${MAILMAN_DATADIR:Q}
-CONFIGURE_ARGS+= --without-permcheck
-
-# Put in externally invalid defaults (MESSAGE directs how to fix it)
-CONFIGURE_ARGS+= --with-mailhost=localhost
-CONFIGURE_ARGS+= --with-urlhost=localhost
-
-BUILD_DEFS+= MAILMAN_DATADIR
-BUILD_DEFS+= MAILMAN_USER
-BUILD_DEFS+= MAILMAN_GROUP
-BUILD_DEFS+= MAILMAN_CGIGROUP
-BUILD_DEFS+= MAILMAN_MAILGROUP
-BUILD_DEFS+= MAILMAN_CGIEXT
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= ${WRKDIR}/mailman.conf.dist
-SUBST_SED.paths+= -e 's,@EXECDIR@,${EXECDIR},g'
-SUBST_SED.paths+= -e 's,@MAILMAN_DATADIR@,${MAILMAN_DATADIR},g'
-SUBST_STAGE.paths= post-patch
-
-PYCOMPILEALL= ${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
-
-post-extract:
- ${CP} ${FILESDIR}/mailman.conf.dist ${WRKDIR}/mailman.conf.dist
-
-post-patch:
- ${RM} -f ${WRKSRC}/[A-Z]*.orig
-
-pre-install:
- ${INSTALL} -d -o ${MAILMAN_USER} -g ${MAILMAN_GROUP} -m 775 ${EXECDIR}
- ${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA_DIR} ${EXECDIR}/support
-
-post-install:
- cd ${WRKSRC} && for i in [A-IN-U]*; do \
- ${INSTALL_DATA} $$i ${DOCDIR}/; \
- done
- cd ${WRKSRC}/admin/www && for i in \
- mailman-*.ps mailman-*.pdf mailman-*.txt; do \
- ${INSTALL_DATA} $$i ${DOCDIR}/; \
- done
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKDIR}/mailman.conf.dist ${EGDIR}/mailman.conf
- ${CHOWN} -R root:${MAILMAN_GROUP} ${EXECDIR}
- ${CHMOD} -R g+w ${EXECDIR}
- ${CHMOD} g+s ${EXECDIR}/cgi-bin/*
- ${RM} -f ${EXECDIR}/Mailman/mm_cfg.pyc
- ${PYTHONBIN} ${PYCOMPILEALL} ${PREFIX}/lib/mailman/bin ${PREFIX}/lib/mailman/cron ${PREFIX}/lib/mailman/scripts
-
-.include "../../lang/python/application.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailman/PLIST b/mail/mailman/PLIST
deleted file mode 100644
index 9718ce8228d..00000000000
--- a/mail/mailman/PLIST
+++ /dev/null
@@ -1,2212 +0,0 @@
-@comment $NetBSD: PLIST,v 1.13 2006/09/25 18:56:44 bouyer Exp $
-lib/mailman/Mailman/Archiver/Archiver.py
-lib/mailman/Mailman/Archiver/Archiver.pyc
-lib/mailman/Mailman/Archiver/HyperArch.py
-lib/mailman/Mailman/Archiver/HyperArch.pyc
-lib/mailman/Mailman/Archiver/HyperDatabase.py
-lib/mailman/Mailman/Archiver/HyperDatabase.pyc
-lib/mailman/Mailman/Archiver/__init__.py
-lib/mailman/Mailman/Archiver/__init__.pyc
-lib/mailman/Mailman/Archiver/pipermail.py
-lib/mailman/Mailman/Archiver/pipermail.pyc
-lib/mailman/Mailman/Autoresponder.py
-lib/mailman/Mailman/Autoresponder.pyc
-lib/mailman/Mailman/Bouncer.py
-lib/mailman/Mailman/Bouncer.pyc
-lib/mailman/Mailman/Bouncers/BouncerAPI.py
-lib/mailman/Mailman/Bouncers/BouncerAPI.pyc
-lib/mailman/Mailman/Bouncers/Caiwireless.py
-lib/mailman/Mailman/Bouncers/Caiwireless.pyc
-lib/mailman/Mailman/Bouncers/Compuserve.py
-lib/mailman/Mailman/Bouncers/Compuserve.pyc
-lib/mailman/Mailman/Bouncers/DSN.py
-lib/mailman/Mailman/Bouncers/DSN.pyc
-lib/mailman/Mailman/Bouncers/Exchange.py
-lib/mailman/Mailman/Bouncers/Exchange.pyc
-lib/mailman/Mailman/Bouncers/Exim.py
-lib/mailman/Mailman/Bouncers/Exim.pyc
-lib/mailman/Mailman/Bouncers/GroupWise.py
-lib/mailman/Mailman/Bouncers/GroupWise.pyc
-lib/mailman/Mailman/Bouncers/LLNL.py
-lib/mailman/Mailman/Bouncers/LLNL.pyc
-lib/mailman/Mailman/Bouncers/Microsoft.py
-lib/mailman/Mailman/Bouncers/Microsoft.pyc
-lib/mailman/Mailman/Bouncers/Netscape.py
-lib/mailman/Mailman/Bouncers/Netscape.pyc
-lib/mailman/Mailman/Bouncers/Postfix.py
-lib/mailman/Mailman/Bouncers/Postfix.pyc
-lib/mailman/Mailman/Bouncers/Qmail.py
-lib/mailman/Mailman/Bouncers/Qmail.pyc
-lib/mailman/Mailman/Bouncers/SMTP32.py
-lib/mailman/Mailman/Bouncers/SMTP32.pyc
-lib/mailman/Mailman/Bouncers/SimpleMatch.py
-lib/mailman/Mailman/Bouncers/SimpleMatch.pyc
-lib/mailman/Mailman/Bouncers/SimpleWarning.py
-lib/mailman/Mailman/Bouncers/SimpleWarning.pyc
-lib/mailman/Mailman/Bouncers/Sina.py
-lib/mailman/Mailman/Bouncers/Sina.pyc
-lib/mailman/Mailman/Bouncers/Yahoo.py
-lib/mailman/Mailman/Bouncers/Yahoo.pyc
-lib/mailman/Mailman/Bouncers/Yale.py
-lib/mailman/Mailman/Bouncers/Yale.pyc
-lib/mailman/Mailman/Bouncers/__init__.py
-lib/mailman/Mailman/Bouncers/__init__.pyc
-lib/mailman/Mailman/Cgi/Auth.py
-lib/mailman/Mailman/Cgi/Auth.pyc
-lib/mailman/Mailman/Cgi/__init__.py
-lib/mailman/Mailman/Cgi/__init__.pyc
-lib/mailman/Mailman/Cgi/admin.py
-lib/mailman/Mailman/Cgi/admin.pyc
-lib/mailman/Mailman/Cgi/admindb.py
-lib/mailman/Mailman/Cgi/admindb.pyc
-lib/mailman/Mailman/Cgi/confirm.py
-lib/mailman/Mailman/Cgi/confirm.pyc
-lib/mailman/Mailman/Cgi/create.py
-lib/mailman/Mailman/Cgi/create.pyc
-lib/mailman/Mailman/Cgi/edithtml.py
-lib/mailman/Mailman/Cgi/edithtml.pyc
-lib/mailman/Mailman/Cgi/listinfo.py
-lib/mailman/Mailman/Cgi/listinfo.pyc
-lib/mailman/Mailman/Cgi/options.py
-lib/mailman/Mailman/Cgi/options.pyc
-lib/mailman/Mailman/Cgi/private.py
-lib/mailman/Mailman/Cgi/private.pyc
-lib/mailman/Mailman/Cgi/rmlist.py
-lib/mailman/Mailman/Cgi/rmlist.pyc
-lib/mailman/Mailman/Cgi/roster.py
-lib/mailman/Mailman/Cgi/roster.pyc
-lib/mailman/Mailman/Cgi/subscribe.py
-lib/mailman/Mailman/Cgi/subscribe.pyc
-lib/mailman/Mailman/Commands/__init__.py
-lib/mailman/Mailman/Commands/__init__.pyc
-lib/mailman/Mailman/Commands/cmd_confirm.py
-lib/mailman/Mailman/Commands/cmd_confirm.pyc
-lib/mailman/Mailman/Commands/cmd_echo.py
-lib/mailman/Mailman/Commands/cmd_echo.pyc
-lib/mailman/Mailman/Commands/cmd_end.py
-lib/mailman/Mailman/Commands/cmd_end.pyc
-lib/mailman/Mailman/Commands/cmd_help.py
-lib/mailman/Mailman/Commands/cmd_help.pyc
-lib/mailman/Mailman/Commands/cmd_info.py
-lib/mailman/Mailman/Commands/cmd_info.pyc
-lib/mailman/Mailman/Commands/cmd_join.py
-lib/mailman/Mailman/Commands/cmd_join.pyc
-lib/mailman/Mailman/Commands/cmd_leave.py
-lib/mailman/Mailman/Commands/cmd_leave.pyc
-lib/mailman/Mailman/Commands/cmd_lists.py
-lib/mailman/Mailman/Commands/cmd_lists.pyc
-lib/mailman/Mailman/Commands/cmd_password.py
-lib/mailman/Mailman/Commands/cmd_password.pyc
-lib/mailman/Mailman/Commands/cmd_remove.py
-lib/mailman/Mailman/Commands/cmd_remove.pyc
-lib/mailman/Mailman/Commands/cmd_set.py
-lib/mailman/Mailman/Commands/cmd_set.pyc
-lib/mailman/Mailman/Commands/cmd_stop.py
-lib/mailman/Mailman/Commands/cmd_stop.pyc
-lib/mailman/Mailman/Commands/cmd_subscribe.py
-lib/mailman/Mailman/Commands/cmd_subscribe.pyc
-lib/mailman/Mailman/Commands/cmd_unsubscribe.py
-lib/mailman/Mailman/Commands/cmd_unsubscribe.pyc
-lib/mailman/Mailman/Commands/cmd_who.py
-lib/mailman/Mailman/Commands/cmd_who.pyc
-lib/mailman/Mailman/Defaults.py
-lib/mailman/Mailman/Defaults.pyc
-lib/mailman/Mailman/Deliverer.py
-lib/mailman/Mailman/Deliverer.pyc
-lib/mailman/Mailman/Digester.py
-lib/mailman/Mailman/Digester.pyc
-lib/mailman/Mailman/Errors.py
-lib/mailman/Mailman/Errors.pyc
-lib/mailman/Mailman/GatewayManager.py
-lib/mailman/Mailman/GatewayManager.pyc
-lib/mailman/Mailman/Gui/Archive.py
-lib/mailman/Mailman/Gui/Archive.pyc
-lib/mailman/Mailman/Gui/Autoresponse.py
-lib/mailman/Mailman/Gui/Autoresponse.pyc
-lib/mailman/Mailman/Gui/Bounce.py
-lib/mailman/Mailman/Gui/Bounce.pyc
-lib/mailman/Mailman/Gui/ContentFilter.py
-lib/mailman/Mailman/Gui/ContentFilter.pyc
-lib/mailman/Mailman/Gui/Digest.py
-lib/mailman/Mailman/Gui/Digest.pyc
-lib/mailman/Mailman/Gui/GUIBase.py
-lib/mailman/Mailman/Gui/GUIBase.pyc
-lib/mailman/Mailman/Gui/General.py
-lib/mailman/Mailman/Gui/General.pyc
-lib/mailman/Mailman/Gui/Language.py
-lib/mailman/Mailman/Gui/Language.pyc
-lib/mailman/Mailman/Gui/Membership.py
-lib/mailman/Mailman/Gui/Membership.pyc
-lib/mailman/Mailman/Gui/NonDigest.py
-lib/mailman/Mailman/Gui/NonDigest.pyc
-lib/mailman/Mailman/Gui/Passwords.py
-lib/mailman/Mailman/Gui/Passwords.pyc
-lib/mailman/Mailman/Gui/Privacy.py
-lib/mailman/Mailman/Gui/Privacy.pyc
-lib/mailman/Mailman/Gui/Topics.py
-lib/mailman/Mailman/Gui/Topics.pyc
-lib/mailman/Mailman/Gui/Usenet.py
-lib/mailman/Mailman/Gui/Usenet.pyc
-lib/mailman/Mailman/Gui/__init__.py
-lib/mailman/Mailman/Gui/__init__.pyc
-lib/mailman/Mailman/HTMLFormatter.py
-lib/mailman/Mailman/HTMLFormatter.pyc
-lib/mailman/Mailman/Handlers/Acknowledge.py
-lib/mailman/Mailman/Handlers/Acknowledge.pyc
-lib/mailman/Mailman/Handlers/AfterDelivery.py
-lib/mailman/Mailman/Handlers/AfterDelivery.pyc
-lib/mailman/Mailman/Handlers/Approve.py
-lib/mailman/Mailman/Handlers/Approve.pyc
-lib/mailman/Mailman/Handlers/AvoidDuplicates.py
-lib/mailman/Mailman/Handlers/AvoidDuplicates.pyc
-lib/mailman/Mailman/Handlers/CalcRecips.py
-lib/mailman/Mailman/Handlers/CalcRecips.pyc
-lib/mailman/Mailman/Handlers/Cleanse.py
-lib/mailman/Mailman/Handlers/Cleanse.pyc
-lib/mailman/Mailman/Handlers/CleanseDKIM.py
-lib/mailman/Mailman/Handlers/CleanseDKIM.pyc
-lib/mailman/Mailman/Handlers/CookHeaders.py
-lib/mailman/Mailman/Handlers/CookHeaders.pyc
-lib/mailman/Mailman/Handlers/Decorate.py
-lib/mailman/Mailman/Handlers/Decorate.pyc
-lib/mailman/Mailman/Handlers/Emergency.py
-lib/mailman/Mailman/Handlers/Emergency.pyc
-lib/mailman/Mailman/Handlers/FileRecips.py
-lib/mailman/Mailman/Handlers/FileRecips.pyc
-lib/mailman/Mailman/Handlers/Hold.py
-lib/mailman/Mailman/Handlers/Hold.pyc
-lib/mailman/Mailman/Handlers/MimeDel.py
-lib/mailman/Mailman/Handlers/MimeDel.pyc
-lib/mailman/Mailman/Handlers/Moderate.py
-lib/mailman/Mailman/Handlers/Moderate.pyc
-lib/mailman/Mailman/Handlers/OwnerRecips.py
-lib/mailman/Mailman/Handlers/OwnerRecips.pyc
-lib/mailman/Mailman/Handlers/Replybot.py
-lib/mailman/Mailman/Handlers/Replybot.pyc
-lib/mailman/Mailman/Handlers/SMTPDirect.py
-lib/mailman/Mailman/Handlers/SMTPDirect.pyc
-lib/mailman/Mailman/Handlers/Scrubber.py
-lib/mailman/Mailman/Handlers/Scrubber.pyc
-lib/mailman/Mailman/Handlers/Sendmail.py
-lib/mailman/Mailman/Handlers/Sendmail.pyc
-lib/mailman/Mailman/Handlers/SpamDetect.py
-lib/mailman/Mailman/Handlers/SpamDetect.pyc
-lib/mailman/Mailman/Handlers/Tagger.py
-lib/mailman/Mailman/Handlers/Tagger.pyc
-lib/mailman/Mailman/Handlers/ToArchive.py
-lib/mailman/Mailman/Handlers/ToArchive.pyc
-lib/mailman/Mailman/Handlers/ToDigest.py
-lib/mailman/Mailman/Handlers/ToDigest.pyc
-lib/mailman/Mailman/Handlers/ToOutgoing.py
-lib/mailman/Mailman/Handlers/ToOutgoing.pyc
-lib/mailman/Mailman/Handlers/ToUsenet.py
-lib/mailman/Mailman/Handlers/ToUsenet.pyc
-lib/mailman/Mailman/Handlers/__init__.py
-lib/mailman/Mailman/Handlers/__init__.pyc
-lib/mailman/Mailman/ListAdmin.py
-lib/mailman/Mailman/ListAdmin.pyc
-lib/mailman/Mailman/LockFile.py
-lib/mailman/Mailman/LockFile.pyc
-lib/mailman/Mailman/Logging/Logger.py
-lib/mailman/Mailman/Logging/Logger.pyc
-lib/mailman/Mailman/Logging/MultiLogger.py
-lib/mailman/Mailman/Logging/MultiLogger.pyc
-lib/mailman/Mailman/Logging/StampedLogger.py
-lib/mailman/Mailman/Logging/StampedLogger.pyc
-lib/mailman/Mailman/Logging/Syslog.py
-lib/mailman/Mailman/Logging/Syslog.pyc
-lib/mailman/Mailman/Logging/Utils.py
-lib/mailman/Mailman/Logging/Utils.pyc
-lib/mailman/Mailman/Logging/__init__.py
-lib/mailman/Mailman/Logging/__init__.pyc
-lib/mailman/Mailman/MTA/Manual.py
-lib/mailman/Mailman/MTA/Manual.pyc
-lib/mailman/Mailman/MTA/Postfix.py
-lib/mailman/Mailman/MTA/Postfix.pyc
-lib/mailman/Mailman/MTA/Utils.py
-lib/mailman/Mailman/MTA/Utils.pyc
-lib/mailman/Mailman/MTA/__init__.py
-lib/mailman/Mailman/MTA/__init__.pyc
-lib/mailman/Mailman/MailList.py
-lib/mailman/Mailman/MailList.pyc
-lib/mailman/Mailman/Mailbox.py
-lib/mailman/Mailman/Mailbox.pyc
-lib/mailman/Mailman/MemberAdaptor.py
-lib/mailman/Mailman/MemberAdaptor.pyc
-lib/mailman/Mailman/Message.py
-lib/mailman/Mailman/Message.pyc
-lib/mailman/Mailman/OldStyleMemberships.py
-lib/mailman/Mailman/OldStyleMemberships.pyc
-lib/mailman/Mailman/Pending.py
-lib/mailman/Mailman/Pending.pyc
-lib/mailman/Mailman/Post.py
-lib/mailman/Mailman/Post.pyc
-lib/mailman/Mailman/Queue/ArchRunner.py
-lib/mailman/Mailman/Queue/ArchRunner.pyc
-lib/mailman/Mailman/Queue/BounceRunner.py
-lib/mailman/Mailman/Queue/BounceRunner.pyc
-lib/mailman/Mailman/Queue/CommandRunner.py
-lib/mailman/Mailman/Queue/CommandRunner.pyc
-lib/mailman/Mailman/Queue/IncomingRunner.py
-lib/mailman/Mailman/Queue/IncomingRunner.pyc
-lib/mailman/Mailman/Queue/MaildirRunner.py
-lib/mailman/Mailman/Queue/MaildirRunner.pyc
-lib/mailman/Mailman/Queue/NewsRunner.py
-lib/mailman/Mailman/Queue/NewsRunner.pyc
-lib/mailman/Mailman/Queue/OutgoingRunner.py
-lib/mailman/Mailman/Queue/OutgoingRunner.pyc
-lib/mailman/Mailman/Queue/RetryRunner.py
-lib/mailman/Mailman/Queue/RetryRunner.pyc
-lib/mailman/Mailman/Queue/Runner.py
-lib/mailman/Mailman/Queue/Runner.pyc
-lib/mailman/Mailman/Queue/Switchboard.py
-lib/mailman/Mailman/Queue/Switchboard.pyc
-lib/mailman/Mailman/Queue/VirginRunner.py
-lib/mailman/Mailman/Queue/VirginRunner.pyc
-lib/mailman/Mailman/Queue/__init__.py
-lib/mailman/Mailman/Queue/__init__.pyc
-lib/mailman/Mailman/Queue/sbcache.py
-lib/mailman/Mailman/Queue/sbcache.pyc
-lib/mailman/Mailman/SafeDict.py
-lib/mailman/Mailman/SafeDict.pyc
-lib/mailman/Mailman/SecurityManager.py
-lib/mailman/Mailman/SecurityManager.pyc
-lib/mailman/Mailman/Site.py
-lib/mailman/Mailman/Site.pyc
-lib/mailman/Mailman/TopicMgr.py
-lib/mailman/Mailman/TopicMgr.pyc
-lib/mailman/Mailman/UserDesc.py
-lib/mailman/Mailman/UserDesc.pyc
-lib/mailman/Mailman/Utils.py
-lib/mailman/Mailman/Utils.pyc
-lib/mailman/Mailman/Version.py
-lib/mailman/Mailman/Version.pyc
-lib/mailman/Mailman/__init__.py
-lib/mailman/Mailman/__init__.pyc
-lib/mailman/Mailman/htmlformat.py
-lib/mailman/Mailman/htmlformat.pyc
-lib/mailman/Mailman/i18n.py
-lib/mailman/Mailman/i18n.pyc
-lib/mailman/Mailman/mm_cfg.py.dist
-lib/mailman/Mailman/versions.py
-lib/mailman/Mailman/versions.pyc
-lib/mailman/bin/add_members
-lib/mailman/bin/arch
-lib/mailman/bin/b4b5-archfix
-lib/mailman/bin/change_pw
-lib/mailman/bin/check_db
-lib/mailman/bin/check_perms
-lib/mailman/bin/cleanarch
-lib/mailman/bin/clone_member
-lib/mailman/bin/config_list
-lib/mailman/bin/convert.py
-lib/mailman/bin/convert.pyc
-lib/mailman/bin/discard
-lib/mailman/bin/dumpdb
-lib/mailman/bin/find_member
-lib/mailman/bin/fix_url.py
-lib/mailman/bin/fix_url.pyc
-lib/mailman/bin/genaliases
-lib/mailman/bin/inject
-lib/mailman/bin/list_admins
-lib/mailman/bin/list_lists
-lib/mailman/bin/list_members
-lib/mailman/bin/list_owners
-lib/mailman/bin/mailmanctl
-lib/mailman/bin/mmsitepass
-lib/mailman/bin/msgfmt.py
-lib/mailman/bin/msgfmt.pyc
-lib/mailman/bin/newlist
-lib/mailman/bin/paths.py
-lib/mailman/bin/paths.pyc
-lib/mailman/bin/qrunner
-lib/mailman/bin/rb-archfix
-lib/mailman/bin/remove_members
-lib/mailman/bin/reset_pw.py
-lib/mailman/bin/reset_pw.pyc
-lib/mailman/bin/rmlist
-lib/mailman/bin/show_qfiles
-lib/mailman/bin/sync_members
-lib/mailman/bin/transcheck
-lib/mailman/bin/unshunt
-lib/mailman/bin/update
-lib/mailman/bin/version
-lib/mailman/bin/withlist
-lib/mailman/cgi-bin/admin${MAILMAN_CGIEXT}
-lib/mailman/cgi-bin/admindb${MAILMAN_CGIEXT}
-lib/mailman/cgi-bin/confirm${MAILMAN_CGIEXT}
-lib/mailman/cgi-bin/create${MAILMAN_CGIEXT}
-lib/mailman/cgi-bin/edithtml${MAILMAN_CGIEXT}
-lib/mailman/cgi-bin/listinfo${MAILMAN_CGIEXT}
-lib/mailman/cgi-bin/options${MAILMAN_CGIEXT}
-lib/mailman/cgi-bin/private${MAILMAN_CGIEXT}
-lib/mailman/cgi-bin/rmlist${MAILMAN_CGIEXT}
-lib/mailman/cgi-bin/roster${MAILMAN_CGIEXT}
-lib/mailman/cgi-bin/subscribe${MAILMAN_CGIEXT}
-lib/mailman/cron/bumpdigests
-lib/mailman/cron/checkdbs
-lib/mailman/cron/crontab.in
-lib/mailman/cron/disabled
-lib/mailman/cron/gate_news
-lib/mailman/cron/mailpasswds
-lib/mailman/cron/nightly_gzip
-lib/mailman/cron/paths.py
-lib/mailman/cron/paths.pyc
-lib/mailman/cron/senddigests
-lib/mailman/icons/PythonPowered.png
-lib/mailman/icons/gnu-head-tiny.jpg
-lib/mailman/icons/mailman-large.jpg
-lib/mailman/icons/mailman.jpg
-lib/mailman/icons/mm-icon.png
-lib/mailman/mail/mailman
-lib/mailman/messages/ar/LC_MESSAGES/mailman.po
-lib/mailman/messages/ar/LC_MESSAGES/mailman.mo
-lib/mailman/messages/ca/LC_MESSAGES/mailman.mo
-lib/mailman/messages/ca/LC_MESSAGES/mailman.po
-lib/mailman/messages/cs/LC_MESSAGES/mailman.mo
-lib/mailman/messages/cs/LC_MESSAGES/mailman.po
-lib/mailman/messages/da/LC_MESSAGES/mailman.mo
-lib/mailman/messages/da/LC_MESSAGES/mailman.po
-lib/mailman/messages/de/LC_MESSAGES/mailman.mo
-lib/mailman/messages/de/LC_MESSAGES/mailman.po
-lib/mailman/messages/de/README.de
-lib/mailman/messages/es/LC_MESSAGES/mailman.mo
-lib/mailman/messages/es/LC_MESSAGES/mailman.po
-lib/mailman/messages/es/README.es
-lib/mailman/messages/et/LC_MESSAGES/mailman.mo
-lib/mailman/messages/et/LC_MESSAGES/mailman.po
-lib/mailman/messages/eu/LC_MESSAGES/mailman.mo
-lib/mailman/messages/eu/LC_MESSAGES/mailman.po
-lib/mailman/messages/eu/README.eu
-lib/mailman/messages/fi/LC_MESSAGES/mailman.mo
-lib/mailman/messages/fi/LC_MESSAGES/mailman.po
-lib/mailman/messages/fi/README.fi
-lib/mailman/messages/fr/LC_MESSAGES/mailman.mo
-lib/mailman/messages/fr/LC_MESSAGES/mailman.po
-lib/mailman/messages/fr/README.fr
-lib/mailman/messages/hr/LC_MESSAGES/mailman.mo
-lib/mailman/messages/hr/LC_MESSAGES/mailman.po
-lib/mailman/messages/hu/LC_MESSAGES/mailman.mo
-lib/mailman/messages/hu/LC_MESSAGES/mailman.po
-lib/mailman/messages/hu/README.hu
-lib/mailman/messages/ia/LC_MESSAGES/mailman.mo
-lib/mailman/messages/ia/LC_MESSAGES/mailman.po
-lib/mailman/messages/it/LC_MESSAGES/mailman.mo
-lib/mailman/messages/it/LC_MESSAGES/mailman.po
-lib/mailman/messages/it/README.it
-lib/mailman/messages/ja/LC_MESSAGES/mailman.mo
-lib/mailman/messages/ja/LC_MESSAGES/mailman.po
-lib/mailman/messages/ja/README.ja
-lib/mailman/messages/ko/LC_MESSAGES/mailman.mo
-lib/mailman/messages/ko/LC_MESSAGES/mailman.po
-lib/mailman/messages/ko/README.ko
-lib/mailman/messages/lt/LC_MESSAGES/mailman.mo
-lib/mailman/messages/lt/LC_MESSAGES/mailman.po
-lib/mailman/messages/nl/LC_MESSAGES/mailman.mo
-lib/mailman/messages/nl/LC_MESSAGES/mailman.po
-lib/mailman/messages/no/LC_MESSAGES/mailman.mo
-lib/mailman/messages/no/LC_MESSAGES/mailman.po
-lib/mailman/messages/pl/LC_MESSAGES/mailman.mo
-lib/mailman/messages/pl/LC_MESSAGES/mailman.po
-lib/mailman/messages/pl/README.pl
-lib/mailman/messages/pt/LC_MESSAGES/mailman.mo
-lib/mailman/messages/pt/LC_MESSAGES/mailman.po
-lib/mailman/messages/pt_BR/LC_MESSAGES/mailman.mo
-lib/mailman/messages/pt_BR/LC_MESSAGES/mailman.po
-lib/mailman/messages/ro/LC_MESSAGES/mailman.mo
-lib/mailman/messages/ro/LC_MESSAGES/mailman.po
-lib/mailman/messages/ru/LC_MESSAGES/mailman.mo
-lib/mailman/messages/ru/LC_MESSAGES/mailman.po
-lib/mailman/messages/ru/README.ru
-lib/mailman/messages/sl/LC_MESSAGES/mailman.mo
-lib/mailman/messages/sl/LC_MESSAGES/mailman.po
-lib/mailman/messages/sr/LC_MESSAGES/mailman.mo
-lib/mailman/messages/sr/LC_MESSAGES/mailman.po
-lib/mailman/messages/sv/LC_MESSAGES/mailman.mo
-lib/mailman/messages/sv/LC_MESSAGES/mailman.po
-lib/mailman/messages/sv/README.sv
-lib/mailman/messages/tr/LC_MESSAGES/mailman.mo
-lib/mailman/messages/tr/LC_MESSAGES/mailman.po
-lib/mailman/messages/uk/LC_MESSAGES/mailman.mo
-lib/mailman/messages/uk/LC_MESSAGES/mailman.po
-lib/mailman/messages/vi/LC_MESSAGES/mailman.po
-lib/mailman/messages/vi/LC_MESSAGES/mailman.mo
-lib/mailman/messages/zh_CN/LC_MESSAGES/mailman.po
-lib/mailman/messages/zh_CN/LC_MESSAGES/mailman.mo
-lib/mailman/messages/zh_TW/LC_MESSAGES/mailman.po
-lib/mailman/messages/zh_TW/LC_MESSAGES/mailman.mo
-lib/mailman/pythonlib/email/Charset.py
-lib/mailman/pythonlib/email/Charset.pyc
-lib/mailman/pythonlib/email/Encoders.py
-lib/mailman/pythonlib/email/Encoders.pyc
-lib/mailman/pythonlib/email/Errors.py
-lib/mailman/pythonlib/email/Errors.pyc
-lib/mailman/pythonlib/email/Generator.py
-lib/mailman/pythonlib/email/Generator.pyc
-lib/mailman/pythonlib/email/Header.py
-lib/mailman/pythonlib/email/Header.pyc
-lib/mailman/pythonlib/email/Iterators.py
-lib/mailman/pythonlib/email/Iterators.pyc
-lib/mailman/pythonlib/email/MIMEAudio.py
-lib/mailman/pythonlib/email/MIMEAudio.pyc
-lib/mailman/pythonlib/email/MIMEBase.py
-lib/mailman/pythonlib/email/MIMEBase.pyc
-lib/mailman/pythonlib/email/MIMEImage.py
-lib/mailman/pythonlib/email/MIMEImage.pyc
-lib/mailman/pythonlib/email/MIMEMessage.py
-lib/mailman/pythonlib/email/MIMEMessage.pyc
-lib/mailman/pythonlib/email/MIMEMultipart.py
-lib/mailman/pythonlib/email/MIMEMultipart.pyc
-lib/mailman/pythonlib/email/MIMENonMultipart.py
-lib/mailman/pythonlib/email/MIMENonMultipart.pyc
-lib/mailman/pythonlib/email/MIMEText.py
-lib/mailman/pythonlib/email/MIMEText.pyc
-lib/mailman/pythonlib/email/Message.py
-lib/mailman/pythonlib/email/Message.pyc
-lib/mailman/pythonlib/email/Parser.py
-lib/mailman/pythonlib/email/Parser.pyc
-lib/mailman/pythonlib/email/Utils.py
-lib/mailman/pythonlib/email/Utils.pyc
-lib/mailman/pythonlib/email/__init__.py
-lib/mailman/pythonlib/email/__init__.pyc
-lib/mailman/pythonlib/email/_compat21.py
-lib/mailman/pythonlib/email/_compat21.pyc
-lib/mailman/pythonlib/email/_compat22.py
-lib/mailman/pythonlib/email/_compat22.pyc
-lib/mailman/pythonlib/email/_parseaddr.py
-lib/mailman/pythonlib/email/_parseaddr.pyc
-lib/mailman/pythonlib/email/base64MIME.py
-lib/mailman/pythonlib/email/base64MIME.pyc
-lib/mailman/pythonlib/email/quopriMIME.py
-lib/mailman/pythonlib/email/quopriMIME.pyc
-lib/mailman/pythonlib/japanese/__init__.py
-lib/mailman/pythonlib/japanese/__init__.pyc
-lib/mailman/pythonlib/japanese/aliases/__init__.py
-lib/mailman/pythonlib/japanese/aliases/__init__.pyc
-lib/mailman/pythonlib/japanese/c/__init__.py
-lib/mailman/pythonlib/japanese/c/__init__.pyc
-lib/mailman/pythonlib/japanese/c/_japanese_codecs.so
-lib/mailman/pythonlib/japanese/c/euc_jp.py
-lib/mailman/pythonlib/japanese/c/euc_jp.pyc
-lib/mailman/pythonlib/japanese/c/iso_2022_jp.py
-lib/mailman/pythonlib/japanese/c/iso_2022_jp.pyc
-lib/mailman/pythonlib/japanese/c/iso_2022_jp_1.py
-lib/mailman/pythonlib/japanese/c/iso_2022_jp_1.pyc
-lib/mailman/pythonlib/japanese/c/iso_2022_jp_ext.py
-lib/mailman/pythonlib/japanese/c/iso_2022_jp_ext.pyc
-lib/mailman/pythonlib/japanese/c/ms932.py
-lib/mailman/pythonlib/japanese/c/ms932.pyc
-lib/mailman/pythonlib/japanese/c/shift_jis.py
-lib/mailman/pythonlib/japanese/c/shift_jis.pyc
-lib/mailman/pythonlib/japanese/euc_jp.py
-lib/mailman/pythonlib/japanese/euc_jp.pyc
-lib/mailman/pythonlib/japanese/iso_2022_jp.py
-lib/mailman/pythonlib/japanese/iso_2022_jp.pyc
-lib/mailman/pythonlib/japanese/iso_2022_jp_1.py
-lib/mailman/pythonlib/japanese/iso_2022_jp_1.pyc
-lib/mailman/pythonlib/japanese/iso_2022_jp_ext.py
-lib/mailman/pythonlib/japanese/iso_2022_jp_ext.pyc
-lib/mailman/pythonlib/japanese/jis_7.py
-lib/mailman/pythonlib/japanese/jis_7.pyc
-lib/mailman/pythonlib/japanese/jis_x_0201_katakana.py
-lib/mailman/pythonlib/japanese/jis_x_0201_katakana.pyc
-lib/mailman/pythonlib/japanese/jis_x_0201_roman.py
-lib/mailman/pythonlib/japanese/jis_x_0201_roman.pyc
-lib/mailman/pythonlib/japanese/mappings/__init__.py
-lib/mailman/pythonlib/japanese/mappings/__init__.pyc
-lib/mailman/pythonlib/japanese/mappings/euc_jp.py
-lib/mailman/pythonlib/japanese/mappings/euc_jp.pyc
-lib/mailman/pythonlib/japanese/mappings/jis_x_0208.py
-lib/mailman/pythonlib/japanese/mappings/jis_x_0208.pyc
-lib/mailman/pythonlib/japanese/mappings/jis_x_0212.py
-lib/mailman/pythonlib/japanese/mappings/jis_x_0212.pyc
-lib/mailman/pythonlib/japanese/mappings/shift_jis.py
-lib/mailman/pythonlib/japanese/mappings/shift_jis.pyc
-lib/mailman/pythonlib/japanese/ms932.py
-lib/mailman/pythonlib/japanese/ms932.pyc
-lib/mailman/pythonlib/japanese/python/__init__.py
-lib/mailman/pythonlib/japanese/python/__init__.pyc
-lib/mailman/pythonlib/japanese/python/euc_jp.py
-lib/mailman/pythonlib/japanese/python/euc_jp.pyc
-lib/mailman/pythonlib/japanese/python/iso_2022_jp.py
-lib/mailman/pythonlib/japanese/python/iso_2022_jp.pyc
-lib/mailman/pythonlib/japanese/python/iso_2022_jp_1.py
-lib/mailman/pythonlib/japanese/python/iso_2022_jp_1.pyc
-lib/mailman/pythonlib/japanese/python/iso_2022_jp_ext.py
-lib/mailman/pythonlib/japanese/python/iso_2022_jp_ext.pyc
-lib/mailman/pythonlib/japanese/python/shift_jis.py
-lib/mailman/pythonlib/japanese/python/shift_jis.pyc
-lib/mailman/pythonlib/japanese/shift_jis.py
-lib/mailman/pythonlib/japanese/shift_jis.pyc
-lib/mailman/pythonlib/japanese/sjis.py
-lib/mailman/pythonlib/japanese/sjis.pyc
-lib/mailman/pythonlib/japanese/ujis.py
-lib/mailman/pythonlib/japanese/ujis.pyc
-lib/mailman/pythonlib/japanese/windows_31j.py
-lib/mailman/pythonlib/japanese/windows_31j.pyc
-lib/mailman/pythonlib/korean.pth
-lib/mailman/pythonlib/korean/__init__.py
-lib/mailman/pythonlib/korean/__init__.pyc
-lib/mailman/pythonlib/korean/aliases.py
-lib/mailman/pythonlib/korean/aliases.pyc
-lib/mailman/pythonlib/korean/c/__init__.py
-lib/mailman/pythonlib/korean/c/__init__.pyc
-lib/mailman/pythonlib/korean/c/_koco.so
-lib/mailman/pythonlib/korean/c/cp949.py
-lib/mailman/pythonlib/korean/c/cp949.pyc
-lib/mailman/pythonlib/korean/c/euc_kr.py
-lib/mailman/pythonlib/korean/c/euc_kr.pyc
-lib/mailman/pythonlib/korean/c/hangul.so
-lib/mailman/pythonlib/korean/cp949.py
-lib/mailman/pythonlib/korean/cp949.pyc
-lib/mailman/pythonlib/korean/euc_kr.py
-lib/mailman/pythonlib/korean/euc_kr.pyc
-lib/mailman/pythonlib/korean/hangul.py
-lib/mailman/pythonlib/korean/hangul.pyc
-lib/mailman/pythonlib/korean/iso_2022_kr.py
-lib/mailman/pythonlib/korean/iso_2022_kr.pyc
-lib/mailman/pythonlib/korean/johab.py
-lib/mailman/pythonlib/korean/johab.pyc
-lib/mailman/pythonlib/korean/mappings/__init__.py
-lib/mailman/pythonlib/korean/mappings/__init__.pyc
-lib/mailman/pythonlib/korean/mappings/johab_ideograph.py
-lib/mailman/pythonlib/korean/mappings/johab_ideograph.pyc
-lib/mailman/pythonlib/korean/mappings/ksc5601_hangul.py
-lib/mailman/pythonlib/korean/mappings/ksc5601_hangul.pyc
-lib/mailman/pythonlib/korean/mappings/ksc5601_ideograph.py
-lib/mailman/pythonlib/korean/mappings/ksc5601_ideograph.pyc
-lib/mailman/pythonlib/korean/mappings/ksc5601_misc.py
-lib/mailman/pythonlib/korean/mappings/ksc5601_misc.pyc
-lib/mailman/pythonlib/korean/mappings/uhc.py
-lib/mailman/pythonlib/korean/mappings/uhc.pyc
-lib/mailman/pythonlib/korean/python/__init__.py
-lib/mailman/pythonlib/korean/python/__init__.pyc
-lib/mailman/pythonlib/korean/python/cp949.py
-lib/mailman/pythonlib/korean/python/cp949.pyc
-lib/mailman/pythonlib/korean/python/euc_kr.py
-lib/mailman/pythonlib/korean/python/euc_kr.pyc
-lib/mailman/pythonlib/korean/python/hangul.py
-lib/mailman/pythonlib/korean/python/hangul.pyc
-lib/mailman/pythonlib/korean/python/iso_2022_kr.py
-lib/mailman/pythonlib/korean/python/iso_2022_kr.pyc
-lib/mailman/pythonlib/korean/python/johab.py
-lib/mailman/pythonlib/korean/python/johab.pyc
-lib/mailman/pythonlib/korean/python/qwerty2bul.py
-lib/mailman/pythonlib/korean/python/qwerty2bul.pyc
-lib/mailman/pythonlib/korean/python/unijohab.py
-lib/mailman/pythonlib/korean/python/unijohab.pyc
-lib/mailman/pythonlib/korean/qwerty2bul.py
-lib/mailman/pythonlib/korean/qwerty2bul.pyc
-lib/mailman/pythonlib/korean/unijohab.py
-lib/mailman/pythonlib/korean/unijohab.pyc
-lib/mailman/pythonlib/lib/python${PYVERSSUFFIX}/site-packages/japanese.pth
-lib/mailman/scripts/admin
-lib/mailman/scripts/bounces
-lib/mailman/scripts/confirm
-lib/mailman/scripts/driver
-lib/mailman/scripts/join
-lib/mailman/scripts/leave
-lib/mailman/scripts/mailman
-lib/mailman/scripts/owner
-lib/mailman/scripts/paths.py
-lib/mailman/scripts/paths.pyc
-lib/mailman/scripts/post
-lib/mailman/scripts/request
-lib/mailman/scripts/subscribe
-lib/mailman/scripts/unsubscribe
-lib/mailman/support/sitelist.cfg
-lib/mailman/templates/ar/admindbdetails.html
-lib/mailman/templates/ar/admindbpreamble.html
-lib/mailman/templates/ar/admindbsummary.html
-lib/mailman/templates/ar/admlogin.html
-lib/mailman/templates/ar/archidxentry.html
-lib/mailman/templates/ar/archidxfoot.html
-lib/mailman/templates/ar/archidxhead.html
-lib/mailman/templates/ar/archlistend.html
-lib/mailman/templates/ar/archliststart.html
-lib/mailman/templates/ar/archtoc.html
-lib/mailman/templates/ar/archtocentry.html
-lib/mailman/templates/ar/archtocnombox.html
-lib/mailman/templates/ar/article.html
-lib/mailman/templates/ar/emptyarchive.html
-lib/mailman/templates/ar/headfoot.html
-lib/mailman/templates/ar/listinfo.html
-lib/mailman/templates/ar/options.html
-lib/mailman/templates/ar/private.html
-lib/mailman/templates/ar/roster.html
-lib/mailman/templates/ar/subscribe.html
-lib/mailman/templates/ar/adminsubscribeack.txt
-lib/mailman/templates/ar/adminunsubscribeack.txt
-lib/mailman/templates/ar/approve.txt
-lib/mailman/templates/ar/bounce.txt
-lib/mailman/templates/ar/checkdbs.txt
-lib/mailman/templates/ar/convert.txt
-lib/mailman/templates/ar/cronpass.txt
-lib/mailman/templates/ar/disabled.txt
-lib/mailman/templates/ar/help.txt
-lib/mailman/templates/ar/invite.txt
-lib/mailman/templates/ar/masthead.txt
-lib/mailman/templates/ar/newlist.txt
-lib/mailman/templates/ar/nomoretoday.txt
-lib/mailman/templates/ar/postack.txt
-lib/mailman/templates/ar/postauth.txt
-lib/mailman/templates/ar/postheld.txt
-lib/mailman/templates/ar/probe.txt
-lib/mailman/templates/ar/refuse.txt
-lib/mailman/templates/ar/subauth.txt
-lib/mailman/templates/ar/subscribeack.txt
-lib/mailman/templates/ar/unsub.txt
-lib/mailman/templates/ar/unsubauth.txt
-lib/mailman/templates/ar/userpass.txt
-lib/mailman/templates/ar/verify.txt
-lib/mailman/templates/ca/admindbdetails.html
-lib/mailman/templates/ca/admindbpreamble.html
-lib/mailman/templates/ca/admindbsummary.html
-lib/mailman/templates/ca/adminsubscribeack.txt
-lib/mailman/templates/ca/adminunsubscribeack.txt
-lib/mailman/templates/ca/admlogin.html
-lib/mailman/templates/ca/approve.txt
-lib/mailman/templates/ca/archidxentry.html
-lib/mailman/templates/ca/archidxfoot.html
-lib/mailman/templates/ca/archidxhead.html
-lib/mailman/templates/ca/archlistend.html
-lib/mailman/templates/ca/archliststart.html
-lib/mailman/templates/ca/archtoc.html
-lib/mailman/templates/ca/archtocentry.html
-lib/mailman/templates/ca/article.html
-lib/mailman/templates/ca/bounce.txt
-lib/mailman/templates/ca/checkdbs.txt
-lib/mailman/templates/ca/convert.txt
-lib/mailman/templates/ca/cronpass.txt
-lib/mailman/templates/ca/disabled.txt
-lib/mailman/templates/ca/emptyarchive.html
-lib/mailman/templates/ca/headfoot.html
-lib/mailman/templates/ca/help.txt
-lib/mailman/templates/ca/invite.txt
-lib/mailman/templates/ca/listinfo.html
-lib/mailman/templates/ca/masthead.txt
-lib/mailman/templates/ca/newlist.txt
-lib/mailman/templates/ca/nomoretoday.txt
-lib/mailman/templates/ca/options.html
-lib/mailman/templates/ca/postack.txt
-lib/mailman/templates/ca/postauth.txt
-lib/mailman/templates/ca/postheld.txt
-lib/mailman/templates/ca/private.html
-lib/mailman/templates/ca/refuse.txt
-lib/mailman/templates/ca/roster.html
-lib/mailman/templates/ca/subauth.txt
-lib/mailman/templates/ca/subscribe.html
-lib/mailman/templates/ca/subscribeack.txt
-lib/mailman/templates/ca/unsub.txt
-lib/mailman/templates/ca/unsubauth.txt
-lib/mailman/templates/ca/userpass.txt
-lib/mailman/templates/ca/verify.txt
-lib/mailman/templates/cs/admindbdetails.html
-lib/mailman/templates/cs/admindbpreamble.html
-lib/mailman/templates/cs/admindbsummary.html
-lib/mailman/templates/cs/adminsubscribeack.txt
-lib/mailman/templates/cs/adminunsubscribeack.txt
-lib/mailman/templates/cs/admlogin.html
-lib/mailman/templates/cs/approve.txt
-lib/mailman/templates/cs/article.html
-lib/mailman/templates/cs/bounce.txt
-lib/mailman/templates/cs/checkdbs.txt
-lib/mailman/templates/cs/convert.txt
-lib/mailman/templates/cs/cronpass.txt
-lib/mailman/templates/cs/disabled.txt
-lib/mailman/templates/cs/emptyarchive.html
-lib/mailman/templates/cs/headfoot.html
-lib/mailman/templates/cs/help.txt
-lib/mailman/templates/cs/listinfo.html
-lib/mailman/templates/cs/masthead.txt
-lib/mailman/templates/cs/newlist.txt
-lib/mailman/templates/cs/options.html
-lib/mailman/templates/cs/postack.txt
-lib/mailman/templates/cs/postauth.txt
-lib/mailman/templates/cs/postheld.txt
-lib/mailman/templates/cs/private.html
-lib/mailman/templates/cs/refuse.txt
-lib/mailman/templates/cs/roster.html
-lib/mailman/templates/cs/subauth.txt
-lib/mailman/templates/cs/subscribe.html
-lib/mailman/templates/cs/subscribeack.txt
-lib/mailman/templates/cs/unsub.txt
-lib/mailman/templates/cs/unsubauth.txt
-lib/mailman/templates/cs/userpass.txt
-lib/mailman/templates/cs/verify.txt
-lib/mailman/templates/da/admindbdetails.html
-lib/mailman/templates/da/admindbpreamble.html
-lib/mailman/templates/da/admindbsummary.html
-lib/mailman/templates/da/admlogin.html
-lib/mailman/templates/da/archidxfoot.html
-lib/mailman/templates/da/archidxhead.html
-lib/mailman/templates/da/archliststart.html
-lib/mailman/templates/da/archtoc.html
-lib/mailman/templates/da/archtocentry.html
-lib/mailman/templates/da/archtocnombox.html
-lib/mailman/templates/da/article.html
-lib/mailman/templates/da/emptyarchive.html
-lib/mailman/templates/da/headfoot.html
-lib/mailman/templates/da/listinfo.html
-lib/mailman/templates/da/options.html
-lib/mailman/templates/da/private.html
-lib/mailman/templates/da/roster.html
-lib/mailman/templates/da/subscribe.html
-lib/mailman/templates/da/approve.txt
-lib/mailman/templates/da/adminsubscribeack.txt
-lib/mailman/templates/da/adminunsubscribeack.txt
-lib/mailman/templates/da/bounce.txt
-lib/mailman/templates/da/checkdbs.txt
-lib/mailman/templates/da/convert.txt
-lib/mailman/templates/da/cronpass.txt
-lib/mailman/templates/da/disabled.txt
-lib/mailman/templates/da/help.txt
-lib/mailman/templates/da/invite.txt
-lib/mailman/templates/da/masthead.txt
-lib/mailman/templates/da/newlist.txt
-lib/mailman/templates/da/nomoretoday.txt
-lib/mailman/templates/da/postack.txt
-lib/mailman/templates/da/postauth.txt
-lib/mailman/templates/da/postheld.txt
-lib/mailman/templates/da/probe.txt
-lib/mailman/templates/da/refuse.txt
-lib/mailman/templates/da/subauth.txt
-lib/mailman/templates/da/subscribeack.txt
-lib/mailman/templates/da/unsub.txt
-lib/mailman/templates/da/unsubauth.txt
-lib/mailman/templates/da/userpass.txt
-lib/mailman/templates/da/verify.txt
-lib/mailman/templates/de/admindbdetails.html
-lib/mailman/templates/de/admindbpreamble.html
-lib/mailman/templates/de/admindbsummary.html
-lib/mailman/templates/de/adminsubscribeack.txt
-lib/mailman/templates/de/adminunsubscribeack.txt
-lib/mailman/templates/de/admlogin.html
-lib/mailman/templates/de/approve.txt
-lib/mailman/templates/de/article.html
-lib/mailman/templates/de/bounce.txt
-lib/mailman/templates/de/checkdbs.txt
-lib/mailman/templates/de/convert.txt
-lib/mailman/templates/de/cronpass.txt
-lib/mailman/templates/de/disabled.txt
-lib/mailman/templates/de/headfoot.html
-lib/mailman/templates/de/help.txt
-lib/mailman/templates/de/invite.txt
-lib/mailman/templates/de/listinfo.html
-lib/mailman/templates/de/masthead.txt
-lib/mailman/templates/de/newlist.txt
-lib/mailman/templates/de/options.html
-lib/mailman/templates/de/postack.txt
-lib/mailman/templates/de/postauth.txt
-lib/mailman/templates/de/postheld.txt
-lib/mailman/templates/de/private.html
-lib/mailman/templates/de/refuse.txt
-lib/mailman/templates/de/roster.html
-lib/mailman/templates/de/subauth.txt
-lib/mailman/templates/de/subscribe.html
-lib/mailman/templates/de/subscribeack.txt
-lib/mailman/templates/de/unsub.txt
-lib/mailman/templates/de/userpass.txt
-lib/mailman/templates/de/verify.txt
-lib/mailman/templates/en/admindbdetails.html
-lib/mailman/templates/en/admindbpreamble.html
-lib/mailman/templates/en/admindbsummary.html
-lib/mailman/templates/en/adminsubscribeack.txt
-lib/mailman/templates/en/adminunsubscribeack.txt
-lib/mailman/templates/en/admlogin.html
-lib/mailman/templates/en/approve.txt
-lib/mailman/templates/en/archidxentry.html
-lib/mailman/templates/en/archidxfoot.html
-lib/mailman/templates/en/archidxhead.html
-lib/mailman/templates/en/archlistend.html
-lib/mailman/templates/en/archliststart.html
-lib/mailman/templates/en/archtoc.html
-lib/mailman/templates/en/archtocentry.html
-lib/mailman/templates/en/archtocnombox.html
-lib/mailman/templates/en/article.html
-lib/mailman/templates/en/bounce.txt
-lib/mailman/templates/en/checkdbs.txt
-lib/mailman/templates/en/convert.txt
-lib/mailman/templates/en/cronpass.txt
-lib/mailman/templates/en/disabled.txt
-lib/mailman/templates/en/emptyarchive.html
-lib/mailman/templates/en/headfoot.html
-lib/mailman/templates/en/help.txt
-lib/mailman/templates/en/invite.txt
-lib/mailman/templates/en/listinfo.html
-lib/mailman/templates/en/masthead.txt
-lib/mailman/templates/en/newlist.txt
-lib/mailman/templates/en/nomoretoday.txt
-lib/mailman/templates/en/options.html
-lib/mailman/templates/en/postack.txt
-lib/mailman/templates/en/postauth.txt
-lib/mailman/templates/en/postheld.txt
-lib/mailman/templates/en/private.html
-lib/mailman/templates/en/probe.txt
-lib/mailman/templates/en/refuse.txt
-lib/mailman/templates/en/roster.html
-lib/mailman/templates/en/subauth.txt
-lib/mailman/templates/en/subscribe.html
-lib/mailman/templates/en/subscribeack.txt
-lib/mailman/templates/en/unsub.txt
-lib/mailman/templates/en/unsubauth.txt
-lib/mailman/templates/en/userpass.txt
-lib/mailman/templates/en/verify.txt
-lib/mailman/templates/es/admindbdetails.html
-lib/mailman/templates/es/admindbpreamble.html
-lib/mailman/templates/es/admindbsummary.html
-lib/mailman/templates/es/adminsubscribeack.txt
-lib/mailman/templates/es/adminunsubscribeack.txt
-lib/mailman/templates/es/admlogin.html
-lib/mailman/templates/es/approve.txt
-lib/mailman/templates/es/archidxentry.html
-lib/mailman/templates/es/archidxfoot.html
-lib/mailman/templates/es/archidxhead.html
-lib/mailman/templates/es/archlistend.html
-lib/mailman/templates/es/archliststart.html
-lib/mailman/templates/es/archtoc.html
-lib/mailman/templates/es/archtocentry.html
-lib/mailman/templates/es/archtocnombox.html
-lib/mailman/templates/es/article.html
-lib/mailman/templates/es/bounce.txt
-lib/mailman/templates/es/checkdbs.txt
-lib/mailman/templates/es/convert.txt
-lib/mailman/templates/es/cronpass.txt
-lib/mailman/templates/es/disabled.txt
-lib/mailman/templates/es/emptyarchive.html
-lib/mailman/templates/es/handle_opts.html
-lib/mailman/templates/es/headfoot.html
-lib/mailman/templates/es/help.txt
-lib/mailman/templates/es/invite.txt
-lib/mailman/templates/es/listinfo.html
-lib/mailman/templates/es/masthead.txt
-lib/mailman/templates/es/newlist.txt
-lib/mailman/templates/es/nomoretoday.txt
-lib/mailman/templates/es/options.html
-lib/mailman/templates/es/postack.txt
-lib/mailman/templates/es/postauth.txt
-lib/mailman/templates/es/postheld.txt
-lib/mailman/templates/es/private.html
-lib/mailman/templates/es/probe.txt
-lib/mailman/templates/es/refuse.txt
-lib/mailman/templates/es/roster.html
-lib/mailman/templates/es/subauth.txt
-lib/mailman/templates/es/subscribe.html
-lib/mailman/templates/es/subscribeack.txt
-lib/mailman/templates/es/unsub.txt
-lib/mailman/templates/es/unsubauth.txt
-lib/mailman/templates/es/userpass.txt
-lib/mailman/templates/es/verify.txt
-lib/mailman/templates/et/admindbdetails.html
-lib/mailman/templates/et/admindbpreamble.html
-lib/mailman/templates/et/admindbsummary.html
-lib/mailman/templates/et/adminsubscribeack.txt
-lib/mailman/templates/et/adminunsubscribeack.txt
-lib/mailman/templates/et/admlogin.html
-lib/mailman/templates/et/approve.txt
-lib/mailman/templates/et/article.html
-lib/mailman/templates/et/bounce.txt
-lib/mailman/templates/et/checkdbs.txt
-lib/mailman/templates/et/convert.txt
-lib/mailman/templates/et/cronpass.txt
-lib/mailman/templates/et/disabled.txt
-lib/mailman/templates/et/emptyarchive.html
-lib/mailman/templates/et/headfoot.html
-lib/mailman/templates/et/help.txt
-lib/mailman/templates/et/invite.txt
-lib/mailman/templates/et/listinfo.html
-lib/mailman/templates/et/masthead.txt
-lib/mailman/templates/et/newlist.txt
-lib/mailman/templates/et/options.html
-lib/mailman/templates/et/postack.txt
-lib/mailman/templates/et/postauth.txt
-lib/mailman/templates/et/postheld.txt
-lib/mailman/templates/et/private.html
-lib/mailman/templates/et/refuse.txt
-lib/mailman/templates/et/roster.html
-lib/mailman/templates/et/subauth.txt
-lib/mailman/templates/et/subscribe.html
-lib/mailman/templates/et/subscribeack.txt
-lib/mailman/templates/et/unsub.txt
-lib/mailman/templates/et/unsubauth.txt
-lib/mailman/templates/et/userpass.txt
-lib/mailman/templates/et/verify.txt
-lib/mailman/templates/eu/admindbdetails.html
-lib/mailman/templates/eu/admindbpreamble.html
-lib/mailman/templates/eu/admindbsummary.html
-lib/mailman/templates/eu/adminsubscribeack.txt
-lib/mailman/templates/eu/adminunsubscribeack.txt
-lib/mailman/templates/eu/admlogin.html
-lib/mailman/templates/eu/approve.txt
-lib/mailman/templates/eu/archidxentry.html
-lib/mailman/templates/eu/archidxfoot.html
-lib/mailman/templates/eu/archidxhead.html
-lib/mailman/templates/eu/archlistend.html
-lib/mailman/templates/eu/archliststart.html
-lib/mailman/templates/eu/archtoc.html
-lib/mailman/templates/eu/archtocentry.html
-lib/mailman/templates/eu/article.html
-lib/mailman/templates/eu/bounce.txt
-lib/mailman/templates/eu/checkdbs.txt
-lib/mailman/templates/eu/convert.txt
-lib/mailman/templates/eu/cronpass.txt
-lib/mailman/templates/eu/disabled.txt
-lib/mailman/templates/eu/emptyarchive.html
-lib/mailman/templates/eu/headfoot.html
-lib/mailman/templates/eu/help.txt
-lib/mailman/templates/eu/invite.txt
-lib/mailman/templates/eu/listinfo.html
-lib/mailman/templates/eu/masthead.txt
-lib/mailman/templates/eu/newlist.txt
-lib/mailman/templates/eu/nomoretoday.txt
-lib/mailman/templates/eu/options.html
-lib/mailman/templates/eu/postack.txt
-lib/mailman/templates/eu/postauth.txt
-lib/mailman/templates/eu/postheld.txt
-lib/mailman/templates/eu/private.html
-lib/mailman/templates/eu/refuse.txt
-lib/mailman/templates/eu/roster.html
-lib/mailman/templates/eu/subauth.txt
-lib/mailman/templates/eu/subscribe.html
-lib/mailman/templates/eu/subscribeack.txt
-lib/mailman/templates/eu/unsub.txt
-lib/mailman/templates/eu/unsubauth.txt
-lib/mailman/templates/eu/userpass.txt
-lib/mailman/templates/eu/verify.txt
-lib/mailman/templates/fi/admindbdetails.html
-lib/mailman/templates/fi/admindbpreamble.html
-lib/mailman/templates/fi/admindbsummary.html
-lib/mailman/templates/fi/adminsubscribeack.txt
-lib/mailman/templates/fi/adminunsubscribeack.txt
-lib/mailman/templates/fi/admlogin.html
-lib/mailman/templates/fi/approve.txt
-lib/mailman/templates/fi/article.html
-lib/mailman/templates/fi/bounce.txt
-lib/mailman/templates/fi/checkdbs.txt
-lib/mailman/templates/fi/convert.txt
-lib/mailman/templates/fi/cronpass.txt
-lib/mailman/templates/fi/disabled.txt
-lib/mailman/templates/fi/headfoot.html
-lib/mailman/templates/fi/help.txt
-lib/mailman/templates/fi/listinfo.html
-lib/mailman/templates/fi/masthead.txt
-lib/mailman/templates/fi/newlist.txt
-lib/mailman/templates/fi/options.html
-lib/mailman/templates/fi/postack.txt
-lib/mailman/templates/fi/postauth.txt
-lib/mailman/templates/fi/postheld.txt
-lib/mailman/templates/fi/private.html
-lib/mailman/templates/fi/reenable.txt
-lib/mailman/templates/fi/refuse.txt
-lib/mailman/templates/fi/roster.html
-lib/mailman/templates/fi/subauth.txt
-lib/mailman/templates/fi/subscribe.html
-lib/mailman/templates/fi/subscribeack.txt
-lib/mailman/templates/fi/unsub.txt
-lib/mailman/templates/fi/unsubauth.txt
-lib/mailman/templates/fi/userpass.txt
-lib/mailman/templates/fi/verify.txt
-lib/mailman/templates/fr/admindbdetails.html
-lib/mailman/templates/fr/admindbpreamble.html
-lib/mailman/templates/fr/admindbsummary.html
-lib/mailman/templates/fr/adminsubscribeack.txt
-lib/mailman/templates/fr/adminunsubscribeack.txt
-lib/mailman/templates/fr/admlogin.html
-lib/mailman/templates/fr/approve.txt
-lib/mailman/templates/fr/archidxentry.html
-lib/mailman/templates/fr/archidxfoot.html
-lib/mailman/templates/fr/archidxhead.html
-lib/mailman/templates/fr/archlistend.html
-lib/mailman/templates/fr/archliststart.html
-lib/mailman/templates/fr/archtoc.html
-lib/mailman/templates/fr/archtocentry.html
-lib/mailman/templates/fr/archtocnombox.html
-lib/mailman/templates/fr/article.html
-lib/mailman/templates/fr/bounce.txt
-lib/mailman/templates/fr/checkdbs.txt
-lib/mailman/templates/fr/convert.txt
-lib/mailman/templates/fr/cronpass.txt
-lib/mailman/templates/fr/disabled.txt
-lib/mailman/templates/fr/emptyarchive.html
-lib/mailman/templates/fr/handle_opts.html
-lib/mailman/templates/fr/headfoot.html
-lib/mailman/templates/fr/help.txt
-lib/mailman/templates/fr/invite.txt
-lib/mailman/templates/fr/listinfo.html
-lib/mailman/templates/fr/masthead.txt
-lib/mailman/templates/fr/newlist.txt
-lib/mailman/templates/fr/nomoretoday.txt
-lib/mailman/templates/fr/options.html
-lib/mailman/templates/fr/postack.txt
-lib/mailman/templates/fr/postauth.txt
-lib/mailman/templates/fr/postheld.txt
-lib/mailman/templates/fr/private.html
-lib/mailman/templates/fr/refuse.txt
-lib/mailman/templates/fr/roster.html
-lib/mailman/templates/fr/subauth.txt
-lib/mailman/templates/fr/subscribe.html
-lib/mailman/templates/fr/subscribeack.txt
-lib/mailman/templates/fr/unsub.txt
-lib/mailman/templates/fr/unsubauth.txt
-lib/mailman/templates/fr/userpass.txt
-lib/mailman/templates/fr/verify.txt
-lib/mailman/templates/hr/admindbdetails.html
-lib/mailman/templates/hr/admindbpreamble.html
-lib/mailman/templates/hr/admindbsummary.html
-lib/mailman/templates/hr/adminsubscribeack.txt
-lib/mailman/templates/hr/adminunsubscribeack.txt
-lib/mailman/templates/hr/admlogin.html
-lib/mailman/templates/hr/approve.txt
-lib/mailman/templates/hr/archidxentry.html
-lib/mailman/templates/hr/archidxfoot.html
-lib/mailman/templates/hr/archidxhead.html
-lib/mailman/templates/hr/archlistend.html
-lib/mailman/templates/hr/archliststart.html
-lib/mailman/templates/hr/archtoc.html
-lib/mailman/templates/hr/archtocentry.html
-lib/mailman/templates/hr/article.html
-lib/mailman/templates/hr/bounce.txt
-lib/mailman/templates/hr/checkdbs.txt
-lib/mailman/templates/hr/convert.txt
-lib/mailman/templates/hr/cronpass.txt
-lib/mailman/templates/hr/disabled.txt
-lib/mailman/templates/hr/emptyarchive.html
-lib/mailman/templates/hr/headfoot.html
-lib/mailman/templates/hr/help.txt
-lib/mailman/templates/hr/invite.txt
-lib/mailman/templates/hr/listinfo.html
-lib/mailman/templates/hr/masthead.txt
-lib/mailman/templates/hr/newlist.txt
-lib/mailman/templates/hr/nomoretoday.txt
-lib/mailman/templates/hr/options.html
-lib/mailman/templates/hr/postack.txt
-lib/mailman/templates/hr/postauth.txt
-lib/mailman/templates/hr/postheld.txt
-lib/mailman/templates/hr/private.html
-lib/mailman/templates/hr/refuse.txt
-lib/mailman/templates/hr/roster.html
-lib/mailman/templates/hr/subauth.txt
-lib/mailman/templates/hr/subscribe.html
-lib/mailman/templates/hr/subscribeack.txt
-lib/mailman/templates/hr/unsub.txt
-lib/mailman/templates/hr/unsubauth.txt
-lib/mailman/templates/hr/userpass.txt
-lib/mailman/templates/hr/verify.txt
-lib/mailman/templates/hu/admindbdetails.html
-lib/mailman/templates/hu/admindbpreamble.html
-lib/mailman/templates/hu/admindbsummary.html
-lib/mailman/templates/hu/adminsubscribeack.txt
-lib/mailman/templates/hu/adminunsubscribeack.txt
-lib/mailman/templates/hu/admlogin.html
-lib/mailman/templates/hu/approve.txt
-lib/mailman/templates/hu/archidxentry.html
-lib/mailman/templates/hu/archidxfoot.html
-lib/mailman/templates/hu/archidxhead.html
-lib/mailman/templates/hu/archlistend.html
-lib/mailman/templates/hu/archliststart.html
-lib/mailman/templates/hu/archtoc.html
-lib/mailman/templates/hu/archtocentry.html
-lib/mailman/templates/hu/article.html
-lib/mailman/templates/hu/bounce.txt
-lib/mailman/templates/hu/checkdbs.txt
-lib/mailman/templates/hu/convert.txt
-lib/mailman/templates/hu/cronpass.txt
-lib/mailman/templates/hu/disabled.txt
-lib/mailman/templates/hu/emptyarchive.html
-lib/mailman/templates/hu/headfoot.html
-lib/mailman/templates/hu/help.txt
-lib/mailman/templates/hu/illik.html
-lib/mailman/templates/hu/invite.txt
-lib/mailman/templates/hu/listinfo.html
-lib/mailman/templates/hu/masthead.txt
-lib/mailman/templates/hu/newlist.txt
-lib/mailman/templates/hu/nomoretoday.txt
-lib/mailman/templates/hu/options.html
-lib/mailman/templates/hu/postack.txt
-lib/mailman/templates/hu/postauth.txt
-lib/mailman/templates/hu/postheld.txt
-lib/mailman/templates/hu/private.html
-lib/mailman/templates/hu/probe.txt
-lib/mailman/templates/hu/refuse.txt
-lib/mailman/templates/hu/roster.html
-lib/mailman/templates/hu/subauth.txt
-lib/mailman/templates/hu/subscribe.html
-lib/mailman/templates/hu/subscribeack.txt
-lib/mailman/templates/hu/unsub.txt
-lib/mailman/templates/hu/unsubauth.txt
-lib/mailman/templates/hu/userpass.txt
-lib/mailman/templates/hu/verify.txt
-lib/mailman/templates/ia/admindbdetails.html
-lib/mailman/templates/ia/admindbpreamble.html
-lib/mailman/templates/ia/admindbsummary.html
-lib/mailman/templates/ia/admlogin.html
-lib/mailman/templates/ia/archidxentry.html
-lib/mailman/templates/ia/archidxfoot.html
-lib/mailman/templates/ia/archidxhead.html
-lib/mailman/templates/ia/archlistend.html
-lib/mailman/templates/ia/archliststart.html
-lib/mailman/templates/ia/archtoc.html
-lib/mailman/templates/ia/archtocentry.html
-lib/mailman/templates/ia/archtocnombox.html
-lib/mailman/templates/ia/article.html
-lib/mailman/templates/ia/emptyarchive.html
-lib/mailman/templates/ia/headfoot.html
-lib/mailman/templates/ia/listinfo.html
-lib/mailman/templates/ia/options.html
-lib/mailman/templates/ia/private.html
-lib/mailman/templates/ia/roster.html
-lib/mailman/templates/ia/subscribe.html
-lib/mailman/templates/ia/adminsubscribeack.txt
-lib/mailman/templates/ia/adminunsubscribeack.txt
-lib/mailman/templates/ia/approve.txt
-lib/mailman/templates/ia/bounce.txt
-lib/mailman/templates/ia/checkdbs.txt
-lib/mailman/templates/ia/convert.txt
-lib/mailman/templates/ia/cronpass.txt
-lib/mailman/templates/ia/disabled.txt
-lib/mailman/templates/ia/help.txt
-lib/mailman/templates/ia/invite.txt
-lib/mailman/templates/ia/masthead.txt
-lib/mailman/templates/ia/newlist.txt
-lib/mailman/templates/ia/nomoretoday.txt
-lib/mailman/templates/ia/postack.txt
-lib/mailman/templates/ia/postauth.txt
-lib/mailman/templates/ia/postheld.txt
-lib/mailman/templates/ia/probe.txt
-lib/mailman/templates/ia/refuse.txt
-lib/mailman/templates/ia/subauth.txt
-lib/mailman/templates/ia/subscribeack.txt
-lib/mailman/templates/ia/unsub.txt
-lib/mailman/templates/ia/unsubauth.txt
-lib/mailman/templates/ia/userpass.txt
-lib/mailman/templates/ia/verify.txt
-lib/mailman/templates/it/admindbdetails.html
-lib/mailman/templates/it/admindbpreamble.html
-lib/mailman/templates/it/admindbsummary.html
-lib/mailman/templates/it/adminsubscribeack.txt
-lib/mailman/templates/it/adminunsubscribeack.txt
-lib/mailman/templates/it/admlogin.html
-lib/mailman/templates/it/approve.txt
-lib/mailman/templates/it/archidxentry.html
-lib/mailman/templates/it/archidxfoot.html
-lib/mailman/templates/it/archidxhead.html
-lib/mailman/templates/it/archlistend.html
-lib/mailman/templates/it/archliststart.html
-lib/mailman/templates/it/archtoc.html
-lib/mailman/templates/it/archtocentry.html
-lib/mailman/templates/it/archtocnombox.html
-lib/mailman/templates/it/article.html
-lib/mailman/templates/it/bounce.txt
-lib/mailman/templates/it/checkdbs.txt
-lib/mailman/templates/it/convert.txt
-lib/mailman/templates/it/cronpass.txt
-lib/mailman/templates/it/disabled.txt
-lib/mailman/templates/it/emptyarchive.html
-lib/mailman/templates/it/headfoot.html
-lib/mailman/templates/it/help.txt
-lib/mailman/templates/it/invite.txt
-lib/mailman/templates/it/listinfo.html
-lib/mailman/templates/it/masthead.txt
-lib/mailman/templates/it/newlist.txt
-lib/mailman/templates/it/nomoretoday.txt
-lib/mailman/templates/it/options.html
-lib/mailman/templates/it/postack.txt
-lib/mailman/templates/it/postauth.txt
-lib/mailman/templates/it/postheld.txt
-lib/mailman/templates/it/private.html
-lib/mailman/templates/it/probe.txt
-lib/mailman/templates/it/refuse.txt
-lib/mailman/templates/it/roster.html
-lib/mailman/templates/it/subauth.txt
-lib/mailman/templates/it/subscribe.html
-lib/mailman/templates/it/subscribeack.txt
-lib/mailman/templates/it/unsub.txt
-lib/mailman/templates/it/unsubauth.txt
-lib/mailman/templates/it/userpass.txt
-lib/mailman/templates/it/verify.txt
-lib/mailman/templates/ja/admindbdetails.html
-lib/mailman/templates/ja/admindbpreamble.html
-lib/mailman/templates/ja/admindbsummary.html
-lib/mailman/templates/ja/adminsubscribeack.txt
-lib/mailman/templates/ja/adminunsubscribeack.txt
-lib/mailman/templates/ja/admlogin.html
-lib/mailman/templates/ja/approve.txt
-lib/mailman/templates/ja/archidxentry.html
-lib/mailman/templates/ja/archidxfoot.html
-lib/mailman/templates/ja/archidxhead.html
-lib/mailman/templates/ja/archlistend.html
-lib/mailman/templates/ja/archliststart.html
-lib/mailman/templates/ja/archtoc.html
-lib/mailman/templates/ja/archtocentry.html
-lib/mailman/templates/ja/archtocnombox.html
-lib/mailman/templates/ja/article.html
-lib/mailman/templates/ja/bounce.txt
-lib/mailman/templates/ja/checkdbs.txt
-lib/mailman/templates/ja/convert.txt
-lib/mailman/templates/ja/cronpass.txt
-lib/mailman/templates/ja/disabled.txt
-lib/mailman/templates/ja/emptyarchive.html
-lib/mailman/templates/ja/headfoot.html
-lib/mailman/templates/ja/help.txt
-lib/mailman/templates/ja/invite.txt
-lib/mailman/templates/ja/listinfo.html
-lib/mailman/templates/ja/masthead.txt
-lib/mailman/templates/ja/newlist.txt
-lib/mailman/templates/ja/nomoretoday.txt
-lib/mailman/templates/ja/options.html
-lib/mailman/templates/ja/postack.txt
-lib/mailman/templates/ja/postauth.txt
-lib/mailman/templates/ja/postheld.txt
-lib/mailman/templates/ja/private.html
-lib/mailman/templates/ja/probe.txt
-lib/mailman/templates/ja/refuse.txt
-lib/mailman/templates/ja/roster.html
-lib/mailman/templates/ja/subauth.txt
-lib/mailman/templates/ja/subscribe.html
-lib/mailman/templates/ja/subscribeack.txt
-lib/mailman/templates/ja/unsub.txt
-lib/mailman/templates/ja/unsubauth.txt
-lib/mailman/templates/ja/userpass.txt
-lib/mailman/templates/ja/verify.txt
-lib/mailman/templates/ko/admindbdetails.html
-lib/mailman/templates/ko/admindbpreamble.html
-lib/mailman/templates/ko/admindbsummary.html
-lib/mailman/templates/ko/adminsubscribeack.txt
-lib/mailman/templates/ko/adminunsubscribeack.txt
-lib/mailman/templates/ko/admlogin.html
-lib/mailman/templates/ko/approve.txt
-lib/mailman/templates/ko/article.html
-lib/mailman/templates/ko/bounce.txt
-lib/mailman/templates/ko/checkdbs.txt
-lib/mailman/templates/ko/convert.txt
-lib/mailman/templates/ko/cronpass.txt
-lib/mailman/templates/ko/disabled.txt
-lib/mailman/templates/ko/emptyarchive.html
-lib/mailman/templates/ko/headfoot.html
-lib/mailman/templates/ko/help.txt
-lib/mailman/templates/ko/invite.txt
-lib/mailman/templates/ko/listinfo.html
-lib/mailman/templates/ko/masthead.txt
-lib/mailman/templates/ko/newlist.txt
-lib/mailman/templates/ko/options.html
-lib/mailman/templates/ko/postack.txt
-lib/mailman/templates/ko/postauth.txt
-lib/mailman/templates/ko/postheld.txt
-lib/mailman/templates/ko/private.html
-lib/mailman/templates/ko/refuse.txt
-lib/mailman/templates/ko/roster.html
-lib/mailman/templates/ko/subauth.txt
-lib/mailman/templates/ko/subscribe.html
-lib/mailman/templates/ko/subscribeack.txt
-lib/mailman/templates/ko/unsub.txt
-lib/mailman/templates/ko/unsubauth.txt
-lib/mailman/templates/ko/userpass.txt
-lib/mailman/templates/ko/verify.txt
-lib/mailman/templates/lt/admindbdetails.html
-lib/mailman/templates/lt/admindbpreamble.html
-lib/mailman/templates/lt/admindbsummary.html
-lib/mailman/templates/lt/adminsubscribeack.txt
-lib/mailman/templates/lt/adminunsubscribeack.txt
-lib/mailman/templates/lt/admlogin.html
-lib/mailman/templates/lt/approve.txt
-lib/mailman/templates/lt/archidxentry.html
-lib/mailman/templates/lt/archidxfoot.html
-lib/mailman/templates/lt/archidxhead.html
-lib/mailman/templates/lt/archlistend.html
-lib/mailman/templates/lt/archliststart.html
-lib/mailman/templates/lt/archtoc.html
-lib/mailman/templates/lt/archtocentry.html
-lib/mailman/templates/lt/article.html
-lib/mailman/templates/lt/bounce.txt
-lib/mailman/templates/lt/checkdbs.txt
-lib/mailman/templates/lt/convert.txt
-lib/mailman/templates/lt/cronpass.txt
-lib/mailman/templates/lt/disabled.txt
-lib/mailman/templates/lt/emptyarchive.html
-lib/mailman/templates/lt/headfoot.html
-lib/mailman/templates/lt/help.txt
-lib/mailman/templates/lt/invite.txt
-lib/mailman/templates/lt/listinfo.html
-lib/mailman/templates/lt/masthead.txt
-lib/mailman/templates/lt/newlist.txt
-lib/mailman/templates/lt/nomoretoday.txt
-lib/mailman/templates/lt/options.html
-lib/mailman/templates/lt/postack.txt
-lib/mailman/templates/lt/postauth.txt
-lib/mailman/templates/lt/postheld.txt
-lib/mailman/templates/lt/private.html
-lib/mailman/templates/lt/refuse.txt
-lib/mailman/templates/lt/roster.html
-lib/mailman/templates/lt/subauth.txt
-lib/mailman/templates/lt/subscribe.html
-lib/mailman/templates/lt/subscribeack.txt
-lib/mailman/templates/lt/unsub.txt
-lib/mailman/templates/lt/unsubauth.txt
-lib/mailman/templates/lt/userpass.txt
-lib/mailman/templates/lt/verify.txt
-lib/mailman/templates/nl/admindbdetails.html
-lib/mailman/templates/nl/admindbpreamble.html
-lib/mailman/templates/nl/admindbsummary.html
-lib/mailman/templates/nl/adminsubscribeack.txt
-lib/mailman/templates/nl/adminunsubscribeack.txt
-lib/mailman/templates/nl/admlogin.html
-lib/mailman/templates/nl/approve.txt
-lib/mailman/templates/nl/archidxentry.html
-lib/mailman/templates/nl/archidxfoot.html
-lib/mailman/templates/nl/archidxhead.html
-lib/mailman/templates/nl/archlistend.html
-lib/mailman/templates/nl/archliststart.html
-lib/mailman/templates/nl/archtoc.html
-lib/mailman/templates/nl/archtocentry.html
-lib/mailman/templates/nl/archtocnombox.html
-lib/mailman/templates/nl/article.html
-lib/mailman/templates/nl/bounce.txt
-lib/mailman/templates/nl/checkdbs.txt
-lib/mailman/templates/nl/convert.txt
-lib/mailman/templates/nl/cronpass.txt
-lib/mailman/templates/nl/disabled.txt
-lib/mailman/templates/nl/emptyarchive.html
-lib/mailman/templates/nl/headfoot.html
-lib/mailman/templates/nl/help.txt
-lib/mailman/templates/nl/invite.txt
-lib/mailman/templates/nl/listinfo.html
-lib/mailman/templates/nl/masthead.txt
-lib/mailman/templates/nl/newlist.txt
-lib/mailman/templates/nl/nomoretoday.txt
-lib/mailman/templates/nl/options.html
-lib/mailman/templates/nl/postack.txt
-lib/mailman/templates/nl/postauth.txt
-lib/mailman/templates/nl/postheld.txt
-lib/mailman/templates/nl/private.html
-lib/mailman/templates/nl/probe.txt
-lib/mailman/templates/nl/refuse.txt
-lib/mailman/templates/nl/roster.html
-lib/mailman/templates/nl/subauth.txt
-lib/mailman/templates/nl/subscribe.html
-lib/mailman/templates/nl/subscribeack.txt
-lib/mailman/templates/nl/unsub.txt
-lib/mailman/templates/nl/unsubauth.txt
-lib/mailman/templates/nl/userpass.txt
-lib/mailman/templates/nl/verify.txt
-lib/mailman/templates/no/admindbdetails.html
-lib/mailman/templates/no/admindbpreamble.html
-lib/mailman/templates/no/admindbsummary.html
-lib/mailman/templates/no/adminsubscribeack.txt
-lib/mailman/templates/no/adminunsubscribeack.txt
-lib/mailman/templates/no/admlogin.html
-lib/mailman/templates/no/approve.txt
-lib/mailman/templates/no/archidxfoot.html
-lib/mailman/templates/no/archidxhead.html
-lib/mailman/templates/no/archliststart.html
-lib/mailman/templates/no/archtoc.html
-lib/mailman/templates/no/archtocentry.html
-lib/mailman/templates/no/archtocnombox.html
-lib/mailman/templates/no/article.html
-lib/mailman/templates/no/bounce.txt
-lib/mailman/templates/no/checkdbs.txt
-lib/mailman/templates/no/convert.txt
-lib/mailman/templates/no/cronpass.txt
-lib/mailman/templates/no/disabled.txt
-lib/mailman/templates/no/emptyarchive.html
-lib/mailman/templates/no/headfoot.html
-lib/mailman/templates/no/help.txt
-lib/mailman/templates/no/invite.txt
-lib/mailman/templates/no/listinfo.html
-lib/mailman/templates/no/masthead.txt
-lib/mailman/templates/no/newlist.txt
-lib/mailman/templates/no/nomoretoday.txt
-lib/mailman/templates/no/options.html
-lib/mailman/templates/no/postack.txt
-lib/mailman/templates/no/postauth.txt
-lib/mailman/templates/no/postheld.txt
-lib/mailman/templates/no/private.html
-lib/mailman/templates/no/refuse.txt
-lib/mailman/templates/no/roster.html
-lib/mailman/templates/no/subauth.txt
-lib/mailman/templates/no/subscribe.html
-lib/mailman/templates/no/subscribeack.txt
-lib/mailman/templates/no/unsub.txt
-lib/mailman/templates/no/unsubauth.txt
-lib/mailman/templates/no/userpass.txt
-lib/mailman/templates/no/verify.txt
-lib/mailman/templates/pl/admindbdetails.html
-lib/mailman/templates/pl/admindbpreamble.html
-lib/mailman/templates/pl/admindbsummary.html
-lib/mailman/templates/pl/adminsubscribeack.txt
-lib/mailman/templates/pl/adminunsubscribeack.txt
-lib/mailman/templates/pl/admlogin.html
-lib/mailman/templates/pl/approve.txt
-lib/mailman/templates/pl/archidxentry.html
-lib/mailman/templates/pl/archidxfoot.html
-lib/mailman/templates/pl/archidxhead.html
-lib/mailman/templates/pl/archlistend.html
-lib/mailman/templates/pl/archliststart.html
-lib/mailman/templates/pl/archtoc.html
-lib/mailman/templates/pl/archtocentry.html
-lib/mailman/templates/pl/article.html
-lib/mailman/templates/pl/bounce.txt
-lib/mailman/templates/pl/checkdbs.txt
-lib/mailman/templates/pl/convert.txt
-lib/mailman/templates/pl/cronpass.txt
-lib/mailman/templates/pl/disabled.txt
-lib/mailman/templates/pl/emptyarchive.html
-lib/mailman/templates/pl/headfoot.html
-lib/mailman/templates/pl/help.txt
-lib/mailman/templates/pl/invite.txt
-lib/mailman/templates/pl/listinfo.html
-lib/mailman/templates/pl/masthead.txt
-lib/mailman/templates/pl/newlist.txt
-lib/mailman/templates/pl/nomoretoday.txt
-lib/mailman/templates/pl/options.html
-lib/mailman/templates/pl/postack.txt
-lib/mailman/templates/pl/postauth.txt
-lib/mailman/templates/pl/postheld.txt
-lib/mailman/templates/pl/private.html
-lib/mailman/templates/pl/refuse.txt
-lib/mailman/templates/pl/roster.html
-lib/mailman/templates/pl/subauth.txt
-lib/mailman/templates/pl/subscribe.html
-lib/mailman/templates/pl/subscribeack.txt
-lib/mailman/templates/pl/unsub.txt
-lib/mailman/templates/pl/unsubauth.txt
-lib/mailman/templates/pl/userpass.txt
-lib/mailman/templates/pl/verify.txt
-lib/mailman/templates/pt/admindbdetails.html
-lib/mailman/templates/pt/admindbpreamble.html
-lib/mailman/templates/pt/admindbsummary.html
-lib/mailman/templates/pt/adminsubscribeack.txt
-lib/mailman/templates/pt/adminunsubscribeack.txt
-lib/mailman/templates/pt/admlogin.html
-lib/mailman/templates/pt/approve.txt
-lib/mailman/templates/pt/archidxentry.html
-lib/mailman/templates/pt/archidxfoot.html
-lib/mailman/templates/pt/archidxhead.html
-lib/mailman/templates/pt/archlistend.html
-lib/mailman/templates/pt/archliststart.html
-lib/mailman/templates/pt/archtoc.html
-lib/mailman/templates/pt/archtocentry.html
-lib/mailman/templates/pt/article.html
-lib/mailman/templates/pt/bounce.txt
-lib/mailman/templates/pt/checkdbs.txt
-lib/mailman/templates/pt/convert.txt
-lib/mailman/templates/pt/cronpass.txt
-lib/mailman/templates/pt/disabled.txt
-lib/mailman/templates/pt/emptyarchive.html
-lib/mailman/templates/pt/headfoot.html
-lib/mailman/templates/pt/help.txt
-lib/mailman/templates/pt/invite.txt
-lib/mailman/templates/pt/listinfo.html
-lib/mailman/templates/pt/masthead.txt
-lib/mailman/templates/pt/newlist.txt
-lib/mailman/templates/pt/nomoretoday.txt
-lib/mailman/templates/pt/options.html
-lib/mailman/templates/pt/postack.txt
-lib/mailman/templates/pt/postauth.txt
-lib/mailman/templates/pt/postheld.txt
-lib/mailman/templates/pt/private.html
-lib/mailman/templates/pt/refuse.txt
-lib/mailman/templates/pt/roster.html
-lib/mailman/templates/pt/subauth.txt
-lib/mailman/templates/pt/subscribe.html
-lib/mailman/templates/pt/subscribeack.txt
-lib/mailman/templates/pt/unsub.txt
-lib/mailman/templates/pt/unsubauth.txt
-lib/mailman/templates/pt/userpass.txt
-lib/mailman/templates/pt/verify.txt
-lib/mailman/templates/pt_BR/admindbdetails.html
-lib/mailman/templates/pt_BR/admindbpreamble.html
-lib/mailman/templates/pt_BR/admindbsummary.html
-lib/mailman/templates/pt_BR/adminsubscribeack.txt
-lib/mailman/templates/pt_BR/adminunsubscribeack.txt
-lib/mailman/templates/pt_BR/admlogin.html
-lib/mailman/templates/pt_BR/approve.txt
-lib/mailman/templates/pt_BR/archidxentry.html
-lib/mailman/templates/pt_BR/archidxfoot.html
-lib/mailman/templates/pt_BR/archidxhead.html
-lib/mailman/templates/pt_BR/archlistend.html
-lib/mailman/templates/pt_BR/archliststart.html
-lib/mailman/templates/pt_BR/archtoc.html
-lib/mailman/templates/pt_BR/archtocentry.html
-lib/mailman/templates/pt_BR/article.html
-lib/mailman/templates/pt_BR/bounce.txt
-lib/mailman/templates/pt_BR/checkdbs.txt
-lib/mailman/templates/pt_BR/convert.txt
-lib/mailman/templates/pt_BR/cronpass.txt
-lib/mailman/templates/pt_BR/disabled.txt
-lib/mailman/templates/pt_BR/emptyarchive.html
-lib/mailman/templates/pt_BR/headfoot.html
-lib/mailman/templates/pt_BR/help.txt
-lib/mailman/templates/pt_BR/invite.txt
-lib/mailman/templates/pt_BR/listinfo.html
-lib/mailman/templates/pt_BR/masthead.txt
-lib/mailman/templates/pt_BR/newlist.txt
-lib/mailman/templates/pt_BR/nomoretoday.txt
-lib/mailman/templates/pt_BR/options.html
-lib/mailman/templates/pt_BR/postack.txt
-lib/mailman/templates/pt_BR/postauth.txt
-lib/mailman/templates/pt_BR/postheld.txt
-lib/mailman/templates/pt_BR/private.html
-lib/mailman/templates/pt_BR/refuse.txt
-lib/mailman/templates/pt_BR/roster.html
-lib/mailman/templates/pt_BR/subauth.txt
-lib/mailman/templates/pt_BR/subscribe.html
-lib/mailman/templates/pt_BR/subscribeack.txt
-lib/mailman/templates/pt_BR/unsub.txt
-lib/mailman/templates/pt_BR/unsubauth.txt
-lib/mailman/templates/pt_BR/userpass.txt
-lib/mailman/templates/pt_BR/verify.txt
-lib/mailman/templates/ro/admindbdetails.html
-lib/mailman/templates/ro/admindbpreamble.html
-lib/mailman/templates/ro/admindbsummary.html
-lib/mailman/templates/ro/adminsubscribeack.txt
-lib/mailman/templates/ro/adminunsubscribeack.txt
-lib/mailman/templates/ro/admlogin.html
-lib/mailman/templates/ro/approve.txt
-lib/mailman/templates/ro/archidxentry.html
-lib/mailman/templates/ro/archidxfoot.html
-lib/mailman/templates/ro/archidxhead.html
-lib/mailman/templates/ro/archlistend.html
-lib/mailman/templates/ro/archliststart.html
-lib/mailman/templates/ro/archtoc.html
-lib/mailman/templates/ro/archtocentry.html
-lib/mailman/templates/ro/article.html
-lib/mailman/templates/ro/bounce.txt
-lib/mailman/templates/ro/checkdbs.txt
-lib/mailman/templates/ro/convert.txt
-lib/mailman/templates/ro/cronpass.txt
-lib/mailman/templates/ro/disabled.txt
-lib/mailman/templates/ro/emptyarchive.html
-lib/mailman/templates/ro/headfoot.html
-lib/mailman/templates/ro/help.txt
-lib/mailman/templates/ro/invite.txt
-lib/mailman/templates/ro/listinfo.html
-lib/mailman/templates/ro/masthead.txt
-lib/mailman/templates/ro/newlist.txt
-lib/mailman/templates/ro/nomoretoday.txt
-lib/mailman/templates/ro/options.html
-lib/mailman/templates/ro/postack.txt
-lib/mailman/templates/ro/postauth.txt
-lib/mailman/templates/ro/postheld.txt
-lib/mailman/templates/ro/private.html
-lib/mailman/templates/ro/refuse.txt
-lib/mailman/templates/ro/roster.html
-lib/mailman/templates/ro/subauth.txt
-lib/mailman/templates/ro/subscribe.html
-lib/mailman/templates/ro/subscribeack.txt
-lib/mailman/templates/ro/unsub.txt
-lib/mailman/templates/ro/unsubauth.txt
-lib/mailman/templates/ro/userpass.txt
-lib/mailman/templates/ro/verify.txt
-lib/mailman/templates/ru/admindbdetails.html
-lib/mailman/templates/ru/admindbpreamble.html
-lib/mailman/templates/ru/admindbsummary.html
-lib/mailman/templates/ru/adminsubscribeack.txt
-lib/mailman/templates/ru/adminunsubscribeack.txt
-lib/mailman/templates/ru/admlogin.html
-lib/mailman/templates/ru/archtocnombox.html
-lib/mailman/templates/ru/approve.txt
-lib/mailman/templates/ru/archidxentry.html
-lib/mailman/templates/ru/archidxfoot.html
-lib/mailman/templates/ru/archidxhead.html
-lib/mailman/templates/ru/archlistend.html
-lib/mailman/templates/ru/archliststart.html
-lib/mailman/templates/ru/archtoc.html
-lib/mailman/templates/ru/archtocentry.html
-lib/mailman/templates/ru/article.html
-lib/mailman/templates/ru/bounce.txt
-lib/mailman/templates/ru/checkdbs.txt
-lib/mailman/templates/ru/convert.txt
-lib/mailman/templates/ru/cronpass.txt
-lib/mailman/templates/ru/disabled.txt
-lib/mailman/templates/ru/emptyarchive.html
-lib/mailman/templates/ru/headfoot.html
-lib/mailman/templates/ru/help.txt
-lib/mailman/templates/ru/invite.txt
-lib/mailman/templates/ru/listinfo.html
-lib/mailman/templates/ru/masthead.txt
-lib/mailman/templates/ru/newlist.txt
-lib/mailman/templates/ru/nomoretoday.txt
-lib/mailman/templates/ru/options.html
-lib/mailman/templates/ru/postack.txt
-lib/mailman/templates/ru/postauth.txt
-lib/mailman/templates/ru/postheld.txt
-lib/mailman/templates/ru/private.html
-lib/mailman/templates/ru/probe.txt
-lib/mailman/templates/ru/refuse.txt
-lib/mailman/templates/ru/roster.html
-lib/mailman/templates/ru/subauth.txt
-lib/mailman/templates/ru/subscribe.html
-lib/mailman/templates/ru/subscribeack.txt
-lib/mailman/templates/ru/unsub.txt
-lib/mailman/templates/ru/unsubauth.txt
-lib/mailman/templates/ru/userpass.txt
-lib/mailman/templates/ru/verify.txt
-lib/mailman/templates/sl/admindbdetails.html
-lib/mailman/templates/sl/admindbpreamble.html
-lib/mailman/templates/sl/admindbsummary.html
-lib/mailman/templates/sl/adminsubscribeack.txt
-lib/mailman/templates/sl/adminunsubscribeack.txt
-lib/mailman/templates/sl/admlogin.html
-lib/mailman/templates/sl/approve.txt
-lib/mailman/templates/sl/archidxentry.html
-lib/mailman/templates/sl/archidxfoot.html
-lib/mailman/templates/sl/archidxhead.html
-lib/mailman/templates/sl/archlistend.html
-lib/mailman/templates/sl/archliststart.html
-lib/mailman/templates/sl/archtoc.html
-lib/mailman/templates/sl/archtocentry.html
-lib/mailman/templates/sl/article.html
-lib/mailman/templates/sl/bounce.txt
-lib/mailman/templates/sl/checkdbs.txt
-lib/mailman/templates/sl/convert.txt
-lib/mailman/templates/sl/cronpass.txt
-lib/mailman/templates/sl/disabled.txt
-lib/mailman/templates/sl/emptyarchive.html
-lib/mailman/templates/sl/headfoot.html
-lib/mailman/templates/sl/help.txt
-lib/mailman/templates/sl/invite.txt
-lib/mailman/templates/sl/listinfo.html
-lib/mailman/templates/sl/masthead.txt
-lib/mailman/templates/sl/newlist.txt
-lib/mailman/templates/sl/nomoretoday.txt
-lib/mailman/templates/sl/options.html
-lib/mailman/templates/sl/postack.txt
-lib/mailman/templates/sl/postauth.txt
-lib/mailman/templates/sl/postheld.txt
-lib/mailman/templates/sl/private.html
-lib/mailman/templates/sl/refuse.txt
-lib/mailman/templates/sl/roster.html
-lib/mailman/templates/sl/subauth.txt
-lib/mailman/templates/sl/subscribe.html
-lib/mailman/templates/sl/subscribeack.txt
-lib/mailman/templates/sl/unsub.txt
-lib/mailman/templates/sl/unsubauth.txt
-lib/mailman/templates/sl/userpass.txt
-lib/mailman/templates/sl/verify.txt
-lib/mailman/templates/sr/admindbdetails.html
-lib/mailman/templates/sr/admindbpreamble.html
-lib/mailman/templates/sr/admindbsummary.html
-lib/mailman/templates/sr/adminsubscribeack.txt
-lib/mailman/templates/sr/adminunsubscribeack.txt
-lib/mailman/templates/sr/admlogin.html
-lib/mailman/templates/sr/approve.txt
-lib/mailman/templates/sr/archidxentry.html
-lib/mailman/templates/sr/archidxfoot.html
-lib/mailman/templates/sr/archidxhead.html
-lib/mailman/templates/sr/archlistend.html
-lib/mailman/templates/sr/archliststart.html
-lib/mailman/templates/sr/archtoc.html
-lib/mailman/templates/sr/archtocentry.html
-lib/mailman/templates/sr/article.html
-lib/mailman/templates/sr/bounce.txt
-lib/mailman/templates/sr/checkdbs.txt
-lib/mailman/templates/sr/convert.txt
-lib/mailman/templates/sr/cronpass.txt
-lib/mailman/templates/sr/disabled.txt
-lib/mailman/templates/sr/emptyarchive.html
-lib/mailman/templates/sr/handle_opts.html
-lib/mailman/templates/sr/headfoot.html
-lib/mailman/templates/sr/help.txt
-lib/mailman/templates/sr/invite.txt
-lib/mailman/templates/sr/listinfo.html
-lib/mailman/templates/sr/masthead.txt
-lib/mailman/templates/sr/newlist.txt
-lib/mailman/templates/sr/nomoretoday.txt
-lib/mailman/templates/sr/options.html
-lib/mailman/templates/sr/postack.txt
-lib/mailman/templates/sr/postauth.txt
-lib/mailman/templates/sr/postheld.txt
-lib/mailman/templates/sr/private.html
-lib/mailman/templates/sr/refuse.txt
-lib/mailman/templates/sr/roster.html
-lib/mailman/templates/sr/subauth.txt
-lib/mailman/templates/sr/subscribe.html
-lib/mailman/templates/sr/subscribeack.txt
-lib/mailman/templates/sr/unsub.txt
-lib/mailman/templates/sr/unsubauth.txt
-lib/mailman/templates/sr/userpass.txt
-lib/mailman/templates/sr/verify.txt
-lib/mailman/templates/sv/admindbdetails.html
-lib/mailman/templates/sv/admindbpreamble.html
-lib/mailman/templates/sv/admindbsummary.html
-lib/mailman/templates/sv/adminsubscribeack.txt
-lib/mailman/templates/sv/adminunsubscribeack.txt
-lib/mailman/templates/sv/admlogin.html
-lib/mailman/templates/sv/approve.txt
-lib/mailman/templates/sv/archtoc.html
-lib/mailman/templates/sv/archtocentry.html
-lib/mailman/templates/sv/article.html
-lib/mailman/templates/sv/bounce.txt
-lib/mailman/templates/sv/checkdbs.txt
-lib/mailman/templates/sv/convert.txt
-lib/mailman/templates/sv/cronpass.txt
-lib/mailman/templates/sv/disabled.txt
-lib/mailman/templates/sv/emptyarchive.html
-lib/mailman/templates/sv/headfoot.html
-lib/mailman/templates/sv/help.txt
-lib/mailman/templates/sv/invite.txt
-lib/mailman/templates/sv/listinfo.html
-lib/mailman/templates/sv/masthead.txt
-lib/mailman/templates/sv/newlist.txt
-lib/mailman/templates/sv/nomoretoday.txt
-lib/mailman/templates/sv/options.html
-lib/mailman/templates/sv/postack.txt
-lib/mailman/templates/sv/postauth.txt
-lib/mailman/templates/sv/postheld.txt
-lib/mailman/templates/sv/private.html
-lib/mailman/templates/sv/refuse.txt
-lib/mailman/templates/sv/roster.html
-lib/mailman/templates/sv/subauth.txt
-lib/mailman/templates/sv/subscribe.html
-lib/mailman/templates/sv/subscribeack.txt
-lib/mailman/templates/sv/unsub.txt
-lib/mailman/templates/sv/unsubauth.txt
-lib/mailman/templates/sv/userpass.txt
-lib/mailman/templates/sv/verify.txt
-lib/mailman/templates/tr/admindbdetails.html
-lib/mailman/templates/tr/admindbpreamble.html
-lib/mailman/templates/tr/admindbsummary.html
-lib/mailman/templates/tr/adminsubscribeack.txt
-lib/mailman/templates/tr/adminunsubscribeack.txt
-lib/mailman/templates/tr/admlogin.html
-lib/mailman/templates/tr/approve.txt
-lib/mailman/templates/tr/archidxentry.html
-lib/mailman/templates/tr/archidxfoot.html
-lib/mailman/templates/tr/archidxhead.html
-lib/mailman/templates/tr/archlistend.html
-lib/mailman/templates/tr/archliststart.html
-lib/mailman/templates/tr/archtoc.html
-lib/mailman/templates/tr/archtocentry.html
-lib/mailman/templates/tr/archtocnombox.html
-lib/mailman/templates/tr/article.html
-lib/mailman/templates/tr/bounce.txt
-lib/mailman/templates/tr/checkdbs.txt
-lib/mailman/templates/tr/convert.txt
-lib/mailman/templates/tr/cronpass.txt
-lib/mailman/templates/tr/disabled.txt
-lib/mailman/templates/tr/emptyarchive.html
-lib/mailman/templates/tr/headfoot.html
-lib/mailman/templates/tr/help.txt
-lib/mailman/templates/tr/invite.txt
-lib/mailman/templates/tr/listinfo.html
-lib/mailman/templates/tr/masthead.txt
-lib/mailman/templates/tr/newlist.txt
-lib/mailman/templates/tr/nomoretoday.txt
-lib/mailman/templates/tr/options.html
-lib/mailman/templates/tr/postack.txt
-lib/mailman/templates/tr/postauth.txt
-lib/mailman/templates/tr/postheld.txt
-lib/mailman/templates/tr/private.html
-lib/mailman/templates/tr/refuse.txt
-lib/mailman/templates/tr/roster.html
-lib/mailman/templates/tr/subauth.txt
-lib/mailman/templates/tr/subscribe.html
-lib/mailman/templates/tr/subscribeack.txt
-lib/mailman/templates/tr/unsub.txt
-lib/mailman/templates/tr/unsubauth.txt
-lib/mailman/templates/tr/userpass.txt
-lib/mailman/templates/tr/verify.txt
-lib/mailman/templates/uk/admindbdetails.html
-lib/mailman/templates/uk/admindbpreamble.html
-lib/mailman/templates/uk/admindbsummary.html
-lib/mailman/templates/uk/adminsubscribeack.txt
-lib/mailman/templates/uk/adminunsubscribeack.txt
-lib/mailman/templates/uk/admlogin.html
-lib/mailman/templates/uk/archtocnombox.html
-lib/mailman/templates/uk/approve.txt
-lib/mailman/templates/uk/archidxentry.html
-lib/mailman/templates/uk/archidxfoot.html
-lib/mailman/templates/uk/archidxhead.html
-lib/mailman/templates/uk/archlistend.html
-lib/mailman/templates/uk/archliststart.html
-lib/mailman/templates/uk/archtoc.html
-lib/mailman/templates/uk/archtocentry.html
-lib/mailman/templates/uk/article.html
-lib/mailman/templates/uk/bounce.txt
-lib/mailman/templates/uk/checkdbs.txt
-lib/mailman/templates/uk/convert.txt
-lib/mailman/templates/uk/cronpass.txt
-lib/mailman/templates/uk/disabled.txt
-lib/mailman/templates/uk/emptyarchive.html
-lib/mailman/templates/uk/headfoot.html
-lib/mailman/templates/uk/help.txt
-lib/mailman/templates/uk/invite.txt
-lib/mailman/templates/uk/listinfo.html
-lib/mailman/templates/uk/masthead.txt
-lib/mailman/templates/uk/newlist.txt
-lib/mailman/templates/uk/nomoretoday.txt
-lib/mailman/templates/uk/options.html
-lib/mailman/templates/uk/postack.txt
-lib/mailman/templates/uk/postauth.txt
-lib/mailman/templates/uk/postheld.txt
-lib/mailman/templates/uk/private.html
-lib/mailman/templates/uk/probe.txt
-lib/mailman/templates/uk/refuse.txt
-lib/mailman/templates/uk/roster.html
-lib/mailman/templates/uk/subauth.txt
-lib/mailman/templates/uk/subscribe.html
-lib/mailman/templates/uk/subscribeack.txt
-lib/mailman/templates/uk/unsub.txt
-lib/mailman/templates/uk/unsubauth.txt
-lib/mailman/templates/uk/userpass.txt
-lib/mailman/templates/uk/verify.txt
-lib/mailman/templates/vi/admindbdetails.html
-lib/mailman/templates/vi/admindbpreamble.html
-lib/mailman/templates/vi/admindbsummary.html
-lib/mailman/templates/vi/admlogin.html
-lib/mailman/templates/vi/archidxentry.html
-lib/mailman/templates/vi/archidxfoot.html
-lib/mailman/templates/vi/archidxhead.html
-lib/mailman/templates/vi/archlistend.html
-lib/mailman/templates/vi/archliststart.html
-lib/mailman/templates/vi/archtoc.html
-lib/mailman/templates/vi/archtocentry.html
-lib/mailman/templates/vi/archtocnombox.html
-lib/mailman/templates/vi/article.html
-lib/mailman/templates/vi/emptyarchive.html
-lib/mailman/templates/vi/headfoot.html
-lib/mailman/templates/vi/listinfo.html
-lib/mailman/templates/vi/options.html
-lib/mailman/templates/vi/private.html
-lib/mailman/templates/vi/roster.html
-lib/mailman/templates/vi/subscribe.html
-lib/mailman/templates/vi/adminsubscribeack.txt
-lib/mailman/templates/vi/adminunsubscribeack.txt
-lib/mailman/templates/vi/approve.txt
-lib/mailman/templates/vi/bounce.txt
-lib/mailman/templates/vi/checkdbs.txt
-lib/mailman/templates/vi/convert.txt
-lib/mailman/templates/vi/cronpass.txt
-lib/mailman/templates/vi/disabled.txt
-lib/mailman/templates/vi/help.txt
-lib/mailman/templates/vi/invite.txt
-lib/mailman/templates/vi/masthead.txt
-lib/mailman/templates/vi/newlist.txt
-lib/mailman/templates/vi/nomoretoday.txt
-lib/mailman/templates/vi/postack.txt
-lib/mailman/templates/vi/postauth.txt
-lib/mailman/templates/vi/postheld.txt
-lib/mailman/templates/vi/probe.txt
-lib/mailman/templates/vi/refuse.txt
-lib/mailman/templates/vi/subauth.txt
-lib/mailman/templates/vi/subscribeack.txt
-lib/mailman/templates/vi/unsub.txt
-lib/mailman/templates/vi/unsubauth.txt
-lib/mailman/templates/vi/userpass.txt
-lib/mailman/templates/vi/verify.txt
-lib/mailman/templates/zh_CN/admindbdetails.html
-lib/mailman/templates/zh_CN/admindbpreamble.html
-lib/mailman/templates/zh_CN/admindbsummary.html
-lib/mailman/templates/zh_CN/admlogin.html
-lib/mailman/templates/zh_CN/archidxentry.html
-lib/mailman/templates/zh_CN/archidxfoot.html
-lib/mailman/templates/zh_CN/archidxhead.html
-lib/mailman/templates/zh_CN/archlistend.html
-lib/mailman/templates/zh_CN/archliststart.html
-lib/mailman/templates/zh_CN/archtoc.html
-lib/mailman/templates/zh_CN/archtocentry.html
-lib/mailman/templates/zh_CN/archtocnombox.html
-lib/mailman/templates/zh_CN/article.html
-lib/mailman/templates/zh_CN/emptyarchive.html
-lib/mailman/templates/zh_CN/headfoot.html
-lib/mailman/templates/zh_CN/listinfo.html
-lib/mailman/templates/zh_CN/options.html
-lib/mailman/templates/zh_CN/private.html
-lib/mailman/templates/zh_CN/roster.html
-lib/mailman/templates/zh_CN/subscribe.html
-lib/mailman/templates/zh_CN/adminsubscribeack.txt
-lib/mailman/templates/zh_CN/adminunsubscribeack.txt
-lib/mailman/templates/zh_CN/approve.txt
-lib/mailman/templates/zh_CN/bounce.txt
-lib/mailman/templates/zh_CN/checkdbs.txt
-lib/mailman/templates/zh_CN/convert.txt
-lib/mailman/templates/zh_CN/cronpass.txt
-lib/mailman/templates/zh_CN/disabled.txt
-lib/mailman/templates/zh_CN/help.txt
-lib/mailman/templates/zh_CN/invite.txt
-lib/mailman/templates/zh_CN/masthead.txt
-lib/mailman/templates/zh_CN/newlist.txt
-lib/mailman/templates/zh_CN/nomoretoday.txt
-lib/mailman/templates/zh_CN/postack.txt
-lib/mailman/templates/zh_CN/postauth.txt
-lib/mailman/templates/zh_CN/postheld.txt
-lib/mailman/templates/zh_CN/probe.txt
-lib/mailman/templates/zh_CN/refuse.txt
-lib/mailman/templates/zh_CN/subauth.txt
-lib/mailman/templates/zh_CN/subscribeack.txt
-lib/mailman/templates/zh_CN/unsub.txt
-lib/mailman/templates/zh_CN/unsubauth.txt
-lib/mailman/templates/zh_CN/userpass.txt
-lib/mailman/templates/zh_CN/verify.txt
-lib/mailman/templates/zh_TW/admindbpreamble.html
-lib/mailman/templates/zh_TW/admlogin.html
-lib/mailman/templates/zh_TW/handle_opts.html
-lib/mailman/templates/zh_TW/headfoot.html
-lib/mailman/templates/zh_TW/listinfo.html
-lib/mailman/templates/zh_TW/options.html
-lib/mailman/templates/zh_TW/roster.html
-lib/mailman/templates/zh_TW/subscribe.html
-lib/mailman/templates/zh_TW/adminsubscribeack.txt
-lib/mailman/templates/zh_TW/adminunsubscribeack.txt
-lib/mailman/templates/zh_TW/approve.txt
-lib/mailman/templates/zh_TW/bounce.txt
-lib/mailman/templates/zh_TW/checkdbs.txt
-lib/mailman/templates/zh_TW/convert.txt
-lib/mailman/templates/zh_TW/cronpass.txt
-lib/mailman/templates/zh_TW/help.txt
-lib/mailman/templates/zh_TW/masthead.txt
-lib/mailman/templates/zh_TW/newlist.txt
-lib/mailman/templates/zh_TW/postack.txt
-lib/mailman/templates/zh_TW/postauth.txt
-lib/mailman/templates/zh_TW/postheld.txt
-lib/mailman/templates/zh_TW/refuse.txt
-lib/mailman/templates/zh_TW/subauth.txt
-lib/mailman/templates/zh_TW/subscribeack.txt
-lib/mailman/templates/zh_TW/userpass.txt
-lib/mailman/templates/zh_TW/verify.txt
-lib/mailman/tests/EmailBase.py
-lib/mailman/tests/TestBase.py
-lib/mailman/tests/bounces/bounce_01.txt
-lib/mailman/tests/bounces/bounce_02.txt
-lib/mailman/tests/bounces/bounce_03.txt
-lib/mailman/tests/bounces/dsn_01.txt
-lib/mailman/tests/bounces/dsn_02.txt
-lib/mailman/tests/bounces/dsn_03.txt
-lib/mailman/tests/bounces/dsn_04.txt
-lib/mailman/tests/bounces/dsn_05.txt
-lib/mailman/tests/bounces/dsn_06.txt
-lib/mailman/tests/bounces/dsn_07.txt
-lib/mailman/tests/bounces/dsn_08.txt
-lib/mailman/tests/bounces/dsn_09.txt
-lib/mailman/tests/bounces/dsn_10.txt
-lib/mailman/tests/bounces/dsn_11.txt
-lib/mailman/tests/bounces/dsn_12.txt
-lib/mailman/tests/bounces/dsn_13.txt
-lib/mailman/tests/bounces/dsn_14.txt
-lib/mailman/tests/bounces/dumbass_01.txt
-lib/mailman/tests/bounces/exim_01.txt
-lib/mailman/tests/bounces/groupwise_01.txt
-lib/mailman/tests/bounces/groupwise_02.txt
-lib/mailman/tests/bounces/hotpop_01.txt
-lib/mailman/tests/bounces/llnl_01.txt
-lib/mailman/tests/bounces/microsoft_01.txt
-lib/mailman/tests/bounces/microsoft_02.txt
-lib/mailman/tests/bounces/microsoft_03.txt
-lib/mailman/tests/bounces/netscape_01.txt
-lib/mailman/tests/bounces/newmailru_01.txt
-lib/mailman/tests/bounces/postfix_01.txt
-lib/mailman/tests/bounces/postfix_02.txt
-lib/mailman/tests/bounces/postfix_03.txt
-lib/mailman/tests/bounces/postfix_04.txt
-lib/mailman/tests/bounces/postfix_05.txt
-lib/mailman/tests/bounces/qmail_01.txt
-lib/mailman/tests/bounces/qmail_02.txt
-lib/mailman/tests/bounces/qmail_03.txt
-lib/mailman/tests/bounces/sendmail_01.txt
-lib/mailman/tests/bounces/simple_01.txt
-lib/mailman/tests/bounces/simple_02.txt
-lib/mailman/tests/bounces/simple_03.txt
-lib/mailman/tests/bounces/simple_04.txt
-lib/mailman/tests/bounces/simple_05.txt
-lib/mailman/tests/bounces/simple_06.txt
-lib/mailman/tests/bounces/simple_07.txt
-lib/mailman/tests/bounces/simple_08.txt
-lib/mailman/tests/bounces/simple_09.txt
-lib/mailman/tests/bounces/simple_10.txt
-lib/mailman/tests/bounces/simple_11.txt
-lib/mailman/tests/bounces/simple_12.txt
-lib/mailman/tests/bounces/simple_13.txt
-lib/mailman/tests/bounces/simple_14.txt
-lib/mailman/tests/bounces/simple_15.txt
-lib/mailman/tests/bounces/simple_16.txt
-lib/mailman/tests/bounces/sina_01.txt
-lib/mailman/tests/bounces/smtp32_01.txt
-lib/mailman/tests/bounces/smtp32_02.txt
-lib/mailman/tests/bounces/smtp32_03.txt
-lib/mailman/tests/bounces/smtp32_04.txt
-lib/mailman/tests/bounces/smtp32_05.txt
-lib/mailman/tests/bounces/smtp32_06.txt
-lib/mailman/tests/bounces/yahoo_01.txt
-lib/mailman/tests/bounces/yahoo_02.txt
-lib/mailman/tests/bounces/yahoo_03.txt
-lib/mailman/tests/bounces/yahoo_04.txt
-lib/mailman/tests/bounces/yahoo_05.txt
-lib/mailman/tests/bounces/yahoo_06.txt
-lib/mailman/tests/bounces/yahoo_07.txt
-lib/mailman/tests/bounces/yahoo_08.txt
-lib/mailman/tests/bounces/yahoo_09.txt
-lib/mailman/tests/bounces/yahoo_10.txt
-lib/mailman/tests/bounces/yale_01.txt
-lib/mailman/tests/fblast.py
-lib/mailman/tests/msgs/bad_01.txt
-lib/mailman/tests/onebounce.py
-lib/mailman/tests/paths.py
-lib/mailman/tests/test_bounces.py
-lib/mailman/tests/test_handlers.py
-lib/mailman/tests/test_lockfile.py
-lib/mailman/tests/test_membership.py
-lib/mailman/tests/test_message.py
-lib/mailman/tests/test_runners.py
-lib/mailman/tests/test_safedict.py
-lib/mailman/tests/test_security_mgr.py
-lib/mailman/tests/test_smtp.py
-lib/mailman/tests/testall.py
-share/doc/mailman/ACKNOWLEDGMENTS
-share/doc/mailman/BUGS
-share/doc/mailman/FAQ
-share/doc/mailman/INSTALL
-share/doc/mailman/NEWS
-share/doc/mailman/README
-share/doc/mailman/README-I18N.en
-share/doc/mailman/README.CONTRIB
-share/doc/mailman/README.NETSCAPE
-share/doc/mailman/README.USERAGENT
-share/doc/mailman/STYLEGUIDE.txt
-share/doc/mailman/TODO
-share/doc/mailman/UPGRADING
-share/doc/mailman/mailman-admin.pdf
-share/doc/mailman/mailman-admin.ps
-share/doc/mailman/mailman-admin.txt
-share/doc/mailman/mailman-install.pdf
-share/doc/mailman/mailman-install.ps
-share/doc/mailman/mailman-install.txt
-share/doc/mailman/mailman-member.pdf
-share/doc/mailman/mailman-member.ps
-share/doc/mailman/mailman-member.txt
-share/examples/mailman/mailman.conf
-share/examples/rc.d/mailman
-@dirrm share/examples/mailman
-@dirrm share/doc/mailman
-@dirrm lib/mailman/tests/msgs
-@dirrm lib/mailman/tests/bounces
-@dirrm lib/mailman/tests
-@dirrm lib/mailman/templates/zh_TW
-@dirrm lib/mailman/templates/zh_CN
-@dirrm lib/mailman/templates/vi
-@dirrm lib/mailman/templates/uk
-@dirrm lib/mailman/templates/tr
-@dirrm lib/mailman/templates/sv
-@dirrm lib/mailman/templates/sr
-@dirrm lib/mailman/templates/sl
-@dirrm lib/mailman/templates/ru
-@dirrm lib/mailman/templates/ro
-@dirrm lib/mailman/templates/pt_BR
-@dirrm lib/mailman/templates/pt
-@dirrm lib/mailman/templates/pl
-@dirrm lib/mailman/templates/no
-@dirrm lib/mailman/templates/nl
-@dirrm lib/mailman/templates/lt
-@dirrm lib/mailman/templates/ko
-@dirrm lib/mailman/templates/ja
-@dirrm lib/mailman/templates/it
-@dirrm lib/mailman/templates/ia
-@dirrm lib/mailman/templates/hu
-@dirrm lib/mailman/templates/hr
-@dirrm lib/mailman/templates/fr
-@dirrm lib/mailman/templates/fi
-@dirrm lib/mailman/templates/eu
-@dirrm lib/mailman/templates/et
-@dirrm lib/mailman/templates/es
-@dirrm lib/mailman/templates/en
-@dirrm lib/mailman/templates/de
-@dirrm lib/mailman/templates/da
-@dirrm lib/mailman/templates/cs
-@dirrm lib/mailman/templates/ca
-@dirrm lib/mailman/templates/ar
-@dirrm lib/mailman/templates
-@dirrm lib/mailman/support
-@dirrm lib/mailman/scripts
-@dirrm lib/mailman/pythonlib/lib/python${PYVERSSUFFIX}/site-packages
-@dirrm lib/mailman/pythonlib/lib/python${PYVERSSUFFIX}
-@dirrm lib/mailman/pythonlib/lib
-@dirrm lib/mailman/pythonlib/korean/python
-@dirrm lib/mailman/pythonlib/korean/mappings
-@dirrm lib/mailman/pythonlib/korean/c
-@dirrm lib/mailman/pythonlib/korean
-@dirrm lib/mailman/pythonlib/japanese/python
-@dirrm lib/mailman/pythonlib/japanese/mappings
-@dirrm lib/mailman/pythonlib/japanese/c
-@dirrm lib/mailman/pythonlib/japanese/aliases
-@dirrm lib/mailman/pythonlib/japanese
-@dirrm lib/mailman/pythonlib/email
-@dirrm lib/mailman/pythonlib
-@dirrm lib/mailman/messages/zh_TW/LC_MESSAGES
-@dirrm lib/mailman/messages/zh_TW
-@dirrm lib/mailman/messages/zh_CN/LC_MESSAGES
-@dirrm lib/mailman/messages/zh_CN
-@dirrm lib/mailman/messages/vi/LC_MESSAGES
-@dirrm lib/mailman/messages/vi
-@dirrm lib/mailman/messages/uk/LC_MESSAGES
-@dirrm lib/mailman/messages/uk
-@dirrm lib/mailman/messages/tr/LC_MESSAGES
-@dirrm lib/mailman/messages/tr
-@dirrm lib/mailman/messages/sv/LC_MESSAGES
-@dirrm lib/mailman/messages/sv
-@dirrm lib/mailman/messages/sr/LC_MESSAGES
-@dirrm lib/mailman/messages/sr
-@dirrm lib/mailman/messages/sl/LC_MESSAGES
-@dirrm lib/mailman/messages/sl
-@dirrm lib/mailman/messages/ru/LC_MESSAGES
-@dirrm lib/mailman/messages/ru
-@dirrm lib/mailman/messages/ro/LC_MESSAGES
-@dirrm lib/mailman/messages/ro
-@dirrm lib/mailman/messages/pt_BR/LC_MESSAGES
-@dirrm lib/mailman/messages/pt_BR
-@dirrm lib/mailman/messages/pt/LC_MESSAGES
-@dirrm lib/mailman/messages/pt
-@dirrm lib/mailman/messages/pl/LC_MESSAGES
-@dirrm lib/mailman/messages/pl
-@dirrm lib/mailman/messages/no/LC_MESSAGES
-@dirrm lib/mailman/messages/no
-@dirrm lib/mailman/messages/nl/LC_MESSAGES
-@dirrm lib/mailman/messages/nl
-@dirrm lib/mailman/messages/lt/LC_MESSAGES
-@dirrm lib/mailman/messages/lt
-@dirrm lib/mailman/messages/ko/LC_MESSAGES
-@dirrm lib/mailman/messages/ko
-@dirrm lib/mailman/messages/ja/LC_MESSAGES
-@dirrm lib/mailman/messages/ja
-@dirrm lib/mailman/messages/it/LC_MESSAGES
-@dirrm lib/mailman/messages/it
-@dirrm lib/mailman/messages/ia/LC_MESSAGES
-@dirrm lib/mailman/messages/ia
-@dirrm lib/mailman/messages/hu/LC_MESSAGES
-@dirrm lib/mailman/messages/hu
-@dirrm lib/mailman/messages/hr/LC_MESSAGES
-@dirrm lib/mailman/messages/hr
-@dirrm lib/mailman/messages/fr/LC_MESSAGES
-@dirrm lib/mailman/messages/fr
-@dirrm lib/mailman/messages/fi/LC_MESSAGES
-@dirrm lib/mailman/messages/fi
-@dirrm lib/mailman/messages/eu/LC_MESSAGES
-@dirrm lib/mailman/messages/eu
-@dirrm lib/mailman/messages/et/LC_MESSAGES
-@dirrm lib/mailman/messages/et
-@dirrm lib/mailman/messages/es/LC_MESSAGES
-@dirrm lib/mailman/messages/es
-@dirrm lib/mailman/messages/de/LC_MESSAGES
-@dirrm lib/mailman/messages/de
-@dirrm lib/mailman/messages/da/LC_MESSAGES
-@dirrm lib/mailman/messages/da
-@dirrm lib/mailman/messages/cs/LC_MESSAGES
-@dirrm lib/mailman/messages/cs
-@dirrm lib/mailman/messages/ca/LC_MESSAGES
-@dirrm lib/mailman/messages/ca
-@dirrm lib/mailman/messages/ar/LC_MESSAGES
-@dirrm lib/mailman/messages/ar
-@dirrm lib/mailman/messages
-@dirrm lib/mailman/mail
-@dirrm lib/mailman/icons
-@dirrm lib/mailman/cron
-@dirrm lib/mailman/cgi-bin
-@dirrm lib/mailman/bin
-@dirrm lib/mailman/Mailman/Queue
-@dirrm lib/mailman/Mailman/MTA
-@dirrm lib/mailman/Mailman/Logging
-@dirrm lib/mailman/Mailman/Handlers
-@dirrm lib/mailman/Mailman/Gui
-@dirrm lib/mailman/Mailman/Commands
-@dirrm lib/mailman/Mailman/Cgi
-@dirrm lib/mailman/Mailman/Bouncers
-@dirrm lib/mailman/Mailman/Archiver
-@unexec ${RMDIR} -p %D/lib/mailman/Mailman 2>/dev/null || ${TRUE}
diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo
deleted file mode 100644
index 240f94059ca..00000000000
--- a/mail/mailman/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.14 2006/09/25 18:56:44 bouyer Exp $
-
-SHA1 (mailman-2.1.9.tgz) = e9f6f55e2551c3e576460749383da20599412d42
-RMD160 (mailman-2.1.9.tgz) = 135f94eeecca1f562f98dfe98c1a367bed229372
-Size (mailman-2.1.9.tgz) = 7829201 bytes
-SHA1 (patch-aa) = f0bc550b28794008ea840a88a5b0053578f3ae0f
-SHA1 (patch-ab) = 39f6294e53110bd1fd09b1e90ab46820f4d48e3f
-SHA1 (patch-ad) = 665884b9dd1789e4abd430c762bdbfd707d48d30
-SHA1 (patch-ae) = 6c17de398014217be8f1c7a3b3a6f8d379fc0fb2
-SHA1 (patch-af) = 985a619a055151d998cefd0c1b7280a0d55f889e
-SHA1 (patch-ag) = f94f190e69ce892841b88574ec8e9f100b182ed9
-SHA1 (patch-ah) = 42296c52e30b1fcc1d42ef0f1b89c83414ca85df
diff --git a/mail/mailman/files/DEINSTALL b/mail/mailman/files/DEINSTALL
deleted file mode 100644
index 934d4d28b6b..00000000000
--- a/mail/mailman/files/DEINSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.1 2004/12/25 16:55:33 kim Exp $
-
-case ${STAGE} in
-DEINSTALL)
- # Remove compiled copy of configuration
- ${RM} -f ${PKG_PREFIX}/lib/mailman/Mailman/mm_cfg.pyc
- ;;
-esac
diff --git a/mail/mailman/files/INSTALL b/mail/mailman/files/INSTALL
deleted file mode 100644
index edaa878708a..00000000000
--- a/mail/mailman/files/INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: INSTALL,v 1.1 2004/12/25 16:55:33 kim Exp $
-
-case ${STAGE} in
-POST-INSTALL)
- # Fix file permissions
- ${PKG_PREFIX}/lib/mailman/bin/check_perms -f
- ;;
-esac
diff --git a/mail/mailman/files/mailman.conf.dist b/mail/mailman/files/mailman.conf.dist
deleted file mode 100644
index 91c8bb82d96..00000000000
--- a/mail/mailman/files/mailman.conf.dist
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: mailman.conf.dist,v 1.2 2007/01/18 06:33:45 martti Exp $
-#
-# Mailman configuration file fragment for Apache
-
-<IfModule mod_alias.c>
- ScriptAlias /mailman/ "@EXECDIR@/cgi-bin/"
- Alias /pipermail/ "@MAILMAN_DATADIR@/archives/public/"
- Alias /mailman-icons/ "@EXECDIR@/icons/"
-</IfModule>
-
-<Directory "@EXECDIR@/cgi-bin">
- Options Indexes Includes MultiViews SymLinksIfOwnerMatch
- AllowOverride FileInfo AuthConfig Limit
- Order allow,deny
- Allow from all
-</Directory>
-
-<Directory "@EXECDIR@/icons">
- Options none
- AllowOverride FileInfo AuthConfig Limit
- Order allow,deny
- Allow from all
-</Directory>
-
-<Directory "@MAILMAN_DATADIR@/archives/public/">
- Options SymLinksIfOwnerMatch
- AllowOverride FileInfo AuthConfig Limit
- Order allow,deny
- Allow from all
-</Directory>
diff --git a/mail/mailman/files/mailman.sh b/mail/mailman/files/mailman.sh
deleted file mode 100644
index 25f697dabfe..00000000000
--- a/mail/mailman/files/mailman.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: mailman.sh,v 1.1 2004/09/06 06:29:42 lukem Exp $
-#
-# PROVIDE: mailman
-# REQUIRE: mail
-# KEYWORD: shutdown
-
-if [ -f /etc/rc.subr ]
-then
- . /etc/rc.subr
-fi
-
-name="mailman"
-rcvar=$name
-ctl_command="@PREFIX@/lib/mailman/bin/mailmanctl"
-start_cmd="mailman_doit start"
-stop_cmd="mailman_doit stop"
-restart_cmd="mailman_doit restart"
-
-mailman_doit ()
-{
- ${ctl_command} $1
-}
-
-if [ -f /etc/rc.subr ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- mailman_doit "$1"
-fi
diff --git a/mail/mailman/patches/patch-aa b/mail/mailman/patches/patch-aa
deleted file mode 100644
index 4c1a2a3bb3a..00000000000
--- a/mail/mailman/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/01/14 01:46:29 xtraeme Exp $
-
---- misc/Makefile.in.orig 2004-01-14 02:40:49.000000000 +0100
-+++ misc/Makefile.in 2004-01-14 02:41:48.000000000 +0100
-@@ -40,7 +40,7 @@
- OPT= @OPT@
- CFLAGS= $(OPT) $(DEFS)
- PACKAGEDIR= $(prefix)/Mailman
--DATADIR= $(var_prefix)/data
-+DATADIR= $(prefix)/support
- ICONDIR= $(prefix)/icons
- SCRIPTSDIR= $(prefix)/scripts
-
-@@ -91,6 +91,7 @@
- do \
- gunzip -c $(srcdir)/$$p.tar.gz | (cd $(PKGDIR) ; tar xf -); \
- (cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \
-+ rm -rf $(PKGDIR)/$$p; \
- done
-
- finish:
diff --git a/mail/mailman/patches/patch-ab b/mail/mailman/patches/patch-ab
deleted file mode 100644
index 680ba1effd4..00000000000
--- a/mail/mailman/patches/patch-ab
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/12/23 11:02:13 xtraeme Exp $
-
---- Makefile.in.orig Mon Sep 15 14:36:04 2003
-+++ Makefile.in
-@@ -65,7 +65,7 @@ DIRMODE= 775
- EXEMODE= 755
- FILEMODE= 644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
--DIRSETGID= chmod g+s
-+DIRSETGID= :
-
- DATE = $(shell python -c 'import time; print time.strftime("%d-%b-%Y"),')
- LANGPACK = README-I18N.en templates messages
-@@ -81,22 +81,10 @@ subdirs: $(SUBDIRS)
- (cd $$d; $(MAKE)); \
- done
-
--install: doinstall update
-+install: doinstall
-
- doinstall: $(SUBDIRS)
- @echo "Creating architecture independent directories..."
-- @for d in $(VAR_DIRS); \
-- do \
-- dir=$(DESTDIR)$(var_prefix)/$$d; \
-- if test ! -d $$dir; then \
-- echo "Creating directory hierarchy $$dir"; \
-- $(srcdir)/mkinstalldirs $$dir; \
-- chmod $(DIRMODE) $$dir; \
-- $(DIRSETGID) $$dir; \
-- else true; \
-- fi; \
-- done
-- chmod o-r $(DESTDIR)$(var_prefix)/archives/private
- @for d in $(ARCH_INDEP_DIRS); \
- do \
- dir=$(DESTDIR)$(prefix)/$$d; \
diff --git a/mail/mailman/patches/patch-ad b/mail/mailman/patches/patch-ad
deleted file mode 100644
index 0af8f8afc61..00000000000
--- a/mail/mailman/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/12/23 11:02:13 xtraeme Exp $
-
---- Mailman/mm_cfg.py.dist.in.orig Mon Sep 15 15:20:02 2003
-+++ Mailman/mm_cfg.py.dist.in
-@@ -42,3 +42,11 @@ from Defaults import *
-
- ##################################################
- # Put YOUR site-specific settings below this line.
-+
-+# IMPORTANT: Edit the following two definitions to provide the domain
-+# name of your mail lists, and host name of the Web server.
-+# (Leave the add_virtualhost line alone.)
-+#
-+DEFAULT_EMAIL_HOST = '@MAILHOST@'
-+DEFAULT_URL_HOST = '@URLHOST@'
-+add_virtualhost(DEFAULT_URL_HOST, DEFAULT_EMAIL_HOST)
diff --git a/mail/mailman/patches/patch-ae b/mail/mailman/patches/patch-ae
deleted file mode 100644
index 4e719b2be03..00000000000
--- a/mail/mailman/patches/patch-ae
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/09/06 04:12:46 lukem Exp $
-
---- Mailman/Defaults.py.in.orig 2003-12-14 03:34:17.000000000 +1100
-+++ Mailman/Defaults.py.in
-@@ -54,7 +54,7 @@ No = no = Off = off = False
- # disable Mailman's logo footer altogther, hack
- # Mailman/htmlformat.py:MailmanLogo(), which also contains the hardcoded links
- # and image names.
--IMAGE_LOGOS = '/icons/'
-+IMAGE_LOGOS = '/mailman-icons/'
-
- # The name of the Mailman favicon
- SHORTCUT_ICON = 'mm-icon.png'
-@@ -64,6 +64,11 @@ MAILMAN_URL = 'http://www.gnu.org/softwa
- #MAILMAN_URL = 'http://www.list.org/'
- #MAILMAN_URL = 'http://mailman.sf.net/'
-
-+# Details of third image
-+IMAGE3_URL = 'http://www.gnu.org/'
-+IMAGE3_IMG = 'gnu-head-tiny.jpg'
-+IMAGE3_ALT = 'Gnu\'s Not Unix'
-+
- # Mailman needs to know about (at least) two fully-qualified domain names
- # (fqdn); 1) the hostname used in your urls, and 2) the hostname used in email
- # addresses for your domain. For example, if people visit your Mailman system
diff --git a/mail/mailman/patches/patch-af b/mail/mailman/patches/patch-af
deleted file mode 100644
index f4fe52fc15f..00000000000
--- a/mail/mailman/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.2 2003/12/23 11:02:13 xtraeme Exp $
-
---- Mailman/Makefile.in.orig Mon Sep 15 14:37:14 2003
-+++ Mailman/Makefile.in
-@@ -68,10 +68,6 @@ install-here:
- $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(PACKAGEDIR); \
- done
- $(INSTALL) -m $(FILEMODE) mm_cfg.py.dist $(DESTDIR)$(PACKAGEDIR)
-- if [ ! -f $(DESTDIR)$(PACKAGEDIR)/mm_cfg.py ]; \
-- then \
-- $(INSTALL) -m $(FILEMODE) mm_cfg.py.dist $(DESTDIR)$(PACKAGEDIR)/mm_cfg.py; \
-- fi
-
- install: install-here
- for d in $(SUBDIRS); \
diff --git a/mail/mailman/patches/patch-ag b/mail/mailman/patches/patch-ag
deleted file mode 100644
index 34b9f6726c5..00000000000
--- a/mail/mailman/patches/patch-ag
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/12/23 11:02:13 xtraeme Exp $
-
---- bin/check_perms.orig Mon Mar 31 14:07:55 2003
-+++ bin/check_perms
-@@ -70,8 +70,14 @@ class State:
-
- STATE = State()
-
--DIRPERMS = S_ISGID | S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH
--QFILEPERMS = S_ISGID | S_IRWXU | S_IRWXG
-+SysName = os.uname()[0]
-+if SysName[-3:] == 'BSD':
-+ DIRPERMS = S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH
-+ QFILEPERMS = S_IRWXU | S_IRWXG
-+else:
-+ DIRPERMS = S_ISGID | S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH
-+ QFILEPERMS = S_ISGID | S_IRWXU | S_IRWXG
-+
- PYFILEPERMS = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
- ARTICLEFILEPERMS = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP
-
diff --git a/mail/mailman/patches/patch-ah b/mail/mailman/patches/patch-ah
deleted file mode 100644
index 8877b9fe25b..00000000000
--- a/mail/mailman/patches/patch-ah
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/09/06 04:12:46 lukem Exp $
-
---- Mailman/htmlformat.py.orig 2003-09-22 12:58:13.000000000 +1000
-+++ Mailman/htmlformat.py
-@@ -599,13 +599,15 @@ class DefinitionList(Container):
- #
- from mm_cfg import MAILMAN_URL
- PYTHON_URL = 'http://www.python.org/'
--GNU_URL = 'http://www.gnu.org/'
-
- # The names of the image logo files. These are concatentated onto
- # mm_cfg.IMAGE_LOGOS (not urljoined).
- DELIVERED_BY = 'mailman.jpg'
- PYTHON_POWERED = 'PythonPowered.png'
--GNU_HEAD = 'gnu-head-tiny.jpg'
-+
-+from mm_cfg import IMAGE3_URL
-+from mm_cfg import IMAGE3_IMG
-+from mm_cfg import IMAGE3_ALT
-
-
- def MailmanLogo():
-@@ -617,17 +619,17 @@ def MailmanLogo():
- '<br>version %s' % (logo(DELIVERED_BY), mm_cfg.VERSION)
- pylink = '<img src="%s" alt="Python Powered" border=0>' % \
- logo(PYTHON_POWERED)
-- gnulink = '<img src="%s" alt="GNU\'s Not Unix" border=0>' % \
-- logo(GNU_HEAD)
-- t.AddRow([mmlink, pylink, gnulink])
-+ image3link = '<img src="%s" alt="%s" border=0>' % \
-+ (logo(IMAGE3_IMG), IMAGE3_ALT)
-+ t.AddRow([mmlink, pylink, image3link])
- else:
- # use only textual links
- version = mm_cfg.VERSION
- mmlink = Link(MAILMAN_URL,
- _('Delivered by Mailman<br>version %(version)s'))
- pylink = Link(PYTHON_URL, _('Python Powered'))
-- gnulink = Link(GNU_URL, _("Gnu's Not Unix"))
-- t.AddRow([mmlink, pylink, gnulink])
-+ image3link = Link(IMAGE3_URL, _(IMAGE3_ALT))
-+ t.AddRow([mmlink, pylink, image3link])
- return t
-
-
diff --git a/mail/mailscanner/DESCR b/mail/mailscanner/DESCR
deleted file mode 100644
index 39038a926d5..00000000000
--- a/mail/mailscanner/DESCR
+++ /dev/null
@@ -1,22 +0,0 @@
-MailScanner is a complete e-mail security system designed for use on
-e-mail gateways. It protects against viruses, and detects attacks against
-e-mail client packages (such as Outlook, Outlook Express, Eudora). It
-can also detect almost all unsolicited commercial e-mail (spam) passing
-through it and respond to all incidents in a wide variety of ways.
-
-Not only can it scan for known viruses, but it can also protect against
-unknown viruses hidden inside e-mail attachments by refusing entry to
-attachments whose filenames match any given pattern. This can include
-generic patterns that trap filenames attempting to hide the true filename
-extension (e.g. ".txt.vbs").
-
-It is superior to many commercial packages in its ability to handle
-attacks against itself, such as Denial Of Service attacks caused by
-messages containing the "Zip of Death". It is easy to install into an
-existing e-mail gateway, requiring very little knowledge of sendmail
-and no change to an existing sendmail configuration.
-
-MailScanner itself is entirely open source, but it uses widely known
-commercial virus scanning packages at its core. The other software it
-uses is all high quality open source software, leading to a system that
-can be trusted for performance and reliability.
diff --git a/mail/mailscanner/MESSAGE b/mail/mailscanner/MESSAGE
deleted file mode 100644
index e3b5c2ee617..00000000000
--- a/mail/mailscanner/MESSAGE
+++ /dev/null
@@ -1,23 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/09/25 04:18:06 grant Exp $
-
-See ${PREFIX}/share/doc/MailScanner/README and the MailScanner(8) and
-MailScanner.conf(5) man pages for further instructions.
-
-As MailScanner supports a wide variety of external 3rd party software,
-you must install other packages separately to achieve your desired
-MailScanner functionality.
-
-You need at the very least an MTA. You will probably also want SpamAssassin
-and/or a virus scanner. Some suggested packages are:
-
- mail/spamassassin
- mail/clamav
- mail/p5-Mail-ClamAV
-
-You will need to edit at least the following config file before MailScanner
-will work correctly:
-
- ${PKG_SYSCONFDIR}/MailScanner.conf
-
-===========================================================================
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
deleted file mode 100644
index 0761f80e487..00000000000
--- a/mail/mailscanner/Makefile
+++ /dev/null
@@ -1,145 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2007/01/07 09:13:58 rillig Exp $
-#
-
-DISTNAME= MailScanner-4.30.3-2
-PKGNAME= mailscanner-4.30.3.2
-PKGREVISION= 2
-CATEGORIES= mail
-MASTER_SITES= http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
-
-MAINTAINER= grant@NetBSD.org
-HOMEPAGE= http://www.mailscanner.info/
-COMMENT= Powerful spam/virus filter with many options
-
-WRKSRC= ${WRKDIR}/MailScanner-4.30.3
-
-PKG_SYSCONFSUBDIR= MailScanner
-
-DEPENDS+= p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
-DEPENDS+= p5-Convert-BinHex-[0-9]*:../../converters/p5-Convert-BinHex
-DEPENDS+= p5-Net-CIDR>=0.09:../../devel/p5-Net-CIDR
-DEPENDS+= p5-MIME-tools>=0:../../mail/p5-MIME-tools
-DEPENDS+= tnef>=1.0:../../mail/tnef
-
-NO_BUILD= YES
-USE_TOOLS+= perl:run
-REPLACE_PERL= bin/MailScanner
-
-DOCSDIR= ${LOCALBASE}/share/doc/MailScanner
-EGDIR= ${LOCALBASE}/share/examples/MailScanner
-LIBDIR= ${LOCALBASE}/lib/MailScanner
-LIBEXECDIR= ${LOCALBASE}/libexec/MailScanner
-
-OWN_DIRS= ${PKG_SYSCONFDIR}/CustomFunctions
-OWN_DIRS+= ${PKG_SYSCONFDIR}/rules
-
-PLIST_SUBST+= DOCSDIR=${DOCSDIR:Q}
-PLIST_SUBST+= EGDIR=${EGDIR:Q}
-PLIST_SUBST+= LIBDIR=${LIBDIR:Q}
-PLIST_SUBST+= LIBEXECDIR=${LIBEXECDIR:Q}
-
-PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-
-MS_CONFIG_FILES= filename.rules.conf \
- filetype.rules.conf spam.assassin.prefs.conf \
- spam.lists.conf virus.scanners.conf \
- rules/bounce.rules rules/spam.whitelist.rules
-
-CONF_FILES+= ${EGDIR}/MailScanner.conf ${PKG_SYSCONFDIR}/MailScanner.conf
-.for _f_ in ${MS_CONFIG_FILES}
-CONF_FILES+= ${EGDIR}/${_f_} ${PKG_SYSCONFDIR}/${_f_}
-.endfor
-
-RCD_SCRIPTS= mailscanner
-
-SUBST_CLASSES+= paths
-SUBST_STAGE.paths= post-patch
-SUBST_FILES.paths= bin/MailScanner etc/MailScanner.conf
-SUBST_FILES.paths+= etc/virus.scanners.conf bin/update_virus_scanners
-SUBST_FILES.paths+= lib/MailScanner/ConfigDefs.pl
-SUBST_SED.paths= -e s,/opt/MailScanner/lib/MailScanner/CustomFunctions,${PKG_SYSCONFDIR}/CustomFunctions,g
-SUBST_SED.paths+= -e s,/opt/MailScanner/lib,${LIBDIR},g
-SUBST_SED.paths+= -e s,/opt/MailScanner/etc/reports,${EGDIR}/reports,g
-SUBST_SED.paths+= -e s,/opt/MailScanner/etc,${PKG_SYSCONFDIR},g
-SUBST_SED.paths+= -e s,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g
-SUBST_SED.paths+= -e s,/opt/MailScanner/bin,${PREFIX}/bin,g
-
-.include "../../mk/bsd.prefs.mk"
-
-# XXX this could use some improvement
-.if ${OPSYS} == "NetBSD"
-SUBST_CLASSES+= sendmail
-SUBST_STAGE.sendmail= post-patch
-SUBST_FILES.sendmail= bin/MailScanner etc/MailScanner.conf
-SUBST_FILES.sendmail+= etc/virus.scanners.conf bin/update_virus_scanners
-SUBST_FILES.sendmail+= lib/MailScanner/ConfigDefs.pl
-SUBST_SED.sendmail= -e s,/usr/lib/sendmail,/usr/sbin/mailwrapper,g
-.endif
-
-SUBST_CLASSES+= systemdefs
-SUBST_STAGE.systemdefs= post-patch
-SUBST_FILES.systemdefs= lib/MailScanner/SystemDefs.pm
-SUBST_SED.systemdefs= -e s,/bin/cat,${CAT},g
-SUBST_SED.systemdefs= -e s,/bin/cp,${CP},g
-SUBST_SED.systemdefs= -e s,/bin/rm,${RM},g
-# we can't use sed from pkgsrc as it won't be registered as a
-# dependency. XXX tools.mk needs a way to tell us about this dependency.
-.if empty(SED:M${LOCALBASE}*)
-SUBST_SED.systemdefs= -e s,/bin/sed,${SED},g
-.endif
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
-
-# get rid of CVS backup files
-post-extract:
- cd ${WRKSRC} && ${RM} -f */.#*
-
-do-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA_DIR} ${EGDIR}/rules
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/MailScanner ${PREFIX}/bin
-
- ${INSTALL_LIB_DIR} ${LIBEXECDIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/update_virus_scanners ${LIBEXECDIR}
- cd ${WRKSRC}/lib && ${FIND} . -name "*-autoupdate" -exec ${INSTALL_SCRIPT} '{}' ${LIBEXECDIR} \;
- cd ${WRKSRC}/lib && ${FIND} . -name "*-wrapper" -exec ${INSTALL_SCRIPT} '{}' ${LIBEXECDIR} \;
-
- ${INSTALL_DATA} ${WRKSRC}/etc/MailScanner.conf ${EGDIR}/MailScanner.conf
-.for _f_ in ${MS_CONFIG_FILES}
- ${INSTALL_DATA} ${WRKSRC}/etc/${_f_} ${EGDIR}
-.endfor
- cd ${WRKSRC}/etc/rules && ${INSTALL_DATA} \
- EXAMPLES README spam.whitelist.rules bounce.rules \
- ${EGDIR}/rules
- cd ${WRKSRC}/etc && ${FIND} reports -type d -exec ${INSTALL_DATA_DIR} ${EGDIR}/'{}' \;
- cd ${WRKSRC}/etc && ${FIND} reports -type f ! -name "*.orig" -exec ${INSTALL_DATA} '{}' ${EGDIR}/'{}' \;
-
- ${INSTALL_LIB_DIR} ${LIBDIR}
- ${INSTALL_LIB_DIR} ${LIBDIR}/MailScanner
- ${INSTALL_SCRIPT} ${WRKSRC}/lib/MailScanner.pm ${LIBDIR}
- cd ${WRKSRC}/lib/MailScanner && ${FIND} . -name "*.pm" -exec ${INSTALL_DATA} '{}' ${LIBDIR}/MailScanner \;
- cd ${WRKSRC}/lib/MailScanner && ${FIND} . -name "*.pl" -exec ${INSTALL_DATA} '{}' ${LIBDIR}/MailScanner \;
-
- ${INSTALL_DATA_DIR} ${DOCSDIR}
- cd ${WRKSRC}/docs && ${FIND} * -type d -exec ${INSTALL_DATA_DIR} ${DOCSDIR}'/{}' \;
- cd ${WRKSRC}/docs && ${FIND} * -type f -exec ${INSTALL_DATA} '{}' ${DOCSDIR} \;
- cd ${WRKSRC}/docs/man && ${INSTALL_MAN} MailScanner.conf.5 ${PREFIX}/${PKGMANDIR}/man5
- cd ${WRKSRC}/docs/man && ${INSTALL_MAN} MailScanner.8 ${PREFIX}/${PKGMANDIR}/man8
-
-post-install:
- ${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
- ${ECHO} bin/MailScanner >> ${PLIST_SRC}
- ${ECHO} man/man5/MailScanner.conf.5 >> ${PLIST_SRC}
- ${ECHO} man/man8/MailScanner.8 >> ${PLIST_SRC}
-.for _dir_ in ${DOCSDIR} ${EGDIR} ${LIBDIR} ${LIBEXECDIR}
- ${FIND} ${_dir_} \( -type f -o -type l \) -print \
- | ${SORT} | ${SED} -e "s,${PREFIX}/,,g" \
- >> ${PLIST_SRC}
-.endfor
-.for _dir_ in ${DOCSDIR} ${EGDIR} ${LIBDIR} ${LIBEXECDIR}
- ${FIND} ${_dir_} -type d -print \
- | ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g" \
- >> ${PLIST_SRC}
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailscanner/PLIST b/mail/mailscanner/PLIST
deleted file mode 100644
index e7070f1ddbd..00000000000
--- a/mail/mailscanner/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/02 20:34:00 reed Exp $
-@comment this PLIST automatically generated
-share/examples/rc.d/mailscanner
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
deleted file mode 100644
index 3798bb87b2e..00000000000
--- a/mail/mailscanner/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:24 agc Exp $
-
-SHA1 (MailScanner-4.30.3-2.tar.gz) = ef9503dc57ec6d6f97a7333fce2b3e283d972498
-RMD160 (MailScanner-4.30.3-2.tar.gz) = f6dbe8acb329068e342d2cbfb16f3309d4db1a7a
-Size (MailScanner-4.30.3-2.tar.gz) = 996850 bytes
diff --git a/mail/mailscanner/files/mailscanner.sh b/mail/mailscanner/files/mailscanner.sh
deleted file mode 100644
index 044f5730ef1..00000000000
--- a/mail/mailscanner/files/mailscanner.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: mailscanner.sh,v 1.1.1.1 2004/09/25 00:33:19 grant Exp $
-#
-# PROVIDE: mailscanner
-# REQUIRE: LOGIN
-
-. /etc/rc.subr
-
-name="MailScanner"
-rcvar="mailscanner"
-start_cmd="@PREFIX@/bin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="@PKG_SYSCONFDIR@/${name}.conf"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/mailserv/DESCR b/mail/mailserv/DESCR
deleted file mode 100644
index e8a1a146a3d..00000000000
--- a/mail/mailserv/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
- MailServ provides a World Wide Web interface to several types of mailing
-list servers. Users can select commands, enter information, and press
-buttons to send email commands to the mail server.
-
- MailServ does not provide the actual mailing list services (you'll need
-to have an existing mailing list management program to do that), but what
-do you expect -- MailServ is free!
diff --git a/mail/mailserv/Makefile b/mail/mailserv/Makefile
deleted file mode 100644
index 09250f3df41..00000000000
--- a/mail/mailserv/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2006/10/04 21:47:16 wiz Exp $
-#
-
-DISTNAME= mailserv
-PKGNAME= ${DISTNAME}-3.29
-CATEGORIES= mail
-MASTER_SITES= http://www.barelyfitz.com/projects/mailserv/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.barelyfitz.com/projects/mailserv/
-COMMENT= WWW interface to several types of mailing list servers
-
-WRKSRC= ${WRKDIR}
-DIST_SUBDIR= ${PKGNAME_NOREV}
-
-USE_TOOLS+= perl:run
-NO_BUILD= YES
-
-PKG_SYSCONFSUBDIR= mailserv
-EGDIR= ${PREFIX}/share/examples/mailserv
-CONF_FILES=
-.for cf in listproc listserv mail-list maiser majordomo-admin \
- majordomo-share majordomo mlp pmdf smartlist subscribe
-CONF_FILES+= ${EGDIR}/${cf}.cf ${PKG_SYSCONFDIR}/${cf}.cf
-.endfor
-
-INSTALLATION_DIRS= libexec/cgi-bin
-
-do-configure:
-.for file in mailserv cgi-lib.pl
- cd ${WRKSRC} && \
- ${CHMOD} 0755 ${file} && \
- ${CP} ${file} ${file}.old && \
- ${SED} < ${file}.old > ${file} \
- -e "s|@PREFIX@|${PREFIX}|g" \
- -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \
- -e "s|/usr/local/bin/perl|${PREFIX}/bin/perl|g" \
- -e "s|/usr/bin/perl|${PREFIX}/bin/perl|g"
-.endfor
-
-do-install:
- ${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/cgi-bin/mailserv
- ${INSTALL_SCRIPT} ${WRKSRC}/mailserv ${PREFIX}/libexec/cgi-bin/mailserv
- ${INSTALL_SCRIPT} ${WRKSRC}/cgi-lib.pl ${PREFIX}/libexec/cgi-bin/mailserv
- ${INSTALL_DATA_DIR} ${EGDIR}
-.for cf in listproc listserv mail-list maiser majordomo-admin \
- majordomo-share majordomo mlp pmdf smartlist subscribe
- ${INSTALL_DATA} ${WRKSRC}/${cf}.cf ${EGDIR}
- cd ${PREFIX}/libexec/cgi-bin/mailserv && \
- ${LN} -s mailserv ${cf}
-.endfor
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mailserv
-.for doc in ChangeLog LICENSE README
- ${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/mailserv
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailserv/PLIST b/mail/mailserv/PLIST
deleted file mode 100644
index 34bd1f54d43..00000000000
--- a/mail/mailserv/PLIST
+++ /dev/null
@@ -1,31 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/05/01 11:59:49 jmmv Exp $
-libexec/cgi-bin/mailserv/cgi-lib.pl
-libexec/cgi-bin/mailserv/listproc
-libexec/cgi-bin/mailserv/listserv
-libexec/cgi-bin/mailserv/mail-list
-libexec/cgi-bin/mailserv/mailserv
-libexec/cgi-bin/mailserv/maiser
-libexec/cgi-bin/mailserv/majordomo
-libexec/cgi-bin/mailserv/majordomo-admin
-libexec/cgi-bin/mailserv/majordomo-share
-libexec/cgi-bin/mailserv/mlp
-libexec/cgi-bin/mailserv/pmdf
-libexec/cgi-bin/mailserv/smartlist
-libexec/cgi-bin/mailserv/subscribe
-share/doc/mailserv/ChangeLog
-share/doc/mailserv/LICENSE
-share/doc/mailserv/README
-share/examples/mailserv/listproc.cf
-share/examples/mailserv/listserv.cf
-share/examples/mailserv/mail-list.cf
-share/examples/mailserv/maiser.cf
-share/examples/mailserv/majordomo-admin.cf
-share/examples/mailserv/majordomo-share.cf
-share/examples/mailserv/majordomo.cf
-share/examples/mailserv/mlp.cf
-share/examples/mailserv/pmdf.cf
-share/examples/mailserv/smartlist.cf
-share/examples/mailserv/subscribe.cf
-@dirrm share/examples/mailserv
-@dirrm share/doc/mailserv
-@dirrm libexec/cgi-bin/mailserv
diff --git a/mail/mailserv/distinfo b/mail/mailserv/distinfo
deleted file mode 100644
index d30da1ea070..00000000000
--- a/mail/mailserv/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 09:59:24 agc Exp $
-
-SHA1 (mailserv-3.29/mailserv.tar.gz) = 3f00cf28775273937dba050a23907c501d3f7fe4
-RMD160 (mailserv-3.29/mailserv.tar.gz) = 8f85e9d234f12f50a65db23a9730e33da4666697
-Size (mailserv-3.29/mailserv.tar.gz) = 26687 bytes
-SHA1 (patch-aa) = 8ee34039096ea7b94a24b87d93e49bf4b682e7d9
diff --git a/mail/mailserv/patches/patch-aa b/mail/mailserv/patches/patch-aa
deleted file mode 100644
index 4203805ac53..00000000000
--- a/mail/mailserv/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/05/01 11:59:50 jmmv Exp $
-
---- mailserv.orig 2002-10-23 02:59:51.000000000 +0200
-+++ mailserv
-@@ -28,7 +28,7 @@ print "Content-type: text/html\n";
- ## the include files are write-protected, otherwise someone
- ## could add malicious code to them.
-
--@INC = (".", "./config");
-+@INC = (".", "./config", "@PKG_SYSCONFDIR@");
- &cgiRequire("cgi-lib.pl");
- &ReadParse();
-
-@@ -71,7 +71,7 @@ $max = 10;
- # Program into which mail is piped
- # You can also override this with $config::mailer.
-
--$mailer = "/usr/lib/sendmail -t";
-+$mailer = "/usr/sbin/sendmail -t";
-
- # mailer_accepts_f
- # Use "-f address" for the mailer?
diff --git a/mail/mailsync/DESCR b/mail/mailsync/DESCR
deleted file mode 100644
index 9bbfc738242..00000000000
--- a/mail/mailsync/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Mailsync is a way of synchronizing a collection of mailboxes. The algorithm is
-a 3-way diff. Two mailboxes are simultaneously compared to a record of the
-state of both mailboxes at last sync. New messages and message deletions are
-propagated between the two mailboxes. If you're familiar with CVS, it's the
-same principle, except there's no opportunity for conflicts.
diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile
deleted file mode 100644
index 80644e6f6d3..00000000000
--- a/mail/mailsync/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2007/02/22 19:30:04 wiz Exp $
-#
-
-DISTNAME= mailsync_5.2.1.orig
-PKGNAME= mailsync-5.2.1
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mailsync/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://mailsync.sourceforge.net/
-COMMENT= Mailsync is a way of synchronizing a collection of mailboxes
-
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_TOOLS+= gmake
-USE_LANGUAGES= c c++
-GNU_CONFIGURE= yes
-
-CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}/include
-CONFIGURE_ARGS+= --with-c-client=${BUILDLINK_DIR}/include/c-client
-CONFIGURE_ARGS+= --without-krb5
-
-SUBST_CLASSES+= conf
-SUBST_STAGE.conf= pre-configure
-SUBST_FILES.conf= configure doc/examples/mailsync doc/mailsync.1
-SUBST_SED.conf= -e "s|@BUILDLINK_DIR@|${BUILDLINK_DIR}|g" \
- -e "s|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g" \
- -e "s|/usr/share|${PREFIX}/share|g"
-SUBST_MESSAGE.conf= Fixing configure script.
-
-DOCS= COPYING NEWS README THANKS TODO doc/ABSTRACT doc/HACKING
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mailsync
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mailsync
- ${INSTALL_PROGRAM} ${WRKSRC}/src/mailsync ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/doc/examples/mailsync \
- ${PREFIX}/share/examples/mailsync/dot.mailsync
- ${INSTALL_MAN} ${WRKSRC}/doc/mailsync.1 ${PREFIX}/${PKGMANDIR}/man1
-.for d in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/${d} ${PREFIX}/share/doc/mailsync
-.endfor
-
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mail/imap-uw/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailsync/PLIST b/mail/mailsync/PLIST
deleted file mode 100644
index 9f3d9618c8c..00000000000
--- a/mail/mailsync/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/11/16 18:56:46 adrianp Exp $
-bin/mailsync
-man/man1/mailsync.1
-share/doc/mailsync/ABSTRACT
-share/doc/mailsync/COPYING
-share/doc/mailsync/HACKING
-share/doc/mailsync/NEWS
-share/doc/mailsync/README
-share/doc/mailsync/THANKS
-share/doc/mailsync/TODO
-share/examples/mailsync/dot.mailsync
-@dirrm share/examples/mailsync
-@dirrm share/doc/mailsync
diff --git a/mail/mailsync/distinfo b/mail/mailsync/distinfo
deleted file mode 100644
index 095ea8551db..00000000000
--- a/mail/mailsync/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 09:59:24 agc Exp $
-
-SHA1 (mailsync_5.2.1.orig.tar.gz) = ce32305c5d2d659ecc41d81036a78a346e97ebe0
-RMD160 (mailsync_5.2.1.orig.tar.gz) = b6aeecee769f67978632bf582ba4df3711fcca69
-Size (mailsync_5.2.1.orig.tar.gz) = 139967 bytes
-SHA1 (patch-ac) = 7805db2f99a0c06c19b30cec3bf3367cf445f717
diff --git a/mail/mailsync/patches/patch-ac b/mail/mailsync/patches/patch-ac
deleted file mode 100644
index 14a2879cf63..00000000000
--- a/mail/mailsync/patches/patch-ac
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/11/16 18:56:46 adrianp Exp $
-
---- configure.orig 2004-06-30 09:04:12.000000000 +0100
-+++ configure 2004-11-16 15:55:22.000000000 +0000
-@@ -5025,7 +5025,7 @@
- if test "$withval" = "no" ; then
- OPENSSLLOCATIONS=""
- else
-- test "$withval" = "yes" || OPENSSLLOCATIONS="$withval,${OPENSSLLOCATIONS}"
-+ test "$withval" = "yes" || OPENSSLLOCATIONS="@SSLBASE@/lib @SSLBASE@/include @SSLBASE@/include/openssl"
- fi
-
-
-@@ -5035,7 +5035,7 @@
- else
- echo "$as_me:$LINENO: checking for libssl" >&5
- echo $ECHO_N "checking for libssl... $ECHO_C" >&6
-- for p in `eval "echo {${OPENSSLLOCATIONS}}{/lib,/lib64}"` ; do
-+ for p in ${OPENSSLLOCATIONS} ; do
- if test -r "${p}/libssl.a" -o -r "${p}/libssl.so" ; then
- OPENSSL_LDFLAGS="-L${p}"
- echo "$as_me:$LINENO: result: found in ${p}" >&5
-@@ -5190,7 +5190,7 @@
- else
- echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
- echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6
-- for p in `eval "echo {${OPENSSLLOCATIONS}}{/include,}"` ; do
-+ for p in ${OPENSSLLOCATIONS} ; do
- if test -r "${p}/openssl/ssl.h" ; then
- OPENSSL_INCLUDES="-I${p}"
- echo "$as_me:$LINENO: result: found in ${p}" >&5
-@@ -5462,7 +5462,7 @@
- if test "$withval" = "no" ; then
- CCLIENTLOCATIONS=""
- else
-- test "$withval" = "yes" || CCLIENTLOCATIONS="$withval,${CCLIENTLOCATIONS}"
-+ test "$withval" = "yes" || CCLIENTLOCATIONS="@BUILDLINK_DIR@/lib @BUILDLINK_DIR@/include/c-client"
- fi
-
-
-@@ -5477,7 +5477,7 @@
-
- echo "$as_me:$LINENO: checking for c-client.h" >&5
- echo $ECHO_N "checking for c-client.h... $ECHO_C" >&6
-- for p in `eval "echo {${CCLIENTLOCATIONS}}{,/c-client,/lib/c-client,/include/c-client,/include,/include/imap}"` ; do
-+ for p in ${CCLIENTLOCATIONS} ; do
- if test -r "${p}/c-client.h" -a -r "${p}/linkage.h" -a -r "${p}/linkage.c" ; then
- CCLIENT_INCLUDES="-I${p}"
- CCLIENT_LINKAGE_H="${p}/linkage.h"
-@@ -5501,11 +5501,11 @@
-
- echo "$as_me:$LINENO: checking for c-client library" >&5
- echo $ECHO_N "checking for c-client library... $ECHO_C" >&6
-- for l in `eval "echo {${CCLIENTLOCATIONS}}{,/c-client,/lib/c-client,/lib,/lib64}/{libc-client,libc-client4,c-client}{${SOP}}"` ; do
-+ for l in ${CCLIENTLOCATIONS} ; do
- if test -r "$l" ; then
- echo "$as_me:$LINENO: result: found ${l}" >&5
- echo "${ECHO_T}found ${l}" >&6
-- CCLIENT_LIBS="$l"
-+ CCLIENT_LIBS="-L $l -lc-client"
- break
- fi
- done
-@@ -5533,7 +5533,7 @@
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "auth_gss" >/dev/null 2>&1; then
-
-- need_krb=yes
-+ need_krb=no
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-
diff --git a/mail/mailwrapper/DEINSTALL b/mail/mailwrapper/DEINSTALL
deleted file mode 100644
index c20aea8f200..00000000000
--- a/mail/mailwrapper/DEINSTALL
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.3 2004/08/10 21:46:34 jlam Exp $
-
-MAILWRAPPEES="@MAILWRAPPEES@"
-MAILWRAPPER="${PKG_PREFIX}/sbin/mailwrapper"
-MAILER_CONF="${PKG_SYSCONFDIR}/mailer.conf"
-MAILER_CONF_SAMPLE="${PKG_PREFIX}/share/examples/mailwrapper/mailer.conf.sendmail"
-MW_BACKUP_SFX="@MAILWRAPPER_BACKUP_SFX@"
-
-ALL_FILES="${ALL_FILES} ${MAILER_CONF_SAMPLE} ${MAILER_CONF}"
-
-case ${STAGE} in
-DEINSTALL)
- for file in ${MAILWRAPPEES}; do
- if [ -f ${file}${MW_BACKUP_SFX} ]; then
- ${ECHO} "Restoring ${file}${MW_BACKUP_SFX} to ${file}."
- ${RM} -f ${file}
- ${MV} -f ${file}${MW_BACKUP_SFX} ${file}
- fi
- done
- ;;
-esac
diff --git a/mail/mailwrapper/DESCR b/mail/mailwrapper/DESCR
deleted file mode 100644
index 04260bdddab..00000000000
--- a/mail/mailwrapper/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-At one time, the only Mail Transfer Agent (MTA) software easily available
-was sendmail(8). As a result of this, most Mail User Agents (MUAs) such
-as mail(1) had the path and calling conventions expected by sendmail(8)
-compiled in.
-
-Times have changed, however. On a modern NetBSD system, the administra-
-tor may wish to use one of several available MTAs.
-
-It would be difficult to modify all MUA software typically available on a
-system, so most of the authors of alternative MTAs have written their
-front end message submission programs so that they use the same calling
-conventions as sendmail(8) and may be put into place instead of
-sendmail(8) in /usr/sbin/sendmail.
diff --git a/mail/mailwrapper/INSTALL b/mail/mailwrapper/INSTALL
deleted file mode 100644
index 1bc9504eebb..00000000000
--- a/mail/mailwrapper/INSTALL
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: INSTALL,v 1.2 2004/07/24 09:19:15 jlam Exp $
-
-MAILWRAPPEES="@MAILWRAPPEES@"
-MAILWRAPPER="${PKG_PREFIX}/sbin/mailwrapper"
-MAILER_CONF="${PKG_SYSCONFDIR}/mailer.conf"
-MAILER_CONF_SAMPLE="${PKG_PREFIX}/share/examples/mailwrapper/mailer.conf.sendmail"
-MW_BACKUP_SFX="@MAILWRAPPER_BACKUP_SFX@"
-
-case ${STAGE} in
-POST-INSTALL)
- for file in ${MAILWRAPPEES}; do
- if [ -f ${file} ]; then
- ${ECHO} "Backing up ${file} as ${file}${MW_BACKUP_SFX}."
- ${MV} -f ${file} ${file}${MW_BACKUP_SFX}
- ${LN} -fs ${MAILWRAPPER} ${file}
- fi
- done
- if [ ! -f ${MAILER_CONF} ]; then
- for file in ${MAILWRAPPEES}; do
- if [ -f ${file}.mailwrappee ]; then
- ${ECHO} "`${BASENAME} ${file}` ${file}${MW_BACKUP_SFX}" >> ${MAILER_CONF}
- case ${file} in
- */sendmail)
- ${ECHO} "send-mail ${file}${MW_BACKUP_SFX}" >> ${MAILER_CONF}
- ;;
- esac
- fi
- done
- fi
- if [ ! -f ${MAILER_CONF} ]; then
- ${CP} ${MAILER_CONF_SAMPLE} ${MAILER_CONF}
- fi
- ${CAT} << EOF
-===========================================================================
-You may wish to customize the following files for ${PKGNAME}:
-
- ${MAILER_CONF}
-===========================================================================
-EOF
- ;;
-esac
diff --git a/mail/mailwrapper/MESSAGE.NetBSD b/mail/mailwrapper/MESSAGE.NetBSD
deleted file mode 100644
index 7a9476ff63e..00000000000
--- a/mail/mailwrapper/MESSAGE.NetBSD
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.2 2004/07/23 23:01:23 jlam Exp $
-
-This package *must* be deinstalled before you upgrade your NetBSD
-installation.
-
-===========================================================================
diff --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile
deleted file mode 100644
index da4e3028e68..00000000000
--- a/mail/mailwrapper/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2007/01/07 09:13:58 rillig Exp $
-
-DISTNAME= mailwrapper-19990412
-PKGREVISION= 4
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Wrapper to support arbitrary Mail Transport Agents
-
-NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
-
-WRKSRC= ${WRKDIR}/mailwrapper
-MANCOMPRESSED_IF_MANZ= yes
-
-EGDIR= ${PREFIX}/share/examples/mailwrapper
-
-MAILWRAPPER_BACKUP_SFX= .pkgsrc.mailwrapper
-FILES_SUBST+= MAILWRAPPER_BACKUP_SFX=${MAILWRAPPER_BACKUP_SFX:Q}
-
-MAILWRAPPEES= /usr/bin/mailq \
- /usr/bin/newaliases /usr/sbin/newaliases \
- /usr/sbin/sendmail /usr/lib/sendmail
-FILES_SUBST+= MAILWRAPPEES=${MAILWRAPPEES:Q}
-
-INSTALLATION_DIRS= ${PKGMANDIR}/cat5 ${PKGMANDIR}/cat8 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin
-
-do-configure:
- cd ${WRKSRC}; \
- for file in mailer.conf.5 mailwrapper.8 mailwrapper.c; do \
- ${MV} $$file $$file.save; \
- ${SED} -e "s|/etc/\(mailer.conf\)|${PKG_SYSCONFDIR}/\\1|g" \
- $$file.save > $$file; \
- done
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/mailer.conf ${EGDIR}/mailer.conf.sendmail
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailwrapper/PLIST b/mail/mailwrapper/PLIST
deleted file mode 100644
index 8b4360c7ea1..00000000000
--- a/mail/mailwrapper/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2004/07/23 23:01:23 jlam Exp $
-man/cat5/mailer.conf.0
-man/cat8/mailwrapper.0
-man/man5/mailer.conf.5
-man/man8/mailwrapper.8
-sbin/mailwrapper
-share/examples/mailwrapper/mailer.conf.sendmail
-@dirrm share/examples/mailwrapper
diff --git a/mail/mailwrapper/distinfo b/mail/mailwrapper/distinfo
deleted file mode 100644
index feb58dc3a4e..00000000000
--- a/mail/mailwrapper/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:24 agc Exp $
-
-SHA1 (mailwrapper-19990412.tar.gz) = 8743e23bf2473557dda67684bae5b8879e5c8b45
-RMD160 (mailwrapper-19990412.tar.gz) = cafe34e6076e5c748ce43ecb81c3a96ed4d02e29
-Size (mailwrapper-19990412.tar.gz) = 6129 bytes
-SHA1 (patch-aa) = b9378b4cb23180f8f4935e9c1ec032928a51de03
diff --git a/mail/mailwrapper/patches/patch-aa b/mail/mailwrapper/patches/patch-aa
deleted file mode 100644
index 5aa60452fa5..00000000000
--- a/mail/mailwrapper/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2000/04/08 23:17:12 bad Exp $
-
---- Makefile.orig Mon Apr 12 22:02:20 1999
-+++ Makefile Sun Apr 9 00:45:43 2000
-@@ -9,7 +9,4 @@
- BINDIR= ${PREFIX}/sbin
- MANDIR= ${PREFIX}/man
-
--MANINSTALL= catinstall maninstall
--MANZ= 1
--
- .include <bsd.prog.mk>
diff --git a/mail/mairix/DESCR b/mail/mairix/DESCR
deleted file mode 100644
index aeb2bfde15b..00000000000
--- a/mail/mairix/DESCR
+++ /dev/null
@@ -1,22 +0,0 @@
-mairix is a program for indexing and searching email messages stored in
-Maildir, MH or mbox folders.
-
-* Indexing is fast. It runs incrementally on new messages - any particular
- message only gets scanned once in the lifetime of the index file.
-
-* The search mode populates a "virtual" folder with symlinks(*) which
- point to the real messages. This folder can be opened as usual in your mail
- program.
-
-* The search mode is very fast.
-
-* Indexing and searching works on the basis of words. The index file tabulates
- which words occur in which parts (particular headers + body) of which
- messages.
-
-The program is a very useful complement to mail programs like mutt
-(http://www.mutt.org/, which supports Maildir, MH and mbox folders) and
-Sylpheed (which supports MH folders).
-
-[(*) where the input or output folder is an mbox, a copy of the message is made
-instead of symlinking.]
diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile
deleted file mode 100644
index cd884881a8b..00000000000
--- a/mail/mairix/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2006/06/09 16:04:00 minskim Exp $
-#
-
-DISTNAME= mairix-0.16.1
-CATEGORIES= mail
-MASTER_SITES= http://www.rpcurnow.force9.co.uk/mairix/
-
-MAINTAINER= simonb@NetBSD.org
-HOMEPAGE= http://www.rc0.org.uk/mairix/
-COMMENT= Program for indexing and searching email messages
-
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
-
-USE_TOOLS+= bison flex makeinfo
-INFO_FILES= # PLIST
-
-BINDIR= ${PREFIX}/bin
-INFODIR= ${PREFIX}/${PKGINFODIR}
-HTMLDIR= ${PREFIX}/share/doc/html/mairix
-
-INSTALLATION_DIRS= ${BINDIR} ${INFODIR} ${HTMLDIR}
-
-pre-build:
- cd ${WRKSRC} && makeinfo mairix.texi
- cd ${WRKSRC} && makeinfo --no-split --number-sections --html \
- mairix.texi > mairix.html
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/mairix ${BINDIR}
- ${INSTALL_DATA} ${WRKSRC}/mairix.html ${HTMLDIR}
- cd ${WRKSRC}; for f in mairix.info mairix.info-[0-9]; do \
- ${TEST} ! -f "$$f" || ${INSTALL_DATA} "$$f" ${INFODIR}; \
- done
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mairix/PLIST b/mail/mairix/PLIST
deleted file mode 100644
index cc6a4b3bfa5..00000000000
--- a/mail/mairix/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/05 16:41:34 jlam Exp $
-bin/mairix
-info/mairix.info
-share/doc/html/mairix/mairix.html
-@dirrm share/doc/html/mairix
diff --git a/mail/mairix/distinfo b/mail/mairix/distinfo
deleted file mode 100644
index 74b247e5191..00000000000
--- a/mail/mairix/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/10/18 01:22:27 simonb Exp $
-
-SHA1 (mairix-0.16.1.tar.gz) = 3fe6e15ec34d903a3fce6299c283b8a0c3d98a02
-RMD160 (mairix-0.16.1.tar.gz) = 8f26d7b1fe94a8a9f645c96c9efdc2acbc37e43a
-Size (mairix-0.16.1.tar.gz) = 126356 bytes
diff --git a/mail/majordomo/DESCR b/mail/majordomo/DESCR
deleted file mode 100644
index 87b1b327e00..00000000000
--- a/mail/majordomo/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Majordomo is a program which automates the management of Internet
-mailing lists. Commands are sent to Majordomo via electronic mail to
-handle all aspects of list maintainance. Once a list is set up,
-virtually all operations can be performed remotely, requiring no
-intervention upon the postmaster of the list site.
-
- majordomo - n: a person who speaks, makes arrangements, or takes
- charge for another. From latin "major domus" - "master of the
- house".
diff --git a/mail/majordomo/MESSAGE b/mail/majordomo/MESSAGE
deleted file mode 100644
index ddfe207a453..00000000000
--- a/mail/majordomo/MESSAGE
+++ /dev/null
@@ -1,54 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2006/06/16 16:43:37 jlam Exp $
-
-Before you can use Majordomo, you will need to complete a few steps
-manually:
-
- - install majordomo.cf in ${HOME}/${MAJORDOMO_USER}.
- Look in ${PREFIX}/share/examples/majordomo for an example and
- be sure to change instances of ${HOSTNAME} as appropriate.
-
- - create lists in ${HOME}/${MAJORDOMO_USER}.
- Look in ${PREFIX}/share/doc/majordomo for information and see
- the files and directories for an example list (example-l) in
- ${PREFIX}/share/examples/majordomo. Pay attention to the
- permissions on the files and directories.
-
- - add a .forward file in ${HOME}/${MAJORDOMO_USER} (or an
- appropriate alias) so administrative mail to
- ${MAJORDOMO_USER} gets redirected properly.
-
- - install majordomo aliases for sendmail.
- For example, create /etc/aliases.majordomo following the
- example in ${PREFIX}/share/examples/majordomo and add it to
- your sendmail configuration. This can be done by adding a
- line similar to the following to /etc/sendmail.cf :
-
- OA/etc/aliases.majordomo (for 8.6.x Sendmail),
-
- O AliasFile=/etc/aliases,/etc/aliases.majordomo (for 8.7.x and up),
-
- or a line similar to the following to your m4 macros file:
-
- define(`ALIAS_FILE',`/etc/aliases,/etc/aliases.majordomo')
-
- - if the group for ${MAJORDOMO_USER} (${MAJORDOMO_GROUP}) is not
- daemon, add ${MAJORDOMO_USER} as a trusted user for sendmail.
- This can be done by adding a line similar to the following
- in /etc/sendmail.cf:
-
- T${MAJORDOMO_USER}
-
- or a line similar to the following to your m4 macros file:
-
- define(`confTRUSTED_USERS', ${MAJORDOMO_USER})dnl
-
- - be sure to run `newaliases' to create the sendmail database,
- and be sure that sendmail knows about any changes to
- /etc/sendmail.cf (e.g., reboot or restart sendmail)
-
- - add entries in /etc/newsyslog.conf to rotate the log in
- ${HOME}/${MAJORDOMO_USER}/Log if necessary.
-
-Enjoy Majordomo!
-===========================================================================
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
deleted file mode 100644
index 0039bf86394..00000000000
--- a/mail/majordomo/Makefile
+++ /dev/null
@@ -1,121 +0,0 @@
-# $NetBSD: Makefile,v 1.28 2007/02/22 19:26:41 wiz Exp $
-
-DISTNAME= majordomo-1.94.5
-PKGREVISION= 2
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.sgi.com/other/majordomo/1.94.5/ \
- ftp://ftp-europe.sgi.com/other/majordomo/1.94.5/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= packages@biology.nmsu.edu
-HOMEPAGE= http://www.greatcircle.com/majordomo/
-COMMENT= The Majordomo mailing list manager
-
-LICENSE= majordomo-license
-
-CONFLICTS+= bounce-*
-
-USE_TOOLS+= perl:run
-
-BUILD_TARGET= wrapper
-INSTALL_TARGET= install install-wrapper
-MAKE_FILE= Makefile.netbsd
-
-MAJORDOMO_TMPDIR?= /var/tmp
-MAJORDOMO_HOMEDIR?= /home
-MAJORDOMO_USER?= majordom
-MAJORDOMO_GROUP?= majordom
-
-MESSAGE_SUBST+= HOME=${MAJORDOMO_HOMEDIR} \
- MAJORDOMO_USER=${MAJORDOMO_USER} \
- MAJORDOMO_GROUP=${MAJORDOMO_GROUP}
-
-DOCDIR= ${PREFIX}/share/doc/majordomo
-DOCFILES= Changelog FUTURE INSTALL LICENSE NEWLIST README
-DOCDOCFILES= FAQ README.sequencer list-owner-info \
- majordomo-faq.html majordomo.lisa6.ps majordomo.ora
-
-EXDIR= ${PREFIX}/share/examples/majordomo
-EXDIRS= archives archives/example-l digests \
- digests/example-l-digest lists
-EXFILES= example-l.passwd example-l.info
-EXLISTS= example-l example-l-digest
-
-BUILD_DEFS+= MAJORDOMO_USER MAJORDOMO_GROUP MAJORDOMO_TMPDIR
-
-USERGROUP_PHASE= configure
-PKG_GROUPS= ${MAJORDOMO_GROUP}
-PKG_USERS= ${MAJORDOMO_USER}:${MAJORDOMO_GROUP}
-OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR}/${MAJORDOMO_USER} \
- ${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0775
-OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR}/${MAJORDOMO_USER}/archives \
- ${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0775
-OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR}/${MAJORDOMO_USER}/digests \
- ${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0775
-OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR}/${MAJORDOMO_USER}/lists \
- ${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0775
-
-CONFIGURE_SED= -e "s|@PREFIX@|${PREFIX}|g" \
- -e "s|@PERL@|${PERL5}|g" \
- -e "s|@HOME@|${MAJORDOMO_HOMEDIR}|g" \
- -e "s|@MAJORDOMO_USER@|${MAJORDOMO_USER}|g" \
- -e "s|@UID@|${PKG_UID.${MAJORDOMO_USER}}|g" \
- -e "s|@GID@|${PKG_GID.${MAJORDOMO_GROUP}}|g" \
- -e "s|@TMPDIR@|${MAJORDOMO_TMPDIR}|g"
-
-MESSAGE_SED= -e 's|$${PREFIX}|${PREFIX}|g' \
- -e 's|$${HOME}|${HOME}|g' \
- -e 's|$${MAJORDOMO_USER}|${MAJORDOMO_USER}|g' \
- -e 's|$${MAJORDOMO_GROUP}|${MAJORDOMO_GROUP}|g' \
-
-do-configure:
- ${SED} ${CONFIGURE_SED} ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.netbsd
-
-post-build:
- ${SED} ${CONFIGURE_SED} ${WRKSRC}/sample.cf > ${WRKSRC}/majordomo.cf
- ${SED} ${CONFIGURE_SED} ${FILESDIR}/aliases.majordomo \
- > ${WRKSRC}/aliases.majordomo
- ${SED} -e 's|$${PREFIX}|${PREFIX}|g' \
- -e 's|$${HOME}|${HOME}|g' \
- -e 's|$${MAJORDOMO_USER}|${MAJORDOMO_USER}|g' \
- -e 's|$${MAJORDOMO_GROUP}|${MAJORDOMO_GROUP}|g' \
- ${PKGDIR}/MESSAGE > ${WRKSRC}/post-install-notes
-
-post-install:
- ${LN} -sf archive2.pl ${PREFIX}/libexec/majordomo/archive
- ${INSTALL_DATA_DIR} ${DOCDIR}
-.for file in ${DOCFILES}
- @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCDIR}/${file}
-.endfor
-.for file in ${DOCDOCFILES}
- ${INSTALL_DATA} ${WRKSRC}/Doc/${file} ${DOCDIR}/${file}
-.endfor
- ${INSTALL_DATA} ${WRKSRC}/post-install-notes ${DOCDIR}/post-install-notes
- ${INSTALL} -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${EXDIR}
-.for dir in ${EXDIRS}
- ${INSTALL} -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${EXDIR}/${dir}
-.endfor
- ${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
- ${WRKSRC}/aliases.majordomo ${EXDIR}/aliases.majordomo
- ${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
- ${FILESDIR}/keep_me ${EXDIR}/archives/example-l/.keep_me
- ${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
- ${FILESDIR}/keep_me ${EXDIR}/digests/example-l-digest/.keep_me
-.for file in ${EXFILES}
- ${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
- ${FILESDIR}/${file} ${EXDIR}/lists/${file}
-.endfor
-.for file in ${EXLISTS}
- ${INSTALL} -m 664 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
- /dev/null ${EXDIR}/lists/${file}
-.endfor
- ${LN} -sf example-l.info ${EXDIR}/lists/example-l-digest.info
- ${LN} -sf example-l.passwd ${EXDIR}/lists/example-l-digest.passwd
- ${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
- ${WRKSRC}/majordomo.cf ${EXDIR}/majordomo.cf
-
-# verify installation; requires interaction
-test: install
- ${PREFIX}/libexec/majordomo/wrapper config-test
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/majordomo/PLIST b/mail/majordomo/PLIST
deleted file mode 100644
index 8b3ffe22e56..00000000000
--- a/mail/majordomo/PLIST
+++ /dev/null
@@ -1,63 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/07/23 22:56:16 he Exp $
-bin/approve
-bin/bounce
-bin/medit
-libexec/majordomo/Tools/archive.pl
-libexec/majordomo/Tools/archive_mh.pl
-libexec/majordomo/Tools/digest.send
-libexec/majordomo/Tools/logsummary.pl
-libexec/majordomo/Tools/makeindex.pl
-libexec/majordomo/Tools/new-list
-libexec/majordomo/Tools/sequencer
-libexec/majordomo/archive
-libexec/majordomo/archive2.pl
-libexec/majordomo/bounce-remind
-libexec/majordomo/config-test
-libexec/majordomo/config_parse.pl
-libexec/majordomo/digest
-libexec/majordomo/majordomo
-libexec/majordomo/majordomo.pl
-libexec/majordomo/majordomo_version.pl
-libexec/majordomo/request-answer
-libexec/majordomo/resend
-libexec/majordomo/sample.cf
-libexec/majordomo/shlock.pl
-libexec/majordomo/wrapper
-man/man1/approve.1
-man/man1/bounce-remind.1
-man/man1/bounce.1
-man/man1/resend.1
-man/man8/digest.8
-man/man8/majordomo.8
-share/doc/majordomo/Changelog
-share/doc/majordomo/FAQ
-share/doc/majordomo/FUTURE
-share/doc/majordomo/INSTALL
-share/doc/majordomo/LICENSE
-share/doc/majordomo/NEWLIST
-share/doc/majordomo/README
-share/doc/majordomo/README.sequencer
-share/doc/majordomo/list-owner-info
-share/doc/majordomo/majordomo-faq.html
-share/doc/majordomo/majordomo.lisa6.ps
-share/doc/majordomo/majordomo.ora
-share/doc/majordomo/post-install-notes
-share/examples/majordomo/aliases.majordomo
-share/examples/majordomo/archives/example-l/.keep_me
-share/examples/majordomo/digests/example-l-digest/.keep_me
-share/examples/majordomo/lists/example-l
-share/examples/majordomo/lists/example-l-digest
-share/examples/majordomo/lists/example-l-digest.info
-share/examples/majordomo/lists/example-l-digest.passwd
-share/examples/majordomo/lists/example-l.info
-share/examples/majordomo/lists/example-l.passwd
-share/examples/majordomo/majordomo.cf
-@dirrm share/examples/majordomo/lists
-@dirrm share/examples/majordomo/digests/example-l-digest
-@dirrm share/examples/majordomo/digests
-@dirrm share/examples/majordomo/archives/example-l
-@dirrm share/examples/majordomo/archives
-@dirrm share/examples/majordomo
-@dirrm share/doc/majordomo
-@dirrm libexec/majordomo/Tools
-@dirrm libexec/majordomo
diff --git a/mail/majordomo/distinfo b/mail/majordomo/distinfo
deleted file mode 100644
index b9aa41c9c07..00000000000
--- a/mail/majordomo/distinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/06/16 17:11:25 jlam Exp $
-
-SHA1 (majordomo-1.94.5.tgz) = 44b18c7b9133f2cd992f6e718551d613d9d45c00
-RMD160 (majordomo-1.94.5.tgz) = 7f6b48fb5cc5b23948133658b055588d0d6608c4
-Size (majordomo-1.94.5.tgz) = 312244 bytes
-SHA1 (patch-aa) = 6cc6cd49eb6413489fb782a3bcac70baac99fa7f
-SHA1 (patch-ab) = 68bdbd77029ebd8f113c492e50e60aa7efb35de9
-SHA1 (patch-ac) = bea997e785b2656b1660a11efce759a56a700ab2
-SHA1 (patch-ad) = 65370547240539128a405484e98c7ed15a869464
-SHA1 (patch-ae) = 692f5018cccef565bec3be0f24e7009ed1902edd
-SHA1 (patch-af) = 9f3d21953ada62876f7c2ba2be0fa5edb48335fb
-SHA1 (patch-ag) = b469a639270d369732e75e6ae4df7f559e9c436e
-SHA1 (patch-ah) = 666b52100cb50a948c145da0ba83c197386cbd1e
-SHA1 (patch-ai) = 771c487d1a3392bf3b523330b8d60fd9a190c58b
-SHA1 (patch-aj) = 6d4fe712af39cb986c24d0227f86aacb6d048870
-SHA1 (patch-ak) = 401da2e552ff92ef35a60e45d6b8994dfd091b49
-SHA1 (patch-al) = 776088c5916b1b0516e8abaecd69870ba57f4a76
-SHA1 (patch-am) = bbdc7c4d650c99e182bac2ae50ccd82f111c7bcc
diff --git a/mail/majordomo/files/aliases.majordomo b/mail/majordomo/files/aliases.majordomo
deleted file mode 100644
index 33af435fb0f..00000000000
--- a/mail/majordomo/files/aliases.majordomo
+++ /dev/null
@@ -1,127 +0,0 @@
-## $NetBSD: aliases.majordomo,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-##
-## Basic Majordomo Aliases
-##
-## Replace your own hostname for "@HOSTNAME@" in the aliases.
-##
-
-majordomo: "|@PREFIX@/libexec/majordomo/wrapper majordomo"
-majordomo-owner: @MAJORDOMO_USER@
-owner-majordomo: majordomo-owner
-majordom: majordomo-owner
-
-## The bounces mailing list is used to move people off of lists when their
-## e-mail address becomes undeliverable. See the bounce-remind script for a
-## way to inform people that they've been moved.
-
-## bounces mailing list
-#owner-bounces:majordomo-owner
-#bounces-approval:owner-bounces
-#owner-bounces-outgoing:owner-bounces
-
-#bounces: "|@PREFIX@/libexec/majordomo/wrapper resend -l bounces -h @HOSTNAME@ bounces-outgoing"
-
-#bounces-outgoing::include:@HOME@/@MAJORDOMO_USER@/lists/bounces
-
-## Example List
-##
-## This is a example list that should be removed once you are familiar with
-## the operation of Majordomo.
-##
-owner-example-l:@MAJORDOMO_USER@
-owner-example-l-digest:owner-example-l
-owner-example-l-outgoing:owner-example-l
-owner-example-l-digest-outgoing:owner-example-l
-example-l-approval:owner-example-l
-example-l-digest-approval:owner-example-l
-
-example-l: "|@PREFIX@/libexec/majordomo/wrapper resend -l example-l -h @HOSTNAME@ example-l-outgoing"
-example-l-digest:example-l
-example-l-outgoing::include:@HOME@/@MAJORDOMO_USER@/lists/example-l,
- "|@PREFIX@/libexec/majordomo/wrapper archive -a -m -f @HOME@/@MAJORDOMO_USER@/archives/example-l/example-l",
- "|@PREFIX@/libexec/majordomo/wrapper digest -r -C -l example-l-digest example-l-digest-outgoing"
-example-l-digest-outgoing::include:@HOME@/@MAJORDOMO_USER@/lists/example-l-digest
-
-example-l-request: "|@PREFIX@/libexec/majordomo/wrapper majordomo -l example-l"
-example-l-digest-request: "|@PREFIX@/libexec/majordomo/wrapper majordomo -l example-l-digest"
-
-
-## Sample Lists
-##
-## Majordomo lists take one of four general forms:
-##
-## 1. Regular mailing list
-## 2. Mailing list with archiving
-## 3. Mailing list with a digested form of the list
-## 4. Mailing list with a digested form of the list and archiving
-##
-## Examples for each are commented out below
-##
-
-
-# Regular Mailing List
-#
-
-#owner-listname:user
-#owner-listname-outgoing:owner-listname
-#listname-approval:owner-listname
-
-#listname: "|@PREFIX@/libexec/majordomo/wrapper resend -l listname -h @HOSTNAME@ listname-outgoing"
-#listname-outgoing::include:@HOME@/@MAJORDOMO_USER@/lists/listname
-
-#listname-request: "|@PREFIX@/libexec/majordomo/wrapper majordomo -l listname"
-
-
-# Mailing List with archiving
-#
-
-#owner-listname:user
-#owner-listname-outgoing:owner-listname
-#listname-approval:owner-listname
-
-#listname: "|@PREFIX@/libexec/majordomo/wrapper resend -l listname -h @HOSTNAME@ listname-outgoing"
-#listname-outgoing::include:@HOME@/@MAJORDOMO_USER@/lists/listname,
-# "|@PREFIX@/libexec/majordomo/wrapper archive -a -m -f @HOME@/@MAJORDOMO_USER@/archives/listname/listname"
-
-#listname-request: "|@PREFIX@/libexec/majordomo/wrapper majordomo -l listname"
-
-
-# Mailing List with a digested form of the list
-#
-
-#owner-listname:user
-#owner-listname-digest:owner-listname
-#owner-listname-outgoing:owner-listname
-#owner-listname-digest-outgoing:owner-listname
-#listname-approval:owner-listname
-#listname-digest-approval:owner-listname
-
-#listname: "|@PREFIX@/libexec/majordomo/wrapper resend -l listname -h @HOSTNAME@ listname-outgoing"
-#listname-digest:listname
-#listname-outgoing::include:@HOME@/@MAJORDOMO_USER@/lists/listname,
-# "|@PREFIX@/libexec/majordomo/wrapper digest -r -C -l listname-digest listname-digest-outgoing"
-#listname-digest-outgoing::include:@HOME@/@MAJORDOMO_USER@/lists/listname-digest
-
-#listname-request: "|@PREFIX@/libexec/majordomo/wrapper majordomo -l listname"
-#listname-digest-request: "|@PREFIX@/libexec/majordomo/wrapper majordomo -l listname-digest"
-
-
-# Mailing List with a digested form of the list and archiving
-#
-
-#owner-listname:user
-#owner-listname-digest:owner-listname
-#owner-listname-outgoing:owner-listname
-#owner-listname-digest-outgoing:owner-listname
-#listname-approval:owner-listname
-#listname-digest-approval:owner-listname
-
-#listname: "|@PREFIX@/libexec/majordomo/wrapper resend -l listname -h @HOSTNAME@ listname-outgoing"
-#listname-digest:listname
-#listname-outgoing::include:@HOME@/@MAJORDOMO_USER@/lists/listname,
-# "|@PREFIX@/libexec/majordomo/wrapper archive -a -m -f @HOME@/@MAJORDOMO_USER@/archives/listname/listname",
-# "|@PREFIX@/libexec/majordomo/wrapper digest -r -C -l listname-digest listname-digest-outgoing"
-#listname-digest-outgoing::include:@HOME@/@MAJORDOMO_USER@/lists/listname-digest
-
-#listname-request: "|@PREFIX@/libexec/majordomo/wrapper majordomo -l listname"
-#listname-digest-request: "|@PREFIX@/libexec/majordomo/wrapper majordomo -l listname-digest"
diff --git a/mail/majordomo/files/example-l.info b/mail/majordomo/files/example-l.info
deleted file mode 100644
index 23d4e92b2a2..00000000000
--- a/mail/majordomo/files/example-l.info
+++ /dev/null
@@ -1 +0,0 @@
-This is an example list installed with the NetBSD port of majordomo.
diff --git a/mail/majordomo/files/example-l.passwd b/mail/majordomo/files/example-l.passwd
deleted file mode 100644
index 33a9488b167..00000000000
--- a/mail/majordomo/files/example-l.passwd
+++ /dev/null
@@ -1 +0,0 @@
-example
diff --git a/mail/majordomo/files/keep_me b/mail/majordomo/files/keep_me
deleted file mode 100644
index aedb72a50a7..00000000000
--- a/mail/majordomo/files/keep_me
+++ /dev/null
@@ -1 +0,0 @@
-This normally empty directory needs to be kept in the distribution.
diff --git a/mail/majordomo/patches/patch-aa b/mail/majordomo/patches/patch-aa
deleted file mode 100644
index 8b24ca9d84b..00000000000
--- a/mail/majordomo/patches/patch-aa
+++ /dev/null
@@ -1,140 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/06/16 17:11:25 jlam Exp $
-
---- Makefile.orig Wed Aug 27 16:56:21 1997
-+++ Makefile Tue Mar 27 12:41:29 2001
-@@ -13,27 +13,29 @@
- #
-
- # Put the location of your Perl binary here:
--PERL = /bin/perl
-+PERL = @PERL@
-
- # What do you call your C compiler?
- CC = cc
-
- # Where do you want Majordomo to be installed? This CANNOT be the
- # current directory (where you unpacked the distribution)
--W_HOME = /usr/test/majordomo-$(VERSION)
-+W_HOME = @PREFIX@/libexec/majordomo
-+HOME = @HOME@/@MAJORDOMO_USER@
-
- # Where do you want man pages to be installed?
--MAN = $(W_HOME)/man
-+MAN = @PREFIX@/man
-
- # You need to have or create a user and group which majordomo will run as.
- # Enter the numeric UID and GID (not their names!) here:
--W_USER = 123
--W_GROUP = 45
-+W_USER = @UID@
-+W_GROUP = @GID@
-
- # These set the permissions for all installed files and executables (except
- # the wrapper), respectively. Some sites may wish to make these more
- # lenient, or more restrictive.
--FILE_MODE = 644
-+CF_MODE = 664
-+MAN_MODE = 444
- EXEC_MODE = 755
- HOME_MODE = 751
-
-@@ -62,11 +64,11 @@
- # parent process, and without the leading "W_" in the variable names) gets
- # passed to processes run by "wrapper"
- W_SHELL = /bin/sh
--W_PATH = /bin:/usr/bin:/usr/ucb
--W_MAJORDOMO_CF = $(W_HOME)/majordomo.cf
-+W_PATH = /bin:/usr/bin
-+W_MAJORDOMO_CF = @HOME@/@MAJORDOMO_USER@/majordomo.cf
-
- # A directory for temp files..
--TMPDIR = /usr/tmp
-+TMPDIR = @TMPDIR@
-
- #--------YOU SHOULDN'T HAVE TO CHANGE ANYTHING BELOW THIS LINE.-------------
-
-@@ -76,7 +78,7 @@
- SHELL = /bin/sh
-
- WRAPPER_FLAGS = -DBIN=\"$(W_HOME)\" -DPATH=\"PATH=$(W_PATH)\" \
-- -DHOME=\"HOME=$(W_HOME)\" -DSHELL=\"SHELL=$(W_SHELL)\" \
-+ -DHOME=\"HOME=$(HOME)\" -DSHELL=\"SHELL=$(W_SHELL)\" \
- -DMAJORDOMO_CF=\"MAJORDOMO_CF=$(W_MAJORDOMO_CF)\" \
- $(POSIX)
-
-@@ -144,13 +146,12 @@
-
- install-scripts: config-scripts
- $(INSTALL) -m $(HOME_MODE) $(INSTALL_FLAGS) . $(W_HOME)
-- $(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) . $(W_HOME)/bin
-
-- @echo "Copying tools to $(W_HOME)/bin"
-+ @echo "Copying tools to @PREFIX@/bin"
-
- @for file in $(BINBIN); do \
- $(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
-- $(TMP)/$$file $(W_HOME)/bin/$$file; \
-+ $(TMP)/$$file @PREFIX@/bin/$$file; \
- done
-
- @echo "Copying Majordomo files to $(W_HOME)"
-@@ -177,45 +178,39 @@
- # all cases, the sample.cf file must be installed so that config-test will
- # be able to check for new variables.
- install-cf:
-- @if [ ! -f $(W_HOME)/majordomo.cf ]; \
-+ @if [ ! -f $(W_MAJORDOMO_CF) ]; \
- then \
- if [ -f majordomo.cf ]; \
- then \
- echo "Using majordomo.cf"; \
-- $(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-- majordomo.cf $(W_HOME)/majordomo.cf; \
-+ $(INSTALL) -m $(CF_MODE) $(INSTALL_FLAGS) \
-+ majordomo.cf $(W_MAJORDOMO_CF); \
- else \
- echo "Using sample.cf"; \
-- $(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-- sample.cf $(W_HOME)/majordomo.cf; \
-+ $(INSTALL) -m $(CF_MODE) $(INSTALL_FLAGS) \
-+ sample.cf $(W_MAJORDOMO_CF); \
- fi; \
- else \
- echo "Using installed majordomo.cf"; \
- fi;
-- @$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-+ @$(INSTALL) -m $(CF_MODE) $(INSTALL_FLAGS) \
- sample.cf $(W_HOME)
-
- install-man:
- @echo "Installing manual pages in $(MAN)"
-- @$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
-- . $(MAN)
-- @$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
-- . $(MAN)/man1
-- @$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
-- . $(MAN)/man8
-- @$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-+ @$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
- Doc/man/approve.1 $(MAN)/man1/approve.1
-- @$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-- Doc/man/digest.1 $(MAN)/man1/digest.1
-- @$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-+ @$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
-+ Doc/man/digest.1 $(MAN)/man8/digest.8
-+ @$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
- Doc/man/bounce.1 $(MAN)/man1/bounce.1
-- @$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-+ @$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
- Doc/man/bounce-remind.1 $(MAN)/man1/bounce-remind.1
-- @$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-+ @$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
- Doc/man/resend.1 $(MAN)/man1/resend.1
-- @$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-+ @$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
- Doc/man/majordomo.8 $(MAN)/man8/majordomo.8
-- @$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-+ @$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
- Doc/man/resend.1 $(MAN)/man1/resend.1
-
- wrapper: wrapper.c
diff --git a/mail/majordomo/patches/patch-ab b/mail/majordomo/patches/patch-ab
deleted file mode 100644
index faf6a3ee621..00000000000
--- a/mail/majordomo/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-
---- ./archive2.pl.orig Wed Aug 27 09:07:44 1997
-+++ ./archive2.pl Tue Jun 8 10:55:12 1999
-@@ -61,4 +61,5 @@
-
- # All these should be in the standard PERL library
-+unshift(@INC, $bindir);
- unshift(@INC, $homedir);
- require "ctime.pl"; # To get MoY definitions for month abbrevs
diff --git a/mail/majordomo/patches/patch-ac b/mail/majordomo/patches/patch-ac
deleted file mode 100644
index 24788b2645d..00000000000
--- a/mail/majordomo/patches/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-
---- ./bounce-remind.orig Mon Dec 9 09:49:46 1996
-+++ ./bounce-remind Tue Jun 8 10:55:12 1999
-@@ -34,4 +34,5 @@
-
- # All these should be in the standard PERL library
-+unshift(@INC, $bindir);
- unshift(@INC, $homedir);
-
diff --git a/mail/majordomo/patches/patch-ad b/mail/majordomo/patches/patch-ad
deleted file mode 100644
index 604a0e5db98..00000000000
--- a/mail/majordomo/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-
---- ./config-test.orig Wed Aug 27 09:17:13 1997
-+++ ./config-test Tue Jun 8 10:55:12 1999
-@@ -126,4 +126,5 @@
- }
-
-+unshift(@INC, $bindir);
- foreach (@requires) {
- if (require $_) {
-@@ -287,5 +288,5 @@
-
- open($cf, $cf) || &bad("Couldn't open $cf for reading, $!");
--open(S, 'sample.cf') || &bad("Couldn't open sample.cf for reading, $!");
-+open(S, "$bindir/sample.cf") || &bad("Couldn't open $bindir/sample.cf for reading, $!");
-
- while (<S>) {
diff --git a/mail/majordomo/patches/patch-ae b/mail/majordomo/patches/patch-ae
deleted file mode 100644
index 3f51328300c..00000000000
--- a/mail/majordomo/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-
---- ./digest.orig Wed Aug 27 08:42:52 1997
-+++ ./digest Tue Jun 8 10:55:12 1999
-@@ -320,4 +320,8 @@
- chdir($homedir);
-
-+ # All these should be in the standard PERL library
-+ unshift(@INC, $bindir);
-+ unshift(@INC, $homedir);
-+
- $opt_l =~ tr/A-Z/a-z/;
-
diff --git a/mail/majordomo/patches/patch-af b/mail/majordomo/patches/patch-af
deleted file mode 100644
index aba5c959188..00000000000
--- a/mail/majordomo/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.3 2000/01/09 01:28:07 wiz Exp $
---- majordomo.orig Sat Nov 27 17:28:39 1999
-+++ majordomo Sat Nov 27 17:29:16 1999
-@@ -58,6 +58,7 @@
- print STDERR "$0: starting\n" if $DEBUG;
-
- # All these should be in the standard PERL library
-+unshift(@INC, $bindir);
- unshift(@INC, $homedir);
- require "ctime.pl"; # To get MoY definitions for month abbrevs
- require "majordomo_version.pl"; # What version of Majordomo is this?
-@@ -1138,7 +1139,7 @@
- # The password is valid, so run digest
-
- open(DIGEST,
-- "$homedir/digest -m -C -l $list $list_outgoing 2>&1 |");
-+ "$bindir/digest -m -C -l $list $list_outgoing 2>&1 |");
- @digest_errors = <DIGEST>;
- close(DIGEST);
-
diff --git a/mail/majordomo/patches/patch-ag b/mail/majordomo/patches/patch-ag
deleted file mode 100644
index d68b1a67c4e..00000000000
--- a/mail/majordomo/patches/patch-ag
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-
---- ./medit.orig Mon Apr 28 12:38:05 1997
-+++ ./medit Tue Jun 8 10:55:13 1999
-@@ -30,4 +30,5 @@
-
- # All these should be in the standard PERL library
-+unshift(@INC, $bindir);
- unshift(@INC, $homedir);
- require "shlock.pl"; # NNTP-style file locking
diff --git a/mail/majordomo/patches/patch-ah b/mail/majordomo/patches/patch-ah
deleted file mode 100644
index f4ce9534e87..00000000000
--- a/mail/majordomo/patches/patch-ah
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-
---- ./request-answer.orig Mon Dec 9 09:50:20 1996
-+++ ./request-answer Tue Jun 8 10:55:13 1999
-@@ -27,4 +27,5 @@
-
- chdir($homedir) || die("Can't chdir(\"$homedir\"): $!");
-+unshift(@INC, $bindir);
- unshift(@INC, $homedir);
- require "shlock.pl";
diff --git a/mail/majordomo/patches/patch-ai b/mail/majordomo/patches/patch-ai
deleted file mode 100644
index 388e25e2de6..00000000000
--- a/mail/majordomo/patches/patch-ai
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-
---- ./resend.orig Wed Aug 27 08:59:24 1997
-+++ ./resend Tue Jun 8 10:55:13 1999
-@@ -93,4 +93,5 @@
- chdir($homedir) || die("Can't chdir(\"$homedir\"): $!");
-
-+unshift(@INC, $bindir);
- unshift(@INC, $homedir);
- require "ctime.pl"; # For logging purposes
-@@ -316,5 +317,5 @@
- &bitch("resend: \$admin_body not defined in $cf !!\n" .
- "Majordomo will only catch \"subscribe\" and \"unsubscribe\" in\n" .
-- "the body.\nLook at $homedir/sample.cf for a good definition.");
-+ "the body.\nLook at $bindir/sample.cf for a good definition.");
- @admin_body = ('/^subject:\s*subscribe\b/i' ,
- '/^subject:\s*unsubscribe\b/i');
diff --git a/mail/majordomo/patches/patch-aj b/mail/majordomo/patches/patch-aj
deleted file mode 100644
index ff46f7e9c87..00000000000
--- a/mail/majordomo/patches/patch-aj
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-
---- ./sample.cf.orig Wed Aug 27 09:00:31 1997
-+++ ./sample.cf Tue Jun 8 10:55:13 1999
-@@ -7,5 +7,5 @@
- # $whereami -- What machine am I running on?
- #
--$whereami = "example.com";
-+$whereami = "@HOSTNAME@";
-
- # $whoami -- Who do users send requests to me as?
-@@ -17,5 +17,5 @@
- $whoami_owner = "Majordomo-Owner\@$whereami";
-
--# $homedir -- Where can I find my extra .pl files, like majordomo.pl?
-+# $homedir -- Where can I find my lists?
- # the environment variable HOME is set by the wrapper
- #
-@@ -23,5 +23,14 @@
- $homedir = $ENV{"HOME"};
- } else {
-- $homedir = "/usr/test/majordomo";
-+ $homedir = "@HOME@/@MAJORDOMO_USER@";
-+}
-+
-+# $bindir -- Where can I find my extra .pl files, like majordomo.pl?
-+# the environment variable BIN is set by the wrapper
-+#
-+if ( defined $ENV{"BIN"}) {
-+ $bindir = $ENV{"BIN"};
-+} else {
-+ $bindir = "@PREFIX@/libexec/majordomo";
- }
-
-@@ -33,8 +42,8 @@
- # Each list must have a subdirectory under this directory in order for
- # digest to work. E.G. The bblisa list would use:
--# /usr/local/mail/digest/bblisa
-+# @HOME@/@MAJORDOMO_USER@/digests/bblisa
- # as its directory.
- #
--$digest_work_dir = "/usr/local/mail/digest";
-+$digest_work_dir = "$homedir/digests";
-
- # $log -- Where do I write my log?
-@@ -46,6 +55,6 @@
- # seem to prefer /usr/sbin/sendmail
- #
--$sendmail_command = "/usr/lib/sendmail";
--# $sendmail_command = "/usr/sbin/sendmail";
-+# $sendmail_command = "/usr/lib/sendmail";
-+$sendmail_command = "/usr/sbin/sendmail";
-
- # $mailer -- What program and args do I use to send mail to the list?
-@@ -69,5 +78,5 @@
- # To use TLB and use no outgoing alias:
- # if ($main'program_name eq 'mj_resend' && $opt_l eq 'test-list') {
--# $mailer = "/usr/local/majordomo/tlb /usr/local/lists/${opt_l}.tlb";
-+# $mailer = "@HOME@/@MAJORDOMO_USER@/tlb @HOME@/@MAJORDOMO_USER@/lists/${opt_l}.tlb";
- # }
- #
-@@ -128,6 +137,6 @@
- # directory "$filedir/$list$filedir_suffix", so set $filedir and
- # $filedir_suffix appropriately. For instance, to look in
--# /usr/local/mail/files/$list, use:
--# $filedir = "/usr/local/mail/files";
-+# @HOME@/@MAJORDOMO_USER@/mail/files/$list, use:
-+# $filedir = "@HOME@/@MAJORDOMO_USER@/mail/files";
- # $filedir_suffix = ""; # empty string
- # or to look in $listdir/$list.archive, use:
-@@ -135,6 +144,6 @@
- # $filedir_suffix = ".archive";
-
--$filedir = "$listdir";
--$filedir_suffix = ".archive";
-+$filedir = "@HOME@/@MAJORDOMO_USER@/archives";
-+$filedir_suffix = "";
-
- # What command should I use to process an "index" request?
-@@ -191,5 +200,5 @@
- # Uses the environment variable TMPDIR, since that's pretty common
- #
--$TMPDIR = $ENV{'TMPDIR'} || "/usr/tmp";
-+$TMPDIR = $ENV{'TMPDIR'} || "@TMPDIR@";
-
- # Tune how long set_lock tries to obtain a lock before giving up. Each
diff --git a/mail/majordomo/patches/patch-ak b/mail/majordomo/patches/patch-ak
deleted file mode 100644
index 3cec2448241..00000000000
--- a/mail/majordomo/patches/patch-ak
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2000/02/05 19:51:44 wiz Exp $
---- wrapper.c.orig Sat Nov 27 17:43:56 1999
-+++ wrapper.c Sat Nov 27 17:45:54 1999
-@@ -16,10 +16,14 @@
- #include <stdio.h>
- #include <sysexits.h>
-
--#if defined(sun) && defined(sparc)
-+#if (defined(sun) && defined(sparc)) || defined(__NetBSD__)
- #include <stdlib.h>
- #endif
-
-+#ifdef __NetBSD__
-+#include <sys/types.h>
-+#include <unistd.h>
-+#endif
-
- #ifndef STRCHR
- # include <string.h>
diff --git a/mail/majordomo/patches/patch-al b/mail/majordomo/patches/patch-al
deleted file mode 100644
index d3c276439d5..00000000000
--- a/mail/majordomo/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2001/03/27 11:53:18 agc Exp $
-
-Change the manual page section, so that it doesn't conflict
-with the digest(1) manpage.
-
---- Doc/man/digest.1 2001/03/27 11:46:32 1.1
-+++ Doc/man/digest.1 2001/03/27 11:46:42
-@@ -1,4 +1,4 @@
--.TH digest 1
-+.TH digest 8
- .SH NAME
- digest \- receive a file for a digest, or create and mail a digest
- .LP
diff --git a/mail/majordomo/patches/patch-am b/mail/majordomo/patches/patch-am
deleted file mode 100644
index 632eebcd563..00000000000
--- a/mail/majordomo/patches/patch-am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-am,v 1.1 2005/07/23 14:44:39 he Exp $
-
---- approve.orig 1997-04-05 21:18:36.000000000 +0200
-+++ approve
-@@ -214,6 +214,11 @@ sub process_bounce {
- $from_skipped = 1;
- next;
- }
-+ if (/^delivered-to: $post_to/i) {
-+ # Remove Delivered-To: lines that point to the list, since they
-+ # will cause postfix to think that the message is looping.
-+ next;
-+ }
- s/^~/~~/;
- print MAIL $_;
- }
diff --git a/mail/mb2md/DESCR b/mail/mb2md/DESCR
deleted file mode 100644
index 862730f55f1..00000000000
--- a/mail/mb2md/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Mb2md.pl is a Perl script that takes one or more Mbox format mailbox
-files in a directory and convert them to Maildir format mailboxes.
-Mb2md.pl does not only convert mailbox files into a Maildir but
-also the /var/spool/mail/$USER mailspool file. It is smart enough
-to not transfer a dummy message such as the UW IMAPD puts at the
-start of Mbox mailboxes - and you could add your own search terms
-into the script to make it ignore other forms of dummy first message.
diff --git a/mail/mb2md/Makefile b/mail/mb2md/Makefile
deleted file mode 100644
index e8fb4dc14da..00000000000
--- a/mail/mb2md/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2005/09/28 20:52:24 rillig Exp $
-#
-
-DISTNAME= mb2md-3.20.pl
-PKGNAME= ${DISTNAME:S/.pl$//}
-CATEGORIES= mail
-MASTER_SITES= ${HOMEPAGE}
-EXTRACT_SUFX= .gz
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://batleth.sapienti-sat.org/projects/mb2md/
-COMMENT= Converts one or more mboxes to maildirs
-
-DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate
-
-WRKSRC= ${WRKDIR}
-
-USE_TOOLS+= perl:run
-REPLACE_PERL= ${DISTNAME}
-
-NO_BUILD= yes
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin/${PKGBASE}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mb2md/PLIST b/mail/mb2md/PLIST
deleted file mode 100644
index 3b38e2c593a..00000000000
--- a/mail/mb2md/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/04/20 11:00:18 schmonz Exp $
-bin/mb2md
diff --git a/mail/mb2md/distinfo b/mail/mb2md/distinfo
deleted file mode 100644
index df10eee53d5..00000000000
--- a/mail/mb2md/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/04/20 11:00:18 schmonz Exp $
-
-SHA1 (mb2md-3.20.pl.gz) = 96f69bea2802eaf578c2ce82320ea4b0bb1a08c6
-RMD160 (mb2md-3.20.pl.gz) = 03ee1e543ba070c222aa7e20624aaf5fa390785c
-Size (mb2md-3.20.pl.gz) = 14977 bytes
diff --git a/mail/mdfrm/DESCR b/mail/mdfrm/DESCR
deleted file mode 100644
index d0057143ce1..00000000000
--- a/mail/mdfrm/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This perl scipt prints a summary of mail in Maildir waiting to be read.
-When no path to Maildir is specified, it defaults to ~/Maildir
diff --git a/mail/mdfrm/Makefile b/mail/mdfrm/Makefile
deleted file mode 100644
index 4f0b8fc9709..00000000000
--- a/mail/mdfrm/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:41 wiz Exp $
-#
-
-DISTNAME= mdfrm.pl
-PKGNAME= mdfrm-1.0
-CATEGORIES= mail
-MASTER_SITES= http://www.goof.com/~mmead/
-EXTRACT_SUFX= #
-
-MAINTAINER= zuntum@NetBSD.org
-COMMENT= Print a summary of mail in a Maildir waiting to be read
-
-DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate
-
-WRKSRC= ${WRKDIR}
-USE_TOOLS+= perl:run
-NO_BUILD= yes
-
-INSTALLATION_DIRS= bin
-
-post-patch:
- ${SED} -e "s,/usr/local/bin/perl,${LOCALBASE}/bin/perl,g" \
- -e "s,.Maildir,Maildir,g" \
- ${WRKSRC}/mdfrm.pl > ${WRKSRC}/mdfrm.pl.done
- ${MV} ${WRKSRC}/mdfrm.pl.done ${WRKSRC}/mdfrm.pl
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/mdfrm.pl ${PREFIX}/bin/mdfrm
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mdfrm/PLIST b/mail/mdfrm/PLIST
deleted file mode 100644
index 1831e281701..00000000000
--- a/mail/mdfrm/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:30 zuntum Exp $
-bin/mdfrm
diff --git a/mail/mdfrm/distinfo b/mail/mdfrm/distinfo
deleted file mode 100644
index 93378364df4..00000000000
--- a/mail/mdfrm/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:24 agc Exp $
-
-SHA1 (mdfrm.pl) = dbfa156f91b363aeaec29a57942fc8c924b8c5ac
-RMD160 (mdfrm.pl) = c10af5b23348a97b62a276d5ef45db3bd6e780dc
-Size (mdfrm.pl) = 3989 bytes
diff --git a/mail/mess822/DESCR b/mail/mess822/DESCR
deleted file mode 100644
index faf5fd91a02..00000000000
--- a/mail/mess822/DESCR
+++ /dev/null
@@ -1,23 +0,0 @@
-mess822 is a library for parsing Internet mail messages. The mess822
-package contains several applications that work with qmail:
-
-* ofmipd rewrites messages from dumb clients. It supports a database
- of recognized senders and From lines, using cdb for fast lookups.
-
-* new-inject is an experimental new version of qmail-inject. It
- includes a flexible user-controlled hostname rewriting mechanism.
-
-* iftocc can be used in .qmail files. It checks whether a known
- address is listed in To or Cc.
-
-* 822header, 822field, 822date, and 822received extract various
- pieces of information from a mail message.
-
-* 822print converts a message into an easier-to-read format.
-
-mess822 supports the full complexity of RFC 822 address lists,
-including address groups, source routes, spaces around dots, etc.
-It also supports common RFC 822 extensions: backslashes in atoms,
-dots in phrases, addresses without host names, etc. It extracts
-each address as an easy-to-use string, with a separate string for
-the accompanying comment.
diff --git a/mail/mess822/Makefile b/mail/mess822/Makefile
deleted file mode 100644
index 607c78daca0..00000000000
--- a/mail/mess822/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:58 rillig Exp $
-#
-
-DISTNAME= mess822-0.58
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= http://cr.yp.to/software/
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://cr.yp.to/mess822.html
-COMMENT= Library for parsing Internet mail messages
-
-DEPENDS+= qmail>=1.03nb7:../../mail/qmail
-
-USE_TOOLS+= nroff
-
-# We change conf-home from the default "/usr/local" and don't
-# provide compatibilbity symlinks. We also patch hier.c to respect
-# PKG_SYSCONFDIR and set reasonable modes on directories under
-# ${PREFIX}, and patch strerr_sys.c to build on Mac OS X.
-DJB_RESTRICTED= YES
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-EGDIR= ${PREFIX}/share/examples/mess822
-CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
-MAKE_DIRS+= ${PKG_SYSCONFDIR}
-CONF_FILES+= ${EGDIR}/leapsecs.dat ${PKG_SYSCONFDIR}/leapsecs.dat
-
-DJB_BUILD_TARGETS= install instcheck
-
-INSTALLATION_DIRS= bin include lib man ${PKGMANDIR}/cat1 ${PKGMANDIR}/cat3 ${PKGMANDIR}/cat5 ${PKGMANDIR}/cat8
-INSTALLATION_DIRS+= man/man1 man/man3 man/man5 man/man8 share/examples/mess822
-
-SUBST_FILES.djbware+= cdb_seek.c leapsecs_read.c
-
-.include "../../mk/djbware.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mess822/PLIST b/mail/mess822/PLIST
deleted file mode 100644
index 92bdfd5ce0f..00000000000
--- a/mail/mess822/PLIST
+++ /dev/null
@@ -1,48 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/02/19 00:41:49 wiz Exp $
-bin/822date
-bin/822field
-bin/822header
-bin/822print
-bin/822received
-bin/iftocc
-bin/new-inject
-bin/ofmipd
-bin/ofmipname
-include/mess822.h
-lib/mess822.a
-man/cat1/822date.0
-man/cat1/822field.0
-man/cat1/822header.0
-man/cat1/822print.0
-man/cat1/822received.0
-man/cat1/iftocc.0
-man/cat1/new-inject.0
-man/cat3/mess822.0
-man/cat3/mess822_addr.0
-man/cat3/mess822_date.0
-man/cat3/mess822_fold.0
-man/cat3/mess822_quote.0
-man/cat3/mess822_token.0
-man/cat3/mess822_when.0
-man/cat5/rewriting.0
-man/cat8/ofmipd.0
-man/cat8/ofmipname.0
-man/man1/822date.1
-man/man1/822field.1
-man/man1/822header.1
-man/man1/822print.1
-man/man1/822received.1
-man/man1/iftocc.1
-man/man1/new-inject.1
-man/man3/mess822.3
-man/man3/mess822_addr.3
-man/man3/mess822_date.3
-man/man3/mess822_fold.3
-man/man3/mess822_quote.3
-man/man3/mess822_token.3
-man/man3/mess822_when.3
-man/man5/rewriting.5
-man/man8/ofmipd.8
-man/man8/ofmipname.8
-share/examples/mess822/leapsecs.dat
-@dirrm share/examples/mess822
diff --git a/mail/mess822/distinfo b/mail/mess822/distinfo
deleted file mode 100644
index 9bf12815de8..00000000000
--- a/mail/mess822/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:24 agc Exp $
-
-SHA1 (mess822-0.58.tar.gz) = ef3380c793c852d40688c108d164234ecf8a5362
-RMD160 (mess822-0.58.tar.gz) = 40fbcb5af92882e133ab3653c6119022180caedb
-Size (mess822-0.58.tar.gz) = 64287 bytes
-SHA1 (patch-aa) = 62464e4d3afb31ad2ef38575cddbee969c8a82b3
-SHA1 (patch-ab) = b947129046bbef7012208db39a341648c13ff68f
diff --git a/mail/mess822/patches/patch-aa b/mail/mess822/patches/patch-aa
deleted file mode 100644
index e0b3f68da51..00000000000
--- a/mail/mess822/patches/patch-aa
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/07/26 23:26:27 schmonz Exp $
-
---- hier.c.orig 1998-09-04 22:33:37.000000000 -0400
-+++ hier.c
-@@ -2,20 +2,20 @@
-
- void hier()
- {
-- h(auto_home,-1,-1,02755);
-+ h(auto_home,-1,-1,0755);
-
-- d(auto_home,"bin",-1,-1,02755);
-- d(auto_home,"lib",-1,-1,02755);
-- d(auto_home,"include",-1,-1,02755);
-- d(auto_home,"man",-1,-1,02755);
-- d(auto_home,"man/man1",-1,-1,02755);
-- d(auto_home,"man/man3",-1,-1,02755);
-- d(auto_home,"man/man5",-1,-1,02755);
-- d(auto_home,"man/man8",-1,-1,02755);
-- d(auto_home,"man/cat1",-1,-1,02755);
-- d(auto_home,"man/cat3",-1,-1,02755);
-- d(auto_home,"man/cat5",-1,-1,02755);
-- d(auto_home,"man/cat8",-1,-1,02755);
-+ d(auto_home,"bin",-1,-1,0755);
-+ d(auto_home,"lib",-1,-1,0755);
-+ d(auto_home,"include",-1,-1,0755);
-+ d(auto_home,"man",-1,-1,0755);
-+ d(auto_home,"man/man1",-1,-1,0755);
-+ d(auto_home,"man/man3",-1,-1,0755);
-+ d(auto_home,"man/man5",-1,-1,0755);
-+ d(auto_home,"man/man8",-1,-1,0755);
-+ d(auto_home,"man/cat1",-1,-1,0755);
-+ d(auto_home,"man/cat3",-1,-1,0755);
-+ d(auto_home,"man/cat5",-1,-1,0755);
-+ d(auto_home,"man/cat8",-1,-1,0755);
-
- c(auto_home,"lib","mess822.a",-1,-1,0644);
- c(auto_home,"include","mess822.h",-1,-1,0644);
-@@ -66,5 +66,5 @@ void hier()
- c(auto_home,"man/cat3","mess822_token.0",-1,-1,0644);
- c(auto_home,"man/cat3","mess822_when.0",-1,-1,0644);
-
-- c("/etc",".","leapsecs.dat",-1,-1,0644);
-+ c(auto_home,"share/examples/mess822","leapsecs.dat",-1,-1,0644);
- }
diff --git a/mail/mess822/patches/patch-ab b/mail/mess822/patches/patch-ab
deleted file mode 100644
index 4e7d6b05c9e..00000000000
--- a/mail/mess822/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/08/30 14:03:49 schmonz Exp $
-
---- strerr_sys.c.orig Fri Sep 4 22:33:37 1998
-+++ strerr_sys.c
-@@ -1,7 +1,7 @@
- #include "error.h"
- #include "strerr.h"
-
--struct strerr strerr_sys;
-+struct strerr strerr_sys = {0,0,0,0};
-
- void strerr_sysinit()
- {
diff --git a/mail/metamail/DESCR b/mail/metamail/DESCR
deleted file mode 100644
index bd22d85baca..00000000000
--- a/mail/metamail/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Metamail is an implementation of MIME, the Multipurpose Internet
-Mail Extensions, a proposed standard for multimedia mail on the Internet.
-Metamail implements MIME, and also implements extensibility and
-configuration via the "mailcap" mechanism described in an informational
-RFC that is a companion to the MIME document.
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
deleted file mode 100644
index 8a835fd04b1..00000000000
--- a/mail/metamail/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# $NetBSD: Makefile,v 1.43 2006/07/21 03:02:55 reed Exp $
-
-DISTNAME= mm2.7
-PKGNAME= metamail-2.7
-PKGREVISION= 9
-CATEGORIES= mail
-MASTER_SITES= http://ftp.funet.fi/pub/unix/mail/metamail/ \
- ftp://ftp.research.telcordia.com/pub/nsb/
-EXTRACT_SUFX= .tar.Z
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Implementation of MIME, the Multipurpose Internet Mail Extensions
-
-CONFLICTS+= elm>=2.5.5 mm-2.7
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-WRKSRC= ${WRKDIR}/${DISTNAME}/src
-
-CFLAGS.Linux+= -DLINUX
-CFLAGS.SunOS+= -DSYSV
-MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} CHMOD=${CHMOD:Q} SED=${SED:Q}
-
-EGDIR= ${PREFIX}/share/examples/metamail
-CONF_FILES= ${EGDIR}/mailcap ${PKG_SYSCONFDIR}/mailcap
-USE_TOOLS+= bdftopcf
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man4
-
-SUBST_CLASSES+= awk sys
-SUBST_STAGE.awk= post-patch
-SUBST_MESSAGE.awk= Adjusting the path to awk
-SUBST_FILES.awk= bin/sun2mime
-SUBST_SED.awk= -e "s|/bin/nawk|${AWK}|"
-SUBST_STAGE.sys= post-patch
-SUBST_MESSAGE.sys= Adjusting the path for PKG_SYSCONFDIR.
-SUBST_FILES.sys= config.h
-SUBST_SED.sys= -e "s|PKG_SYSCONFDIR|\"${PKG_SYSCONFDIR}\"|g"
-
-post-patch:
- ${RM} -f ${WRKDIR}/mm2.7/src/bin/*.orig
-
-pre-configure:
- if ${GREP} putenv /usr/include/stdlib.h >/dev/null; \
- then \
- cd ${WRKSRC}/metamail; \
- ${MV} Makefile Makefile.pre-sed; \
- ${SED} -e s/putenv.o//g Makefile.pre-sed >Makefile; \
- fi
-
-pre-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/metamail/PLIST b/mail/metamail/PLIST
deleted file mode 100644
index 95d7a0496c5..00000000000
--- a/mail/metamail/PLIST
+++ /dev/null
@@ -1,49 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2006/07/21 08:24:08 tron Exp $
-bin/audiocompose
-bin/audiosend
-bin/extcompose
-bin/getfilename
-bin/mailserver
-bin/mailto
-bin/mailto-hebrew
-bin/metamail
-bin/metasend
-bin/mimencode
-bin/mmencode
-bin/patch-metamail
-bin/rcvAppleSingle
-bin/richtext
-bin/richtoatk
-bin/showaudio
-bin/showexternal
-bin/shownonascii
-bin/showpartial
-bin/showpicture
-bin/sndAppleSingle
-bin/splitmail
-bin/sun-audio-file
-bin/sun-message.csh
-bin/sun-to-mime
-bin/sun2mime
-man/man1/audiocompose.1
-man/man1/audiosend.1
-man/man1/extcompose.1
-man/man1/getfilename.1
-man/man1/mailto-hebrew.1
-man/man1/mailto.1
-man/man1/metamail.1
-man/man1/metasend.1
-man/man1/mime.1
-man/man1/mimencode.1
-man/man1/mmencode.1
-man/man1/patch-metamail.1
-man/man1/richtext.1
-man/man1/showaudio.1
-man/man1/showexternal.1
-man/man1/shownonascii.1
-man/man1/showpartial.1
-man/man1/showpicture.1
-man/man1/splitmail.1
-man/man4/mailcap.4
-share/examples/metamail/mailcap
-@dirrm share/examples/metamail
diff --git a/mail/metamail/distinfo b/mail/metamail/distinfo
deleted file mode 100644
index fb273214069..00000000000
--- a/mail/metamail/distinfo
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: distinfo,v 1.21 2006/09/16 15:29:35 hira Exp $
-
-SHA1 (mm2.7.tar.Z) = 8f213baec9b17c05bcb066f616977a561757d7a6
-RMD160 (mm2.7.tar.Z) = ae322cad0653140cbe7f0148ce48757df98c26b0
-Size (mm2.7.tar.Z) = 262881 bytes
-SHA1 (patch-aa) = 48a10ec31e170ecc79be648c09c0fb25a4770a7b
-SHA1 (patch-ab) = 15dd81405551f4d7d3c0e59cf49038857603a9eb
-SHA1 (patch-ac) = f0b04f7d6b17fb5c71a09b4caaf4298acdcff64e
-SHA1 (patch-ad) = 1f152ab38d3c2da42afdb3b3c6a1b218ac8d3996
-SHA1 (patch-ae) = 7abed3b508779f354036a3634510d4c68c3670a8
-SHA1 (patch-af) = 9ba42f1eef27d452debb9c1e0abc800f19deccac
-SHA1 (patch-ag) = 674ceb59955de76e9a673ee4969d359a30fba5f8
-SHA1 (patch-ah) = 69f286fbb45420921cfe57e16c6ec220e409b784
-SHA1 (patch-ai) = 4e85922573dc0ae2017c112198f1f23c2b08f729
-SHA1 (patch-aj) = 7384564119a360189c68bdc5ce0ba3648a44769c
-SHA1 (patch-ak) = fcf331b9d28243cb403fd0dc34a365eb147f3da4
-SHA1 (patch-al) = c63427174a5d80c62b207212e0d855457939d0bc
-SHA1 (patch-am) = d5d2cc002173da827fb452a91ccd906452420bfc
-SHA1 (patch-an) = 56c228106dc663623cb31ecf4eeba1fc5c27d045
-SHA1 (patch-ao) = 90566d47642fe8ee71295ea47f3cf7420d0b2880
-SHA1 (patch-ap) = ade6fba2254e7db3f9cf52acf453bb512c0a3d32
-SHA1 (patch-aq) = 90f84381aaf91db03cecef84d9433c3ffd1152db
-SHA1 (patch-ar) = 21e137edd2bb1dc09048f7ef23e86859d698d848
-SHA1 (patch-as) = 8d8c31f1ff508e9d7fc73a03a5f7ba63faa118ef
diff --git a/mail/metamail/patches/patch-aa b/mail/metamail/patches/patch-aa
deleted file mode 100644
index 7265a9e47df..00000000000
--- a/mail/metamail/patches/patch-aa
+++ /dev/null
@@ -1,156 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2006/07/21 08:24:29 tron Exp $
-
---- Makefile.orig 1994-01-26 11:32:33.000000000 -0600
-+++ Makefile 2006-07-20 22:10:32.000000000 -0500
-@@ -20,13 +20,13 @@
- # RM = rm -f
-
- # How to run Make
--MAKE = make
-+#MAKE = make
-
- # How to copy files
- CP = cp
-
- # How to compile C programs
--CC = cc
-+#CC = cc
-
- # You may also want to change the CFLAGS variable, which will be passed on
- # to all subdirectories. If you do that, the changes will only work right if you
-@@ -38,7 +38,7 @@
-
- STATICFLAG=FOOBAR${HOST_ARCH}
-
--CFLAGS = -g -I. ${$(STATICFLAG)}
-+CFLAGS += -I. ${$(STATICFLAG)}
- # The following is better if you want to make sure you run with SYSV defined
- # CFLAGS = -g -I. ${$(STATICFLAG)} -DSYSV
- # Also, for SGI Irix, compile in K&R mode
-@@ -49,9 +49,12 @@
- # LDLIBS variable.
- #
- # For Sun and BSD systems, the following should work...
--LDLIBS =
-+# LDLIBS =
- # On BSD 4.4 systems, you will need the following
--# LDLIBS = -lcompat
-+OPSYS!= uname -s
-+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-+LDLIBS = -s -lcompat
-+.endif
- # On SGI machines, we need -lsun for getpw...(), and -lc_s saves some space.
- # LDLIBS = -lsun -lc_s
- # ISC SysVr3.2.2 has a shared C library and requires libinet.a to resolve
-@@ -72,18 +75,18 @@
- # install -s -c $(LOCALBINDIR) $$file
- #
- #INSTALL = cp
--INSTALL = install -c -s
-+#INSTALL = install -c -s
-
- # Root of installation tree
--INSTROOT = /usr/local
-+INSTROOT = ${PREFIX}
- #
- # This is where binaries should be copied
- LOCALBINDIR = ${INSTROOT}/bin
-
- # This is where man pages should be copied, and their extensions
--MAN1DIR = ${INSTROOT}/man/man1
-+MAN1DIR = ${INSTROOT}/${PKGMANDIR}/man1
- MAN1EXT = 1
--MAN4DIR = ${INSTROOT}/man/man4
-+MAN4DIR = ${INSTROOT}/${PKGMANDIR}/man4
- MAN4EXT = 4
-
- # Sets the font suffix your version of X uses - snf for X11R4, pcf for X11R5
-@@ -91,23 +94,27 @@
- FONTSUFFIX=pcf
-
- # This is where the mailcap file should be put
--MAILCAPDIR = ${INSTROOT}/etc
-+MAILCAPDIR = ${INSTROOT}/share/examples/metamail
-
- # This helps with the "for" constructs below on some platforms:
- SHELL=/bin/sh
-
--install: basics
-+BINARIES= mailto metamail mmencode richtext richtoatk \
-+ splitmail
-+SCRIPTS= audiocompose audiosend extcompose getfilename mailserver \
-+ mailto-hebrew metasend patch-metamail rcvAppleSingle \
-+ showaudio showexternal shownonascii showpartial \
-+ showpicture sndAppleSingle sun-audio-file sun-message.csh \
-+ sun-to-mime sun2mime
-
--basics::
-+install: install-all
-+
-+all basics::
- (cd metamail ; $(MAKE) CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}")
- -${RM} bin/metamail
- (cd bin; ${LN} ../metamail/metamail metamail)
- -${RM} bin/mmencode
- (cd bin; ${LN} ../metamail/mmencode mmencode)
-- -${RM} bin/mimencode
-- (cd bin; ${LN} ../metamail/mmencode mimencode)
-- -${RM} man/mimencode.1
-- (cd man; ${LN} ../man/mmencode.1 mimencode.1)
- -${RM} bin/mailto
- (cd bin; ${LN} ../metamail/mailto mailto)
- -${RM} bin/splitmail
-@@ -117,7 +124,7 @@
- (cd bin; ${LN} ../richmail/richtext richtext)
- -${RM} bin/richtoatk
- (cd bin; ${LN} ../richmail/richtoatk richtoatk)
-- (cd fonts ; $(MAKE) CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}")
-+ (cd fonts ; $(MAKE) PREFIX=${PREFIX} CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}")
- -${RM} bin/shownonascii
- (cd bin; ${LN} ../fonts/shownonascii shownonascii)
- -${RM} bin/mailto-hebrew
-@@ -125,30 +132,38 @@
-
- install-all: basics
- @(cd bin; \
-- for file in *; \
-+ for file in $(BINARIES); \
-+ do \
-+ target=$(LOCALBINDIR)/$$file; \
-+ echo "installing binary $$target"; \
-+ ${BSD_INSTALL_PROGRAM} $$file $$target; \
-+ done; \
-+ for file in $(SCRIPTS); \
- do \
- target=$(LOCALBINDIR)/$$file; \
- echo "installing binary $$target"; \
-- ${INSTALL} $$file $$target; \
-+ ${BSD_INSTALL_SCRIPT} $$file $$target; \
- done)
-+ ${RM} -f ${LOCALBINDIR}/mimencode ; ${LN} -s mmencode ${LOCALBINDIR}/mimencode
- @(cd man; \
- for file in *.1; \
- do \
- target=$(MAN1DIR)/`basename $$file .1`.$(MAN1EXT); \
- echo "installing man page $$target";\
-- ${CP} $$file $$target; \
-+ ${BSD_INSTALL_MAN} $$file $$target; \
- done)
-+ ${RM} -f ${MAN1DIR}/mimencode.1 ; ${LN} -s mmencode.1 ${MAN1DIR}/mimencode.1
- @(cd man; \
- for file in *.4; \
- do \
- target=$(MAN4DIR)/`basename $$file .4`.$(MAN4EXT); \
- echo "installing man page $$target";\
-- ${CP} $$file $$target; \
-+ ${BSD_INSTALL_MAN} $$file $$target; \
- done)
-- @echo "Renaming old mailcap file to $(MAILCAPDIR)/mailcap.old
-+ @echo "Renaming old mailcap file to $(MAILCAPDIR)/mailcap.old"
- -mv $(MAILCAPDIR)/mailcap $(MAILCAPDIR)/mailcap.old
- @echo "installing file $(MAILCAPDIR)/mailcap"
-- ${CP} mailcap $(MAILCAPDIR)
-+ ${BSD_INSTALL_DATA} mailcap $(MAILCAPDIR)
-
- uninstall-all:
- @(cd bin; \
diff --git a/mail/metamail/patches/patch-ab b/mail/metamail/patches/patch-ab
deleted file mode 100644
index bee023cc4f1..00000000000
--- a/mail/metamail/patches/patch-ab
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2005/11/21 09:47:45 rillig Exp $
-
---- config.h.orig 1993-11-24 09:36:07.000000000 -0600
-+++ config.h
-@@ -40,7 +40,7 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
- #define SYSV /* Linux is SysV */
- #endif
-
--#ifdef SVR3
-+#if defined(SVR3) || defined(__sgi)
- #ifndef SYSV
- /* Stupid SGI machines define SVR3 but not SYSV */
- #define SYSV
-@@ -65,6 +65,12 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
- #endif
- #endif
-
-+/* agc - test for 4.4 BSD-derived systems properly */
-+#include <sys/param.h>
-+#if (defined(BSD) && BSD >= 199306)
-+#define __BSD_4_4__
-+#endif
-+
- /* NOTE: The RESET_PROGRAM resets the terminal to a "normal" state
- If you comment out the definition, all will be well except that metamail's
- -R switch won't work, and metamail-called programs might be more likely
-@@ -100,9 +106,13 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
- #endif
-
- #ifdef SYSV
-+#if !(defined(__sun__) && defined(__svr4__)) && !defined(LINUX) && !(defined(__sun) && defined(__SVR4))
- #define killpg(a, b) kill(-(a), (b))
-+#endif
- #define bcopy(a, b, c) memcpy(b, a, c)
-+#ifndef LINUX
- #define bzero(a, b) memset(a, 0, b)
-+#endif
- #define bcmp memcmp
- #define index strchr
- #define rindex strrchr
-@@ -155,9 +165,13 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
- #ifdef NeXT
- #define sigtype void
- #else
-+#if defined(__BSD_4_4__)
-+#define sigtype void
-+#else
- #define sigtype int
- #endif
- #endif
-+#endif
-
- #ifdef MSDOS
- #define PATH_SEPARATOR ';'
-@@ -173,7 +187,7 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
- #else
- #define PATH_SEPARATOR ':'
- #ifndef STDPATH
--#define STDPATH "/.mailcap:/usr/local/etc/mailcap:/usr/etc/mailcap:/etc/mailcap:/etc/mail/mailcap:/usr/public/lib/mailcap"
-+#define STDPATH "/.mailcap:" PKG_SYSCONFDIR "/mailcap"
- #endif
- #endif
- #endif
diff --git a/mail/metamail/patches/patch-ac b/mail/metamail/patches/patch-ac
deleted file mode 100644
index 87c3eac41d1..00000000000
--- a/mail/metamail/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2004/03/29 02:17:24 snj Exp $
-
---- bin/audiosend.orig 2004-03-28 18:04:21.000000000 -0800
-+++ bin/audiosend 2004-03-28 18:04:30.000000000 -0800
-@@ -86,7 +86,7 @@ set which = $<
- switch ("$which")
- case 1:
- echo -n "Sending mail, please wait... "
-- /usr/lib/sendmail $to $cc < $fname
-+ /usr/sbin/sendmail $to $cc < $fname
- if (! $status) then
- echo "Done."
- rm $fname
diff --git a/mail/metamail/patches/patch-ad b/mail/metamail/patches/patch-ad
deleted file mode 100644
index f9281ea88ff..00000000000
--- a/mail/metamail/patches/patch-ad
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2006/09/16 15:29:36 hira Exp $
-
---- fonts/Makefile.orig 1993-05-31 15:49:27.000000000 -0500
-+++ fonts/Makefile 2006-07-20 21:39:41.000000000 -0500
-@@ -10,7 +10,7 @@
- #FONTSUFFIX=fb
- #DIRBUILDER=bldfamily
-
--all: shownonascii heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX} mailto-hebrew
-+all: shownonascii mailto-hebrew
-
- heb6x13.${FONTSUFFIX}: heb6x13.bdf
- # convertfont -o heb6x13 heb6x13.bdf
-@@ -28,12 +28,12 @@
- -${DIRBUILDER}
-
- shownonascii: Xshownonascii
-- sed -e s@/u/nsb/lib/fonts@`pwd`@ < Xshownonascii > shownonascii
-- chmod +x shownonascii
-+ ${SED} -e s@/u/nsb/lib/fonts@${PREFIX}/share/fonts@ < Xshownonascii > shownonascii
-+ ${CHMOD} +x shownonascii
-
- mailto-hebrew: Xmailto-hebrew
-- sed -e s@/u/nsb/lib/fonts@`pwd`@ < Xmailto-hebrew > mailto-hebrew
-- chmod +x mailto-hebrew
-+ ${SED} -e s@/u/nsb/lib/fonts@${PREFIX}/share/fonts@ < Xmailto-hebrew > mailto-hebrew
-+ ${CHMOD} +x mailto-hebrew
-
- clean:
- rm -f heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX} shownonascii mailto-hebrew fonts.dir
diff --git a/mail/metamail/patches/patch-ae b/mail/metamail/patches/patch-ae
deleted file mode 100644
index ebfdbda31de..00000000000
--- a/mail/metamail/patches/patch-ae
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2004/03/04 15:04:41 cjep Exp $
---- metamail/splitmail.c.orig Mon Jan 31 23:23:14 1994
-+++ metamail/splitmail.c Sat Feb 28 20:08:44 2004
-@@ -41,8 +41,8 @@
- #define VERBOSEDELIVERYCMD VerboseDeliveryCmd
- #else
- extern char *getenv();
--#define NORMALDELIVERYCMD "/usr/lib/sendmail -t -oi"
--#define VERBOSEDELIVERYCMD "/usr/lib/sendmail -t -v -oi"
-+#define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi"
-+#define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi"
- #endif
-
- usageexit() {
-@@ -194,7 +194,7 @@
- s = endofheader(from); /* would be index(from, '\n'),
- but need to check for continuation lines */
- *s = '\0';
-- if (ShareThisHeader(from, SubjectBuf, &OrigID)) {
-+ if (ShareThisHeader(from, SubjectBuf, sizeof(SubjectBuf), &OrigID)) {
- strcat(SharedHeaders, from);
- strcat(SharedHeaders, "\n");
- }
-@@ -339,9 +339,10 @@
- NULL
- };
-
--ShareThisHeader(s, SubjectBuf, OrigID)
-+ShareThisHeader(s, SubjectBuf, size, OrigID)
- char *s;
- char *SubjectBuf;
-+size_t size;
- char **OrigID;
- {
- int i;
-@@ -361,7 +362,8 @@
- }
- if (!ULstrcmp(s, "subject")) {
- *colon = ':';
-- strcpy(SubjectBuf, ++colon);
-+ strncpy(SubjectBuf, ++colon, size);
-+ SubjectBuf[size - 1] = '\0';
- return(0);
- }
- if (!ULstrcmp(s, "content-type")) {
diff --git a/mail/metamail/patches/patch-af b/mail/metamail/patches/patch-af
deleted file mode 100644
index 9d5c60a054d..00000000000
--- a/mail/metamail/patches/patch-af
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-af,v 1.3 2004/02/25 03:58:43 snj Exp $
-
---- metamail/mailto.c.orig 1994-02-09 12:30:26.000000000 -0800
-+++ metamail/mailto.c 2004-02-24 10:13:44.000000000 -0800
-@@ -570,6 +570,7 @@ char **argv;
- if (isupper(*sdum)) *sdum = tolower(*sdum);
- }
- if (strcmp(CharacterSet, "us-ascii")
-+ && strcmp(CharacterSet, "koi8-r")
- && strncmp(CharacterSet, "iso-8859-", 9)) {
- fprintf(stderr, "mailto: Unsupported character set: %s\n", CharacterSet);
- exit(-1);
-@@ -1130,6 +1131,7 @@ struct mailpart *part;
- if (part->isrich) {
- if (strcmp(CharacterSet, "us-ascii")
- && (strncmp(CharacterSet, "iso-8859-", 9)
-+ && strcmp(CharacterSet, "koi8-r")
- || part->encoding_type_needed != ENC_NONE)) {
- fprintf(fp, "Content-type: text/richtext; charset=\"%s\"\n", CharacterSet);
- } else {
-@@ -1140,6 +1142,7 @@ struct mailpart *part;
- WriteCtypeNicely(fp, part->content_type);
- if (strcmp(CharacterSet, "us-ascii")
- && (strncmp(CharacterSet, "iso-8859-", 9)
-+ && strcmp(CharacterSet, "koi8-r")
- || part->encoding_type_needed != ENC_NONE)) {
- fprintf(fp, "; charset=\"%s\"\n", CharacterSet);
- } else fputs("\n", fp);
-@@ -1745,6 +1748,7 @@ CreateNewPart() {
- }
- printf("\n\nEnter your choice as a number from 0 to %d: ", i);
- fflush(stdout);
-+ *LineBuf = '\0';
- fgets(LineBuf, sizeof(LineBuf), stdin);
- ans = atoi(LineBuf);
- if (ans == 0 || ans == 1) {
-@@ -1791,7 +1795,7 @@ CreateNewPart() {
- int ct;
- printf("\nEnter the MIME Content-type value for the data from file %s\n (type '?' for a list of locally-valid content-types): ", sdum);
- fflush(stdout);
-- gets(LineBuf);
-+ fgets(LineBuf, sizeof(LineBuf), stdin);
- if (index(LineBuf, '/')) {
- char lc[100], *s, AnsBuf[100];
- strcpy(lc, LineBuf);
-@@ -1809,7 +1813,7 @@ CreateNewPart() {
- }
- if (mc) break;
- printf("The MIME content-type '%s' is not listed in your local mailcap files,\nand may not be a valid MIME type. Do you want to use it anyway [no] ? ", LineBuf);
-- s = gets(AnsBuf);
-+ s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
- while (s && *s && isspace((unsigned char) *s)) ++s;
- if (s && (*s == 'y' || *s == 'Y')) break;
- continue;
diff --git a/mail/metamail/patches/patch-ag b/mail/metamail/patches/patch-ag
deleted file mode 100644
index b84492f149b..00000000000
--- a/mail/metamail/patches/patch-ag
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2004/02/25 03:58:43 snj Exp $
-
-diff -u -r mm2.7.org/src/bin/showaudio mm2.7/src/bin/showaudio
---- bin/showaudio Wed Feb 2 16:21:26 1994
-+++ bin/showaudio Wed May 21 21:34:08 1997
-@@ -15,9 +15,35 @@
- # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
- #
-
--
-+# Set a sensible value for the temporary directory, if its not
-+# already set. If TMPDIR is set previously, then we will
-+# assume it is adequately protected.
- if (! $?METAMAIL_TMPDIR) then
-- set METAMAIL_TMPDIR=/tmp
-+ if ($?TMPDIR) then
-+ set METAMAIL_TMPDIR="$TMPDIR"
-+ else
-+ set METAMAIL_TMPDIR=~/metamail_tmp
-+ endif
-+endif
-+
-+# Set a sensible umask value
-+umask 077
-+
-+# Make sure that the temporary directory is available
-+if (! -d "$METAMAIL_TMPDIR") then
-+
-+ if (! -e "$METAMAIL_TMPDIR") then
-+ mkdir "$METAMAIL_TMPDIR"
-+ else
-+ echo "$METAMAIL_TMPDIR exists, but is not a directory"
-+ exit 2
-+ endif
-+
-+ if ( $status != 0 || ! -d "$METAMAIL_TMPDIR" ) then
-+ echo "Error creating $METAMAIL_TMPDIR"
-+ exit 2
-+ endif
-+
- endif
-
- # First, figure out which machine to play it on!
-@@ -33,7 +59,7 @@
- set ORG="Bellcore"
- set STDINPUT=0
- if ("$1" == "-p") then
-- set AUDIOPHONE=$2
-+ set AUDIOPHONE="$2"
- shift
- shift
- endif
-@@ -173,7 +199,7 @@
- set AUDIOPHONE=$<
- endif
- if ($thishost == $AUDIOPHONEHOST || $thishost == $AUDIOPHONEHOSTLONG) then
-- echo Calling Phone number $AUDIOPHONE
-+ echo Calling Phone number "$AUDIOPHONE"
- echo "You MUST SAY HELLO when you answer the phone, or you will not hear the message."
- mail -s "showaudio: `whoami` called $AUDIOPHONE" $AUDIOLOGMAIL < /dev/null
- if ($STDINPUT) then
-@@ -206,7 +232,7 @@
- echo -n "File name:"
- set fname=$<
- endif
--cp $1 $fname
-+cp "$1" $fname
- if ($status == 0) echo Wrote raw audio file: $fname
- exit 0
diff --git a/mail/metamail/patches/patch-ah b/mail/metamail/patches/patch-ah
deleted file mode 100644
index 67ac73f7e3c..00000000000
--- a/mail/metamail/patches/patch-ah
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2004/03/29 02:17:24 snj Exp $
-
---- man/mailto.1.orig 1994-02-09 12:29:12.000000000 -0800
-+++ man/mailto.1 2004-03-28 18:08:59.000000000 -0800
-@@ -1,6 +1,6 @@
- .TH MAILTO 1 "Release 1" "Bellcore Prototype"
- .SH NAME
--mailto - Simple mutlimedia mail sending program
-+mailto - Simple multimedia mail sending program
- .SH SYNOPSIS
- .ta 8n
- \fBmailto\fP [-a] [-c] [-s] [recipient name(s)]
-@@ -74,7 +74,7 @@ multimedia mail generator. There are, a
-
- Basically, mailto can include the following things in mail:
-
--1. Simple formatted text, using the MIME type "text/richtext". This allows you to add emphasis to your message using underlining, bold text, italic (diaplsyed as reverse video), centering, and the like.
-+1. Simple formatted text, using the MIME type "text/richtext". This allows you to add emphasis to your message using underlining, bold text, italic (displayed as reverse video), centering, and the like.
-
- 2. Non-text data. Metamail can include pictures, sounds, and other non-textual data in the middle of any mail message. The mailcap configuration mechanism can even make this process reasonably user-friendly, but a knowledgable user can include non-textual data even in the absence of a proper mailcap entry.
-
-@@ -230,7 +230,7 @@ The .mailrc file in your home directory
- dot -- controls whether or not a period alone on a line
- should be interpreted as terminating your mail
- ignore -- controls whether or not interrupts are ignored
-- verbose -- controls the verbosity of output from /usr/lib/sendmail
-+ verbose -- controls the verbosity of output from /usr/sbin/sendmail
- quiet -- controls the verbosity of output from the mailto program.
- keepblind -- controls whether or not a 'blind' copy of the mail is kept.
- commasonly -- controls whether or not a space character
-@@ -275,7 +275,7 @@ The mailto program reads both the aliase
-
- .I
- Altered editing behavior:
--The ~e and ~v commands, which are used to edit the message being composed, will behave differently in mailto if the mail includes non-text portions. In such cases, each part will be edited separately, in sequence, which makes it impossble for the user to accidentally mess up the inter-part boundaries. Moreover, if the mailcap entry for a given data type includes an "edit" field, the user will be given the choice of editing with the program named there or editing with his usual (text) editor. In most cases, this will be a choice between using a structured editor or editing the raw data stream.
-+The ~e and ~v commands, which are used to edit the message being composed, will behave differently in mailto if the mail includes non-text portions. In such cases, each part will be edited separately, in sequence, which makes it imposisble for the user to accidentally mess up the inter-part boundaries. Moreover, if the mailcap entry for a given data type includes an "edit" field, the user will be given the choice of editing with the program named there or editing with his usual (text) editor. In most cases, this will be a choice between using a structured editor or editing the raw data stream.
-
- .I
- Altered behavior for large messages:
-@@ -283,7 +283,7 @@ Mailto delivers your message using the s
-
- .I
- New -r command-line option
--The -r comand-line option is not found in standard Berkeley mail.
-+The -r command-line option is not found in standard Berkeley mail.
-
- .SH SUMMARY OF OPTIONS
- -a <charset> -- specifies an alternate character set in use. This had better be the one your terminal is actually using. Currently it must be in the iso-8859 character set family.
diff --git a/mail/metamail/patches/patch-ai b/mail/metamail/patches/patch-ai
deleted file mode 100644
index e9e8f14a1db..00000000000
--- a/mail/metamail/patches/patch-ai
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2004/02/25 03:58:43 snj Exp $
-
---- metamail/metamail.c.orig 1994-02-16 17:57:19.000000000 -0800
-+++ metamail/metamail.c 2004-02-24 10:47:27.000000000 -0800
-@@ -83,7 +83,7 @@ extern char *MkRmScript();
- #define MAX_FILE_NAME_SIZE 256
- #define WRITE_BINARY "w"
- #else /* AMIGA */
--extern char **environ, *gets();
-+extern char **environ;
- #define CATCOMMAND "cat"
- #define CATTEMPLATE "cat %s"
- #define METAMAIL "metamail"
-@@ -579,7 +579,7 @@ int nestingdepth;
- int overwriteans = -1;
- do {
- printf("File %s exists. Do you want to overwrite it (y/n) ?\n", Fname);
-- s = gets(AnsBuf);
-+ s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
- if (!s) {
- overwriteans = 0;
- } else {
-@@ -1202,9 +1202,9 @@ char *SquirrelFile;
- fprintf(outfp, "Content-type: %s", ContentType);
- for (j=0; j<CParamsUsed; ++j) {
- fprintf(outfp, " ; ");
-- fprintf(outfp, CParams[j]);
-+ fprintf(outfp, "%s", CParams[j]);
- fprintf(outfp, " = ");
-- fprintf(outfp, CParamValues[j]);
-+ fprintf(outfp, "%s", CParamValues[j]);
- }
- fprintf(outfp, "\n\n");
- TranslateInputToOutput(InputFP, outfp, EncodingCode, ContentType);
-@@ -1823,7 +1823,7 @@ char *ctype, *progname, *label;
- } else {
- printf("This message contains '%s'-format data.\nDo you want to view it using the '%s' command (y/n) [y] ? ", ctype, ShortCommand(progname));
- }
-- s = gets(AnsBuf);
-+ s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
- if (!s) return(0); /* EOF */
- while (s && *s && isspace((unsigned char) *s)) ++s;
- if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') return(1);
-@@ -2022,7 +2022,8 @@ int ShowLeadingWhitespace;
- if (lc2strcmp(charset, PrevCharset)) {
- char *s2, *charsetinuse;
-
-- strcpy(PrevCharset, charset);
-+ strncpy(PrevCharset, charset, sizeof(PrevCharset));
-+ PrevCharset[sizeof(PrevCharset) - 1] = '\0';
- for (s2=PrevCharset; *s2; ++s2) {
- if (isupper((unsigned char) *s2)) *s2 = tolower((unsigned char) *s2);
- }
-@@ -2032,7 +2033,7 @@ int ShowLeadingWhitespace;
- }
- }
- if (ecode == ENCODING_NONE) {
-- printf(txt+1);
-+ printf("%s", txt+1);
- } else {
- /* What follows is REALLY bogus, but all my encoding stuff is pipe-oriented right now... */
- MkTmpFileName(TmpFile);
diff --git a/mail/metamail/patches/patch-aj b/mail/metamail/patches/patch-aj
deleted file mode 100644
index 988ac6c9caa..00000000000
--- a/mail/metamail/patches/patch-aj
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2004/02/25 03:58:43 snj Exp $
-
-diff -u -r mm2.7.org/src/bin/showexternal mm2.7/src/bin/showexternal
---- bin/showexternal Tue Feb 8 09:39:05 1994
-+++ bin/showexternal Wed May 21 21:41:39 1997
-@@ -15,9 +15,45 @@
- # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
- #
-
-+# Check argument integrity. Don't trust mail headers
-+switch ("$1$2$3$4$5$6$7")
-+case "*[\t ]*":
-+ echo "Illegal white space in arguments\!"
-+ echo "Command was:"
-+ echo "'$0' '$1' '$2' '$3' '$4' '$5' '$6' '$7'"
-+ exit 2
-+endsw
-+
- onintr cleanup
-+# Set a sensible value for the temporary directory, if its not
-+# already set. If TMPDIR is set previously, then we will
-+# assume it is adequately protected.
- if (! $?METAMAIL_TMPDIR) then
-- set METAMAIL_TMPDIR=/tmp
-+ if ($?TMPDIR) then
-+ set METAMAIL_TMPDIR="$TMPDIR"
-+ else
-+ set METAMAIL_TMPDIR=~/metamail_tmp
-+ endif
-+endif
-+
-+# Set a sensible umask value
-+umask 077
-+
-+# Make sure that the temporary directory is available
-+if (! -d "$METAMAIL_TMPDIR") then
-+
-+ if (! -e "$METAMAIL_TMPDIR") then
-+ mkdir "$METAMAIL_TMPDIR"
-+ else
-+ echo "$METAMAIL_TMPDIR exists, but is not a directory"
-+ exit 2
-+ endif
-+
-+ if ( $status != 0 || ! -d "$METAMAIL_TMPDIR" ) then
-+ echo "Error creating $METAMAIL_TMPDIR"
-+ exit 2
-+ endif
-+
- endif
- if (! $?FTP) then
- set FTP=ftp
diff --git a/mail/metamail/patches/patch-ak b/mail/metamail/patches/patch-ak
deleted file mode 100644
index f198ee73fd5..00000000000
--- a/mail/metamail/patches/patch-ak
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2004/02/25 03:58:43 snj Exp $
-
-diff -u -r mm2.7.org/src/bin/showpartial mm2.7/src/bin/showpartial
---- bin/showpartial Wed Feb 2 16:21:29 1994
-+++ bin/showpartial Wed May 21 21:39:49 1997
-@@ -2,8 +2,44 @@
- # (The "-fb" might need to be changed to "-f" on some systems)
- #
-
-+# Check argument integrity. Don't trust mail headers
-+switch ("$1$2$3$4")
-+case "*[\t ]*":
-+ echo "Illegal white space in arguments\!"
-+ echo "Command was:"
-+ echo "'$0' '$1' '$2' '$3' '$4'"
-+ exit 2
-+endsw
-+
-+# Set a sensible value for the temporary directory, if its not
-+# already set. If TMPDIR is set previously, then we will
-+# assume it is adequately protected.
- if (! $?METAMAIL_TMPDIR) then
-- set METAMAIL_TMPDIR=/tmp
-+ if ($?TMPDIR) then
-+ set METAMAIL_TMPDIR="$TMPDIR"
-+ else
-+ set METAMAIL_TMPDIR=~/metamail_tmp
-+ endif
-+endif
-+
-+# Set a sensible umask value
-+umask 077
-+
-+# Make sure that the temporary directory is available
-+if (! -d "$METAMAIL_TMPDIR") then
-+
-+ if (! -e "$METAMAIL_TMPDIR") then
-+ mkdir "$METAMAIL_TMPDIR"
-+ else
-+ echo "$METAMAIL_TMPDIR exists, but is not a directory"
-+ exit 2
-+ endif
-+
-+ if ( $status != 0 || ! -d "$METAMAIL_TMPDIR" ) then
-+ echo "Error creating $METAMAIL_TMPDIR"
-+ exit 2
-+ endif
-+
- endif
-
- set TREEROOT=${METAMAIL_TMPDIR}/m-prts-`whoami`
-@@ -11,14 +47,14 @@
- echo "Usage: showpartial file id partnum totalnum"
- exit -1
- endif
--set file=$1
-+set file="$1"
- # This next line is because message-id can contain weird chars
--set id=`echo $2 | tr -d \!\$\&\*\(\)\|\'\"\;\/\<\>\\`
--@ partnum = $3
--if ($#argv == 3 || $4 == "") then
-+set id=`echo "$2" | tr -d \!\$\&\*\(\)\|\'\"\;\/\<\>\\`
-+@ partnum = "$3"
-+if ($#argv == 3 || "$4" == "") then
- set totalnum=-1
- else
-- @ totalnum = $4
-+ @ totalnum = "$4"
- endif
-
- if (! -d $TREEROOT) then
-@@ -35,9 +71,9 @@
- exit -1
- endif
- endif
--cp $file ${TREEROOT}/$id/$partnum
-+cp "$file" ${TREEROOT}/$id/$partnum
- if ($status) then
-- echo cp $file ${TREEROOT}/$id/$partnum failed
-+ echo cp "$file" ${TREEROOT}/$id/$partnum failed
- exit -1
- endif
- if ($totalnum == -1) then
diff --git a/mail/metamail/patches/patch-al b/mail/metamail/patches/patch-al
deleted file mode 100644
index 1233277e3b2..00000000000
--- a/mail/metamail/patches/patch-al
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-al,v 1.1 2004/02/25 03:58:43 snj Exp $
-
-diff -u -r mm2.7.org/src/bin/showpicture mm2.7/src/bin/showpicture
---- bin/showpicture Mon Feb 7 10:59:54 1994
-+++ bin/showpicture Wed May 21 21:34:59 1997
-@@ -15,15 +15,42 @@
- # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
- #
-
-+# Set a sensible value for the temporary directory, if its not
-+# already set. If TMPDIR is set previously, then we will
-+# assume it is adequately protected.
- if (! $?METAMAIL_TMPDIR) then
-- set METAMAIL_TMPDIR=/tmp
-+ if ($?TMPDIR) then
-+ set METAMAIL_TMPDIR="$TMPDIR"
-+ else
-+ set METAMAIL_TMPDIR=~/metamail_tmp
-+ endif
-+endif
-+
-+# Set a sensible umask value
-+umask 077
-+
-+# Make sure that the temporary directory is available
-+if (! -d "$METAMAIL_TMPDIR") then
-+
-+ if (! -e "$METAMAIL_TMPDIR") then
-+ mkdir "$METAMAIL_TMPDIR"
-+ else
-+ echo "$METAMAIL_TMPDIR exists, but is not a directory"
-+ exit 2
-+ endif
-+
-+ if ( $status != 0 || ! -d "$METAMAIL_TMPDIR" ) then
-+ echo "Error creating $METAMAIL_TMPDIR"
-+ exit 2
-+ endif
-+
- endif
-
- if (! $?X_VIEWER) then
--set X_VIEWER="xloadimage -view -quiet -geometry +1+1"
-+ set X_VIEWER="xloadimage -view -quiet -geometry +1+1"
- # set X_VIEWER="xv -geometry +1+1"
- endif
--if ($1 == "-viewer" && $#argv > 1) then
-+if ("$1" == "-viewer" && $#argv > 1) then
- set X_VIEWER = "$2"
- shift
- shift
-@@ -57,7 +84,7 @@
- endif
- end
- endif
-- cp $1 $fname
-+ cp "$1" $fname
- if ($status == 0) echo Wrote file $fname
- exit 0
- endif
diff --git a/mail/metamail/patches/patch-am b/mail/metamail/patches/patch-am
deleted file mode 100644
index 95167ae262c..00000000000
--- a/mail/metamail/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2004/02/25 03:58:43 snj Exp $
-
---- man/mailcap.4.orig 2004-02-24 10:35:36.000000000 -0800
-+++ man/mailcap.4 2004-02-24 10:36:52.000000000 -0800
-@@ -42,7 +42,7 @@ The "textualnewlines" field can be used
-
- The "compose" field may be used to specify a program that can be used to compose a new body or body part in the given format. Its intended use is to support mail composing agents that support the composition of multiple types of mail using external composing agents. As with the view-command, the compose command will be executed after replacing certain escape sequences starting with "%". In particular, %s should be replaced by the name of a file to which the composed data is to be written by the specified composing program, thus allowing th3e calling program (e.g. metamail) to tell the called program where to store the composed data. If %s does not appear, then the composed data will be assumed to be written by the composing programs to standard output. The result of the composing program may be data that is NOT yet suitable for mail transport -- that is, a Content-Transfer-Encoding may still need to be applied to the data.
-
--The "composetyped" field is similar to the "compose" field, but is to be used when the composing program needs to specify the Content-type header field to be applied to the composed data. The "compose" field is simpler, and is preferred for use with existing (non-mail-oriented) programs for composing data in a given format. The "composetyped" field is necessary when the Content-type information must include auxilliary parameters, and the composition program must then know enough about mail formats to produce output that includes the mail type information, and to apply any necessary Content-Transfer-Encoding. Conceptually, "compose" specifies a program that simply outputs the specified type of data in its raw form, while "composetyped" specifies a program that outputs the data as a MIME object, with all necessary Content-* headers already in place.
-+The "composetyped" field is similar to the "compose" field, but is to be used when the composing program needs to specify the Content-type header field to be applied to the composed data. The "compose" field is simpler, and is preferred for use with existing (non-mail-oriented) programs for composing data in a given format. The "composetyped" field is necessary when the Content-type information must include auxiliary parameters, and the composition program must then know enough about mail formats to produce output that includes the mail type information, and to apply any necessary Content-Transfer-Encoding. Conceptually, "compose" specifies a program that simply outputs the specified type of data in its raw form, while "composetyped" specifies a program that outputs the data as a MIME object, with all necessary Content-* headers already in place.
-
- .TP 8
- .B needsterminal
diff --git a/mail/metamail/patches/patch-an b/mail/metamail/patches/patch-an
deleted file mode 100644
index 6271abda917..00000000000
--- a/mail/metamail/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 2004/02/25 03:58:43 snj Exp $
-
---- man/metasend.1.orig 2004-02-24 10:38:49.000000000 -0800
-+++ man/metasend.1 2004-02-24 10:38:56.000000000 -0800
-@@ -12,7 +12,7 @@ program will allow a user to send one or
-
- With no arguments, the program will ask the user for the To, Subject, and CC fields. It will then ask for the name of a MIME content-type. Next, it will ask the user for the name of an existing file containing that type of data. After this, it will ask what encoding type, if any, should be applied to this data. Finally, it will ask if the user wants to include information from an additional file, in which case the last three questions will be repeated for the next file.
-
--Alternately, all of this information can be provided on the comand line, using the following options:
-+Alternately, all of this information can be provided on the command line, using the following options:
-
- -b -- specifies Batch (non-interactive) Mode. Will exit with an error message if all additional needed information is not provided on the command line.
- -c cc -- specifies the CC address
diff --git a/mail/metamail/patches/patch-ao b/mail/metamail/patches/patch-ao
deleted file mode 100644
index f713ae3fbe5..00000000000
--- a/mail/metamail/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2004/02/25 03:58:43 snj Exp $
-
---- man/splitmail.1.orig 2004-02-24 10:42:15.000000000 -0800
-+++ man/splitmail.1 2004-02-24 10:42:25.000000000 -0800
-@@ -16,7 +16,7 @@ If the -d option is specified, the mail
-
- The -i option can be used to make splitmail generate the pieces with similar (but not identical) message-id fields, in a format which allows them to be easily correlated with one another and which end with the suffix provided on the command line after -i.
-
--The default chunk size for spliting messages is 250000 at most sites, though this is also a compile-time option. This can be overriden with the -s switch, or with the environment variable SPLITSIZE.
-+The default chunk size for spliting messages is 250000 at most sites, though this is also a compile-time option. This can be overridden with the -s switch, or with the environment variable SPLITSIZE.
-
- Messages smaller than the chunk size will not be turned into partial messages, but will be written to a single file or delivered as a single message.
- .SH ENVIRONMENT
diff --git a/mail/metamail/patches/patch-ap b/mail/metamail/patches/patch-ap
deleted file mode 100644
index 34d74d65b17..00000000000
--- a/mail/metamail/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2004/03/29 02:17:24 snj Exp $
-
---- bin/showexternal.orig 2004-03-28 18:05:20.000000000 -0800
-+++ bin/showexternal 2004-03-28 18:05:27.000000000 -0800
-@@ -222,7 +222,7 @@ quit
- echo "" >> $NEWNAME
- sed -e 1,/^\$/d < $bodyfile >> $NEWNAME
- echo "" >> $NEWNAME
-- /usr/lib/sendmail -t < $NEWNAME
-+ /usr/sbin/sendmail -t < $NEWNAME
- if ($status) then
- echo sendmail failed
- cd ${METAMAIL_TMPDIR}
diff --git a/mail/metamail/patches/patch-aq b/mail/metamail/patches/patch-aq
deleted file mode 100644
index e3307c6fe70..00000000000
--- a/mail/metamail/patches/patch-aq
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2004/03/29 02:17:24 snj Exp $
-
---- bin/mailserver.orig 2004-03-28 18:11:22.000000000 -0800
-+++ bin/mailserver 2004-03-28 18:11:34.000000000 -0800
-@@ -68,7 +68,7 @@ reproduced below. If no message appears
- probably run in some circumstance other than mail delivery.
- --------------------
- !
-- cat $TmpFile - | /usr/lib/sendmail $MAINTAINER
-+ cat $TmpFile - | /usr/sbin/sendmail $MAINTAINER
- # Takes the rest of the message from standard input
- rm $TmpFile
- exit 0
-@@ -86,7 +86,7 @@ that contain ".." in the path name.
-
- The file you requested, if it exists, will not be sent to you.
- !
-- /usr/lib/sendmail -t < $TmpFile
-+ /usr/sbin/sendmail -t < $TmpFile
- rm $TmpFile
- exit 0
- endif
-@@ -107,7 +107,7 @@ Here is a list of the currently availabl
- --------------------------------
- !
- ls -R >> $TmpFile
-- /usr/lib/sendmail -t < $TmpFile
-+ /usr/sbin/sendmail -t < $TmpFile
- rm $TmpFile
- exit 0
- endif
-@@ -135,13 +135,13 @@ Command failed:
- metasend -b -t "$FromName" -f "$Subject" -m "$ct" -s "Re: $Subject"
-
- !
-- /usr/lib/sendmail -t < $TmpFile
-+ /usr/sbin/sendmail -t < $TmpFile
- rm $TmpFile
- exit 0
- endif
-
- if ("$LOGADDR" != "") then
-- /usr/lib/sendmail -t <<!
-+ /usr/sbin/sendmail -t <<!
- From: ${LOCALADDR}@`hostname`
- To: $LOGADDR
- Subject: Autosend delivery report
diff --git a/mail/metamail/patches/patch-ar b/mail/metamail/patches/patch-ar
deleted file mode 100644
index 986eacc1b46..00000000000
--- a/mail/metamail/patches/patch-ar
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2006/01/19 10:55:30 tron Exp $
-
---- richmail/richtext.c.orig 1994-02-09 16:31:18.000000000 +0000
-+++ richmail/richtext.c 2006-01-19 10:51:42.000000000 +0000
-@@ -16,6 +16,8 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <signal.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include "richlex.h"
- #include "richset.h"
- #include <config.h>
-@@ -79,6 +81,8 @@
- extern tputs();
- #endif
-
-+static int lc2strcmp(char *s1, char *s2);
-+
- static outputc(), realoutputc(), MakeWorkingMargins(), Pause(), fputsmovingright(), ResetTerminalCodes(), FinalizeTerminal(), outputstr(), FPUTS();
-
- #define OUTC(c) (outputc((RCHAR)(c)))
-@@ -989,7 +993,7 @@
- while(*s) (*RichtextPutc)((int)(*s++),fp);
- }
-
--static lc2strcmp(s1, s2)
-+static int lc2strcmp(s1, s2)
- char *s1, *s2;
- {
- if (!s1 || !s2) return (-1);
diff --git a/mail/metamail/patches/patch-as b/mail/metamail/patches/patch-as
deleted file mode 100644
index 9d1b68f8cf7..00000000000
--- a/mail/metamail/patches/patch-as
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-as,v 1.1 2006/01/22 01:57:44 joerg Exp $
-
---- metamail/putenv.c.orig 2006-01-22 01:55:38.000000000 +0000
-+++ metamail/putenv.c
-@@ -19,17 +19,9 @@ Cambridge, MA 02139, USA. */
- #include <config.h>
- #include <sys/types.h>
- #include <errno.h>
--#ifdef STDC_HEADERS
- #include <stdlib.h>
--#else
--extern int errno;
--#endif
-
--#if defined(STDC_HEADERS) || defined(USG) || defined(SYSV)
- #include <string.h>
--#else /* not (STDC_HEADERS or USG) */
--#include <strings.h>
--#endif /* STDC_HEADERS or USG */
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
diff --git a/mail/mew/DESCR b/mail/mew/DESCR
deleted file mode 100644
index d16ef5ace9c..00000000000
--- a/mail/mew/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Mew is an interface to integrate
-
- - Email
- - NetNews
- - MIME(Multipurpose Internet Mail Extensions)
- - PGP(Pretty Good Privacy)
-
-and to make it easy to view and compose them.
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
deleted file mode 100644
index 64eca5e46f5..00000000000
--- a/mail/mew/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.73 2007/02/20 12:41:53 uebayasi Exp $
-
-DISTNAME= mew-5.2
-PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
-CATEGORIES= mail
-MASTER_SITES= http://www.mew.org/Release/
-
-MAINTAINER= uebayasi@NetBSD.org
-HOMEPAGE= http://www.mew.org/
-COMMENT= Messaging in the Emacs World
-
-CONFLICTS+= mew-xemacs-[0-9]* incm-[0-9]*
-
-INFO_FILES= yes
-
-HAS_CONFIGURE= yes
-
-EMACS_VERSIONS_ACCEPTED= emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs214 xemacs215
-EMACS_MODULES+= base
-
-MEW_CONTRIB_DIR=${EMACS_LISPPREFIX}/mew/contrib
-
-MAKE_FLAGS+= prefix=${PREFIX:Q}
-MAKE_FLAGS+= EMACS=${EMACS_BIN:Q}
-MAKE_FLAGS+= elispdir=${EMACS_LISPPREFIX}/mew
-MAKE_FLAGS+= etcdir=${PREFIX}/share/mew
-MAKE_FLAGS+= infodir=${EMACS_INFOPREFIX}
-MAKE_FLAGS+= mandir=${PREFIX:Q}/${PKGMANDIR:Q}/man1
-
-SUBST_CLASSES+= local
-SUBST_STAGE.local= post-configure
-SUBST_FILES.local= Makefile bin/configure info/Makefile
-SUBST_SED.local= -e 's|/usr/local|${PREFIX}|g'
-
-post-install:
- ${INSTALL_DATA_DIR} ${MEW_CONTRIB_DIR}
- ${INSTALL_DATA} ${WRKSRC}/contrib/* ${MEW_CONTRIB_DIR}
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/emacs.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mew/PLIST b/mail/mew/PLIST
deleted file mode 100644
index e19e04f63cd..00000000000
--- a/mail/mew/PLIST
+++ /dev/null
@@ -1,209 +0,0 @@
-@comment $NetBSD: PLIST,v 1.15 2007/01/19 15:10:50 taca Exp $
-bin/incm
-bin/mew-pinentry
-bin/mewcat
-bin/mewdecode
-bin/mewencode
-bin/mewest
-bin/mewl
-man/man1/incm.1
-man/man1/mew-pinentry.1
-man/man1/mewcat.1
-man/man1/mewdecode.1
-man/man1/mewencode.1
-man/man1/mewest.1
-man/man1/mewl.1
-share/mew/Mew.img
-share/mew/Mew.png
-share/mew/Mew.xbm
-share/mew/Mew.xpm
-share/mew/etc/COLOR
-share/mew/etc/mew-Plain.xpm
-share/mew/etc/mew-curr.xpm
-share/mew/etc/mew-folder.xpm
-share/mew/etc/mew-inc2.xpm
-share/mew/etc/mew-kill.xpm
-share/mew/mew-Audio.xpm
-share/mew/mew-Blank.xpm
-share/mew/mew-External.xpm
-share/mew/mew-Folder.xpm
-share/mew/mew-Image.xpm
-share/mew/mew-Octet-Stream.xpm
-share/mew/mew-Postscript.xpm
-share/mew/mew-Rfc822.xpm
-share/mew/mew-Text.xpm
-share/mew/mew-Unknown.xpm
-share/mew/mew-Video.xpm
-share/mew/mew-attach.xpm
-share/mew/mew-cite.xpm
-share/mew/mew-forward.xpm
-share/mew/mew-inc.xpm
-share/mew/mew-lock.xpm
-share/mew/mew-next.xpm
-share/mew/mew-pgp-enc.xpm
-share/mew/mew-pgp-sigenc.xpm
-share/mew/mew-pgp-sign.xpm
-share/mew/mew-prev.xpm
-share/mew/mew-queue.xpm
-share/mew/mew-refile.xpm
-share/mew/mew-reply.xpm
-share/mew/mew-send.xpm
-share/mew/mew-sep.xpm
-share/mew/mew-show.xpm
-share/mew/mew-write.xpm
-share/mew/mew-yank.xpm
-${EMACS_INFOPREFIX}/mew.info
-${EMACS_LISPPREFIX}/mew/contrib/00readme
-${EMACS_LISPPREFIX}/mew/contrib/mew-browse.el
-${EMACS_LISPPREFIX}/mew/contrib/mew-caesar.el
-${EMACS_LISPPREFIX}/mew/contrib/mew-edebug.el
-${EMACS_LISPPREFIX}/mew/contrib/mew-fancy-summary.el
-${EMACS_LISPPREFIX}/mew/contrib/mew-nmz-fixer.el
-${EMACS_LISPPREFIX}/mew/contrib/mew-refile-view.el
-${EMACS_LISPPREFIX}/mew/contrib/mew-toolbar-frame.el
-${EMACS_LISPPREFIX}/mew/mew-addrbook.el
-${EMACS_LISPPREFIX}/mew/mew-addrbook.elc
-${EMACS_LISPPREFIX}/mew/mew-attach.el
-${EMACS_LISPPREFIX}/mew/mew-attach.elc
-${EMACS_LISPPREFIX}/mew/mew-auth.el
-${EMACS_LISPPREFIX}/mew/mew-auth.elc
-${EMACS_LISPPREFIX}/mew/mew-blvs.el
-${EMACS_LISPPREFIX}/mew/mew-blvs.elc
-${EMACS_LISPPREFIX}/mew/mew-bq.el
-${EMACS_LISPPREFIX}/mew/mew-bq.elc
-${EMACS_LISPPREFIX}/mew/mew-cache.el
-${EMACS_LISPPREFIX}/mew/mew-cache.elc
-${EMACS_LISPPREFIX}/mew/mew-complete.el
-${EMACS_LISPPREFIX}/mew/mew-complete.elc
-${EMACS_LISPPREFIX}/mew/mew-config.el
-${EMACS_LISPPREFIX}/mew/mew-config.elc
-${EMACS_LISPPREFIX}/mew/mew-const.el
-${EMACS_LISPPREFIX}/mew/mew-const.elc
-${EMACS_LISPPREFIX}/mew/mew-darwin.el
-${EMACS_LISPPREFIX}/mew/mew-decode.el
-${EMACS_LISPPREFIX}/mew/mew-decode.elc
-${EMACS_LISPPREFIX}/mew/mew-demo.el
-${EMACS_LISPPREFIX}/mew/mew-demo.elc
-${EMACS_LISPPREFIX}/mew/mew-draft.el
-${EMACS_LISPPREFIX}/mew/mew-draft.elc
-${EMACS_LISPPREFIX}/mew/mew-edit.el
-${EMACS_LISPPREFIX}/mew/mew-edit.elc
-${EMACS_LISPPREFIX}/mew/mew-encode.el
-${EMACS_LISPPREFIX}/mew/mew-encode.elc
-${EMACS_LISPPREFIX}/mew/mew-env.el
-${EMACS_LISPPREFIX}/mew/mew-env.elc
-${EMACS_LISPPREFIX}/mew/mew-exec.el
-${EMACS_LISPPREFIX}/mew/mew-exec.elc
-${EMACS_LISPPREFIX}/mew/mew-ext.el
-${EMACS_LISPPREFIX}/mew/mew-ext.elc
-${EMACS_LISPPREFIX}/mew/mew-fib.el
-${EMACS_LISPPREFIX}/mew/mew-fib.elc
-${EMACS_LISPPREFIX}/mew/mew-func.el
-${EMACS_LISPPREFIX}/mew/mew-func.elc
-${EMACS_LISPPREFIX}/mew/mew-gemacs.el
-${EMACS_LISPPREFIX}/mew/mew-header.el
-${EMACS_LISPPREFIX}/mew/mew-header.elc
-${EMACS_LISPPREFIX}/mew/mew-highlight.el
-${EMACS_LISPPREFIX}/mew/mew-highlight.elc
-${EMACS_LISPPREFIX}/mew/mew-imap.el
-${EMACS_LISPPREFIX}/mew/mew-imap.elc
-${EMACS_LISPPREFIX}/mew/mew-imap2.el
-${EMACS_LISPPREFIX}/mew/mew-imap2.elc
-${EMACS_LISPPREFIX}/mew/mew-key.el
-${EMACS_LISPPREFIX}/mew/mew-key.elc
-${EMACS_LISPPREFIX}/mew/mew-lang-jp.el
-${EMACS_LISPPREFIX}/mew/mew-lang-kr.el
-${EMACS_LISPPREFIX}/mew/mew-lang-latin.el
-${EMACS_LISPPREFIX}/mew/mew-local.el
-${EMACS_LISPPREFIX}/mew/mew-local.elc
-${EMACS_LISPPREFIX}/mew/mew-mark.el
-${EMACS_LISPPREFIX}/mew/mew-mark.elc
-${EMACS_LISPPREFIX}/mew/mew-md5.el
-${EMACS_LISPPREFIX}/mew/mew-md5.elc
-${EMACS_LISPPREFIX}/mew/mew-message.el
-${EMACS_LISPPREFIX}/mew/mew-message.elc
-${EMACS_LISPPREFIX}/mew/mew-mime.el
-${EMACS_LISPPREFIX}/mew/mew-mime.elc
-${EMACS_LISPPREFIX}/mew/mew-minibuf.el
-${EMACS_LISPPREFIX}/mew/mew-minibuf.elc
-${EMACS_LISPPREFIX}/mew/mew-mule.el
-${EMACS_LISPPREFIX}/mew/mew-mule0.el
-${EMACS_LISPPREFIX}/mew/mew-mule3.el
-${EMACS_LISPPREFIX}/mew/mew-net.el
-${EMACS_LISPPREFIX}/mew/mew-net.elc
-${EMACS_LISPPREFIX}/mew/mew-nmz.el
-${EMACS_LISPPREFIX}/mew/mew-nmz.elc
-${EMACS_LISPPREFIX}/mew/mew-nntp.el
-${EMACS_LISPPREFIX}/mew/mew-nntp.elc
-${EMACS_LISPPREFIX}/mew/mew-nntp2.el
-${EMACS_LISPPREFIX}/mew/mew-nntp2.elc
-${EMACS_LISPPREFIX}/mew/mew-pgp.el
-${EMACS_LISPPREFIX}/mew/mew-pgp.elc
-${EMACS_LISPPREFIX}/mew/mew-pick.el
-${EMACS_LISPPREFIX}/mew/mew-pick.elc
-${EMACS_LISPPREFIX}/mew/mew-pop.el
-${EMACS_LISPPREFIX}/mew/mew-pop.elc
-${EMACS_LISPPREFIX}/mew/mew-refile.el
-${EMACS_LISPPREFIX}/mew/mew-refile.elc
-${EMACS_LISPPREFIX}/mew/mew-scan.el
-${EMACS_LISPPREFIX}/mew/mew-scan.elc
-${EMACS_LISPPREFIX}/mew/mew-smime.el
-${EMACS_LISPPREFIX}/mew/mew-smime.elc
-${EMACS_LISPPREFIX}/mew/mew-smtp.el
-${EMACS_LISPPREFIX}/mew/mew-smtp.elc
-${EMACS_LISPPREFIX}/mew/mew-sort.el
-${EMACS_LISPPREFIX}/mew/mew-sort.elc
-${EMACS_LISPPREFIX}/mew/mew-ssh.el
-${EMACS_LISPPREFIX}/mew/mew-ssh.elc
-${EMACS_LISPPREFIX}/mew/mew-ssl.el
-${EMACS_LISPPREFIX}/mew/mew-ssl.elc
-${EMACS_LISPPREFIX}/mew/mew-summary.el
-${EMACS_LISPPREFIX}/mew/mew-summary.elc
-${EMACS_LISPPREFIX}/mew/mew-summary2.el
-${EMACS_LISPPREFIX}/mew/mew-summary2.elc
-${EMACS_LISPPREFIX}/mew/mew-summary3.el
-${EMACS_LISPPREFIX}/mew/mew-summary3.elc
-${EMACS_LISPPREFIX}/mew/mew-summary4.el
-${EMACS_LISPPREFIX}/mew/mew-summary4.elc
-${EMACS_LISPPREFIX}/mew/mew-syntax.el
-${EMACS_LISPPREFIX}/mew/mew-syntax.elc
-${EMACS_LISPPREFIX}/mew/mew-temacs.el
-@comment ${EMACS_LISPPREFIX}/mew/mew-theme.el
-@comment ${EMACS_LISPPREFIX}/mew/mew-theme.elc
-${EMACS_LISPPREFIX}/mew/mew-thread.el
-${EMACS_LISPPREFIX}/mew/mew-thread.elc
-${EMACS_LISPPREFIX}/mew/mew-unix.el
-${EMACS_LISPPREFIX}/mew/mew-vars.el
-${EMACS_LISPPREFIX}/mew/mew-vars.elc
-${EMACS_LISPPREFIX}/mew/mew-vars2.el
-${EMACS_LISPPREFIX}/mew/mew-vars2.elc
-${EMACS_LISPPREFIX}/mew/mew-virtual.el
-${EMACS_LISPPREFIX}/mew/mew-virtual.elc
-${EMACS_LISPPREFIX}/mew/mew-win32.el
-${EMACS_LISPPREFIX}/mew/mew-xemacs.el
-${EMACS_LISPPREFIX}/mew/mew.el
-${EMACS_LISPPREFIX}/mew/mew.elc
-${EMACS_LISPPREFIX}/mew/mew-passwd.el
-${EMACS_LISPPREFIX}/mew/mew-passwd.elc
-${EMACS_LISPPREFIX}/mew/mew-search.el
-${EMACS_LISPPREFIX}/mew/mew-search.elc
-${EMACS_LISPPREFIX}/mew/mew-vars3.el
-${EMACS_LISPPREFIX}/mew/mew-vars3.elc
-${EMACS_LISPPREFIX}/mew/mew-varsx.el
-${EMACS_LISPPREFIX}/mew/mew-varsx.elc
-${EMACS_LISPPREFIX}/mew/mew-darwin.elc
-${EMACS_LISPPREFIX}/mew/mew-gemacs.elc
-${EMACS_LISPPREFIX}/mew/mew-lang-jp.elc
-${EMACS_LISPPREFIX}/mew/mew-lang-kr.elc
-${EMACS_LISPPREFIX}/mew/mew-lang-latin.elc
-${EMACS_LISPPREFIX}/mew/mew-mule.elc
-${EMACS_LISPPREFIX}/mew/mew-mule0.elc
-${EMACS_LISPPREFIX}/mew/mew-mule3.elc
-${EMACS_LISPPREFIX}/mew/mew-temacs.elc
-${EMACS_LISPPREFIX}/mew/mew-unix.elc
-${EMACS_LISPPREFIX}/mew/mew-win32.elc
-${EMACS_LISPPREFIX}/mew/mew-xemacs.elc
-@dirrm ${EMACS_LISPPREFIX}/mew/contrib
-@dirrm ${EMACS_LISPPREFIX}/mew
-@dirrm share/mew/etc
-@dirrm share/mew
diff --git a/mail/mew/distinfo b/mail/mew/distinfo
deleted file mode 100644
index a9bdb1187c6..00000000000
--- a/mail/mew/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.33 2007/01/19 15:10:50 taca Exp $
-
-SHA1 (mew-5.2.tar.gz) = dc9127bc1039e8d1d6840ff81755152c953d6bd0
-RMD160 (mew-5.2.tar.gz) = 83ef3aa726b9e6763624c26d7f774598d134f274
-Size (mew-5.2.tar.gz) = 969584 bytes
diff --git a/mail/mhonarc/DESCR b/mail/mhonarc/DESCR
deleted file mode 100644
index cbd097e79f9..00000000000
--- a/mail/mhonarc/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-MHonArc is a Perl program for converting e-mail messages as specified
-in RFC 822 and the MIME standard to HTML. MHonArc can perform the
-following tasks:
-
-* Convert MH mail folders or UUCP/Unix style mailboxes into an HTML
- mail archive.
-* Add or remove messages to an existing HTML mail archive generated
- by MHonArc.
-* Convert a single message to HTML.
-
-Along with these tasks, MHonArc provides the following:
-
-* A main customizable index for mail messages archived.
-* A customizable thread index listing messages by thread.
-* Control over message formatting.
-* The ability to hook in your own custom message filters.
diff --git a/mail/mhonarc/Makefile b/mail/mhonarc/Makefile
deleted file mode 100644
index d3db3f6133d..00000000000
--- a/mail/mhonarc/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2007/02/28 16:04:16 jwise Exp $
-
-DISTNAME= MHonArc-2.6.16
-PKGNAME= mhonarc-2.6.16
-CATEGORIES= mail
-MASTER_SITES= http://www.mhonarc.org/release/MHonArc/tar/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= jwise@NetBSD.org
-HOMEPAGE= http://www.mhonarc.org/
-COMMENT= Mailbox to HTML converter, suitable for list archives
-
-USE_TOOLS+= perl:run
-NO_BUILD= YES
-
-INSTALLATION_DIRS= bin lib man share/doc
-
-do-install:
- cd ${WRKSRC} && ${PERL5} ./install.me \
- -prefix ${PREFIX} \
- -perl ${PERL5} \
- -binpath ${PREFIX}/bin \
- -libpath ${PREFIX}/lib/mhonarc \
- -docpath ${PREFIX}/share/doc/mhonarc \
- -manpath ${PREFIX}/${PKGMANDIR} \
- -batch
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mhonarc/PLIST b/mail/mhonarc/PLIST
deleted file mode 100644
index 44c53c4634c..00000000000
--- a/mail/mhonarc/PLIST
+++ /dev/null
@@ -1,483 +0,0 @@
-@comment $NetBSD: PLIST,v 1.9 2005/08/20 19:31:00 kristerw Exp $
-bin/mha-dbedit
-bin/mha-dbrecover
-bin/mha-decode
-bin/mhonarc
-lib/mhonarc/MHonArc/Char.pm
-lib/mhonarc/MHonArc/Char/JP.pm
-lib/mhonarc/MHonArc/Char/KR.pm
-lib/mhonarc/MHonArc/CharEnt.pm
-lib/mhonarc/MHonArc/CharEnt/AppleArabic.pm
-lib/mhonarc/MHonArc/CharEnt/AppleCenteuro.pm
-lib/mhonarc/MHonArc/CharEnt/AppleCroatian.pm
-lib/mhonarc/MHonArc/CharEnt/AppleCyrillic.pm
-lib/mhonarc/MHonArc/CharEnt/AppleGreek.pm
-lib/mhonarc/MHonArc/CharEnt/AppleHebrew.pm
-lib/mhonarc/MHonArc/CharEnt/AppleIceland.pm
-lib/mhonarc/MHonArc/CharEnt/AppleRoman.pm
-lib/mhonarc/MHonArc/CharEnt/AppleRomanian.pm
-lib/mhonarc/MHonArc/CharEnt/AppleThai.pm
-lib/mhonarc/MHonArc/CharEnt/AppleTurkish.pm
-lib/mhonarc/MHonArc/CharEnt/BIG5_ETEN.pm
-lib/mhonarc/MHonArc/CharEnt/BIG5_HKSCS.pm
-lib/mhonarc/MHonArc/CharEnt/CP1250.pm
-lib/mhonarc/MHonArc/CharEnt/CP1251.pm
-lib/mhonarc/MHonArc/CharEnt/CP1252.pm
-lib/mhonarc/MHonArc/CharEnt/CP1253.pm
-lib/mhonarc/MHonArc/CharEnt/CP1254.pm
-lib/mhonarc/MHonArc/CharEnt/CP1255.pm
-lib/mhonarc/MHonArc/CharEnt/CP1256.pm
-lib/mhonarc/MHonArc/CharEnt/CP1257.pm
-lib/mhonarc/MHonArc/CharEnt/CP1258.pm
-lib/mhonarc/MHonArc/CharEnt/CP866.pm
-lib/mhonarc/MHonArc/CharEnt/CP932.pm
-lib/mhonarc/MHonArc/CharEnt/CP936.pm
-lib/mhonarc/MHonArc/CharEnt/CP949.pm
-lib/mhonarc/MHonArc/CharEnt/CP950.pm
-lib/mhonarc/MHonArc/CharEnt/EUC_JP.pm
-lib/mhonarc/MHonArc/CharEnt/GB2312.pm
-lib/mhonarc/MHonArc/CharEnt/GOST19768_87.pm
-lib/mhonarc/MHonArc/CharEnt/HP_ROMAN8.pm
-lib/mhonarc/MHonArc/CharEnt/ISO8859_1.pm
-lib/mhonarc/MHonArc/CharEnt/ISO8859_10.pm
-lib/mhonarc/MHonArc/CharEnt/ISO8859_11.pm
-lib/mhonarc/MHonArc/CharEnt/ISO8859_13.pm
-lib/mhonarc/MHonArc/CharEnt/ISO8859_14.pm
-lib/mhonarc/MHonArc/CharEnt/ISO8859_15.pm
-lib/mhonarc/MHonArc/CharEnt/ISO8859_16.pm
-lib/mhonarc/MHonArc/CharEnt/ISO8859_2.pm
-lib/mhonarc/MHonArc/CharEnt/ISO8859_3.pm
-lib/mhonarc/MHonArc/CharEnt/ISO8859_4.pm
-lib/mhonarc/MHonArc/CharEnt/ISO8859_5.pm
-lib/mhonarc/MHonArc/CharEnt/ISO8859_6.pm
-lib/mhonarc/MHonArc/CharEnt/ISO8859_7.pm
-lib/mhonarc/MHonArc/CharEnt/ISO8859_8.pm
-lib/mhonarc/MHonArc/CharEnt/ISO8859_9.pm
-lib/mhonarc/MHonArc/CharEnt/KOI8_A.pm
-lib/mhonarc/MHonArc/CharEnt/KOI8_B.pm
-lib/mhonarc/MHonArc/CharEnt/KOI8_E.pm
-lib/mhonarc/MHonArc/CharEnt/KOI8_F.pm
-lib/mhonarc/MHonArc/CharEnt/KOI8_R.pm
-lib/mhonarc/MHonArc/CharEnt/KOI8_U.pm
-lib/mhonarc/MHonArc/CharEnt/KOI_0.pm
-lib/mhonarc/MHonArc/CharEnt/KOI_7.pm
-lib/mhonarc/MHonArc/CharEnt/VISCII.pm
-lib/mhonarc/MHonArc/CharMaps.pm
-lib/mhonarc/MHonArc/Encode.pm
-lib/mhonarc/MHonArc/RFC822.pm
-lib/mhonarc/MHonArc/UTF8.pm
-lib/mhonarc/MHonArc/UTF8/AppleArabic.pm
-lib/mhonarc/MHonArc/UTF8/AppleCenteuro.pm
-lib/mhonarc/MHonArc/UTF8/AppleCroatian.pm
-lib/mhonarc/MHonArc/UTF8/AppleCyrillic.pm
-lib/mhonarc/MHonArc/UTF8/AppleGreek.pm
-lib/mhonarc/MHonArc/UTF8/AppleHebrew.pm
-lib/mhonarc/MHonArc/UTF8/AppleIceland.pm
-lib/mhonarc/MHonArc/UTF8/AppleRoman.pm
-lib/mhonarc/MHonArc/UTF8/AppleRomanian.pm
-lib/mhonarc/MHonArc/UTF8/AppleThai.pm
-lib/mhonarc/MHonArc/UTF8/AppleTurkish.pm
-lib/mhonarc/MHonArc/UTF8/BIG5_ETEN.pm
-lib/mhonarc/MHonArc/UTF8/BIG5_HKSCS.pm
-lib/mhonarc/MHonArc/UTF8/CP1250.pm
-lib/mhonarc/MHonArc/UTF8/CP1251.pm
-lib/mhonarc/MHonArc/UTF8/CP1252.pm
-lib/mhonarc/MHonArc/UTF8/CP1253.pm
-lib/mhonarc/MHonArc/UTF8/CP1254.pm
-lib/mhonarc/MHonArc/UTF8/CP1255.pm
-lib/mhonarc/MHonArc/UTF8/CP1256.pm
-lib/mhonarc/MHonArc/UTF8/CP1257.pm
-lib/mhonarc/MHonArc/UTF8/CP1258.pm
-lib/mhonarc/MHonArc/UTF8/CP866.pm
-lib/mhonarc/MHonArc/UTF8/CP932.pm
-lib/mhonarc/MHonArc/UTF8/CP936.pm
-lib/mhonarc/MHonArc/UTF8/CP949.pm
-lib/mhonarc/MHonArc/UTF8/CP950.pm
-lib/mhonarc/MHonArc/UTF8/EUC_JP.pm
-lib/mhonarc/MHonArc/UTF8/Encode.pm
-lib/mhonarc/MHonArc/UTF8/GB2312.pm
-lib/mhonarc/MHonArc/UTF8/GOST19768_87.pm
-lib/mhonarc/MHonArc/UTF8/HP_ROMAN8.pm
-lib/mhonarc/MHonArc/UTF8/ISO8859_1.pm
-lib/mhonarc/MHonArc/UTF8/ISO8859_10.pm
-lib/mhonarc/MHonArc/UTF8/ISO8859_11.pm
-lib/mhonarc/MHonArc/UTF8/ISO8859_13.pm
-lib/mhonarc/MHonArc/UTF8/ISO8859_14.pm
-lib/mhonarc/MHonArc/UTF8/ISO8859_15.pm
-lib/mhonarc/MHonArc/UTF8/ISO8859_16.pm
-lib/mhonarc/MHonArc/UTF8/ISO8859_2.pm
-lib/mhonarc/MHonArc/UTF8/ISO8859_3.pm
-lib/mhonarc/MHonArc/UTF8/ISO8859_4.pm
-lib/mhonarc/MHonArc/UTF8/ISO8859_5.pm
-lib/mhonarc/MHonArc/UTF8/ISO8859_6.pm
-lib/mhonarc/MHonArc/UTF8/ISO8859_7.pm
-lib/mhonarc/MHonArc/UTF8/ISO8859_8.pm
-lib/mhonarc/MHonArc/UTF8/ISO8859_9.pm
-lib/mhonarc/MHonArc/UTF8/KOI8_A.pm
-lib/mhonarc/MHonArc/UTF8/KOI8_B.pm
-lib/mhonarc/MHonArc/UTF8/KOI8_E.pm
-lib/mhonarc/MHonArc/UTF8/KOI8_F.pm
-lib/mhonarc/MHonArc/UTF8/KOI8_R.pm
-lib/mhonarc/MHonArc/UTF8/KOI8_U.pm
-lib/mhonarc/MHonArc/UTF8/KOI_0.pm
-lib/mhonarc/MHonArc/UTF8/KOI_7.pm
-lib/mhonarc/MHonArc/UTF8/MapUTF8.pm
-lib/mhonarc/MHonArc/UTF8/MhaEncode.pm
-lib/mhonarc/MHonArc/UTF8/VISCII.pm
-lib/mhonarc/base64.pl
-lib/mhonarc/ewhutil.pl
-lib/mhonarc/iso2022jp.pl
-lib/mhonarc/iso8859.pl
-lib/mhonarc/mhamain.pl
-lib/mhonarc/mhdb.pl
-lib/mhonarc/mhdysub.pl
-lib/mhonarc/mhexternal.pl
-lib/mhonarc/mhfile.pl
-lib/mhonarc/mhidxrc.pl
-lib/mhonarc/mhindex.pl
-lib/mhonarc/mhinit.pl
-lib/mhonarc/mhlock.pl
-lib/mhonarc/mhmimetypes.pl
-lib/mhonarc/mhmsgextbody.pl
-lib/mhonarc/mhmsgfile.pl
-lib/mhonarc/mhnote.pl
-lib/mhonarc/mhnull.pl
-lib/mhonarc/mhopt.pl
-lib/mhonarc/mhrcfile.pl
-lib/mhonarc/mhrcvars.pl
-lib/mhonarc/mhrmm.pl
-lib/mhonarc/mhscan.pl
-lib/mhonarc/mhsingle.pl
-lib/mhonarc/mhthread.pl
-lib/mhonarc/mhtime.pl
-lib/mhonarc/mhtxtenrich.pl
-lib/mhonarc/mhtxthtml.pl
-lib/mhonarc/mhtxtplain.pl
-lib/mhonarc/mhtxttsv.pl
-lib/mhonarc/mhusage.pl
-lib/mhonarc/mhutil.pl
-lib/mhonarc/osinit.pl
-lib/mhonarc/qprint.pl
-lib/mhonarc/readmail.pl
-man/man1/mha-dbedit.1
-man/man1/mha-dbrecover.1
-man/man1/mha-decode.1
-man/man1/mhonarc.1
-share/doc/mhonarc/app-api.html
-share/doc/mhonarc/app-bugs.html
-share/doc/mhonarc/app-diagnos.html
-share/doc/mhonarc/app-mimeconf.html
-share/doc/mhonarc/app-rcfileexs.html
-share/doc/mhonarc/app-rcidx.html
-share/doc/mhonarc/app-utilsprg.html
-share/doc/mhonarc/blank.png
-share/doc/mhonarc/bug.png
-share/doc/mhonarc/commontasks.html
-share/doc/mhonarc/contacts.html
-share/doc/mhonarc/faq.png
-share/doc/mhonarc/faq/about.html
-share/doc/mhonarc/faq/archives.html
-share/doc/mhonarc/faq/envs.html
-share/doc/mhonarc/faq/faq.html
-share/doc/mhonarc/faq/general.html
-share/doc/mhonarc/faq/indexpgs.html
-share/doc/mhonarc/faq/mime.html
-share/doc/mhonarc/faq/monicon.png
-share/doc/mhonarc/faq/monsmall_t.png
-share/doc/mhonarc/faq/msgpgs.html
-share/doc/mhonarc/faq/security.html
-share/doc/mhonarc/faq/threads.html
-share/doc/mhonarc/faq/usage.html
-share/doc/mhonarc/home.png
-share/doc/mhonarc/index.html
-share/doc/mhonarc/install.html
-share/doc/mhonarc/intro.html
-share/doc/mhonarc/layout.html
-share/doc/mhonarc/mhonarc.html
-share/doc/mhonarc/monicon.png
-share/doc/mhonarc/next.png
-share/doc/mhonarc/prev.png
-share/doc/mhonarc/quickstart.html
-share/doc/mhonarc/rcfileexs/blog.mrc.html
-share/doc/mhonarc/rcfileexs/date.mrc.html
-share/doc/mhonarc/rcfileexs/def-mime.mrc.html
-share/doc/mhonarc/rcfileexs/frames.mrc.html
-share/doc/mhonarc/rcfileexs/icons.mrc.html
-share/doc/mhonarc/rcfileexs/subject.mrc.html
-share/doc/mhonarc/rcfileexs/utf-8-encode.mrc.html
-share/doc/mhonarc/rcfileexs/utf-8.mrc.html
-share/doc/mhonarc/rcvars.html
-share/doc/mhonarc/relnotes.html
-share/doc/mhonarc/resources.html
-share/doc/mhonarc/resources/add.html
-share/doc/mhonarc/resources/addressmodifycode.html
-share/doc/mhonarc/resources/afs.html
-share/doc/mhonarc/resources/annotate.html
-share/doc/mhonarc/resources/archive.html
-share/doc/mhonarc/resources/attachmentdir.html
-share/doc/mhonarc/resources/attachmenturl.html
-share/doc/mhonarc/resources/authorbegin.html
-share/doc/mhonarc/resources/authorend.html
-share/doc/mhonarc/resources/authsort.html
-share/doc/mhonarc/resources/botlinks.html
-share/doc/mhonarc/resources/charsetaliases.html
-share/doc/mhonarc/resources/charsetconverters.html
-share/doc/mhonarc/resources/checknoarchive.html
-share/doc/mhonarc/resources/conlen.html
-share/doc/mhonarc/resources/datefields.html
-share/doc/mhonarc/resources/daybegin.html
-share/doc/mhonarc/resources/dayend.html
-share/doc/mhonarc/resources/dbfile.html
-share/doc/mhonarc/resources/dbfileperms.html
-share/doc/mhonarc/resources/decodeheads.html
-share/doc/mhonarc/resources/defcharset.html
-share/doc/mhonarc/resources/definederived.html
-share/doc/mhonarc/resources/definevar.html
-share/doc/mhonarc/resources/defrcfile.html
-share/doc/mhonarc/resources/defrcname.html
-share/doc/mhonarc/resources/doc.html
-share/doc/mhonarc/resources/docurl.html
-share/doc/mhonarc/resources/editidx.html
-share/doc/mhonarc/resources/excs.html
-share/doc/mhonarc/resources/expireage.html
-share/doc/mhonarc/resources/expiredate.html
-share/doc/mhonarc/resources/fasttempfiles.html
-share/doc/mhonarc/resources/fieldorder.html
-share/doc/mhonarc/resources/fieldsbeg.html
-share/doc/mhonarc/resources/fieldsend.html
-share/doc/mhonarc/resources/fieldstore.html
-share/doc/mhonarc/resources/fieldstyles.html
-share/doc/mhonarc/resources/fileperms.html
-share/doc/mhonarc/resources/firstpglink.html
-share/doc/mhonarc/resources/fldbeg.html
-share/doc/mhonarc/resources/fldend.html
-share/doc/mhonarc/resources/folrefs.html
-share/doc/mhonarc/resources/folupbegin.html
-share/doc/mhonarc/resources/folupend.html
-share/doc/mhonarc/resources/foluplitxt.html
-share/doc/mhonarc/resources/force.html
-share/doc/mhonarc/resources/fromfields.html
-share/doc/mhonarc/resources/genidx.html
-share/doc/mhonarc/resources/gmtdatefmt.html
-share/doc/mhonarc/resources/gzipexe.html
-share/doc/mhonarc/resources/gzipfiles.html
-share/doc/mhonarc/resources/gziplinks.html
-share/doc/mhonarc/resources/headbodysep.html
-share/doc/mhonarc/resources/htmlext.html
-share/doc/mhonarc/resources/icons.html
-share/doc/mhonarc/resources/iconurlprefix.html
-share/doc/mhonarc/resources/idxfname.html
-share/doc/mhonarc/resources/idxlabel.html
-share/doc/mhonarc/resources/idxpgbegin.html
-share/doc/mhonarc/resources/idxpgend.html
-share/doc/mhonarc/resources/idxpgssmarkup.html
-share/doc/mhonarc/resources/idxprefix.html
-share/doc/mhonarc/resources/idxsize.html
-share/doc/mhonarc/resources/include.html
-share/doc/mhonarc/resources/keeponrmm.html
-share/doc/mhonarc/resources/labelbeg.html
-share/doc/mhonarc/resources/labelend.html
-share/doc/mhonarc/resources/labelstyles.html
-share/doc/mhonarc/resources/lang.html
-share/doc/mhonarc/resources/lastpglink.html
-share/doc/mhonarc/resources/listbegin.html
-share/doc/mhonarc/resources/listend.html
-share/doc/mhonarc/resources/litemplate.html
-share/doc/mhonarc/resources/localdatefmt.html
-share/doc/mhonarc/resources/lock.html
-share/doc/mhonarc/resources/lockdelay.html
-share/doc/mhonarc/resources/lockfile.html
-share/doc/mhonarc/resources/lockmethod.html
-share/doc/mhonarc/resources/locktries.html
-share/doc/mhonarc/resources/mailto.html
-share/doc/mhonarc/resources/mailtourl.html
-share/doc/mhonarc/resources/main.html
-share/doc/mhonarc/resources/maxsize.html
-share/doc/mhonarc/resources/mhpattern.html
-share/doc/mhonarc/resources/mimealtprefs.html
-share/doc/mhonarc/resources/mimeargs.html
-share/doc/mhonarc/resources/mimedecoders.html
-share/doc/mhonarc/resources/mimeexcs.html
-share/doc/mhonarc/resources/mimefilters.html
-share/doc/mhonarc/resources/mimeincs.html
-share/doc/mhonarc/resources/modifybodyaddresses.html
-share/doc/mhonarc/resources/modtime.html
-share/doc/mhonarc/resources/months.html
-share/doc/mhonarc/resources/monthsabr.html
-share/doc/mhonarc/resources/msgbodyend.html
-share/doc/mhonarc/resources/msgexcfilter.html
-share/doc/mhonarc/resources/msgfoot.html
-share/doc/mhonarc/resources/msggmtdatefmt.html
-share/doc/mhonarc/resources/msghead.html
-share/doc/mhonarc/resources/msgidlink.html
-share/doc/mhonarc/resources/msglocaldatefmt.html
-share/doc/mhonarc/resources/msgpgbegin.html
-share/doc/mhonarc/resources/msgpgend.html
-share/doc/mhonarc/resources/msgpgs.html
-share/doc/mhonarc/resources/msgpgssmarkup.html
-share/doc/mhonarc/resources/msgprefix.html
-share/doc/mhonarc/resources/msgsep.html
-share/doc/mhonarc/resources/multipg.html
-share/doc/mhonarc/resources/news.html
-share/doc/mhonarc/resources/newsurl.html
-share/doc/mhonarc/resources/nextbutton.html
-share/doc/mhonarc/resources/nextbuttonia.html
-share/doc/mhonarc/resources/nextlink.html
-share/doc/mhonarc/resources/nextlinkia.html
-share/doc/mhonarc/resources/nextpglink.html
-share/doc/mhonarc/resources/nextpglinkia.html
-share/doc/mhonarc/resources/nosubjecttxt.html
-share/doc/mhonarc/resources/note.html
-share/doc/mhonarc/resources/notedir.html
-share/doc/mhonarc/resources/noteia.html
-share/doc/mhonarc/resources/notetext.html
-share/doc/mhonarc/resources/otherindexes.html
-share/doc/mhonarc/resources/outdir.html
-share/doc/mhonarc/resources/perlinc.html
-share/doc/mhonarc/resources/posixstrftime.html
-share/doc/mhonarc/resources/prevbutton.html
-share/doc/mhonarc/resources/prevbuttonia.html
-share/doc/mhonarc/resources/prevlink.html
-share/doc/mhonarc/resources/prevlinkia.html
-share/doc/mhonarc/resources/prevpglink.html
-share/doc/mhonarc/resources/prevpglinkia.html
-share/doc/mhonarc/resources/printxcomments.html
-share/doc/mhonarc/resources/quiet.html
-share/doc/mhonarc/resources/rcfile.html
-share/doc/mhonarc/resources/reconvert.html
-share/doc/mhonarc/resources/refsbegin.html
-share/doc/mhonarc/resources/refsend.html
-share/doc/mhonarc/resources/refslitxt.html
-share/doc/mhonarc/resources/reverse.html
-share/doc/mhonarc/resources/rmm.html
-share/doc/mhonarc/resources/saveresources.html
-share/doc/mhonarc/resources/scan.html
-share/doc/mhonarc/resources/single.html
-share/doc/mhonarc/resources/sort.html
-share/doc/mhonarc/resources/spammode.html
-share/doc/mhonarc/resources/ssmarkup.html
-share/doc/mhonarc/resources/stderr.html
-share/doc/mhonarc/resources/stdin.html
-share/doc/mhonarc/resources/stdout.html
-share/doc/mhonarc/resources/subjectarticlerxp.html
-share/doc/mhonarc/resources/subjectbegin.html
-share/doc/mhonarc/resources/subjectend.html
-share/doc/mhonarc/resources/subjectheader.html
-share/doc/mhonarc/resources/subjectreplyrxp.html
-share/doc/mhonarc/resources/subjectstripcode.html
-share/doc/mhonarc/resources/subjectthreads.html
-share/doc/mhonarc/resources/subsort.html
-share/doc/mhonarc/resources/tcontbegin.html
-share/doc/mhonarc/resources/tcontend.html
-share/doc/mhonarc/resources/tendbutton.html
-share/doc/mhonarc/resources/tendbuttonia.html
-share/doc/mhonarc/resources/tendlink.html
-share/doc/mhonarc/resources/tendlinkia.html
-share/doc/mhonarc/resources/textclipfunc.html
-share/doc/mhonarc/resources/textencode.html
-share/doc/mhonarc/resources/tfirstpglink.html
-share/doc/mhonarc/resources/tfoot.html
-share/doc/mhonarc/resources/thead.html
-share/doc/mhonarc/resources/thread.html
-share/doc/mhonarc/resources/tidxfname.html
-share/doc/mhonarc/resources/tidxlabel.html
-share/doc/mhonarc/resources/tidxpgbegin.html
-share/doc/mhonarc/resources/tidxpgend.html
-share/doc/mhonarc/resources/tidxpgssmarkup.html
-share/doc/mhonarc/resources/tidxprefix.html
-share/doc/mhonarc/resources/timezones.html
-share/doc/mhonarc/resources/tindentbegin.html
-share/doc/mhonarc/resources/tindentend.html
-share/doc/mhonarc/resources/title.html
-share/doc/mhonarc/resources/tlastpglink.html
-share/doc/mhonarc/resources/tlevels.html
-share/doc/mhonarc/resources/tliend.html
-share/doc/mhonarc/resources/tlinone.html
-share/doc/mhonarc/resources/tlinoneend.html
-share/doc/mhonarc/resources/tlitxt.html
-share/doc/mhonarc/resources/tnextbutton.html
-share/doc/mhonarc/resources/tnextbuttonia.html
-share/doc/mhonarc/resources/tnextinbutton.html
-share/doc/mhonarc/resources/tnextinbuttonia.html
-share/doc/mhonarc/resources/tnextinlink.html
-share/doc/mhonarc/resources/tnextinlinkia.html
-share/doc/mhonarc/resources/tnextlink.html
-share/doc/mhonarc/resources/tnextlinkia.html
-share/doc/mhonarc/resources/tnextpglink.html
-share/doc/mhonarc/resources/tnextpglinkia.html
-share/doc/mhonarc/resources/tnexttopbutton.html
-share/doc/mhonarc/resources/tnexttopbuttonia.html
-share/doc/mhonarc/resources/tnexttoplink.html
-share/doc/mhonarc/resources/tnexttoplinkia.html
-share/doc/mhonarc/resources/toplinks.html
-share/doc/mhonarc/resources/tprevbutton.html
-share/doc/mhonarc/resources/tprevbuttonia.html
-share/doc/mhonarc/resources/tprevinbutton.html
-share/doc/mhonarc/resources/tprevinbuttonia.html
-share/doc/mhonarc/resources/tprevinlink.html
-share/doc/mhonarc/resources/tprevinlinkia.html
-share/doc/mhonarc/resources/tprevlink.html
-share/doc/mhonarc/resources/tprevlinkia.html
-share/doc/mhonarc/resources/tprevpglink.html
-share/doc/mhonarc/resources/tprevpglinkia.html
-share/doc/mhonarc/resources/tprevtopbutton.html
-share/doc/mhonarc/resources/tprevtopbuttonia.html
-share/doc/mhonarc/resources/tprevtoplink.html
-share/doc/mhonarc/resources/tprevtoplinkia.html
-share/doc/mhonarc/resources/treverse.html
-share/doc/mhonarc/resources/tsingletxt.html
-share/doc/mhonarc/resources/tslice.html
-share/doc/mhonarc/resources/tslicebeg.html
-share/doc/mhonarc/resources/tslicecontbeg.html
-share/doc/mhonarc/resources/tslicecontend.html
-share/doc/mhonarc/resources/tsliceend.html
-share/doc/mhonarc/resources/tsliceindentbeg.html
-share/doc/mhonarc/resources/tsliceindentend.html
-share/doc/mhonarc/resources/tslicelevels.html
-share/doc/mhonarc/resources/tsliceliend.html
-share/doc/mhonarc/resources/tsliceliendcur.html
-share/doc/mhonarc/resources/tslicelinone.html
-share/doc/mhonarc/resources/tslicelinoneend.html
-share/doc/mhonarc/resources/tslicelitxt.html
-share/doc/mhonarc/resources/tslicelitxtcur.html
-share/doc/mhonarc/resources/tslicesingletxt.html
-share/doc/mhonarc/resources/tslicesingletxtcur.html
-share/doc/mhonarc/resources/tslicesubjectbeg.html
-share/doc/mhonarc/resources/tslicesubjectend.html
-share/doc/mhonarc/resources/tslicesublistbeg.html
-share/doc/mhonarc/resources/tslicesublistend.html
-share/doc/mhonarc/resources/tslicetopbeg.html
-share/doc/mhonarc/resources/tslicetopbegcur.html
-share/doc/mhonarc/resources/tslicetopend.html
-share/doc/mhonarc/resources/tslicetopendcur.html
-share/doc/mhonarc/resources/tsort.html
-share/doc/mhonarc/resources/tsubjectbeg.html
-share/doc/mhonarc/resources/tsubjectend.html
-share/doc/mhonarc/resources/tsublistbeg.html
-share/doc/mhonarc/resources/tsublistend.html
-share/doc/mhonarc/resources/tsubsort.html
-share/doc/mhonarc/resources/ttitle.html
-share/doc/mhonarc/resources/ttopbegin.html
-share/doc/mhonarc/resources/ttopbutton.html
-share/doc/mhonarc/resources/ttopbuttonia.html
-share/doc/mhonarc/resources/ttopend.html
-share/doc/mhonarc/resources/ttoplink.html
-share/doc/mhonarc/resources/ttoplinkia.html
-share/doc/mhonarc/resources/umask.html
-share/doc/mhonarc/resources/uselocaltime.html
-share/doc/mhonarc/resources/usinglastpg.html
-share/doc/mhonarc/resources/varregex.html
-share/doc/mhonarc/resources/weekdays.html
-share/doc/mhonarc/resources/weekdaysabr.html
-share/doc/mhonarc/ssbg75.jpg
-share/doc/mhonarc/stampwb2.png
-share/doc/mhonarc/up.png
-@dirrm share/doc/mhonarc/resources
-@dirrm share/doc/mhonarc/rcfileexs
-@dirrm share/doc/mhonarc/faq
-@dirrm share/doc/mhonarc
-@dirrm lib/mhonarc/MHonArc/UTF8
-@dirrm lib/mhonarc/MHonArc/CharEnt
-@dirrm lib/mhonarc/MHonArc/Char
-@dirrm lib/mhonarc/MHonArc
-@dirrm lib/mhonarc
diff --git a/mail/mhonarc/distinfo b/mail/mhonarc/distinfo
deleted file mode 100644
index 9bf54a7dacf..00000000000
--- a/mail/mhonarc/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.15 2007/02/28 16:04:16 jwise Exp $
-
-SHA1 (MHonArc-2.6.16.tar.bz2) = 8b803a610805fe736036c3dcd2596e2e416a886b
-RMD160 (MHonArc-2.6.16.tar.bz2) = 31d6659fabdb00b4d4594eda9f5985bd5f3f33b8
-Size (MHonArc-2.6.16.tar.bz2) = 1562490 bytes
diff --git a/mail/milter-greylist/DESCR b/mail/milter-greylist/DESCR
deleted file mode 100644
index ef605eba442..00000000000
--- a/mail/milter-greylist/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Grey listing is a wonderful spam filtering technique, which uses a
-behavior trick: spammers never resend a message when they get a
-temporary error, whereas real MTA do. The idea is to refuse any mail
-on first attempt, and accept it after some time has elapsed.
-
-milter-greylist is a stand-alone milter written in C that implement
-grey listing. It has been reported as efficient and easy to setup
-by a large number of system administrators.
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
deleted file mode 100644
index b87c4e658da..00000000000
--- a/mail/milter-greylist/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.31 2007/03/07 17:33:51 gdt Exp $
-
-DISTNAME= milter-greylist-3.0
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= tron@NetBSD.org
-HOMEPAGE= http://hcpnet.free.fr/milter-greylist/
-COMMENT= Easy-to-use greylist milter for sendmail
-
-
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --with-user=smmsp
-
-BUILD_TARGET= milter-greylist
-
-PKG_GROUPS= smmsp
-PKG_USERS= smmsp:smmsp
-PKG_GECOS.smmsp= Sendmail Message Submission Program
-
-RCD_SCRIPTS= milter-greylist
-
-.include "options.mk"
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/milter-greylist
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/milter-greylist
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/milter-greylist
- ${INSTALL_DATA} ${WRKSRC}/greylist.conf \
- ${PREFIX}/share/examples/milter-greylist
-
-.include "../../mail/libmilter/buildlink3.mk"
-.include "../../mail/libspf-alt/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/milter-greylist/PLIST b/mail/milter-greylist/PLIST
deleted file mode 100644
index c40da88d628..00000000000
--- a/mail/milter-greylist/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2005/05/02 20:34:00 reed Exp $
-bin/milter-greylist
-man/man8/milter-greylist.8
-man/man5/greylist.conf.5
-share/doc/milter-greylist/README
-share/examples/milter-greylist/greylist.conf
-share/examples/rc.d/milter-greylist
-@dirrm share/examples/milter-greylist
-@dirrm share/doc/milter-greylist
diff --git a/mail/milter-greylist/distinfo b/mail/milter-greylist/distinfo
deleted file mode 100644
index 3d17ab87de6..00000000000
--- a/mail/milter-greylist/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.18 2007/03/07 17:33:51 gdt Exp $
-
-SHA1 (milter-greylist-3.0.tgz) = 38b334300fe1141a8329fe198754e63286981129
-RMD160 (milter-greylist-3.0.tgz) = 6391883be9076b1f790ab582070b152b80e2050c
-Size (milter-greylist-3.0.tgz) = 141461 bytes
-SHA1 (patch-aa) = 2e31f7db50a8aac45e21e4ae4642d0c6631e8c78
-SHA1 (patch-ab) = c2f0859a0b9353c59810c330fbaddb9f7634daee
-SHA1 (patch-ac) = 7409182f4d5870615183e9e3d4baa27084a4c4d5
diff --git a/mail/milter-greylist/files/milter-greylist.sh b/mail/milter-greylist/files/milter-greylist.sh
deleted file mode 100644
index 3334cf73790..00000000000
--- a/mail/milter-greylist/files/milter-greylist.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: milter-greylist.sh,v 1.3 2006/02/11 23:14:15 seb Exp $
-#
-
-# PROVIDE: milter-greylist
-# REQUIRE: DAEMON
-# BEFORE: mail
-
-name="miltergreylist"
-rcvar="miltergreylist"
-command="@PREFIX@/bin/milter-greylist"
-command_args="-p /var/milter-greylist/milter-greylist.sock -u smmsp"
-
-if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
- . /etc/rc.subr
- . /etc/rc.conf
-
- load_rc_config $name
- run_rc_command "$1"
-
-else # old NetBSD, Solaris, Linux, etc...
- pidfile=/var/run/${name}.pid
-
- case $1 in
- start)
- nohup ${command} -D ${command_args} </dev/null >/dev/null 1>&2 &
- echo $! >${pidfile}
-
- ;;
- stop)
- if [ -f ${pidfile} ]
- then
- kill `cat ${pidfile}`
- rm -f ${pidfile}
- fi
- ;;
- *)
- @ECHO@ "Usage: $0 {start|stop}" 1>&2
- exit 64
- ;;
- esac
-
-fi
diff --git a/mail/milter-greylist/options.mk b/mail/milter-greylist/options.mk
deleted file mode 100644
index a47af91b6e5..00000000000
--- a/mail/milter-greylist/options.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2006/11/09 13:15:10 ghen Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.milter-greylist
-PKG_SUPPORTED_OPTIONS= dnsrbl drac spf
-PKG_SUGGESTED_OPTIONS= dnsrbl spf
-
-.include "../../mk/bsd.options.mk"
-
-###
-### DNS Realtime Black List
-###
-.if empty(PKG_OPTIONS:Mdnsrbl)
-CONFIGURE_ARGS+= --disable-dnsrbl
-.else
-CONFIGURE_ARGS+= --enable-dnsrbl
-.endif
-
-###
-### Dynamic Relay Authorization Control
-###
-.if empty(PKG_OPTIONS:Mdrac)
-CONFIGURE_ARGS+= --disable-drac
-.else
-DRACD_DB?= /etc/mail/dracd.db
-
-CONFIGURE_ARGS+= --enable-drac --with-drac-db=${DRACD_DB}
-.endif
-
-###
-### Sender Policy Framework
-###
-.if !empty(PKG_OPTIONS:Mspf)
-.include "../../mail/libspf-alt/buildlink3.mk"
-
-CONFIGURE_ARGS+= --with-libspf_alt=${PREFIX:Q}
-.endif
diff --git a/mail/milter-greylist/patches/patch-aa b/mail/milter-greylist/patches/patch-aa
deleted file mode 100644
index fbc153065bd..00000000000
--- a/mail/milter-greylist/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/10/15 12:11:51 tron Exp $
-
---- Makefile.in.orig 2006-10-06 10:14:39.000000000 +0100
-+++ Makefile.in 2006-10-15 13:06:07.000000000 +0100
-@@ -121,7 +121,7 @@
- echo " ================================================"; \
- ) || ${TRUE}
-
--install: install-daemon-to-bin install-man install-conf install-db
-+install: install-daemon-to-bin install-man install-db
-
- depend:
- ${MKDEP} ${CFLAGS} ${SRC}
diff --git a/mail/milter-greylist/patches/patch-ab b/mail/milter-greylist/patches/patch-ab
deleted file mode 100644
index 99e70dc56a2..00000000000
--- a/mail/milter-greylist/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/03/07 17:33:51 gdt Exp $
-
---- autowhite.c.orig 2006-09-04 18:05:58.000000000 -0400
-+++ autowhite.c
-@@ -385,6 +385,7 @@ autowhite_textdump(stream)
- char textdate[DATELEN + 1];
- char textaddr[IPADDRSTRLEN];
- struct tm tm;
-+ time_t ti;
-
- fprintf(stream, "\n\n#\n# Auto-whitelisted tuples\n#\n");
- fprintf(stream, "# Sender IP\t%s\t%s\tExpire\n",
-@@ -401,7 +402,8 @@ autowhite_textdump(stream)
- textaddr, aw->a_from, aw->a_rcpt,
- (long)aw->a_tv.tv_sec);
- } else {
-- localtime_r((time_t *)&aw->a_tv.tv_sec, &tm);
-+ ti = aw->a_tv.tv_sec; /* types do not match */
-+ localtime_r(&ti, &tm);
- strftime(textdate, DATELEN, "%Y-%m-%d %T", &tm);
-
- fprintf(stream,
diff --git a/mail/milter-greylist/patches/patch-ac b/mail/milter-greylist/patches/patch-ac
deleted file mode 100644
index 0b39726b0b3..00000000000
--- a/mail/milter-greylist/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/03/07 17:33:51 gdt Exp $
-
---- pending.c.orig 2006-09-04 18:05:59.000000000 -0400
-+++ pending.c
-@@ -403,6 +403,7 @@ pending_textdump(stream)
- int done = 0;
- char textdate[DATELEN + 1];
- struct tm tm;
-+ time_t ti;
-
- fprintf(stream, "\n\n#\n# greylisted tuples\n#\n");
- fprintf(stream, "# Sender IP\t%s\t%s\tTime accepted\n",
-@@ -416,7 +417,8 @@ pending_textdump(stream)
- pending->p_addr, pending->p_from,
- pending->p_rcpt, (long)pending->p_tv.tv_sec);
- } else {
-- localtime_r((time_t *)&pending->p_tv.tv_sec, &tm);
-+ ti = pending->p_tv.tv_sec;
-+ localtime_r(&ti, &tm);
- strftime(textdate, DATELEN, "%Y-%m-%d %T", &tm);
-
- fprintf(stream, "%s\t%s\t%s\t%ld # %s\n",
diff --git a/mail/milter-regex/DESCR b/mail/milter-regex/DESCR
deleted file mode 100644
index f85755f1a2c..00000000000
--- a/mail/milter-regex/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-The milter-regex plugin can be used with the milter API of sendmail(8) to
-filter mails using regular expressions matching SMTP envelope parameters
-and mail headers and body.
diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile
deleted file mode 100644
index 889c11852f0..00000000000
--- a/mail/milter-regex/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:58 rillig Exp $
-
-DISTNAME= milter-regex-1.6
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= http://www.benzedrine.cx/
-
-MAINTAINER= jdarrow@NetBSD.org
-HOMEPAGE= http://www.benzedrine.cx/milter-regex.html
-COMMENT= Milter enabling regular expression filtering
-
-INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin
-
-PKG_GROUPS= smmsp
-PKG_USERS= smmsp:smmsp
-PKG_GECOS.smmsp= Sendmail Message Submission Program
-
-RCD_SCRIPTS= milter-regex
-
-SUBST_CLASSES+= etc
-SUBST_STAGE.etc= do-configure
-SUBST_FILES.etc= milter-regex.8 milter-regex.c
-SUBST_SED.etc= -e 's|/etc|${PKG_SYSCONFDIR}|g'
-
-SUBST_CLASSES+= var
-SUBST_STAGE.var= do-configure
-SUBST_FILES.var= milter-regex.8 milter-regex.c
-SUBST_SED.var= -e 's|/var/spool|${VARBASE}|g'
-
-# Work arround to avoid naming clash between the source directory
-# and our "rc.d" script.
-post-extract:
- ${MV} ${WRKDIR}/${PKGBASE} ${WRKSRC}
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/milter-regex ${PREFIX}/sbin
- ${INSTALL_DATA} ${WRKSRC}/milter-regex.8 ${PREFIX}/${PKGMANDIR}/man8
-
-.include "../../mail/libmilter/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/milter-regex/PLIST b/mail/milter-regex/PLIST
deleted file mode 100644
index 16cdbe57b3c..00000000000
--- a/mail/milter-regex/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/03/08 22:01:21 tron Exp $
-sbin/milter-regex
-man/man8/milter-regex.8
-share/examples/rc.d/milter-regex
diff --git a/mail/milter-regex/distinfo b/mail/milter-regex/distinfo
deleted file mode 100644
index 123068c834f..00000000000
--- a/mail/milter-regex/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.8 2006/06/14 19:24:15 tron Exp $
-
-SHA1 (milter-regex-1.6.tar.gz) = 4035f9ed20b54bc9c8409b1e7ffffde86dfc61af
-RMD160 (milter-regex-1.6.tar.gz) = 1cb60a063ac3e7cada2c9800710c6a0cc4862174
-Size (milter-regex-1.6.tar.gz) = 16969 bytes
-SHA1 (patch-aa) = fdeaa835b6827f7deced58bf0c26a69e8bfca1f6
-SHA1 (patch-ab) = 07054cd076dfd54e1536ad1bf4dcbf7faa383f51
-SHA1 (patch-ac) = 1877281e0c53065c4d81a565bf55ef6927077d25
diff --git a/mail/milter-regex/files/milter-regex.sh b/mail/milter-regex/files/milter-regex.sh
deleted file mode 100644
index 41315637de7..00000000000
--- a/mail/milter-regex/files/milter-regex.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: milter-regex.sh,v 1.1 2006/03/08 22:01:21 tron Exp $
-#
-
-# PROVIDE: milter-regex
-# REQUIRE: DAEMON
-# BEFORE: mail
-
-name="milterregex"
-rcvar="milterregex"
-command="@PREFIX@/sbin/milter-regex"
-command_args="-u smmsp"
-
-if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
- . /etc/rc.subr
- . /etc/rc.conf
-
- load_rc_config $name
- run_rc_command "$1"
-
-else # old NetBSD, Solaris, Linux, etc...
- pidfile=/var/run/${name}.pid
-
- case $1 in
- start)
- nohup ${command} -D ${command_args} </dev/null >/dev/null 1>&2 &
- echo $! >${pidfile}
-
- ;;
- stop)
- if [ -f ${pidfile} ]
- then
- kill `cat ${pidfile}`
- rm -f ${pidfile}
- fi
- ;;
- *)
- @ECHO@ "Usage: $0 {start|stop}" 1>&2
- exit 64
- ;;
- esac
-
-fi
diff --git a/mail/milter-regex/patches/patch-aa b/mail/milter-regex/patches/patch-aa
deleted file mode 100644
index 9967a38be21..00000000000
--- a/mail/milter-regex/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/06/14 19:13:00 tron Exp $
-
---- milter-regex.c.orig 2005-03-06 11:42:53.000000000 +0000
-+++ milter-regex.c 2006-06-14 20:03:06.000000000 +0100
-@@ -561,7 +561,7 @@
- const char *ofile = NULL;
-
- tzset();
-- openlog("milter-regex", LOG_PID | LOG_NDELAY, LOG_DAEMON);
-+ openlog("milter-regex", LOG_PID | LOG_NDELAY, LOG_MAIL);
-
- while ((ch = getopt(argc, argv, "c:dp:u:")) != -1) {
- switch (ch) {
-@@ -609,7 +609,7 @@
- return (1);
- }
- if (
--#if ! ( __linux__ || __sun__ )
-+#if ! ( __linux__ || __sun__ || __NetBSD__ || defined(__DragonFly__) )
- seteuid(pw->pw_uid) ||
- #endif
- setuid(pw->pw_uid)) {
diff --git a/mail/milter-regex/patches/patch-ab b/mail/milter-regex/patches/patch-ab
deleted file mode 100644
index 4d5962e34ed..00000000000
--- a/mail/milter-regex/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/04/30 17:11:25 joerg Exp $
-
---- Makefile.orig 2006-04-30 17:05:50.000000000 +0000
-+++ Makefile
-@@ -6,7 +6,7 @@ MAN= milter-regex.8
-
- CFLAGS+= -Wall -Wstrict-prototypes -g
- CFLAGS+= -I/usr/src/gnu/usr.sbin/sendmail/include
--LDADD+= -lmilter -lpthread
-+LDADD+= -lmilter ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
-
- .include <bsd.prog.mk>
-
diff --git a/mail/milter-regex/patches/patch-ac b/mail/milter-regex/patches/patch-ac
deleted file mode 100644
index 745226ee90d..00000000000
--- a/mail/milter-regex/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/06/14 19:24:15 tron Exp $
-
---- milter-regex.8.orig 2004-03-13 17:21:23.000000000 +0000
-+++ milter-regex.8 2006-06-14 20:22:58.000000000 +0100
-@@ -323,7 +323,7 @@
- .Xr syslogd 8
- using
- .Em facility
--daemon and, with increasing verbosity,
-+mail and, with increasing verbosity,
- .Em level
- err, notice, info and debug.
- The following
-@@ -331,7 +331,7 @@
- section can be used to log messages to a dedicated file:
- .Bd -literal
- !milter-regex
--daemon.err;daemon.notice /var/log/milter-regex
-+mail.err;mail.notice /var/log/milter-regex
- .Ed
- .Sh GRAMMAR
- Syntax for
diff --git a/mail/mimedefang/DESCR b/mail/mimedefang/DESCR
deleted file mode 100644
index d171ad012fa..00000000000
--- a/mail/mimedefang/DESCR
+++ /dev/null
@@ -1,20 +0,0 @@
-MIMEDefang is an e-mail filter program which works with Sendmail 8.12
-and later. MIMEDefang filters all e-mail messages sent via SMTP.
-MIMEDefang splits multi-part MIME messages into their components and
-potentially deletes or modifies the various parts. It then
-reassembles the parts back into an e-mail message and sends it on its
-way.
-
-MIMEDefang is written (mostly) in Perl, and the filter actions are
-expressed in Perl. This makes MIMEDefang highly flexible and
-configurable. As a simple example, you can delete all *.exe and *.com
-files, convert all Word documents to HTML, and allow other attachments
-through.
-
-MIMEDefang uses the "milter" feature of Sendmail to "listen in" to
-SMTP connections. It runs a scan once for each message, not once for
-each recipient (as simpler procmail-based systems do.) Therefore, it
-is more CPU-friendly than procmail-based systems. In addition,
-because MIMEDefang can participate in the SMTP connection, you can
-bounce messages (something impossible to do with procmail-based
-systems.)
diff --git a/mail/mimedefang/INSTALL b/mail/mimedefang/INSTALL
deleted file mode 100644
index 72f32520158..00000000000
--- a/mail/mimedefang/INSTALL
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2002/09/23 13:08:52 markd Exp $
-
-case ${STAGE} in
-POST-INSTALL)
- if test ! -f @PKG_SYSCONFDIR@/mimedefang-ip-key ; then
- ${PERL5} @SHAREDIR@/gen-ip-validator.pl > @PKG_SYSCONFDIR@/mimedefang-ip-key
- fi
- ${CHOWN} @DEFANG_USER@ @PKG_SYSCONFDIR@/mimedefang-ip-key
- ${CHMOD} 600 @PKG_SYSCONFDIR@/mimedefang-ip-key
- ;;
-esac
diff --git a/mail/mimedefang/MESSAGE b/mail/mimedefang/MESSAGE
deleted file mode 100644
index b331cd1ca54..00000000000
--- a/mail/mimedefang/MESSAGE
+++ /dev/null
@@ -1,17 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2005/09/28 14:15:49 rillig Exp $
-
-From version 2.52 mimedefang.pl doesn't detect and load Perl modules until
-the detect_and_load_perl_modules() function is called.
-You *MUST* call detect_and_load_perl_modules() inside your filter before
-you can rely on the %Features hash being set correctly, and before you can
-rely on SpamAssassin being loaded!!!
-
-In version 2.44 the location of the sa-mimedefang.cf file moved from
-${PKG_SYSCONFDIR}/spamassassin/sa-mimedefang.cf to
-${PKG_SYSCONFDIR}/sa-mimedefang.cf
-
-From version 2.43 filter_relay no longer has access to the HELO argument,
-nor does the MIMEDefang spool directory exist when filter_relay is called.
-
-===========================================================================
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
deleted file mode 100644
index b4af5f3f627..00000000000
--- a/mail/mimedefang/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# $NetBSD: Makefile,v 1.36 2007/03/14 11:21:33 markd Exp $
-
-DISTNAME= mimedefang-2.61
-CATEGORIES= mail
-MASTER_SITES= http://www.mimedefang.org/static/
-
-MAINTAINER= markd@NetBSD.org
-HOMEPAGE= http://www.mimedefang.org/
-COMMENT= To inspect/modify e-mail as it passes through your mail relay
-
-DEPENDS+= p5-Digest-SHA1>=2.00:../../security/p5-Digest-SHA1
-DEPENDS+= p5-HTML-Parser>=3.26:../../www/p5-HTML-Parser
-DEPENDS+= p5-HTML-Tagset>=3.03:../../www/p5-HTML-Tagset
-DEPENDS+= p5-IO-stringy>=2.108:../../devel/p5-IO-stringy
-DEPENDS+= p5-MailTools>=1.44:../../mail/p5-MailTools
-DEPENDS+= p5-MIME-Base64>=2.11:../../converters/p5-MIME-Base64
-DEPENDS+= p5-MIME-tools>=5.411.1:../../mail/p5-MIME-tools
-DEPENDS+= spamassassin>=2.31:../../mail/spamassassin
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_TOOLS+= perl:run
-GNU_CONFIGURE= YES
-PKG_SYSCONFSUBDIR?= mimedefang
-
-DEFANG_SPOOLDIR?= ${VARBASE}/spool/MIMEDefang
-DEFANG_USER?= defang
-DEFANG_GROUP?= defang
-
-PKG_GROUPS= ${DEFANG_GROUP}
-PKG_USERS= ${DEFANG_USER}:${DEFANG_GROUP}
-
-BUILD_DEFS+= PKG_SYSCONFSUBDIR DEFANG_SPOOLDIR
-BUILD_DEFS+= DEFANG_USER DEFANG_GROUP VARBASE
-
-EGDIR= ${PREFIX}/share/examples/mimedefang
-SHAREDIR= ${PREFIX}/share/mimedefang
-
-FILES_SUBST+= SHAREDIR=${SHAREDIR:Q}
-FILES_SUBST+= DEFANG_USER=${DEFANG_USER:Q}
-FILES_SUBST+= DEFANG_SPOOLDIR=${DEFANG_SPOOLDIR:Q}
-
-RCD_SCRIPTS= mimedefang-multiplexor mimedefang
-
-OWN_DIRS_PERMS+= ${DEFANG_SPOOLDIR} ${DEFANG_USER} ${DEFANG_GROUP} 0700
-
-CONF_FILES+= ${EGDIR}/mimedefang-filter ${PKG_SYSCONFDIR}/mimedefang-filter
-CONF_FILES+= ${EGDIR}/sa-mimedefang.cf ${PKG_SYSCONFDIR}/sa-mimedefang.cf
-
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --with-confsubdir=
-CONFIGURE_ARGS+= --with-milterinc=${BUILDLINK_PREFIX.libmilter}/include
-CONFIGURE_ARGS+= --with-milterlib=${BUILDLINK_PREFIX.libmilter}/lib
-CONFIGURE_ARGS+= --with-spooldir=${DEFANG_SPOOLDIR:Q}
-CONFIGURE_ARGS+= --with-quarantinedir=${DEFANG_SPOOLDIR:Q}
-CONFIGURE_ARGS+= --with-user=${DEFANG_USER:Q}
-# CONFIGURE_ARGS+= --disable-anti-virus
-# list the paths where they _would_ be installed, so they
-# can be found at runtime. -- they have to be listed
-# in the environment, as the --enable-<> flags don't work
-CONFIGURE_ENV+= CLAMD=${PREFIX}/sbin/clamd
-CONFIGURE_ENV+= CLAMSCAN=${PREFIX}/bin/clamscan
-CONFIGURE_ENV+= FPROT=${PREFIX}/bin/f-prot
-CONFIGURE_ENV+= NAI=${PREFIX}/bin/uvscan
-
-# Doesn't work with pth
-PTHREAD_OPTS+= require native
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man5 ${PKGMANDIR}/man7 ${PKGMANDIR}/man8
-do-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA_DIR} ${SHAREDIR}
- ${INSTALL_DATA} ${WRKSRC}/gen-ip-validator.pl ${SHAREDIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/md-mx-ctrl ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/mimedefang-multiplexor ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/mimedefang ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/watch-mimedefang ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/mimedefang.pl ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/md-mx-ctrl.8 ${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_DATA} ${WRKSRC}/mimedefang.8 ${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_DATA} ${WRKSRC}/mimedefang.pl.8 ${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_DATA} ${WRKSRC}/mimedefang-multiplexor.8 ${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_DATA} ${WRKSRC}/watch-mimedefang.8 ${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_DATA} ${WRKSRC}/mimedefang-filter.5 ${PREFIX}/${PKGMANDIR}/man5
- ${INSTALL_DATA} ${WRKSRC}/mimedefang-protocol.7 ${PREFIX}/${PKGMANDIR}/man7
- ${INSTALL_DATA} ${WRKSRC}/examples/suggested-minimum-filter-for-windows-clients ${EGDIR}/mimedefang-filter
- ${INSTALL_DATA} ${WRKSRC}/SpamAssassin/spamassassin.cf ${EGDIR}/sa-mimedefang.cf
-
-.include "../../mail/libmilter/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mimedefang/PLIST b/mail/mimedefang/PLIST
deleted file mode 100644
index e5eff8f701f..00000000000
--- a/mail/mimedefang/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2005/05/02 20:34:00 reed Exp $
-bin/md-mx-ctrl
-bin/mimedefang
-bin/mimedefang-multiplexor
-bin/mimedefang.pl
-bin/watch-mimedefang
-man/man5/mimedefang-filter.5
-man/man7/mimedefang-protocol.7
-man/man8/md-mx-ctrl.8
-man/man8/mimedefang-multiplexor.8
-man/man8/mimedefang.8
-man/man8/mimedefang.pl.8
-man/man8/watch-mimedefang.8
-share/examples/mimedefang/mimedefang-filter
-share/examples/mimedefang/sa-mimedefang.cf
-share/examples/rc.d/mimedefang
-share/examples/rc.d/mimedefang-multiplexor
-share/mimedefang/gen-ip-validator.pl
-@dirrm share/mimedefang
-@dirrm share/examples/mimedefang
diff --git a/mail/mimedefang/distinfo b/mail/mimedefang/distinfo
deleted file mode 100644
index e21ba405a12..00000000000
--- a/mail/mimedefang/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.16 2007/03/14 11:21:33 markd Exp $
-
-SHA1 (mimedefang-2.61.tar.gz) = fb64b6f7ff57e095c48fce087211b1d67213a8cb
-RMD160 (mimedefang-2.61.tar.gz) = 982565fb55f0825aee631158d3b6acd3d8a3b3e1
-Size (mimedefang-2.61.tar.gz) = 326722 bytes
-SHA1 (patch-ab) = f6ba8f91126c65af434e6377e7e4873baf5c94ec
-SHA1 (patch-ac) = 9ae301538003ae087da649279167a0dc37273efa
diff --git a/mail/mimedefang/files/mimedefang-multiplexor.sh b/mail/mimedefang/files/mimedefang-multiplexor.sh
deleted file mode 100644
index 0f3b5112630..00000000000
--- a/mail/mimedefang/files/mimedefang-multiplexor.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: mimedefang-multiplexor.sh,v 1.1 2004/03/07 11:18:33 markd Exp $
-#
-# mimedefang-multiplexor handles communications between sendmail and
-# the real processor
-#
-## only for NetBSD
-# PROVIDE: mimedefang-multiplexor
-# REQUIRE: LOGIN
-# BEFORE: mail
-# KEYWORD: shutdown
-##
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/pkg/bin
-export PATH
-
-if [ -f /etc/rc.subr ]
-then
- . /etc/rc.subr
-fi
-
-
-name="mimedefang_multiplexor"
-rcvar="$name"
-mimedefang_multiplexor_user=${mimedefang_multiplexor_user-"@DEFANG_USER@"}
-
-defangdir="@DEFANG_SPOOLDIR@"
-command="@PREFIX@/bin/mimedefang-multiplexor"
-pidfile="${defangdir}/${name}.pid"
-command_args="-p ${pidfile}"
-
-# default values, may be overridden on NetBSD by setting them in /etc/rc.conf
-mimedefang_multiplexor_flags=${mimedefang_multiplexor_flags-\
- "-s ${defangdir}/mimedefang-multiplexor.sock"}
-mimedefang_multiplexor=${mimedefang_multiplexor:-NO}
-mimedefang_multiplexor_fdlimit=${mimedefang_multiplexor_fdlimit-"128"}
-
-sig_stop="TERM"
-sig_reload="INT"
-extra_commands="reload"
-
-# A default limit of 64 (at least on NetBSD) may be too low for many
-# people (eg with addional RBL rules)
-SOFT_FDLIMIT=`ulimit -S -n`
-HARD_FDLIMIT=`ulimit -H -n`
-
-if [ ${mimedefang_multiplexor_fdlimit} -gt ${SOFT_FDLIMIT} ]; then
- if [ ${mimedefang_multiplexor_fdlimit} -le ${HARD_FDLIMIT} ]; then
- ulimit -S -n ${mimedefang_multiplexor_fdlimit}
- else
- ulimit -S -n ${HARD_FDLIMIT}
- fi
-fi
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/mimedefang/files/mimedefang.sh b/mail/mimedefang/files/mimedefang.sh
deleted file mode 100644
index 50a01568d48..00000000000
--- a/mail/mimedefang/files/mimedefang.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: mimedefang.sh,v 1.1 2004/03/07 11:18:33 markd Exp $
-#
-# mimedefang does "in-stream" spam and virus checking using
-# sendmail's MailFilter interfaces.
-#
-## only for NetBSD
-# PROVIDE: mimedefang
-# REQUIRE: LOGIN mimedefang-multiplexor
-# BEFORE: mail
-# KEYWORD: shutdown
-##
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/pkg/bin
-export PATH
-
-if [ -f /etc/rc.subr ]
-then
- . /etc/rc.subr
-fi
-
-defangdir="@DEFANG_SPOOLDIR@"
-
-name="mimedefang"
-rcvar=$name
-command="@PREFIX@/bin/mimedefang"
-pidfile="${defangdir}/${name}.pid"
-mimedefang_user=${mimedefang_user-"@DEFANG_USER@"}
-command_args="-P ${pidfile}"
-
-# default values, may be overridden on NetBSD by setting them in /etc/rc.conf
-mimedefang_flags=${mimedefang_flags-"-p ${defangdir}/mimedefang.sock \
- -m ${defangdir}/mimedefang-multiplexor.sock"}
-
-mimedefang=${mimedefang:-NO}
-mimedefang_fdlimit=${mimedefang_fdlimit-"128"}
-
-# A default limit of 64 (at least on NetBSD) may be too low for many
-# people (eg with addional RBL rules)
-SOFT_FDLIMIT=`ulimit -S -n`
-HARD_FDLIMIT=`ulimit -H -n`
-
-if [ ${mimedefang_fdlimit} -gt ${SOFT_FDLIMIT} ]; then
- if [ ${mimedefang_fdlimit} -le ${HARD_FDLIMIT} ]; then
- ulimit -S -n ${mimedefang_fdlimit}
- else
- ulimit -S -n ${HARD_FDLIMIT}
- fi
-fi
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/mimedefang/patches/patch-ab b/mail/mimedefang/patches/patch-ab
deleted file mode 100644
index 47db429f605..00000000000
--- a/mail/mimedefang/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2007/03/14 11:21:33 markd Exp $
-
---- Makefile.in.orig 2007-01-20 07:42:17.000000000 +1300
-+++ Makefile.in
-@@ -136,7 +136,7 @@ mimedefang-multiplexor.o: mimedefang-mul
- @CC@ @CFLAGS@ $(DEFS) $(MINCLUDE) -c -o mimedefang-multiplexor.o mimedefang-multiplexor.c
-
- mimedefang: mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o dynbuf.o
-- @CC@ @CFLAGS@ @PTHREAD_FLAG@ -o mimedefang mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o dynbuf.o @LIBMILTERDIR@ -lmilter @LIBS@
-+ @CC@ @CFLAGS@ @PTHREAD_FLAG@ -o mimedefang mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o dynbuf.o @LDFLAGS@ @LIBMILTERDIR@ -lmilter @LIBS@
- -test "$(DONT_STRIP)" != "1" && strip mimedefang
-
- mimedefang.o: mimedefang.c mimedefang.h
diff --git a/mail/mimedefang/patches/patch-ac b/mail/mimedefang/patches/patch-ac
deleted file mode 100644
index 702383384b8..00000000000
--- a/mail/mimedefang/patches/patch-ac
+++ /dev/null
@@ -1,102 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2007/03/14 11:21:33 markd Exp $
-
---- mimedefang.pl.in.orig 2007-01-19 03:43:12.000000000 +1300
-+++ mimedefang.pl.in
-@@ -121,26 +121,26 @@ $VirusScannerRoutinesInitialized = 0;
- $SALocalTestsOnly = 1;
- $DoStatusTags = 0;
-
--$Features{'Virus:AVP'} = ('@AVP@' ne '/bin/false' ? '@AVP@' : 0);
--$Features{'Virus:AVP5'} = ('@AVP5@' ne '/bin/false' ? '@AVP5@' : 0);
--$Features{'Virus:KAVSCANNER'} = ('@KAVSCANNER@' ne '/bin/false' ? '@KAVSCANNER@' : 0);
--$Features{'Virus:CLAMAV'} = ('@CLAMSCAN@' ne '/bin/false' ? '@CLAMSCAN@' : 0);
--$Features{'Virus:CLAMD'} = ('@CLAMD@' ne '/bin/false' ? '@CLAMD@' : 0);
--$Features{'Virus:FPROT'} = ('@FPROT@' ne '/bin/false' ? '@FPROT@' : 0);
--$Features{'Virus:FSAV'} = ('@FSAV@' ne '/bin/false' ? '@FSAV@' : 0);
--$Features{'Virus:HBEDV'} = ('@HBEDV@' ne '/bin/false' ? '@HBEDV@' : 0);
--$Features{'Virus:VEXIRA'} = ('@VEXIRA@' ne '/bin/false' ? '@VEXIRA@' : 0);
--$Features{'Virus:NAI'} = ('@NAI@' ne '/bin/false' ? '@NAI@' : 0);
--$Features{'Virus:BDC'} = ('@BDC@' ne '/bin/false' ? '@BDC@' : 0);
--$Features{'Virus:NVCC'} = ('@NVCC@' ne '/bin/false' ? '@NVCC@' : 0);
-+$Features{'Virus:AVP'} = ((('@AVP@' ne '/bin/false') and (-x '@AVP@')) ? '@AVP@' : 0);
-+$Features{'Virus:AVP5'} = ((('@AVP5@' ne '/bin/false') and (-x '@AVP5@')) ? '@AVP5@' : 0);
-+$Features{'Virus:KAVSCANNER'} = ((('@KAVSCANNER@' ne '/bin/false') and (-x '@KAVSCANNER@')) ? '@KAVSCANNER@' : 0);
-+$Features{'Virus:CLAMAV'} = ((('@CLAMSCAN@' ne '/bin/false') and (-x '@CLAMSCAN@')) ? '@CLAMSCAN@' : 0);
-+$Features{'Virus:CLAMD'} = ((('@CLAMD@' ne '/bin/false') and (-x '@CLAMD@')) ? '@CLAMD@' : 0);
-+$Features{'Virus:FPROT'} = ((('@FPROT@' ne '/bin/false') and (-x '@FPROT@')) ? '@FPROT@' : 0);
-+$Features{'Virus:FSAV'} = ((('@FSAV@' ne '/bin/false') and (-x '@FSAV@')) ? '@FSAV@' : 0);
-+$Features{'Virus:HBEDV'} = ((('@HBEDV@' ne '/bin/false') and (-x '@HBEDV@')) ? '@HBEDV@' : 0);
-+$Features{'Virus:VEXIRA'} = ((('@VEXIRA@' ne '/bin/false') and (-x '@VEXIRA@')) ? '@VEXIRA@' : 0);
-+$Features{'Virus:NAI'} = ((('@NAI@' ne '/bin/false') and (-x '@NAI@')) ? '@NAI@' : 0);
-+$Features{'Virus:BDC'} = ((('@BDC@' ne '/bin/false') and (-x '@BDC@')) ? '@BDC@' : 0);
-+$Features{'Virus:NVCC'} = ((('@NVCC@' ne '/bin/false') and (-x '@NVCC@')) ? '@NVCC@' : 0);
- $Features{'Virus:OpenAV'} = 0; # Not a good idea but we need a test!
- $Features{'Virus:SymantecCSS'} = 0; # Ditto
- $Features{'Virus:FPROTD'} = 0;
--$Features{'Virus:SOPHIE'} = ('@SOPHIE@' ne '/bin/false' ? '@SOPHIE@' : 0);
--$Features{'Virus:SOPHOS'} = ('@SOPHOS@' ne '/bin/false' ? '@SOPHOS@' : 0);
--$Features{'Virus:TREND'} = ('@TREND@' ne '/bin/false' ? '@TREND@' : 0);
--$Features{'Virus:TROPHIE'} = ('@TROPHIE@' ne '/bin/false' ? '@TROPHIE@' : 0);
--$Features{'Virus:CSAV'} = ('@CSAV@' ne '/bin/false' ? '@CSAV@' : 0);
-+$Features{'Virus:SOPHIE'} = ((('@SOPHIE@' ne '/bin/false') and (-x '@SOPHIE@')) ? '@SOPHIE@' : 0);
-+$Features{'Virus:SOPHOS'} = ((('@SOPHOS@' ne '/bin/false') and (-x '@SOPHOS@')) ? '@SOPHOS@' : 0);
-+$Features{'Virus:TREND'} = ((('@TREND@' ne '/bin/false') and (-x '@TREND@')) ? '@TREND@' : 0);
-+$Features{'Virus:TROPHIE'} = ((('@TROPHIE@' ne '/bin/false') and (-x '@TROPHIE@')) ? '@TROPHIE@' : 0);
-+$Features{'Virus:CSAV'} = ((('@CSAV@' ne '/bin/false') and (-x '@CSAV@')) ? '@CSAV@' : 0);
-
- $Features{'Path:SENDMAIL'} = '@SENDMAILPROG@';
- $Features{'Path:QUARANTINEDIR'} = '@QDIR@';
-@@ -3669,7 +3669,7 @@ sub entity_contains_virus_clamav ($) {
-
- # Run clamscan
- my($code, $category, $action) =
-- run_virus_scanner($Features{'Virus:CLAMAV'} . " --mbox --stdout --disable-summary --infected $path 2>&1");
-+ run_virus_scanner($Features{'Virus:CLAMAV'} . " --stdout --no-summary --infected $path 2>&1");
- if ($action ne 'proceed') {
- return (wantarray ? ($code, $category, $action) : $code);
- }
-@@ -3693,7 +3693,7 @@ sub message_contains_virus_clamav () {
-
- # Run clamscan
- my($code, $category, $action) =
-- run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --mbox --stdout --disable-summary --infected ./Work 2>&1");
-+ run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --stdout --no-summary --infected ./Work 2>&1");
- if ($action ne 'proceed') {
- return (wantarray ? ($code, $category, $action) : $code);
- }
-@@ -4506,14 +4506,14 @@ sub entity_contains_virus_clamd ($;$) {
- md_syslog('err', "$MsgID: Clamd returned error: $err_detail");
- # If it's a zip module failure, try falling back on clamscan.
- # This is despicable, but it might work
-- if ($err_detail =~ /zip module failure/i &&
-+ if ($err_detail =~ /(?:zip module failure|not supported data format)/i &&
- $Features{'Virus:CLAMAV'}) {
- my ($code, $category, $action) =
-- run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --unzip --mbox --stdout --disable-summary --infected $CWD/Work 2>&1");
-+ run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --unzip --unrar --stdout --no-summary --infected $CWD/Work 2>&1");
- if ($action ne 'proceed') {
- return (wantarray ? ($code, $category, $action) : $code);
- }
-- md_syslog('info', "$MsgID: Falling back on clamscan --unzip because of Zip module failure in clamd");
-+ md_syslog('info', "$MsgID: Falling back on clamscan --unzip --unrar because of Zip module failure in clamd");
- return (wantarray ? interpret_clamav_code($code) : $code);
- }
- return (wantarray ? (999, 'swerr', 'tempfail') : 1);
-@@ -4603,14 +4603,14 @@ sub message_contains_virus_clamd (;$) {
- md_syslog('err', "$MsgID: Clamd returned error: $err_detail");
- # If it's a zip module failure, try falling back on clamscan.
- # This is despicable, but it might work
-- if ($err_detail =~ /zip module failure/i &&
-+ if ($err_detail =~ /(?:zip module failure|not supported data format)/i &&
- $Features{'Virus:CLAMAV'}) {
- my ($code, $category, $action) =
-- run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --unzip --mbox --stdout --disable-summary --infected $CWD/Work 2>&1");
-+ run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --unzip --unrar --stdout --no-summary --infected $CWD/Work 2>&1");
- if ($action ne 'proceed') {
- return (wantarray ? ($code, $category, $action) : $code);
- }
-- md_syslog('info', "$MsgID: Falling back on clamscan --unzip because of Zip module failure in clamd");
-+ md_syslog('info', "$MsgID: Falling back on clamscan --unzip --unrar because of Zip module failure in clamd");
- return (wantarray ? interpret_clamav_code($code) : $code);
- }
- return (wantarray ? (999, 'swerr', 'tempfail') : 999);
diff --git a/mail/mini_sendmail/DESCR b/mail/mini_sendmail/DESCR
deleted file mode 100644
index eb6e5f359e3..00000000000
--- a/mail/mini_sendmail/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-mini_sendmail reads its standard input up to an end-of-file and
-sends a copy of the message found there to all of the addresses
-listed. The message is sent by connecting to a local SMTP server.
-
-If you want to use mini_sendmail to send email from inside a
-chroot(2) area, you might want to use the mini_sendmail_static
-package instead to avoid copying libraries.
-
-See the manual entry for more details.
diff --git a/mail/mini_sendmail/MESSAGE b/mail/mini_sendmail/MESSAGE
deleted file mode 100644
index 6b40cf2e646..00000000000
--- a/mail/mini_sendmail/MESSAGE
+++ /dev/null
@@ -1,12 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2006/06/13 09:27:27 martin Exp $
-
-Before you install ${PREFIX}/share/examples/mini_sendmail/mailer.conf
-as /etc/mailer.conf, edit it to replace ``relayhost'' with the name of
-the smart mail relay host.
-
-You probably will also want to set check_mailq=NO in /etc/daily.conf.
-
-See the manual page for details.
-
-===========================================================================
diff --git a/mail/mini_sendmail/Makefile b/mail/mini_sendmail/Makefile
deleted file mode 100644
index c67949b44a3..00000000000
--- a/mail/mini_sendmail/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2006/12/01 10:40:48 martin Exp $
-#
-
-PKGNAME= mini_sendmail-1.3.6
-PKGREVISION= 2
-
-BUILD_DEFS+= USE_INET6
-
-.include "Makefile.common"
diff --git a/mail/mini_sendmail/Makefile.common b/mail/mini_sendmail/Makefile.common
deleted file mode 100644
index 1e2a7c4034f..00000000000
--- a/mail/mini_sendmail/Makefile.common
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile.common,v 1.13 2007/01/07 09:13:58 rillig Exp $
-#
-
-DISTNAME= mini_sendmail-1.3.6
-CATEGORIES= mail
-MASTER_SITES= http://www.acme.com/software/mini_sendmail/
-
-MAINTAINER= is@NetBSD.org
-HOMEPAGE= http://www.acme.com/software/mini_sendmail/
-COMMENT= Accept email on behalf of the real sendmail without spooling
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-
-FILESDIR= ${.CURDIR}/../mini_sendmail/files
-
-EGDIR= ${PREFIX}/share/examples/mini_sendmail
-
-INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == SunOS)
-MAKE_ENV+="SYSV_LIBS=-lsocket -lnsl"
-.endif
-
-post-build:
- ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
- <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EGDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mini_sendmail/PLIST b/mail/mini_sendmail/PLIST
deleted file mode 100644
index 66b182ce286..00000000000
--- a/mail/mini_sendmail/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/04/24 19:49:24 jmmv Exp $
-man/man8/mini_sendmail.8
-sbin/mini_sendmail
-share/examples/mini_sendmail/mailer.conf
-@dirrm share/examples/mini_sendmail
diff --git a/mail/mini_sendmail/distinfo b/mail/mini_sendmail/distinfo
deleted file mode 100644
index 0ba4088eae6..00000000000
--- a/mail/mini_sendmail/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.10 2006/12/01 10:40:48 martin Exp $
-
-SHA1 (mini_sendmail-1.3.6.tar.gz) = e8d18419ffa5075ce0b3f49a52bd5e1a38beeb02
-RMD160 (mini_sendmail-1.3.6.tar.gz) = 87fc1133c5976ae6e85730d3600149f69c7cab55
-Size (mini_sendmail-1.3.6.tar.gz) = 7579 bytes
-SHA1 (patch-aa) = 82eccc80d1cde777ed49d965e1c9b3df05e8cc22
-SHA1 (patch-ab) = f96d22be2f94445a6f8b249cdd823dcfbd1528de
-SHA1 (patch-ac) = b14f2687f3186e198af03b2662b81726c7321558
-SHA1 (patch-ad) = 35319baaf3eac9dd931170ed4e6d638a19fff8b5
diff --git a/mail/mini_sendmail/files/mailer.conf b/mail/mini_sendmail/files/mailer.conf
deleted file mode 100644
index b8f9bb182ab..00000000000
--- a/mail/mini_sendmail/files/mailer.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: mailer.conf,v 1.1 2003/02/15 22:11:27 is Exp $
-#
-# Use "mini_sendmail" as replacement for "sendmail".
-#
-sendmail @@PREFIX@@/sbin/mini_sendmail -srelayhost
-send-mail @@PREFIX@@/sbin/mini_sendmail -srelayhost
diff --git a/mail/mini_sendmail/patches/patch-aa b/mail/mini_sendmail/patches/patch-aa
deleted file mode 100644
index dfd3bd6461c..00000000000
--- a/mail/mini_sendmail/patches/patch-aa
+++ /dev/null
@@ -1,198 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2006/12/01 10:40:48 martin Exp $
-
---- mini_sendmail.c.orig 2005-06-29 19:37:15.000000000 +0200
-+++ mini_sendmail.c 2006-12-01 11:35:27.000000000 +0100
-@@ -66,8 +66,13 @@ static char* argv0;
- static char* fake_from;
- static int parse_message, verbose;
- #ifdef DO_MINUS_SP
--static char* server;
- static short port;
-+struct server_entry {
-+ const char *server;
-+ short port;
-+ struct server_entry *next;
-+};
-+struct server_entry *servers;
- #endif /* DO_MINUS_SP */
- static int timeout;
- static int sockfd1, sockfd2;
-@@ -84,7 +89,7 @@ static char* make_received( char* from,
- #endif /* DO_RECEIVED */
- static void parse_for_recipients( char* message );
- static void add_recipient( char* recipient, int len );
--static int open_client_socket( void );
-+static int open_client_socket( const char *server, short port );
- static int read_response( void );
- static void send_command( char* command );
- static void send_data( char* data );
-@@ -106,13 +111,15 @@ main( int argc, char** argv )
- char from[1000];
- int status;
- char buf[2000];
-+#ifdef DO_MINUS_SP
-+ struct server_entry *cur_server;
-+#endif
-
- /* Parse args. */
- argv0 = argv[0];
- fake_from = (char*) 0;
- parse_message = 0;
- #ifdef DO_MINUS_SP
-- server = "127.0.0.1";
- port = SMTP_PORT;
- #endif /* DO_MINUS_SP */
- verbose = 0;
-@@ -125,15 +132,21 @@ main( int argc, char** argv )
- else if ( strcmp( argv[argn], "-t" ) == 0 )
- parse_message = 1;
- #ifdef DO_MINUS_SP
-- else if ( strncmp( argv[argn], "-s", 2 ) == 0 && argv[argn][2] != '\0' )
-- server = &(argv[argn][2]);
-- else if ( strncmp( argv[argn], "-p", 2 ) == 0 && argv[argn][2] != '\0' )
-+ else if ( strncmp( argv[argn], "-s", 2 ) == 0 && argv[argn][2] != '\0' ) {
-+ cur_server = malloc(sizeof(struct server_entry));
-+ cur_server->server = &(argv[argn][2]);
-+ cur_server->port = port;
-+ cur_server->next = servers;
-+ servers = cur_server;
-+ } else if ( strncmp( argv[argn], "-p", 2 ) == 0 && argv[argn][2] != '\0' )
- port = atoi( &(argv[argn][2]) );
- #endif /* DO_MINUS_SP */
- else if ( strncmp( argv[argn], "-T", 2 ) == 0 && argv[argn][2] != '\0' )
- timeout = atoi( &(argv[argn][2]) );
- else if ( strcmp( argv[argn], "-v" ) == 0 )
- verbose = 1;
-+ else if ( strcmp( argv[argn], "-oeq" ) == 0 )
-+ verbose = 0;
- else if ( strcmp( argv[argn], "-i" ) == 0 )
- ; /* ignore */
- else if ( strcmp( argv[argn], "-oi" ) == 0 )
-@@ -186,8 +199,21 @@ main( int argc, char** argv )
-
- (void) signal( SIGALRM, sigcatch );
-
-+ if (!servers) {
-+ static const char default_server[] = "127.0.0.1";
-+ servers = malloc(sizeof(struct server_entry));
-+ servers->server = default_server;
-+ servers->port = port;
-+ servers->next = NULL;
-+ }
-+
- (void) alarm( timeout );
-- sockfd1 = open_client_socket();
-+ for (cur_server = servers; cur_server; cur_server = cur_server->next) {
-+ sockfd1 = open_client_socket(cur_server->server, cur_server->port);
-+ if (sockfd1 >= 0) break;
-+ }
-+ if (sockfd1 == -1)
-+ show_error("could not open SMTP socket");
-
- sockfd2 = dup( sockfd1 );
- sockrfp = fdopen( sockfd1, "r" );
-@@ -507,14 +533,24 @@ parse_for_recipients( char* message )
- switch ( *cp )
- {
- case '\n':
-- add_recipient( recip, ( cp - recip ) );
-- state = ST_BOL;
-- if ( bcc != (char*) 0 )
-+ /* peek ahead for continuation line */
-+ switch (cp[1])
- {
-- /* Elide the Bcc: line, and reset cp. */
-- (void) strcpy( bcc, cp + 1 );
-- cp = bcc - 1;
-- bcc = (char*) 0;
-+ case ' ':
-+ case '\t':
-+ break;
-+
-+ default:
-+ add_recipient( recip, ( cp - recip ) );
-+ state = ST_BOL;
-+ if ( bcc != (char*) 0 )
-+ {
-+ /* Elide the Bcc: line, and reset cp. */
-+ (void) strcpy( bcc, cp + 1 );
-+ cp = bcc - 1;
-+ bcc = (char*) 0;
-+ }
-+ break;
- }
- break;
- case ',':
-@@ -532,25 +568,43 @@ static void
- add_recipient( char* recipient, int len )
- {
- char buf[1000];
-+ char *first;
- int status;
-+ int i;
-+
-
- /* Skip leading whitespace. */
-- while ( len > 0 && ( *recipient == ' ' || *recipient == '\t' ) )
-+ while ( len > 0 && ( *recipient == ' ' || *recipient == '\t' ||
-+ *recipient == '\n') )
- {
- ++recipient;
- --len;
- }
-
-- /* Strip off any angle brackets. */
-- while ( len > 0 && *recipient == '<' )
-+ first = recipient;
-+ /* search for angle bracket */
-+
-+ while (first < recipient+len && *first != '<')
- {
-- ++recipient;
-- --len;
-+ ++first;
- }
-- while ( len > 0 && recipient[len-1] == '>' )
-- --len;
-+
-+ if (*first == '<')
-+ {
-+ len -= first + 1 - recipient;
-+ recipient = first + 1;
-+
-+ while (len > 2 && recipient[--len] != '>')
-+ ; /* nothing */
-+
-+ }
-
- (void) snprintf( buf, sizeof(buf), "RCPT TO:<%.*s>", len, recipient );
-+ for (i=0; i<sizeof(buf); i++)
-+ {
-+ if (buf[i] == '\n')
-+ buf[i] = ' ';
-+ }
- send_command( buf );
- status = read_response();
- if ( status != 250 && status != 251 )
-@@ -569,7 +623,7 @@ add_recipient( char* recipient, int len
- #endif
-
- static int
--open_client_socket( void )
-+open_client_socket(const char *server, short port)
- {
- #ifdef USE_IPV6
- struct sockaddr_in6 sa;
-@@ -744,10 +798,10 @@ open_client_socket( void )
-
- sockfd = socket( sock_family, sock_type, sock_protocol );
- if ( sockfd < 0 )
-- show_error( "socket" );
-+ return -1;
-
- if ( connect( sockfd, (struct sockaddr*) &sa, sa_len ) < 0 )
-- show_error( "connect" );
-+ return -1;
-
- return sockfd;
- }
diff --git a/mail/mini_sendmail/patches/patch-ab b/mail/mini_sendmail/patches/patch-ab
deleted file mode 100644
index c2f530237f8..00000000000
--- a/mail/mini_sendmail/patches/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/02/15 22:11:28 is Exp $
-
---- Makefile.orig Fri Jan 4 07:05:25 2002
-+++ Makefile
-@@ -4,12 +4,12 @@
- # Solaris, you will need to uncomment this definition.
- #SYSV_LIBS = -lnsl -lsocket
-
--BINDIR = /usr/local/sbin
--MANDIR = /usr/local/man
--CC = gcc
--CFLAGS = -O
-+BINDIR = $(PREFIX)/sbin
-+MANDIR = $(PREFIX)/man
-+#CC = gcc
-+#CFLAGS = -O
- #CFLAGS = -g
--LDFLAGS = -s -static
-+#LDFLAGS = -s -static
- #LDFLAGS = -g -static
- LDLIBS = $(SYSV_LIBS)
-
-@@ -30,10 +30,8 @@
-
-
- install: all
-- rm -f $(BINDIR)/mini_sendmail
-- cp mini_sendmail $(BINDIR)
-- rm -f $(MANDIR)/man8/mini_sendmail.8
-- cp mini_sendmail.8 $(MANDIR)/man8
-+ $(BSD_INSTALL_PROGRAM) mini_sendmail $(BINDIR)
-+ $(BSD_INSTALL_MAN) mini_sendmail.8 $(MANDIR)/man8
-
- clean:
- rm -f mini_sendmail *.o core core.* *.core
diff --git a/mail/mini_sendmail/patches/patch-ac b/mail/mini_sendmail/patches/patch-ac
deleted file mode 100644
index 6c001183893..00000000000
--- a/mail/mini_sendmail/patches/patch-ac
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2005/06/26 19:51:47 is Exp $
-
---- mini_sendmail.8.orig 2003-11-17 02:47:33.000000000 +0100
-+++ mini_sendmail.8
-@@ -1,10 +1,12 @@
--.TH mini_sendmail 8 "12 July 2001"
-+.TH mini_sendmail 8 "25 June 2005"
- .SH NAME
- mini_sendmail - accept email on behalf of real sendmail
- .SH SYNOPSIS
- .B mini_sendmail
- .RB [ -f<name> ]
- .RB [ -t ]
-+.RB [ -i ]
-+.RB [ -oi ]
- .RB [ -s<server> ]
- .RB [ -p<port> ]
- .RB [ -T<timeout> ]
-@@ -26,6 +28,17 @@ can be used to send email from inside a
- .B -f
- Sets the name of the "from" person (i.e. the sender of the mail).
- .TP
-+.B -i
-+Don't parse for a dot-line, but read input up to an end-of-file.
-+Currently, this is always the case, but this option is needed for
-+compatibility with sendmail.
-+.TP
-+.B -oeq
-+Quiet mode, needed for compatibility with sendmail.
-+.TP
-+.B -oi
-+Same as -i, needed for compatibility with sendmail.
-+.TP
- .B -t
- Read message for recipients.
- To:, Cc:, and Bcc: lines will be scanned for recipient addresses.
diff --git a/mail/mini_sendmail/patches/patch-ad b/mail/mini_sendmail/patches/patch-ad
deleted file mode 100644
index 30ad976069e..00000000000
--- a/mail/mini_sendmail/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2005/06/29 22:01:19 is Exp $
-
---- version.h.orig 2005-06-29 19:39:00.000000000 +0200
-+++ version.h
-@@ -3,6 +3,6 @@
- #ifndef _VERSION_H_
- #define _VERSION_H_
-
--#define VERSION "mini_sendmail/1.3.6 29jun2005"
-+#define VERSION "mini_sendmail/1.3.6 29jun2005 nb1 29jun2005"
-
- #endif /* _VERSION_H_ */
diff --git a/mail/mpop/DESCR b/mail/mpop/DESCR
deleted file mode 100644
index ccae4b7bb5a..00000000000
--- a/mail/mpop/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-mpop is a small, fast, and portable POP3 client. Its features include
-header-based email filtering (filter junk mail before downloading it),
-delivery to mbox files, maildir folders, or a mail delivery agent, a
-very fast POP3 implementation, many authentication methods, and good
-support for TLS/SSL.
diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
deleted file mode 100644
index 23888b7735c..00000000000
--- a/mail/mpop/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2007/03/16 19:05:17 reed Exp $
-#
-
-DISTNAME= mpop-1.0.7
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpop/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= reed@reedmedia.net
-HOMEPAGE= http://mpop.sourceforge.net/
-COMMENT= Small, fast and portable POP3 client
-
-GNU_CONFIGURE= yes
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= pkg-config
-INFO_FILES= # PLIST
-
-CONFIGURE_ARGS+= --enable-nls
-
-EGDIR= ${PREFIX}/share/examples/mpop
-
-.include "options.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libgetopt/buildlink3.mk"
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/mpoprc.example ${EGDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mpop/PLIST b/mail/mpop/PLIST
deleted file mode 100644
index 116a9b4cd41..00000000000
--- a/mail/mpop/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2007/03/16 19:05:17 reed Exp $
-bin/mpop
-info/mpop.info
-man/man1/mpop.1
-share/examples/mpop/mpoprc.example
-share/locale/de/LC_MESSAGES/mpop.mo
-share/locale/es/LC_MESSAGES/mpop.mo
-@dirrm share/examples/mpop
diff --git a/mail/mpop/distinfo b/mail/mpop/distinfo
deleted file mode 100644
index 1b07356e16c..00000000000
--- a/mail/mpop/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2007/03/16 19:05:17 reed Exp $
-
-SHA1 (mpop-1.0.7.tar.bz2) = fe3172882114d2f17501a069128a117c33b2f096
-RMD160 (mpop-1.0.7.tar.bz2) = cc1f9e1ba2f643e509c8992705c00906aec39e00
-Size (mpop-1.0.7.tar.bz2) = 557870 bytes
diff --git a/mail/mpop/options.mk b/mail/mpop/options.mk
deleted file mode 100644
index 0a0732eac49..00000000000
--- a/mail/mpop/options.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: options.mk,v 1.1.1.1 2005/11/13 03:09:20 minskim Exp $
-#
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.mpop
-PKG_SUPPORTED_OPTIONS= gsasl
-PKG_OPTIONS_OPTIONAL_GROUPS= ssl
-PKG_OPTIONS_GROUP.ssl= gnutls ssl
-PKG_SUGGESTED_OPTIONS= ssl
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgnutls)
-CONFIGURE_ARGS+= --with-ssl=gnutls
-. include "../../security/gnutls/buildlink3.mk"
-.elif !empty(PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+= --with-ssl=openssl
-. include "../../security/openssl/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-ssl
-.endif
-
-.if !empty(PKG_OPTIONS:Mgsasl)
-CONFIGURE_ARGS+= --enable-gsasl
-. include "../../security/gsasl/buildlink3.mk"
-.endif
diff --git a/mail/msmtp/DESCR b/mail/msmtp/DESCR
deleted file mode 100644
index 9b274c8c7c2..00000000000
--- a/mail/msmtp/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-msmtp -- SMTP plugin for MUAs
-
-This is a simple program that works as an "SMTP plugin" for Mutt
-and probably other MUAs (mail user agents). msmtp forwards mails
-to an SMTP server (for example at a free mail provider) which does
-the delivery.
-
-Features include:
- * SMTP AUTH methods PLAIN, LOGIN and CRAM-MD5
- * TLS encrypted connections
- * IPv6 support
- * robustness
- * detailed error messages (including the full answer of the
- SMTP server) if something goes wrong
- * sendmail compatible exit codes (which most MUAs understand).
-
-Simply tell your MUA to call msmtp instead of /usr/sbin/sendmail.
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
deleted file mode 100644
index 77082936890..00000000000
--- a/mail/msmtp/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/04/05 16:41:34 jlam Exp $
-
-DISTNAME= msmtp-1.4.5
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=msmtp/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= bcv@hub3.net
-HOMEPAGE= http://msmtp.sourceforge.net/
-COMMENT= SMTP plugin for MUAs
-
-GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config
-
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-
-EGDIR= ${PREFIX}/share/examples/msmtp
-CONF_FILES= ${EGDIR}/msmtprc-user.example \
- ${PKG_SYSCONFDIR}/msmtprc
-
-INFO_FILES= # PLIST
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Interix"
-CPPFLAGS+= -D__WINSOCK
-.endif
-
-.include "options.mk"
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/msmtprc-user.example ${EGDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/msmtp/PLIST b/mail/msmtp/PLIST
deleted file mode 100644
index a04ea5202b9..00000000000
--- a/mail/msmtp/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/05 16:41:34 jlam Exp $
-bin/msmtp
-info/msmtp.info
-man/man1/msmtp.1
-share/examples/msmtp/msmtprc-user.example
-@dirrm share/examples/msmtp
diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo
deleted file mode 100644
index 76d24b8e218..00000000000
--- a/mail/msmtp/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.13 2006/01/14 20:08:20 ben Exp $
-
-SHA1 (msmtp-1.4.5.tar.bz2) = 2734c4b0ab50d221c6c8248cdafc4af6ee0f6cf5
-RMD160 (msmtp-1.4.5.tar.bz2) = 21428a4d7c93da8383fe8f752b224dd2c0aff014
-Size (msmtp-1.4.5.tar.bz2) = 489336 bytes
-SHA1 (patch-aa) = 30be9810fdbdd1de0c4727c94d5c799317548bdb
-SHA1 (patch-ab) = 9ce732fb3258f0b5fcafaabaa92960489a62124e
-SHA1 (patch-ac) = 54b47760510320c08cf9703ce79ea431a69115e4
-SHA1 (patch-ad) = 1191e01ccad89532badb4240cb1e190965f1ed40
-SHA1 (patch-ae) = 1d5c4ece937ce23580ab2aef3d9362925023d7ad
-SHA1 (patch-af) = 3810dba45fdf83a8534fdac118b9da66db5bafc8
diff --git a/mail/msmtp/options.mk b/mail/msmtp/options.mk
deleted file mode 100644
index f80deaf5746..00000000000
--- a/mail/msmtp/options.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: options.mk,v 1.8 2005/08/31 18:37:33 tv Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.msmtp
-
-PKG_OPTIONS_OPTIONAL_GROUPS= ssl
-PKG_OPTIONS_GROUP.ssl= gnutls ssl
-
-PKG_SUPPORTED_OPTIONS= gsasl inet6
-PKG_SUGGESTED_OPTIONS= ssl
-
-.include "../../mk/bsd.options.mk"
-
-###
-### SSL support
-###
-.if !empty(PKG_OPTIONS:Mssl)
-. include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+= --with-ssl=openssl
-.elif !empty(PKG_OPTIONS:Mgnutls)
-. include "../../security/gnutls/buildlink3.mk"
-CONFIGURE_ARGS+= --with-ssl=gnutls
-.else
-CONFIGURE_ARGS+= --disable-ssl
-.endif
-
-###
-### GNUsasl support
-###
-.if !empty(PKG_OPTIONS:Mgsasl)
-. include "../../security/gsasl/buildlink3.mk"
-.endif
diff --git a/mail/msmtp/patches/patch-aa b/mail/msmtp/patches/patch-aa
deleted file mode 100644
index 3cc143e26cd..00000000000
--- a/mail/msmtp/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/01/08 16:38:41 joerg Exp $
-
---- src/net.c.orig 2005-08-14 20:13:06.000000000 +0000
-+++ src/net.c
-@@ -43,7 +43,6 @@
- #define NI_MAXHOST 1025
- #endif
- #include <errno.h>
--extern int errno;
- #else /* UNIX */
- #include <unistd.h>
- #include <fcntl.h>
-@@ -57,7 +56,6 @@ extern int h_errno;
- #include <arpa/inet.h>
- #include <netdb.h>
- #include <errno.h>
--extern int errno;
- #endif /* UNIX */
-
- #include "gettext.h"
-@@ -325,7 +323,7 @@ void net_set_io_timeout(int socket, int
- * en-us/winsock/winsock/setsockopt_2.asp
- * We activate these timeouts only for Windows systems that also have
- * getaddrinfo(), which means XP or newer, to work around this problem. */
--#if defined __MINGW32__ && !defined HAVE_GETADDRINFO
-+#if (defined __MINGW32__ && !defined HAVE_GETADDRINFO) || defined __WINSOCK
- /* do nothing */
- #else
- struct timeval tv;
diff --git a/mail/msmtp/patches/patch-ab b/mail/msmtp/patches/patch-ab
deleted file mode 100644
index 8afc1019b12..00000000000
--- a/mail/msmtp/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/01/08 16:38:41 joerg Exp $
-
---- src/msmtp.c.orig 2005-08-14 20:13:02.000000000 +0000
-+++ src/msmtp.c
-@@ -31,7 +31,6 @@
- #include <string.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;
- #include <time.h>
- #include <getopt.h>
- extern char *optarg;
-@@ -3382,5 +3381,5 @@ exit:
- list_xfree(errmsg, free);
- }
-
-- return error_code;
-+ return (error_code == EX_OK) ? 0 : error_code;
- }
diff --git a/mail/msmtp/patches/patch-ac b/mail/msmtp/patches/patch-ac
deleted file mode 100644
index 47bfe850211..00000000000
--- a/mail/msmtp/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/01/08 16:38:41 joerg Exp $
-
---- src/conf.c.orig 2006-01-08 16:30:23.000000000 +0000
-+++ src/conf.c
-@@ -31,7 +31,6 @@
- #include <string.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;
-
- #include "gettext.h"
- #include "xalloc.h"
diff --git a/mail/msmtp/patches/patch-ad b/mail/msmtp/patches/patch-ad
deleted file mode 100644
index a3c83eabd70..00000000000
--- a/mail/msmtp/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/01/08 16:38:41 joerg Exp $
-
---- src/tls.c.orig 2006-01-08 16:34:02.000000000 +0000
-+++ src/tls.c
-@@ -33,7 +33,6 @@
- #include <limits.h>
- #include <time.h>
- #include <errno.h>
--extern int errno;
-
- #ifdef HAVE_GNUTLS
- #include <gnutls/gnutls.h>
diff --git a/mail/msmtp/patches/patch-ae b/mail/msmtp/patches/patch-ae
deleted file mode 100644
index 34f7f8202ac..00000000000
--- a/mail/msmtp/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/01/08 16:38:41 joerg Exp $
-
---- src/os_env.c.orig 2006-01-08 16:32:07.000000000 +0000
-+++ src/os_env.c
-@@ -29,7 +29,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
--extern int errno;
- #include <fcntl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
diff --git a/mail/msmtp/patches/patch-af b/mail/msmtp/patches/patch-af
deleted file mode 100644
index b925836c6af..00000000000
--- a/mail/msmtp/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/01/08 16:38:41 joerg Exp $
-
---- src/smtp.c.orig 2006-01-08 16:33:04.000000000 +0000
-+++ src/smtp.c
-@@ -33,7 +33,6 @@
- #include <strings.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;
-
- #ifdef USE_GSASL
- #include <gsasl.h>
diff --git a/mail/mush/DESCR b/mail/mush/DESCR
deleted file mode 100644
index f2861feffe1..00000000000
--- a/mail/mush/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-The "Mail User's Shell" (MUSH) is a "Mail User Agent" (MUA) that is
-designed to manage electronic mail on most UNIX systems. That is,
-mush is used by users to read mail, sort it, edit it, delete it,
-or use it to act as an interface to send mail to others. A Mail
-Transport Agent (MTA) is the program which mush communicates with
-that actually -delivers- mail.
-
-Mush is copyright (c) 1986, 1987, 1988, 1989, 1990, 1991 by Dan Heller.
-All Rights Reserved. This software is not in the public domain.
diff --git a/mail/mush/Makefile b/mail/mush/Makefile
deleted file mode 100644
index 29e1cb6aa2c..00000000000
--- a/mail/mush/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2006/10/09 02:41:11 rillig Exp $
-
-DISTNAME= mush-7.2.5
-PKGNAME= mush-7.2.6.b4.pl1
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://cse.ogi.edu/pub/mush/
-EXTRACT_SUFX= .tar.Z
-
-PATCH_SITES= ftp://cse.ogi.edu/pub/mush/CONTRIB/
-PATCH_DIST_ARGS= -s -d ${WRKDIR} -E -p1
-PATCHFILES= patch-7.2.6-alpha-1 \
- patch-7.2.6-alpha-2 \
- patch-7.2.6-alpha-3 \
- patch-7.2.6-beta-1 \
- patch-7.2.6-beta-2 \
- patch-7.2.6-beta-3 \
- patch-7.2.6-beta-4
-
-MAINTAINER= christos@NetBSD.org
-COMMENT= Text-based mail client
-
-LICENSE= mush-license
-RESTRICTED= Can't sell the code as part of anything
-NO_SRC_ON_CDROM= ${RESTRICTED}
-
-WRKSRC= ${WRKDIR}
-DIST_SUBDIR= mush
-BUILD_TARGET= mush
-
-INSTALLATION_DIRS= bin share/misc
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "DragonFly"
-PLAT_MAKEFILE= makefile.netbsd
-.else
-PLAT_MAKEFILE= makefile.${LOWER_OPSYS}
-.endif
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= config.h-dist ${PLAT_MAKEFILE}
-SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+= -e 's,@MANDIR@,${PREFIX}/${PKGMANDIR},g'
-SUBST_STAGE.paths= post-patch
-
-pre-configure:
- ${CP} ${WRKSRC}/config.h-dist ${WRKSRC}/config.h
- ${CP} ${WRKSRC}/${PLAT_MAKEFILE} ${WRKSRC}/Makefile
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mush/PLIST b/mail/mush/PLIST
deleted file mode 100644
index 68fb92c36e1..00000000000
--- a/mail/mush/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:36 zuntum Exp $
-bin/mush
-man/man1/mush.1
-share/misc/Mushrc
-share/misc/cmd_help
diff --git a/mail/mush/distinfo b/mail/mush/distinfo
deleted file mode 100644
index e603ea2cc8a..00000000000
--- a/mail/mush/distinfo
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: distinfo,v 1.10 2006/01/08 17:04:58 joerg Exp $
-
-SHA1 (mush/mush-7.2.5.tar.Z) = 1b9b54b368b9a748401b1baeb3b3eba5a9ed2c03
-RMD160 (mush/mush-7.2.5.tar.Z) = 32e010f544f79cc1a0f899d722d465975d552a4e
-Size (mush/mush-7.2.5.tar.Z) = 496317 bytes
-SHA1 (mush/patch-7.2.6-alpha-1) = 132e609a6c44889a4ee462cdf0078923c1e0f4c8
-RMD160 (mush/patch-7.2.6-alpha-1) = c7ede33d55899435674ac721d2302139ee4b8b2a
-Size (mush/patch-7.2.6-alpha-1) = 139372 bytes
-SHA1 (mush/patch-7.2.6-alpha-2) = 34c72281af8e2f7f3ef72efad77b824f422845d4
-RMD160 (mush/patch-7.2.6-alpha-2) = 6eed5884f568f52745171f22f717c6f90c46c6c2
-Size (mush/patch-7.2.6-alpha-2) = 12684 bytes
-SHA1 (mush/patch-7.2.6-alpha-3) = a04066037178155c9849fb06329557480a768d87
-RMD160 (mush/patch-7.2.6-alpha-3) = 3ba6b8554d64e826f04b430c227ae436988bc8d1
-Size (mush/patch-7.2.6-alpha-3) = 22109 bytes
-SHA1 (mush/patch-7.2.6-beta-1) = c21c2e60871bccae16310e994a1421c791d1b8cd
-RMD160 (mush/patch-7.2.6-beta-1) = 6abdceaeacb30f2dcd1c18ba1f442bce3a3e7e05
-Size (mush/patch-7.2.6-beta-1) = 5432 bytes
-SHA1 (mush/patch-7.2.6-beta-2) = d6e6ccfa1aaa7113a601c6570364eaa901e78749
-RMD160 (mush/patch-7.2.6-beta-2) = b42f8d4f142f556cff02140bba0ca596cc57440d
-Size (mush/patch-7.2.6-beta-2) = 1907 bytes
-SHA1 (mush/patch-7.2.6-beta-3) = 43014005455f1f219f5590506ae354875da0f825
-RMD160 (mush/patch-7.2.6-beta-3) = 196e8aa0f7d3574709760a6a2ae74b0343b11b9f
-Size (mush/patch-7.2.6-beta-3) = 56089 bytes
-SHA1 (mush/patch-7.2.6-beta-4) = ad506cafa0649196a8dc0576dd17d60937f226e7
-RMD160 (mush/patch-7.2.6-beta-4) = dd3ac8494e0c85ba47516c4d4bb9fce4c9f1a8a7
-Size (mush/patch-7.2.6-beta-4) = 19764 bytes
-SHA1 (patch-aa) = dd38a31a1e048471013df7a167fdf5582445ce2b
-SHA1 (patch-ab) = e1482baca81fe09889f8316d96f9afb1a7a6bbb0
-SHA1 (patch-ac) = 963ce2cc9e30a2cd5e7e63edbe09692a880d8d5b
-SHA1 (patch-ad) = 2bcbd8e6e052d1549d4eb5201ec10f5ff3fd3051
-SHA1 (patch-ae) = 2923fa751a0e3dba13bc711694285973225e21b6
-SHA1 (patch-af) = 1df2f9fb0b536cc30f94ba357a5de9fe11bbf941
-SHA1 (patch-ag) = dce8cf449bca506d2d478a9b925aa4b80b34f6d6
-SHA1 (patch-ah) = ddd684d8de13fd2f338c506254229fa63cca9e94
-SHA1 (patch-ai) = 5659b2d975f86e856d1bf6efb8909bc08ec2acf4
-SHA1 (patch-aj) = fee38b6e855a6494ecef0e41e2602850d1b58746
-SHA1 (patch-ak) = fc25abdf0dfe16020a7ca5e4b284c40367f20f98
-SHA1 (patch-al) = 4d0c9ff2a6a8c3c1d59a81b659ed3599881cc762
-SHA1 (patch-am) = 6ce0fd015cb33ada51e086be1131ec0ad94f4169
-SHA1 (patch-an) = 9c7441265ac13e73a4143440b3a1706f81d9d00c
-SHA1 (patch-ao) = e5b28c4a761c1bc1bba195c5dc6ff332cad51f67
diff --git a/mail/mush/patches/patch-aa b/mail/mush/patches/patch-aa
deleted file mode 100644
index 32db031d4ef..00000000000
--- a/mail/mush/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1 1998/09/04 18:33:46 christos Exp $
-
-*** old/curs_io.c Fri Sep 4 11:22:07 1998
---- curs_io.c Fri Sep 4 11:21:28 1998
-***************
-*** 56,62 ****
- if (is_tty)
- savetty();
-
-! #if defined(SYSV) || defined(AIX)
- eofc = _tty.c_cc[VEOF];
- #else
- #ifdef BSD
---- 56,62 ----
- if (is_tty)
- savetty();
-
-! #if defined(SYSV) || defined(AIX) || defined(POSIX)
- eofc = _tty.c_cc[VEOF];
- #else
- #ifdef BSD
diff --git a/mail/mush/patches/patch-ab b/mail/mush/patches/patch-ab
deleted file mode 100644
index 7f13124941f..00000000000
--- a/mail/mush/patches/patch-ab
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1998/09/04 18:33:46 christos Exp $
-
-*** old/file.c Fri Sep 4 11:22:07 1998
---- file.c Fri Sep 4 11:21:28 1998
-***************
-*** 115,121 ****
- return buf; /* it may be wanted for creating */
- }
- *isdir = -1;
-! return sys_errlist[errno];
- }
- *isdir = ((stat_buf.st_mode & S_IFMT) == S_IFDIR);
- return buf;
---- 115,121 ----
- return buf; /* it may be wanted for creating */
- }
- *isdir = -1;
-! return (char *) sys_errlist[errno];
- }
- *isdir = ((stat_buf.st_mode & S_IFMT) == S_IFDIR);
- return buf;
-***************
-*** 396,401 ****
---- 396,402 ----
- register int total = 0;
- char file[MAXPATHLEN], buf[HDRSIZ], *start = s, c;
- register char *p, *b = buf, *fpath;
-+ static char gpat[] = "/?*=*?/\052";
-
- do {
- if (!(p = get_name_n_addr(s, NULL, file)))
-***************
-*** 409,415 ****
- * \052 is a * for broken compilers that would do a comment.
- */
- if (force || *file == '+' || *file == '~' ||
-! *file == '|' || *file == '/' && !glob(file, "/?*=*?/\052")) {
- int isdir;
- /* open either "file" or &file[1] */
- if (*file == '|') {
---- 410,416 ----
- * \052 is a * for broken compilers that would do a comment.
- */
- if (force || *file == '+' || *file == '~' ||
-! *file == '|' || *file == '/' && !glob(file, gpat)) {
- int isdir;
- /* open either "file" or &file[1] */
- if (*file == '|') {
diff --git a/mail/mush/patches/patch-ac b/mail/mush/patches/patch-ac
deleted file mode 100644
index 361cb512fa6..00000000000
--- a/mail/mush/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1998/09/04 18:33:47 christos Exp $
-
-*** old/malloc.c Fri Sep 4 11:22:08 1998
---- malloc.c Fri Sep 4 11:21:28 1998
-***************
-*** 436,442 ****
- {
- extern char end[];
-
-! if (cp && cp >= end && cp < stackbottom && cp < (char *) &cp && debug < 5)
- free(cp);
- }
-
---- 436,442 ----
- {
- extern char end[];
-
-! if (cp && cp >= (void *) end && cp < (void *) stackbottom && cp < (void *) &cp && debug < 5)
- free(cp);
- }
-
diff --git a/mail/mush/patches/patch-ad b/mail/mush/patches/patch-ad
deleted file mode 100644
index e26b4f286f8..00000000000
--- a/mail/mush/patches/patch-ad
+++ /dev/null
@@ -1,785 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2006/01/08 17:04:58 joerg Exp $
-
---- mush.h.orig 2006-01-08 16:53:34.000000000 +0000
-+++ mush.h
-@@ -4,89 +4,98 @@
-
- /* POSIX -- a collection of standardized parts from SYSV and BSD */
- #if defined(POSIX) || defined(BSD44)
--#include <unistd.h>
--#ifndef NO_STDLIB
--#include <stdlib.h>
--#endif
--#define SIGRET void
-+# include <unistd.h>
-+# ifndef NO_STDLIB
-+# include <stdlib.h>
-+# endif
-+# define SIGRET void
- #endif
-+
- #ifdef SVR4
--#include <libgen.h>
-+# include <libgen.h>
- #endif
-
- /* STDC -- i.e. ANSI C, a collection of standardized modifications to
- * the C language, often accompanied by [partial] POSIX compliance
- */
- #ifdef __STDC__
--#ifndef VPRINTF
--#define VPRINTF
--#endif
-+# ifndef VPRINTF
-+# define VPRINTF
-+# endif
- #endif
-
- #ifdef CURSES
-
--#ifndef POSIX
--#ifdef USG
--# define _USG
--# undef USG
--#endif /* USG */
--#ifdef SYSV
--# define _SYSV
--# undef SYSV
--#endif /* SYSV */
--#endif /* POSIX */
--
--#ifdef NCURSES
--# undef NCURSES
--# include <ncurses.h>
--#else
--# include <curses.h>
--#endif
--
--#ifdef timeout
--#undef timeout
--#endif
--#ifdef overwrite
--#undef overwrite
--#endif
--
--#ifdef linux
--#include <termios.h>
--#endif /* linux */
--
--#if !defined(USG) && defined(_USG)
--# define USG
--#endif /* USG */
--#if !defined(SYSV) && defined(_SYSV)
--# define SYSV
--#endif /* SYSV */
-+# ifndef POSIX
-+# ifdef USG
-+# define _USG
-+# undef USG
-+# endif /* USG */
-+# ifdef SYSV
-+# define _SYSV
-+# undef SYSV
-+# endif /* SYSV */
-+# endif /* POSIX */
-+
-+# ifdef BSD44
-+# include <termios.h>
-+# endif /* BSD44 */
-+# ifdef NCURSES
-+# undef NCURSES
-+# include <ncurses.h>
-+# else
-+# include <curses.h>
-+# endif
-+
-+# ifdef timeout
-+# undef timeout
-+# endif
-+# ifdef overwrite
-+# undef overwrite
-+# endif
-+
-+# ifdef linux
-+# include <termios.h>
-+# endif /* linux */
-+
-+# if !defined(USG) && defined(_USG)
-+# define USG
-+# endif /* USG */
-+# if !defined(SYSV) && defined(_SYSV)
-+# define SYSV
-+# endif /* SYSV */
-
- #else /* CURSES */
--#include <stdio.h>
--#if defined(POSIX) || defined(SVR4)
--#include <termios.h>
--#else /* POSIX */
--#if defined(SYSV) && defined(USG) || defined(AIX)
--#include <termio.h>
--#ifdef DGUX
--#include <ioctl.h>
--#endif /* DGUX */
--#endif /* POSIX */
--#endif /* SYSV && USG */
-+# include <stdio.h>
-+# if defined(POSIX) || defined(SVR4)
-+# include <termios.h>
-+# else /* POSIX */
-+# if defined(SYSV) && defined(USG) || defined(AIX)
-+# include <termio.h>
-+# ifdef DGUX
-+# include <ioctl.h>
-+# endif /* DGUX */
-+# endif /* SYSV && USG || AIX */
-+# endif /* POSIX */
- #endif /* CURSES */
-
- #ifdef HPUX
--#include <termio.h>
-+# include <termio.h>
- #endif /* HPUX */
-
- #if defined(SVR4)
--#include <sys/ttold.h>
-+# include <sys/ttold.h>
- #endif /* SVR4 */
-
- #include <ctype.h>
- #include <errno.h>
- #include <setjmp.h>
- #include "strings.h"
-+#ifdef MSGS_DYNAMIC
-+# if (defined(sun) || defined(__sun__)) && (defined(sparc) || defined(__sparc__))
-+# include <alloca.h>
-+# endif
-+#endif
-
- #ifndef __STDC__
- extern char
-@@ -100,79 +109,85 @@ extern void
- xfree(); /* free malloc'ed pointers */
-
- #ifdef BSD
--#define fputs Fputs /* See comments in print.c */
-+# define fputs Fputs /* See comments in print.c */
- #endif /* BSD */
-
- #if (defined(BSD) || defined(GETWD)) && !defined(__STDC__)
- extern char *getwd();
--#define GetCwd(buf,len) getwd(buf)
-+# define GetCwd(buf,len) getwd(buf)
- #else
--#ifndef __STDC__
-+# ifndef __STDC__
- extern char *getcwd();
--#endif
--#define GetCwd(buf,len) getcwd(buf,len)
-+# endif
-+# define GetCwd(buf,len) getcwd(buf,len)
- #endif /* BSD || GETWD */
-
- #ifdef SUNTOOL
--# include <suntool/sunview.h>
--#ifdef SUN_4_0
--# include <suntool/alert.h>
--#endif /* SUN_4_0 */
--# include <suntool/textsw.h>
--# include <sys/ioctl.h> /* for ltchars */
-+# include <suntool/sunview.h>
-+# ifdef SUN_4_0
-+# include <suntool/alert.h>
-+# endif /* SUN_4_0 */
-+# include <suntool/textsw.h>
-+# include <sys/ioctl.h> /* for ltchars */
- #else
--# include <sys/types.h>
--# include <signal.h>
--# ifndef SYSV
--# include <sys/time.h>
--# include <sys/ioctl.h> /* for ltchars */
--# else
--# include <time.h>
--# ifdef M_UNIX
--# ifndef SELECT
--# define SELECT
--# endif
--# include <sys/select.h>
--# endif /* M_UNIX */
--# include <fcntl.h>
--# endif /* SYSV */
-+# include <sys/types.h>
-+# include <signal.h>
-+# ifndef SYSV
-+# include <sys/time.h>
-+# include <sys/ioctl.h> /* for ltchars */
-+# else
-+# include <time.h>
-+# ifdef M_UNIX
-+# ifndef SELECT
-+# define SELECT
-+# endif
-+# include <sys/select.h>
-+# endif /* M_UNIX */
-+# include <fcntl.h>
-+# endif /* SYSV */
- #endif /* SUNTOOL */
-
-+#ifdef BSD44
-+# define REGCOMP
-+# include <regex.h>
-+#endif
-+
- #ifdef POSIX_UTIME
--#ifdef POSIX
--#include <utime.h>
--#else /* POSIX */
--#include <sys/utime.h>
--#endif /* POSIX */
-+# ifdef POSIX
-+# include <utime.h>
-+# else /* POSIX */
-+# include <sys/utime.h>
-+# endif /* POSIX */
- #endif /* POSIX_UTIME */
-+
- #include <sys/stat.h>
- #include <sys/file.h>
-
- #ifdef SUNTOOL
--# include <suntool/panel.h>
--# include <suntool/canvas.h>
--# include <suntool/tty.h>
--# include <suntool/menu.h>
--# include <suntool/icon.h>
--# include <suntool/scrollbar.h>
--# include <suntool/icon_load.h>
-+# include <suntool/panel.h>
-+# include <suntool/canvas.h>
-+# include <suntool/tty.h>
-+# include <suntool/menu.h>
-+# include <suntool/icon.h>
-+# include <suntool/scrollbar.h>
-+# include <suntool/icon_load.h>
- #endif /* SUNTOOL */
-
- /* if no maximum number of files can be found, we'll use getdtablesize() */
- #ifdef _NFILE
--# define MAXFILES _NFILE
-+# define MAXFILES _NFILE
- #else
--#ifdef NOFILE
--# define MAXFILES NOFILE
--#endif /* NOFILE */
-+# ifdef NOFILE
-+# define MAXFILES NOFILE
-+# endif /* NOFILE */
- #endif /* _NFILE */
-
- #ifndef MAXPATHLEN
--#define MAXPATHLEN BUFSIZ
-+# define MAXPATHLEN BUFSIZ
- #endif /* MAXPATHLEN */
-
- #ifdef CTRL
--#undef CTRL
-+# undef CTRL
- #endif /* CTRL */
- #define CTRL(c) ((c) & 037)
-
-@@ -180,20 +195,24 @@ extern char *getcwd();
-
- #define NO_STRING ""
- #ifdef NULL
--#undef NULL
-+# undef NULL
- #endif /* NULL */
-+#ifdef __STDC__
-+#define NULL (void *)0
-+#else
- #define NULL (char *)0
-+#endif
- #define NULL_FILE (FILE *)0
- #define DUBL_NULL (char **)0
- #define TRPL_NULL (char ***)0
- #ifdef putchar
--#undef putchar
-+# undef putchar
- #endif /* putchar */
- #define putchar(c) (void) (fputc(c, stdout), fflush(stdout))
- #ifdef SUNTOOL
- extern int bell();
- #else /* SUNTOOL */
--#define bell() (void) (fputc('\007', stderr), fflush(stderr))
-+# define bell() (void) (fputc('\007', stderr), fflush(stderr))
- #endif /* SUNTOOL */
-
- /* For error recovery purposes, send keyboard generated signals to a special
-@@ -211,121 +230,121 @@ extern int bell();
-
- /* Don't flush input when setting echo or cbreak modes (allow typeahead) */
- #ifdef TIOCSETN
--#ifdef stty
--#undef stty
--#endif /* stty */
--#define stty(fd, sgttybuf) ioctl(fd, TIOCSETN, sgttybuf)
-+# ifdef stty
-+# undef stty
-+# endif /* stty */
-+# define stty(fd, sgttybuf) ioctl(fd, TIOCSETN, sgttybuf)
- #endif /* TIOCSETN */
-
- /* for system-V machines that run termio */
- #if defined(SYSV) && defined(USG) || defined(AIX) || defined(POSIX) || defined(BSD44)
--#ifdef crmode
--#undef crmode
--#undef nocrmode
--#endif /* nocrmode */
-+# ifdef crmode
-+# undef crmode
-+# undef nocrmode
-+# endif /* nocrmode */
-
- unsigned char vmin, vtime;
-
--#ifdef __linux__
--# undef TCGETA
--# undef TCSETAW
--# define TCGETA TCGETS
--# define TCSETAW TCSETSW
--#endif
--#ifdef BSD44
--# undef TCGETA
--# undef TCSETAW
--# define TCGETA TIOCGETA
--# define TCSETAW TIOCSETAW
--#endif
--
--#ifdef POSIX
--#define sg_erase c_cc[VERASE]
--#define sg_flags c_lflag
--#define sg_kill c_cc[VKILL]
--#define gtty(fd, SGTTYbuf) tcgetattr(fd, SGTTYbuf)
--#undef stty
--#define stty(fd, SGTTYbuf) tcsetattr(fd, TCSADRAIN, SGTTYbuf)
--#else /* !POSIX */
--#define sg_erase c_cc[2]
--#define sg_flags c_lflag
--#define sg_kill c_cc[3]
--#define sg_ospeed c_cflag
--#define gtty(fd, SGTTYbuf) ioctl(fd, TCGETA, SGTTYbuf)
--#undef stty
--#define stty(fd, SGTTYbuf) ioctl(fd, TCSETAW, SGTTYbuf)
--#endif /* POSIX */
--
--#define echon() (_tty.sg_flags |= (ECHO|ECHOE), stty(0, &_tty))
--#define echoff() (_tty.sg_flags &= ~ECHO, stty(0, &_tty))
--#define cbrkon() \
-+# ifdef __linux__
-+# undef TCGETA
-+# undef TCSETAW
-+# define TCGETA TCGETS
-+# define TCSETAW TCSETSW
-+# endif
-+# ifdef BSD44
-+# undef TCGETA
-+# undef TCSETAW
-+# define TCGETA TIOCGETA
-+# define TCSETAW TIOCSETAW
-+# endif
-+
-+# ifdef POSIX
-+# define sg_erase c_cc[VERASE]
-+# define sg_flags c_lflag
-+# define sg_kill c_cc[VKILL]
-+# define gtty(fd, SGTTYbuf) tcgetattr(fd, SGTTYbuf)
-+# undef stty
-+# define stty(fd, SGTTYbuf) tcsetattr(fd, TCSADRAIN, SGTTYbuf)
-+# else /* !POSIX */
-+# define sg_erase c_cc[2]
-+# define sg_flags c_lflag
-+# define sg_kill c_cc[3]
-+# define sg_ospeed c_cflag
-+# define gtty(fd, SGTTYbuf) ioctl(fd, TCGETA, SGTTYbuf)
-+# undef stty
-+# define stty(fd, SGTTYbuf) ioctl(fd, TCSETAW, SGTTYbuf)
-+# endif /* POSIX */
-+
-+# define echon() (_tty.sg_flags |= (ECHO|ECHOE), stty(0, &_tty))
-+# define echoff() (_tty.sg_flags &= ~ECHO, stty(0, &_tty))
-+# define cbrkon() \
- (_tty.sg_flags &= ~ICANON, _tty.c_cc[VMIN] = 1, stty(0, &_tty))
--#define cbrkoff() \
-+# define cbrkoff() \
- (_tty.sg_flags |= ICANON,_tty.c_cc[VMIN] = vmin,_tty.c_iflag |= ICRNL, \
- _tty.c_cc[VTIME] = vtime, stty(0, &_tty))
-
--#ifdef __linux__
--# undef savetty
--# undef cbreak
--# undef nocbreak
--#endif
-+# ifdef __linux__
-+# undef savetty
-+# undef cbreak
-+# undef nocbreak
-+# endif
-
--#ifndef savetty
--# define savetty() \
-+# ifndef savetty
-+# define savetty() \
- (void) gtty(0, &_tty), vtime = _tty.c_cc[VTIME], vmin = _tty.c_cc[VMIN]
--#endif
--#ifndef cbreak
--# define cbreak() cbrkon()
--#endif
--#ifndef nocbreak
--# define nocbreak() cbrkoff()
--#endif
-+# endif
-+# ifndef cbreak
-+# define cbreak() cbrkon()
-+# endif
-+# ifndef nocbreak
-+# define nocbreak() cbrkoff()
-+# endif
-
- /* If curses isn't defined, declare our 'tty' and macros for echo/cbreak */
--#ifndef CURSES
--#ifdef POSIX
-+# ifndef CURSES
-+# ifdef POSIX
- typedef struct termios SGTTY;
--#else
-+# else
- typedef struct termio SGTTY;
--#endif
--#define echom() echon()
--#define noechom() echoff()
--#define crmode() cbrkon()
--#define nocrmode() cbrkoff()
-+# endif
-+# define echom() echon()
-+# define noechom() echoff()
-+# define crmode() cbrkon()
-+# define nocrmode() cbrkoff()
-
- /* These two moved from above; is that right?? Were they misplaced? */
- /* are these even needed? I don't think any code (except below) uses them. */
--#define cbreak() cbrkon()
--#define nocbreak() cbrkoff()
-+# define cbreak() cbrkon()
-+# define nocbreak() cbrkoff()
-
--#else /* CURSES */
--#ifdef DEFINE_CURSES_SGTTY
-+# else /* CURSES */
-+# if defined(DEFINE_CURSES_SGTTY) || defined(BSD44)
- typedef struct termios SGTTY;
--#endif
-+# endif
- /* If curses is defined, use the echo/cbreak commands in library only
- * if curses is running. If curses isn't running, use macros above.
- */
--#define echom() ((iscurses) ? echo(): echon())
--#define noechom() ((iscurses) ? noecho(): echoff())
--#define crmode() ((iscurses) ? cbreak() : cbrkon())
--#define nocrmode() ((iscurses) ? nocbreak() : cbrkoff())
--#endif /* CURSES */
-+# define echom() ((iscurses) ? echo(): echon())
-+# define noechom() ((iscurses) ? noecho(): echoff())
-+# define crmode() ((iscurses) ? cbreak() : cbrkon())
-+# define nocrmode() ((iscurses) ? nocbreak() : cbrkoff())
-+# endif /* CURSES */
- #endif /* SYSV && USG || AIX || POSIX || BSD44 */
-
- #if !defined(USG) && !defined(AIX) && !defined(POSIX) && !defined(BSD44)
--#ifndef CURSES
-+# ifndef CURSES
- /* if curses is not defined, simulate the same tty based macros */
- typedef struct sgttyb SGTTY;
- /* Do real ioctl calls to set the tty modes */
--#define crmode() (_tty.sg_flags |= CBREAK, stty(0, &_tty))
--#define nocrmode() (_tty.sg_flags &= ~CBREAK, stty(0, &_tty))
--#define echom() (_tty.sg_flags |= ECHO, stty(0, &_tty))
--#define noechom() (_tty.sg_flags &= ~ECHO, stty(0, &_tty))
--#define savetty() (void) gtty(0, &_tty)
--#else /* CURSES */
--#define echom() echo()
--#define noechom() noecho()
--#endif /* ~CURSES */
-+# define crmode() (_tty.sg_flags |= CBREAK, stty(0, &_tty))
-+# define nocrmode() (_tty.sg_flags &= ~CBREAK, stty(0, &_tty))
-+# define echom() (_tty.sg_flags |= ECHO, stty(0, &_tty))
-+# define noechom() (_tty.sg_flags &= ~ECHO, stty(0, &_tty))
-+# define savetty() (void) gtty(0, &_tty)
-+# else /* CURSES */
-+# define echom() echo()
-+# define noechom() noecho()
-+# endif /* ~CURSES */
- #endif /* ~USG */
-
- /* With all that out of the way, we can now declare our tty type */
-@@ -351,78 +370,78 @@ extern char
- #define Debug if (debug == 0) {;} else (void) wprint
-
- #ifdef SYSV
--#ifndef L_SET
--#define L_SET 0
--#endif /* L_SET */
--#ifndef F_OK
--#define F_OK 000
--#define R_OK 004
--#define W_OK 002
--#define E_OK 001
--#endif /* F_OK */
--#ifdef u_long
--#undef u_long
--#endif /* u_long */
--#define u_long unsigned long
--#ifndef HPUX
--#define vfork fork
--#endif /* HPUX */
--#ifndef SIGCHLD
--#define SIGCHLD SIGCLD
--#endif /* SIGCHLD */
-+# ifndef L_SET
-+# define L_SET 0
-+# endif /* L_SET */
-+# ifndef F_OK
-+# define F_OK 000
-+# define R_OK 004
-+# define W_OK 002
-+# define E_OK 001
-+# endif /* F_OK */
-+# ifdef u_long
-+# undef u_long
-+# endif /* u_long */
-+# define u_long unsigned long
-+# ifndef HPUX
-+# define vfork fork
-+# endif /* HPUX */
-+# ifndef SIGCHLD
-+# define SIGCHLD SIGCLD
-+# endif /* SIGCHLD */
- #endif /* SYSV */
-
- #if !defined(SUNTOOL) && !defined(CURSES)
-
--#define TRUE 1
--#define FALSE 0
--#define print (void) printf
--#define wprint (void) printf
--#define print_more (void) printf
-+# define TRUE 1
-+# define FALSE 0
-+# define print (void) printf
-+# define wprint (void) printf
-+# define print_more (void) printf
-
- #endif /* !SUNTOOL && !CURSES */
-
- #ifndef max
--#define max(a,b) (((a) > (b)) ? (a) : (b))
--#define min(a,b) (((a) < (b)) ? (a) : (b))
-+# define max(a,b) (((a) > (b)) ? (a) : (b))
-+# define min(a,b) (((a) < (b)) ? (a) : (b))
- #endif /* max */
-
- #if defined(CURSES) && (!defined(SUNTOOL))
--#define wprint (void) printf
-+# define wprint (void) printf
- #endif /* CURSES && (!SUNTOOL) */
-
- #ifdef SUNTOOL
- /* stdout may be closed */
--#define printf wprint
-+# define printf wprint
- #else /* !SUNTOOL */
--#define ok_box print
-+# define ok_box print
- #endif /* SUNTOOL */
-
- #if defined(CURSES) || defined(SUNTOOL)
--#define print_more turnon(glob_flags, CONT_PRNT), print
--#ifdef __STDC__
-+# define print_more turnon(glob_flags, CONT_PRNT), print
-+# ifdef __STDC__
- void print(char *fmt,...); /* compliance with ansi header for varargs */
--#else /* __STDC__ */
-+# else /* __STDC__ */
- void print(); /* printf to window or curses or tty accordingly */
--#endif /* __STDC__ */
-+# endif /* __STDC__ */
- #endif /* CURSES || SUNTOOL */
-
- #define ArraySize(o) (sizeof(o) / sizeof(*o))
-
- #ifdef SUNTOOL
-
--#define NO_ITEM (Panel_item)0
--#define NO_EVENT (struct inputevent *)0
--#define TIME_OUT 60 /* sleep 60 secs between mailchecks */
--#define PIX_XOR PIX_SRC ^ PIX_DST
--#define ID event_id(event)
--#define l_width() mush_font->pf_defaultsize.x /* width of letter */
--#define l_height() mush_font->pf_defaultsize.y /* height of letter */
--#define Clrtoeol(w,x,y) ((void) pw_text(w, x, y, PIX_SRC, mush_font, blank))
--
-+# define NO_ITEM (Panel_item)0
-+# define NO_EVENT (struct inputevent *)0
-+# define TIME_OUT 60 /* sleep 60 secs between mailchecks */
-+# define PIX_XOR PIX_SRC ^ PIX_DST
-+# define ID event_id(event)
-+# define l_width() mush_font->pf_defaultsize.x /* width of letter */
-+# define l_height() mush_font->pf_defaultsize.y /* height of letter */
-+# define Clrtoeol(w,x,y) ((void) pw_text(w, x, y, PIX_SRC, mush_font, blank))
-+
- /* Miscellaneous old-SunView cleanup */
- #ifndef TTY_ARGV_DO_NOT_FORK
--#define TTY_ARGV_DO_NOT_FORK (-1)
-+# define TTY_ARGV_DO_NOT_FORK (-1)
- #endif
-
- #endif /* SUNTOOL */
-@@ -547,19 +566,34 @@ u_long glob_flags; /* global boolean f
- /* It is possible to reset MAX_PRIORITY to as high as 9 */
- #define MAX_PRIORITY 5
-
--#define MAXMSGS_BITS ((MAXMSGS+7)/8) /* number of bits for bitmap */
--
-+#ifndef MSGS_DYNAMIC
-+# define MAXMSGS_BITS MAXMSGS/sizeof(char) /* number of bits for bitmap */
-+#else
-+# define MSGS_BITS(a) (((a)+7)/8)
-+# define MSGS_INCR 500
-+#endif
-+
- struct msg {
- u_long m_flags;
- long m_offset; /* offset in tempfile of msg */
- long m_size; /* number of bytes in msg */
- int m_lines; /* number of lines in msg */
-+ int m_headers; /* number of header lines in msg */
- char *m_date_recv;/* Date user received msg (see dates.c for fmt) */
- char *m_date_sent;/* Date author sent msg (see dates.c for fmt) */
- char *m_to; /* Cached To: field */
- char *m_subject; /* Cached Subject: field */
- char *m_from; /* Cached Reply-To: or From: field */
--} msg[MAXMSGS];
-+ char *m_addr; /* Cached Reply-To: or From: field */
-+ char *m_name; /* Cached Reply-To: or From: field */
-+ char m_author; /* if any of the 3 preceding ones has been inited */
-+ u_long m_spare; /* spare field */
-+}
-+#ifdef MSGS_DYNAMIC
-+ *msg;
-+#else
-+ msg[MAXMSGS];
-+#endif
-
- struct options {
- char *option;
-@@ -597,13 +631,16 @@ extern char
- **environ; /* user's environment variables */
- #endif
-
--extern int errno; /* global system error number */
- jmp_buf jmpbuf; /* longjmp to jmpbuf on sigs (not in tool) */
-
- char
- debug, /* debug causes various print statements in code */
- tempfile[MAXPATHLEN], /* path to filename of temporary file */
-+#ifdef MSGS_DYNAMIC
-+ *msg_list, /* boolean storage */
-+#else
- msg_list[MAXMSGS_BITS], /* MAXMSGS bits of boolean storage */
-+#endif
- **alternates, /* alternates list --see alts() */
- *cmd_help, /* filename of location for "command -?" commands. */
- *login, /* login name of user */
-@@ -658,6 +695,9 @@ char
- int
- last_msg_cnt, /* when checking for new mail, save the last msg_cnt */
- msg_cnt, /* total number of messages */
-+#ifdef MSGS_DYNAMIC
-+ msg_max, /* current maximum allocation limit */
-+#endif
- crt, /* min number of lines msg contains to invoke pager */
- current_msg, /* the current message we're dealing with */
- exec_pid, /* pid of a command that has been "exec"ed */
-@@ -666,7 +706,7 @@ int
- #if defined(SUNTOOL) || defined(lint)
- istool, /* argv[0] == "xxxxtool", ranges from 0 to 2 */
- #else /* !SUNTOOL */
--#define istool 0
-+# define istool 0
- #endif /* SUNTOOL */
- n_array[128], /* array of message numbers in the header window */
- screen, /* number of headers window can handle */
-@@ -725,7 +765,7 @@ int
- char * quoteit();
-
- #ifndef SIGRET
--#define SIGRET int
-+# define SIGRET int
- #endif /* SIGRET */
- SIGRET
- rm_edfile(), /* remove letter-compose file on interrupts */
-@@ -737,8 +777,8 @@ SIGRET
-
- long
- spool_size, /* size of spool mail regardless of current folder */
-- last_size, /* the last size of the mailfile since last check */
-- time(); /* satisfy lint */
-+ last_size; /* the last size of the mailfile since last check */
-+/* time(); satisfy lint */
-
- void
- error(), getmail(), mail_status(), sign_letter(),
-@@ -754,9 +794,9 @@ void
- #ifdef TIOCGLTC
- struct ltchars ltchars; /* tty character settings */
- #endif /* TIOCGLTC */
--#if defined(BSD) && !defined(AIX) /* (TIOCGETC) */
-+#if defined(BSD) && !defined(AIX) && defined(TIOCGETC)
- struct tchars tchars; /* more tty character settings */
--#endif /* BSD && !AIX (TIOCGETC) */
-+#endif /* BSD && !AIX && TIOCGETC */
-
- #ifdef CURSES
-
-@@ -775,16 +815,16 @@ void
- mac_flush(); /* Abandon macro processing (on error) */
-
- #if defined(SUNTOOL) || defined(POP3_SUPPORT)
--#ifdef POP3_SUPPORT
--#define MIN_TIME_OUT (15 * 60) /* 15 min. checks */
-+# ifdef POP3_SUPPORT
-+# define MIN_TIME_OUT (15 * 60) /* 15 min. checks */
- extern void popchkmail();
- extern void popgetmail();
--#ifdef MAIL_FROM_POPHOST
-+# ifdef MAIL_FROM_POPHOST
- extern char *pophostname();
--#endif /* MAIL_FROM_POPHOST */
--#else
--#define MIN_TIME_OUT 30 /* 30 sec. checks */
--#endif /* POP3_SUPPORT */
-+# endif /* MAIL_FROM_POPHOST */
-+# else
-+# define MIN_TIME_OUT 30 /* 30 sec. checks */
-+# endif /* POP3_SUPPORT */
-
- int
- time_out; /* time out interval to wait for new mail */
-@@ -838,3 +878,7 @@ typedef enum {
- MUSH_SCROLL_PASS_EVENT
- } Scroll_action;
- #endif /* SUNTOOL */
-+
-+#ifdef __linux__
-+#include <time.h>
-+#endif
diff --git a/mail/mush/patches/patch-ae b/mail/mush/patches/patch-ae
deleted file mode 100644
index f7c74aa7839..00000000000
--- a/mail/mush/patches/patch-ae
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1998/09/04 18:33:47 christos Exp $
-
-*** old/panels.c Fri Sep 4 11:22:05 1998
---- panels.c Fri Sep 4 11:21:28 1998
-***************
-*** 31,36 ****
---- 31,37 ----
- save_item, /* saves messages */
- sub_hdr_item[6]; /* display items that just sit there and give help */
-
-+ static char gpat[] = "*/{.,..}";
- #ifndef NO_WALK_MENUS
- Panel
- folder_panel,
-***************
-*** 461,467 ****
- struct stat s_buf;
- char buf[MAXPATHLEN];
-
-! if (glob(path, "*/{.,..}")) {
- return NULL;
- }
-
---- 462,468 ----
- struct stat s_buf;
- char buf[MAXPATHLEN];
-
-! if (glob(path, gpat)) {
- return NULL;
- }
-
-***************
-*** 708,714 ****
- sprintf(buf, "%s/{.*,*}", path);
- if (filexp(buf, &names) > 0) {
- for (np = names; np && *np; np++) {
-! if (!glob(*np, "*/{.,..}"))
- add_path_to_menu(item, *np, n);
- }
- free_vec(names);
---- 709,715 ----
- sprintf(buf, "%s/{.*,*}", path);
- if (filexp(buf, &names) > 0) {
- for (np = names; np && *np; np++) {
-! if (!glob(*np, gpat))
- add_path_to_menu(item, *np, n);
- }
- free_vec(names);
diff --git a/mail/mush/patches/patch-af b/mail/mush/patches/patch-af
deleted file mode 100644
index 6cbf99690c6..00000000000
--- a/mail/mush/patches/patch-af
+++ /dev/null
@@ -1,938 +0,0 @@
-$NetBSD: patch-af,v 1.4 2000/01/03 20:59:24 christos Exp $
-
-*** old/commands.c Fri Sep 4 11:22:06 1998
---- commands.c Fri Sep 4 11:21:28 1998
-***************
-*** 493,499 ****
---- 493,503 ----
- char **argv, *list;
- {
- register char *cmd = *argv;
-+ #ifndef MSGS_DYNAMIC
- char list1[MAXMSGS_BITS];
-+ #else
-+ char *list1 = (char *) alloca(MSGS_BITS(msg_cnt));
-+ #endif
- int cur_msg = current_msg, save_cnt = msg_cnt;
-
- if (*++argv && !strcmp(*argv, "-?"))
-***************
-*** 502,508 ****
- return -1;
-
- /* make into our own list so ~: commands don't overwrite this list */
-! bitput(list, list1, MAXMSGS, =);
-
- /* back up one arg to replace "cmd" in the new argv[0] */
- argv += (n-1);
---- 506,512 ----
- return -1;
-
- /* make into our own list so ~: commands don't overwrite this list */
-! bitput(list, list1, msg_cnt, =);
-
- /* back up one arg to replace "cmd" in the new argv[0] */
- argv += (n-1);
-***************
-*** 533,539 ****
- if (istool)
- (void) do_hdrs(0, DUBL_NULL, NULL);
- /* copy the specified list back into msg_list */
-! bitput(list1, list, MAXMSGS, =);
- return 0;
- }
-
---- 537,543 ----
- if (istool)
- (void) do_hdrs(0, DUBL_NULL, NULL);
- /* copy the specified list back into msg_list */
-! bitput(list1, list, msg_cnt, =);
- return 0;
- }
-
-*** old/doproc.c Fri Sep 4 11:22:05 1998
---- doproc.c Fri Sep 4 11:21:28 1998
-***************
-*** 859,865 ****
- int value;
- Event *event;
- {
-! char *argv[3], list[MAXMSGS_BITS];
- char *p = (char *)panel_get_value(msg_num_item);
- int n = 0;
-
---- 859,869 ----
- int value;
- Event *event;
- {
-! #ifndef MSGS_DYNAMIC
-! char list[MAXMSGS_BITS];
-! #else
-! char *list = (char *) alloca(MSGS_BITS(msg_cnt));
-! #endif
- char *p = (char *)panel_get_value(msg_num_item);
- int n = 0;
-
-*** old/expr.c Thu May 3 15:40:10 1990
---- expr.c Fri Sep 4 11:21:28 1998
-***************
-*** 17,23 ****
---- 17,27 ----
- {
- register int num1 = -1, num2 = -1, except = 0;
- register char *p2;
-+ #ifndef MSGS_DYNAMIC
- char list2[MAXMSGS_BITS];
-+ #else
-+ char *list2 = (char *) alloca(MSGS_BITS(msg_cnt));
-+ #endif
-
- if (!p)
- return "";
-*** old/folders.c Fri Sep 4 11:22:09 1998
---- folders.c Fri Sep 4 11:21:28 1998
-***************
-*** 138,145 ****
---- 138,153 ----
- xfree(msg[msg_cnt].m_subject);
- xfree(msg[msg_cnt].m_to);
- xfree(msg[msg_cnt].m_from);
-+ xfree(msg[msg_cnt].m_name);
-+ xfree(msg[msg_cnt].m_addr);
- msg[msg_cnt].m_subject = NULL;
- msg[msg_cnt].m_to = msg[msg_cnt].m_from = NULL;
-+ msg[msg_cnt].m_name = msg[msg_cnt].m_addr = NULL;
-+ msg[msg_cnt].m_author = 0;
-+ msg[msg_cnt].m_flags = 0;
-+ msg[msg_cnt].m_size = 0;
-+ msg[msg_cnt].m_offset = 0;
-+ msg[msg_cnt].m_lines = 0;
- }
- msg_cnt = 0, msg[0].m_offset = 0L;
- turnoff(glob_flags, CONT_PRNT);
-***************
-*** 268,274 ****
- register char **argv;
- {
- register char *p;
-! char buf[128], unused[MAXMSGS_BITS];
-
- if (argv && argv[1] && !strcmp(argv[1], "-?"))
- return help(0, "folders", cmd_help);
---- 276,287 ----
- register char **argv;
- {
- register char *p;
-! char buf[128];
-! #ifndef MSGS_DYNAMIC
-! char *unused[MAXMSGS_BITS];
-! #else
-! char *unused = (char *) alloca(MSGS_BITS(msg_cnt));
-! #endif
-
- if (argv && argv[1] && !strcmp(argv[1], "-?"))
- return help(0, "folders", cmd_help);
-***************
-*** 418,424 ****
- char *argv[], list[];
- {
- int r, articles = 0, merge = 0, appending = 0;
-! char buf[MAXPATHLEN], cmdbuf[MAXPATHLEN], newlist[MAXMSGS_BITS], *dir;
- char *art_sep = ARTICLE_SEP;
- FILE *fp;
-
---- 431,442 ----
- char *argv[], list[];
- {
- int r, articles = 0, merge = 0, appending = 0;
-! char buf[MAXPATHLEN], cmdbuf[MAXPATHLEN], *dir;
-! #ifndef MSGS_DYNAMIC
-! char newlist[MAXMSGS_BITS];
-! #else
-! char *newlist = (char *) alloca(MSGS_BITS(msg_cnt));
-! #endif
- char *art_sep = ARTICLE_SEP;
- FILE *fp;
-
-*** old/loop.c Fri Sep 4 11:22:07 1998
---- loop.c Fri Sep 4 11:21:28 1998
-***************
-*** 251,257 ****
---- 251,261 ----
-
- /* Return values from commands, see check_internal() */
- static int last_status; /* Changes after every command */
-+ #ifndef MSGS_DYNAMIC
- static char last_output[MAXMSGS]; /* Changes after SUCCESSFUL command */
-+ #else
-+ char* last_output; /* Changes after SUCCESSFUL command */
-+ #endif
-
- /*
- * do the command specified by the argument vector, argv.
-***************
-*** 1196,1203 ****
---- 1200,1211 ----
- struct history *hist;
- #ifndef REGCMP
- # ifdef REGCOMP
-+ # ifdef REG_EXTENDED
-+ regex_t rex;
-+ # else
- char *rex = NULL;
- extern char *regcomp();
-+ # endif
- # else
- extern char *re_comp();
- # endif
-***************
-*** 1222,1228 ****
---- 1230,1240 ----
- if (*str) {
- #ifndef REGCMP
- # ifdef REGCOMP
-+ # ifdef REG_EXTENDED
-+ if (regcomp(&rex, str, REG_EXTENDED) != 0) /* Assign and test */
-+ # else
- if (!(rex = regcomp(str))) /* Assign and test */
-+ # endif
- # else
- if (re_comp(str))
- # endif
-***************
-*** 1256,1262 ****
---- 1268,1278 ----
- found =
- #ifndef REGCMP
- # ifdef REGCOMP
-+ # ifdef REG_EXTENDED
-+ regexec(&rex, buf, 0, NULL, 0) == 0
-+ # else
- !!regexec(rex, buf)
-+ # endif
- # else
- re_exec(buf)
- # endif
-***************
-*** 1273,1279 ****
---- 1289,1299 ----
- free(rex);
- #else
- # ifdef REGCOMP
-+ # ifdef REG_EXTENDED
-+ regfree(&rex);
-+ # else
- free(rex);
-+ # endif
- # endif
- #endif
- return (*p == '?' ? p + 1 : p);
-***************
-*** 1286,1292 ****
---- 1306,1316 ----
- #else
- # ifdef REGCOMP
- /* XXX: regfree */
-+ # ifdef REG_EXTENDED
-+ regfree(&rex);
-+ # else
- free(rex);
-+ # endif
- # endif
- #endif
- return NULL;
-*** old/mail.c Fri Sep 4 11:22:09 1998
---- mail.c Fri Sep 4 11:21:28 1998
-***************
-*** 34,40 ****
- char firstchar = (argv)? **argv: 'm';
- char *to = NULL, *cc = NULL, *addcc = NULL, *bcc = NULL, *subj = NULL;
- char *route = NULL;
-! char inc_list[MAXMSGS_BITS], buf[HDRSIZ];
- u_long flgs = 0;
-
- if (ison(glob_flags, IS_GETTING)) {
---- 34,45 ----
- char firstchar = (argv)? **argv: 'm';
- char *to = NULL, *cc = NULL, *addcc = NULL, *bcc = NULL, *subj = NULL;
- char *route = NULL;
-! char buf[HDRSIZ];
-! #ifndef MSGS_DYNAMIC
-! char inc_list[MAXMSGS_BITS];
-! #else
-! char *inc_list = (char *) alloca(MSGS_BITS(msg_cnt));
-! #endif
- u_long flgs = 0;
-
- if (ison(glob_flags, IS_GETTING)) {
-***************
-*** 350,356 ****
---- 355,365 ----
-
- /* If forwarding w/o editing, start a new file for each. */
- if (ison(flags, FORWARD) && ison(flags, SEND_NOW)) {
-+ #ifndef MSGS_DYNAMIC
- char fwd[MAXMSGS_BITS];
-+ #else
-+ char *fwd = (char *) alloca(MSGS_BITS(msg_cnt));
-+ #endif
- register int i;
- clear_msg_list(fwd);
- for (i = 0; i < msg_cnt; i++)
-***************
-*** 694,700 ****
---- 703,713 ----
- putstring(p2, ed_fp);
- }
- when ':': {
-+ #ifndef MSGS_DYNAMIC
- char new[MAXMSGS_BITS];
-+ #else
-+ char *new = (char *) alloca(MSGS_BITS(msg_cnt));
-+ #endif
- u_long save_flags = glob_flags;
-
- turnon(glob_flags, IGN_SIGS);
-***************
-*** 706,712 ****
---- 719,729 ----
- when 'i': case 'f': case 'I': case 'm': {
- int n;
- u_long copy_flgs = 0;
-+ #ifndef MSGS_DYNAMIC
- char list[MAXMSGS_BITS];
-+ #else
-+ char *list = (char *) alloca(MSGS_BITS(msg_cnt));
-+ #endif
-
- if (!msg_cnt) {
- wprint("No messages.\n");
-***************
-*** 962,967 ****
---- 979,985 ----
- register char *p;
- int c;
- char buf[MAXPATHLEN];
-+ static char gpat[] = "{,{,*[ \\,]}mail{,[ \\,]*}}";
-
- /* forwarded mail has no additional personalized text */
- if (ison(flags, FORWARD)) {
-***************
-*** 985,992 ****
- p = NULL;
- if (!strncmp(Cc, "~v", 2) ||
- /* Flashy test for $verify either empty or set to "mail" */
-! glob(p = do_set(set_options, "verify"),
-! "{,{,*[ \\,]}mail{,[ \\,]*}}")) {
- if (!p) /* so we don't Cc to ~v! */
- *Cc = 0;
- for (;;) {
---- 1003,1009 ----
- p = NULL;
- if (!strncmp(Cc, "~v", 2) ||
- /* Flashy test for $verify either empty or set to "mail" */
-! glob(p = do_set(set_options, "verify"), gpat)) {
- if (!p) /* so we don't Cc to ~v! */
- *Cc = 0;
- for (;;) {
-*** old/main.c Fri Sep 4 11:22:09 1998
---- main.c Fri Sep 4 11:21:28 1998
-***************
-*** 30,36 ****
- char buf[MAXPATHLEN];
- register char *p;
- struct mush_flags Flags;
-!
- #ifndef INTERNAL_MALLOC
- extern char *stackbottom; /* used by xfree() */
-
---- 30,36 ----
- char buf[MAXPATHLEN];
- register char *p;
- struct mush_flags Flags;
-! static char gpat[] = "{,{,*[ \\,]}startup{,[ \\,]*}}";
- #ifndef INTERNAL_MALLOC
- extern char *stackbottom; /* used by xfree() */
-
-***************
-*** 59,64 ****
---- 59,80 ----
- malloc_debug(0);
- #endif /* sun && debug */
-
-+ #ifdef MSGS_DYNAMIC
-+ {
-+ extern char *last_output;
-+ msg_max = MSGS_INCR;
-+ msg = (struct msg *) malloc(sizeof(struct msg) * msg_max);
-+ bzero(msg, sizeof(struct msg) * msg_max);
-+ msg_list = (char *) malloc(MSGS_BITS(msg_max));
-+ last_output = (char *) malloc(sizeof(char) * msg_max);
-+ if (msg == (struct msg *) 0 || msg_list == NULL ||
-+ last_output == NULL) {
-+ (void) fprintf(stderr, "%s: Out of memory.\n", prog_name);
-+ exit(1);
-+ }
-+ }
-+ #endif
-+
- if (!isatty(0))
- turnon(glob_flags, REDIRECT);
- else
-***************
-*** 255,261 ****
- (void) signal(SIGHUP, catch);
-
- if (!hdrs_only && !istool && (!Flags.src_file || !Flags.src_n_exit) &&
-! !glob(do_set(set_options, "quiet"), "{,{,*[ \\,]}startup{,[ \\,]*}}"))
- (void) printf("%s: Type '?' for help.\n", check_internal("version"));
-
- (void) sprintf(buf, "folder %s %s", Flags.f_flags, mailfile);
---- 271,277 ----
- (void) signal(SIGHUP, catch);
-
- if (!hdrs_only && !istool && (!Flags.src_file || !Flags.src_n_exit) &&
-! !glob(do_set(set_options, "quiet"), gpat))
- (void) printf("%s: Type '?' for help.\n", check_internal("version"));
-
- (void) sprintf(buf, "folder %s %s", Flags.f_flags, mailfile);
-*** old/misc.c Fri Sep 4 11:22:08 1998
---- misc.c Fri Sep 4 11:21:28 1998
-***************
-*** 201,207 ****
---- 201,211 ----
- int argc, ret_val = -1;
- u_long save_do_pipe = ison(glob_flags, DO_PIPE);
- u_long save_is_pipe = ison(glob_flags, IS_PIPE);
-+ #ifndef MSGS_DYNAMIC
- char dummy_list[MAXMSGS_BITS];
-+ #else
-+ char *dummy_list = (char *) alloca(MSGS_BITS(msg_cnt));
-+ #endif
-
- turnoff(glob_flags, DO_PIPE);
- turnoff(glob_flags, IS_PIPE);
-*** old/msgs.c Fri Sep 4 11:22:08 1998
---- msgs.c Fri Sep 4 11:21:28 1998
-***************
-*** 843,848 ****
---- 843,849 ----
- }
- #endif /* MMDF */
- buf[0] = 0;
-+ date[0] = 0;
- while (fgets(buf, sizeof (buf), fp)) {
- #ifndef MSG_SEPARATOR
- turnoff(glob_flags, WARNING);
-***************
-*** 875,880 ****
---- 876,882 ----
- {
- msg_found++;
- had_error = 0;
-+ #ifndef MSGS_DYNAMIC
- if (append && cnt == MAXMSGS-append) {
- wprint("WARNING: exceeded %d messages.\n", MAXMSGS-append);
- wprint("Not all messages have been loaded.\n");
-***************
-*** 882,887 ****
---- 884,931 ----
- had_error++;
- break;
- }
-+ #else
-+ if (append && cnt == msg_max-append) {
-+ /*
-+ * XXX: should really ignore signals here but instead
-+ * are careful with the order we do things
-+ * so if we get interrupted, we only lose memory
-+ */
-+ int nmsg_max = msg_max + MSGS_INCR;
-+ struct msg* m;
-+ char* b, *l;
-+ extern char* last_output;
-+
-+ m = (struct msg *) realloc(msg, sizeof(struct msg) *
-+ nmsg_max);
-+ if (m == (struct msg *) 0) {
-+ bad:
-+ wprint("Out of memory for %d messages.\n", nmsg_max);
-+ wprint("Not all messages have been loaded.\n");
-+ msg_cnt--;
-+ had_error++;
-+ break;
-+ }
-+
-+ b = (char *) realloc(msg_list, MSGS_BITS(nmsg_max));
-+ if (b == NULL)
-+ goto bad;
-+
-+ l = (char *) realloc(last_output, sizeof(char) * nmsg_max);
-+ if (l == NULL)
-+ goto bad;
-+
-+
-+ msg = m;
-+ msg_list = b;
-+ last_output = l;
-+
-+ bzero(&msg[msg_max], sizeof(struct msg) * MSGS_INCR);
-+
-+ msg_max = nmsg_max;
-+
-+ }
-+ #endif /* MSGS_DYNAMIC */
- if (ison(glob_flags, READ_ONLY))
- bytes = ftell(fp) - strlen(buf);
- else {
-***************
-*** 1058,1064 ****
- }
- close_lock(file, fp);
- if (isoff(glob_flags, READ_ONLY)) {
-! if (had_error && msg_found && append == 1 && cnt == MAXMSGS-append) {
- wprint("Using read-only mode.\n");
- turnon(glob_flags, READ_ONLY);
- had_error = 0; /* return successfully anyway */
---- 1102,1113 ----
- }
- close_lock(file, fp);
- if (isoff(glob_flags, READ_ONLY)) {
-! #ifndef MSGS_DYNAMIC
-! if (had_error && msg_found && append == 1 && cnt == MAXMSGS-append)
-! #else
-! if (had_error && msg_found && append == 1 && cnt == msg_max-append)
-! #endif
-! {
- wprint("Using read-only mode.\n");
- turnon(glob_flags, READ_ONLY);
- had_error = 0; /* return successfully anyway */
-
---- version.h.orig Mon Jan 3 15:49:04 2000
-+++ version.h Mon Jan 3 15:50:42 2000
-@@ -1,7 +1,11 @@
- /* @(#)version.h (c) Copyright 1989, 1990, 1991 (Dan Heller) */
-
- #define MUSHNAME "Mail User's Shell"
--#define RELEASE_DATE "beta(4) 03/19/98"
-+#ifdef MSGS_DYNAMIC
-+#define RELEASE_DATE "beta(4.pl1)+dynamic 20000103"
-+#else
-+#define RELEASE_DATE "beta(4.pl1) 20000103"
-+#endif
- #define RELEASE 7
- #define REVISION "2"
- #define PATCHLEVEL 6
-*** old/pick.c Fri Sep 4 12:07:59 1998
---- pick.c Fri Sep 4 13:12:17 1998
-***************
-*** 11,19 ****
- static int pick();
- static void month_day_year();
-
-! #ifdef REGCOMP
- regerror(msg)
-! char *msg;
- {
- printf("regcomp error: %s\n", msg);
- }
---- 11,20 ----
- static int pick();
- static void month_day_year();
-
-! #if defined(REGCOMP) && !defined(REG_EXTENDED)
-! void
- regerror(msg)
-! const char *msg;
- {
- printf("regcomp error: %s\n", msg);
- }
-***************
-*** 23,29 ****
---- 24,34 ----
- register int n;
- register char **argv, list[];
- {
-+ #ifndef MSGS_DYNAMIC
- char ret_list[MAXMSGS_BITS];
-+ #else
-+ char *ret_list = (char *) alloca(MSGS_BITS(msg_cnt));
-+ #endif
-
- if (n > 1 && !strcmp(argv[1], "-?"))
- return help(0, "pick", cmd_help);
-***************
-*** 72,78 ****
- register char c;
- int matches = 0;
- char pattern[256];
-! short head_first, head_cnt, tail_cnt, search = TRUE;
- int n;
-
- if (!msg_cnt) {
---- 77,83 ----
- register char c;
- int matches = 0;
- char pattern[256];
-! short head_first, head_cnt, tail_cnt, search = TRUE, dups = FALSE;
- int n;
-
- if (!msg_cnt) {
-***************
-*** 166,171 ****
---- 171,177 ----
- turnon(match_priority, M_PRIORITY(c - 'A' + 1));
- when 'x' : xflg = 1;
- when 'i' : icase = 1;
-+ when 'D' : dups = TRUE;
- otherwise:
- print("pick: unknown flag: %c\n", argv[0][1]);
- clear_msg_list(ret_list);
-***************
-*** 175,181 ****
- print("Can't specify -x and head/tail options together.\n");
- return -1;
- }
-! if (!mdy[1]) {
- (void) argv_to_string(pattern, argv);
- if (pattern[0] == '\0' && match_priority == 0 &&
- head_cnt + tail_cnt < 0) {
---- 181,187 ----
- print("Can't specify -x and head/tail options together.\n");
- return -1;
- }
-! if (!mdy[1] && !dups) {
- (void) argv_to_string(pattern, argv);
- if (pattern[0] == '\0' && match_priority == 0 &&
- head_cnt + tail_cnt < 0) {
-***************
-*** 184,190 ****
- return -1;
- }
- }
-! search = (pattern[0] || mdy[1] || (match_priority != 0));
- if (verbose) {
- if (head_cnt + tail_cnt >= 0) {
- print("Finding the ");
---- 190,196 ----
- return -1;
- }
- }
-! search = (pattern[0] || mdy[1] || (match_priority > 0));
- if (verbose) {
- if (head_cnt + tail_cnt >= 0) {
- print("Finding the ");
-***************
-*** 209,216 ****
- print_more(" of the last %d", tail_cnt);
- } else
- print_more("Searching for %smessages",
-! match_priority != 0 ? "priority " : "");
-! if (!search) {
- if (tail_cnt > 0 && head_cnt > 0)
- print_more(" messages");
- if (ison(glob_flags, IS_PIPE))
---- 215,224 ----
- print_more(" of the last %d", tail_cnt);
- } else
- print_more("Searching for %smessages",
-! match_priority > 0 ? "priority " : "");
-! if (dups) {
-! print_more(" that are duplicates");
-! } else if (!search) {
- if (tail_cnt > 0 && head_cnt > 0)
- print_more(" messages");
- if (ison(glob_flags, IS_PIPE))
-***************
-*** 241,247 ****
- }
- if (mdy[1] > 0 && icase)
- print("using date: -i flag ignored.\n");
-! if (!search) {
- for (n = 0; n < msg_cnt && (!head_first || matches < head_cnt); n++)
- if (msg_bit(list, n))
- ++matches, set_msg_bit(ret_list, n);
---- 249,258 ----
- }
- if (mdy[1] > 0 && icase)
- print("using date: -i flag ignored.\n");
-! if (dups)
-! matches = find_dups(head_first? head_cnt : msg_cnt,
-! list, ret_list);
-! else if (!search) {
- for (n = 0; n < msg_cnt && (!head_first || matches < head_cnt); n++)
- if (msg_bit(list, n))
- ++matches, set_msg_bit(ret_list, n);
-***************
-*** 284,289 ****
---- 295,424 ----
- return matches;
- }
-
-+
-+ static int
-+ cmplines(m1, m2)
-+ struct msg **m1;
-+ struct msg **m2;
-+ {
-+ int z = (int) (*m2)->m_lines - (int) (*m1)->m_lines;
-+ if (z > 0)
-+ return 1;
-+ else if (z < 0)
-+ return -1;
-+ else
-+ return 0;
-+ }
-+
-+
-+ /*
-+ * find_dups searches for messages with the same body as others
-+ */
-+ find_dups(cnt, check_list, ret_list)
-+ int cnt;
-+ char check_list[], ret_list[];
-+ {
-+ int i, j, n, lcur, mcur;
-+ int matches = 0;
-+ #ifndef MSGS_DYNAMIC
-+ struct msg *mlist[MAXMSGS];
-+ #else
-+ struct msg **mlist = (struct msg **) alloca(msg_cnt *
-+ sizeof(struct msg *));
-+ #endif
-+ char *omsg = NULL, *nmsg = NULL, *otext, *ntext;
-+ size_t otsize = 0, ntsize = 0, omsize = 0, nmsize = 0, mid;
-+
-+ if (cnt == -1)
-+ cnt = msg_cnt;
-+
-+ for (i = 0, n = 0; i < cnt && n < msg_cnt; n++)
-+ if (msg_bit(check_list, n)) {
-+ mlist[i] = &msg[n];
-+ mlist[i]->m_spare = n;
-+ i++;
-+ }
-+
-+ cnt = i;
-+ qsort((char *) mlist, cnt, sizeof(struct msg *), cmplines);
-+
-+ clear_msg_list(ret_list);
-+
-+ lcur = -1;
-+
-+ for (i = 0; i < cnt - 1; i++) {
-+ lcur = mlist[i]->m_lines;
-+ mcur = mlist[i]->m_spare;
-+
-+ if (mlist[i + 1]->m_lines != lcur)
-+ /* Next message has not the same number of lines, skip */
-+ continue;
-+
-+ (void) msg_get(mcur, NULL, 0);
-+ if (otsize < mlist[i]->m_size) {
-+ otsize = mlist[i]->m_size;
-+ otext = otext ? (char *) malloc(otsize) :
-+ (char *) realloc(otext, otsize);
-+ if (otext == NULL) {
-+ print("Out of memory in find_dups\n");
-+ goto bad;
-+ }
-+ }
-+ if (fread(otext, 1, mlist[i]->m_size, tmpf) != mlist[i]->m_size) {
-+ print("fread old for %d failed %d\n", mcur, sys_errlist[errno]);
-+ goto bad;
-+ }
-+ if ((omsg = (char *) strstr(otext, "\n\n")) == NULL) {
-+ printf("could not find start of message %d\n", mcur);
-+ continue;
-+ }
-+ omsize = mlist[i]->m_size - (omsg - otext);
-+ for (j = i + 1; j < cnt; j++) {
-+ if (mlist[j]->m_lines != lcur)
-+ /* Next message has not the same number of lines, skip */
-+ break;
-+ mid = mlist[j]->m_spare;
-+ (void) msg_get(mid, NULL, 0);
-+ if (ntsize < mlist[j]->m_size) {
-+ ntsize = mlist[j]->m_size;
-+ ntext = ntext ? (char *) malloc(ntsize) :
-+ (char *) realloc(ntext, ntsize);
-+ if (ntext == NULL) {
-+ print("Out of memory in find_dups\n");
-+ goto bad;
-+ }
-+ }
-+ if (fread(ntext, 1, mlist[j]->m_size, tmpf) != mlist[j]->m_size) {
-+ print("fread new for %d failed %d\n", mid, sys_errlist[errno]);
-+ goto bad;
-+ }
-+ if ((nmsg = (char *) strstr(ntext, "\n\n")) == NULL) {
-+ printf("could not find start of message %d\n", mid);
-+ continue;
-+ }
-+ nmsize = mlist[j]->m_size - (nmsg - ntext);
-+ if (nmsize != omsize)
-+ continue;
-+ if (memcmp(nmsg, omsg, nmsize) == 0) {
-+ ++matches;
-+ set_msg_bit(ret_list, mid);
-+ }
-+ }
-+ }
-+ if (otext)
-+ free(otext);
-+ if (ntext)
-+ free(ntext);
-+ return matches;
-+ bad:
-+ clear_msg_list(ret_list);
-+ if (otext)
-+ free(otext);
-+ if (ntext)
-+ free(ntext);
-+ return 0;
-+ }
-+
- /*
- * find_pattern will search thru all the messages set in the check_list
- * until the list runs out or "cnt" has been exhasted. ret_list contains
-***************
-*** 307,313 ****
---- 442,452 ----
- #endif
- #else /* REGCMP */
- # ifdef REGCOMP
-+ # ifdef REG_EXTENDED
-+ regex_t rex;
-+ # else
- char *regcomp(), *regexec();
-+ # endif
- # else
- char *re_comp();
- # endif
-***************
-*** 328,334 ****
---- 467,478 ----
- }
- #else /* REGCMP */
- # ifdef REGCOMP
-+ # ifdef REG_EXTENDED
-+ if (regcomp(&rex, p, REG_EXTENDED) != 0)
-+ # else
- if ((err = regcomp(p)) == NULL) {
-+ # endif
-+ {
- clear_msg_list(ret_list);
- return -1;
- }
-***************
-*** 348,354 ****
- /* start searching: set bytes, and message number: n */
- for (n = 0; cnt && n < msg_cnt; n++)
- if (msg_bit(check_list, n)) {
-! if (match_priority != 0) {
- if (msg[n].m_flags & match_priority)
- ++matches, set_msg_bit(ret_list, n);
- continue;
---- 492,498 ----
- /* start searching: set bytes, and message number: n */
- for (n = 0; cnt && n < msg_cnt; n++)
- if (msg_bit(check_list, n)) {
-! if (match_priority > 0) {
- if (msg[n].m_flags & match_priority)
- ++matches, set_msg_bit(ret_list, n);
- continue;
-***************
-*** 421,427 ****
---- 565,575 ----
- val = !!regex(err, p, NULL); /* convert value to a boolean */
- #else /* REGCMP */
- # ifdef REGCOMP
-+ # ifdef REG_EXTENDED
-+ val = regexec(&rex, p, 0, NULL, 0) == 0;
-+ # else
- val = !!regexec(err, p);
-+ # endif
- # else
- val = re_exec(p);
- # endif
-***************
-*** 448,455 ****
---- 596,607 ----
- #else
- # ifdef REGCOMP
- if (err)
-+ # ifdef REG_EXTENDED
-+ regfree(&rex);
-+ # else
- /* XXX: regfree soon */
- free(err);
-+ # endif
- # endif
- #endif /* REGCMP */
- return matches;
-***************
-*** 476,482 ****
---- 628,638 ----
- #endif
- #else /* REGCMP */
- # ifdef REGCOMP
-+ # ifdef REG_EXTENDED
-+ regex_t rex;
-+ # else
- char *regcomp(), *regexec();
-+ # endif
- # else
- char *re_comp();
- # endif
-***************
-*** 509,515 ****
- }
- #else /* REGCMP */
- # ifdef REGCOMP
-! if (*pattern && !(err = regcomp(pattern, NULL))) {
- print("Error in regcomp in %s", pattern);
- return 0;
- }
---- 665,676 ----
- }
- #else /* REGCMP */
- # ifdef REGCOMP
-! # ifdef REG_EXTENDED
-! if (*pattern && regcomp(&rex, pattern, REG_EXTENDED))
-! # else
-! if (*pattern && !(err = regcomp(pattern, NULL)))
-! # endif
-! {
- print("Error in regcomp in %s", pattern);
- return 0;
- }
-***************
-*** 534,540 ****
---- 695,705 ----
- val = !!regex(err, p, NULL); /* convert value to a boolean */
- #else /* REGCMP */
- # ifdef REGCOMP
-+ # ifdef REG_EXTENDED
-+ val = regexec(&rex, p, 0, NULL, 0) == 0;
-+ # else
- val = !!regexec(err, p);
-+ # endif
- # else
- val = re_exec(p);
- # endif
-***************
-*** 549,556 ****
---- 714,725 ----
- #else
- # ifdef REGCOMP
- if (err)
-+ # ifdef REG_EXTENDED
-+ regfree(&rex);
-+ # else
- /* XXX: regfree soon */
- free(err);
-+ # endif
- # endif
- #endif /* REGCMP */
-
diff --git a/mail/mush/patches/patch-ag b/mail/mush/patches/patch-ag
deleted file mode 100644
index 9887f12edea..00000000000
--- a/mail/mush/patches/patch-ag
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2006/01/08 17:04:58 joerg Exp $
-
-*** /dev/null Fri Sep 4 13:38:54 1998
---- makefile.netbsd Fri Sep 4 13:36:36 1998
-***************
-*** 0 ****
---- 1,76 ----
-+ # makefile.netbsd
-+ #
-+ HDRS= mush.h config.h-dist strings.h bindings.h options.h version.h glob.h pop.h
-+
-+ SRCS= main.c init.c misc.c mail.c hdrs.c execute.c commands.c print.c dates.c \
-+ signals.c setopts.c msgs.c pick.c sort.c expr.c folders.c \
-+ loop.c viewopts.c curses.c curs_io.c bind.c file.c strings.c \
-+ lock.c macros.c options.c addrs.c malloc.c glob.c command2.c \
-+ pop.c pmush.c xcreat.c
-+ OBJS= main.o init.o misc.o mail.o hdrs.o execute.o commands.o print.o file.o \
-+ signals.o setopts.o msgs.o pick.o sort.o expr.o strings.o \
-+ folders.o dates.o loop.o viewopts.o curses.o curs_io.o bind.o \
-+ lock.o macros.o options.o addrs.o malloc.o glob.o command2.o \
-+ pop.o pmush.o xcreat.o
-+
-+ HELP_FILES= README README-7.0 README-7.1 README-7.2.0 README-7.2.2 \
-+ README-7.2.4 mush.1 cmd_help Mushrc Mailrc Gnurc \
-+ sample.mushrc advanced.mushrc digestify
-+
-+ MAKES= makefile.bsdi makefile.bsd makefile.xenix makefile.sys.v makefile.hpux makefile.sun makefile.solaris makefile.freebsd
-+
-+ CFLAGS= -O2 -DPOSIX -DCURSES -DBSD -DBSD44 -DSIGRET=void -DBASENAME -DENV_MAIL -DMSGS_DYNAMIC
-+ LDFLAGS=
-+ LINTFLAGS= -bxah -Dlint -DCURSES -DBSD
-+ LIBS= -lcurses -ltermlib
-+ OTHERLIBS=
-+ # Use some variant of this one if you #define MMDF in config.h
-+ #OTHERLIBS=/usr/src/mmdf/lib/libmmdf.a
-+
-+ all: mush
-+
-+ mush: $(OBJS)
-+ @echo loading...
-+ @$(CC) $(LDFLAGS) $(OBJS) $(LIBS) $(OTHERLIBS) -o mush
-+
-+ $(OBJS): config.h mush.h
-+ loop.o: version.h
-+
-+ tape:
-+ @tar cv $(MAKES) $(HDRS) $(SRCS) $(HELP_FILES)
-+
-+ tar:
-+ @tar fcv MUSH $(MAKES) $(HDRS) $(SRCS) $(HELP_FILES)
-+
-+ tarmail:
-+ tar fcv - $(MAKES) $(HDRS) $(SRCS) $(HELP_FILES) | \
-+ compress | btoa > mush.tarmail
-+
-+ lint:
-+ lint $(LINTFLAGS) $(SRCS)
-+
-+ clean:
-+ rm -f *.o core mush
-+
-+ BINDIR= @PREFIX@/bin
-+ LIBDIR= @PREFIX@/share/misc
-+ MRCDIR= @PREFIX@/share/misc
-+ MANDIR= @MANDIR@/man1
-+ MANEXT= 1
-+
-+ install: mush
-+ cp mush $(BINDIR)
-+ strip $(BINDIR)/mush
-+ chmod 0755 $(BINDIR)/mush
-+ cp cmd_help $(LIBDIR)
-+ chmod 0644 $(LIBDIR)/cmd_help
-+ cp Mushrc $(MRCDIR)/Mushrc
-+ chmod 0644 $(MRCDIR)/Mushrc
-+ cp mush.1 $(MANDIR)/mush.$(MANEXT)
-+ chmod 0644 $(MANDIR)/mush.$(MANEXT)
-+
-+
-+ glob: glob.c
-+ $(CC) $(CFLAGS) -DTEST -DTEST2 glob.c $(LIBS) $(OTHERLIBS) -o glob
-+
-+
diff --git a/mail/mush/patches/patch-ah b/mail/mush/patches/patch-ah
deleted file mode 100644
index 569334e5591..00000000000
--- a/mail/mush/patches/patch-ah
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2006/01/08 17:04:58 joerg Exp $
-
-*** old/config.h-dist Fri Sep 4 11:21:28 1998
---- config.h-dist Fri Sep 4 11:21:28 1998
-***************
-*** 3,15 ****
- /* Default names and locations for files */
- #define MAILRC ".mushrc"
- #define ALTERNATE_RC ".mailrc"
-! #define DEFAULT_RC "/usr/lib/Mushrc"
-! #define ALT_DEF_RC "/usr/lib/Mail.rc"
- #define SIGNATURE ".signature"
- #define FORTUNE "/usr/games/fortune"
-! #define COMMAND_HELP "/usr/lib/cmd_help"
- #ifdef SUNTOOL
-! # define TOOL_HELP "/usr/lib/tool_help"
- #endif /* SUNTOOL */
- #define ALTERNATE_HOME "/tmp" /* Path must be read/write to EVERYONE */
- #define EDFILE ".edXXXXXX" /* file/pathname added to user's "home" */
---- 3,15 ----
- /* Default names and locations for files */
- #define MAILRC ".mushrc"
- #define ALTERNATE_RC ".mailrc"
-! #define DEFAULT_RC "@PREFIX@/share/misc/Mushrc"
-! #define ALT_DEF_RC "/etc/Mail.rc"
- #define SIGNATURE ".signature"
- #define FORTUNE "/usr/games/fortune"
-! #define COMMAND_HELP "@PREFIX@/share/misc/cmd_help"
- #ifdef SUNTOOL
-! # define TOOL_HELP "@PREFIX@/share/misc/tool_help"
- #endif /* SUNTOOL */
- #define ALTERNATE_HOME "/tmp" /* Path must be read/write to EVERYONE */
- #define EDFILE ".edXXXXXX" /* file/pathname added to user's "home" */
-***************
-*** 112,118 ****
- /*
- * If you are not using MMDF, check these definitions.
- */
-! #ifdef __FreeBSD__
- #define MAIL_DELIVERY "/usr/sbin/sendmail -i" /* "-i" works like "-oi" */
- #else
- #define MAIL_DELIVERY "/usr/lib/sendmail -i" /* "-i" works like "-oi" */
---- 113,119 ----
- /*
- * If you are not using MMDF, check these definitions.
- */
-! #ifdef BSD44
- #define MAIL_DELIVERY "/usr/sbin/sendmail -i" /* "-i" works like "-oi" */
- #else
- #define MAIL_DELIVERY "/usr/lib/sendmail -i" /* "-i" works like "-oi" */
diff --git a/mail/mush/patches/patch-ai b/mail/mush/patches/patch-ai
deleted file mode 100644
index 887999855ce..00000000000
--- a/mail/mush/patches/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1998/09/04 19:29:06 christos Exp $
-*** old/Mushrc Sun Oct 21 22:24:37 1990
---- Mushrc Fri Sep 4 15:13:56 1998
-***************
-*** 6,12 ****
- set \
- MAILRC = ".mushrc" \
- ALTERNATE_RC = ".mailrc" \
-! ALT_DEF_RC = "/usr/lib/Mail.rc"
-
- # Set up the display early to allow quick exit in headers-only mode.
- # The hdrs_only flag is true if the command line was: "mush -H".
---- 6,12 ----
- set \
- MAILRC = ".mushrc" \
- ALTERNATE_RC = ".mailrc" \
-! ALT_DEF_RC = "/etc/mail.rc"
-
- # Set up the display early to allow quick exit in headers-only mode.
- # The hdrs_only flag is true if the command line was: "mush -H".
diff --git a/mail/mush/patches/patch-aj b/mail/mush/patches/patch-aj
deleted file mode 100644
index ec57470138d..00000000000
--- a/mail/mush/patches/patch-aj
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aj,v 1.2 1998/10/25 17:10:01 christos Exp $
-*** old/mush.1 Fri Oct 9 07:24:11 1998
---- mush.1 Fri Oct 9 07:29:26 1998
-***************
-*** 2766,2771 ****
---- 2766,2772 ----
- .in +2
- +<num> keep only the first <num> messages matched (head).
- \-<num> keep only the last <num> messages matched (tail).
-+ \-D pick messages that have the same body as others.
- \-ago <format> search for messages relative to today's date.
- \-d [+|\-]date messages sent on or [+ after] [`\-' before] date.
- \-e take all remaining arguments to be the pattern.
-***************
-*** 2786,2791 ****
---- 2787,2793 ----
- .IR \-a .
- Only one of \-a, \-d, \-f, \-h, \-p, \-s and \-t can be specified at once,
- but multiple \-p options may be specified to select several priorities.
-+ A <pattern> must be specified for all arguments, except \-D.
- Entire messages are scanned for the <pattern>
- unless \-a, \-d, \-f, \-h, \-p, \-s or \-t is specified.
- Messages marked for deletion are also searched.
-***************
-*** 2858,2863 ****
---- 2860,2869 ----
- February 5, 1987, that contain the subject "mail stuff" and send them
- to the printer.
- .sp
-+ .ti +2
-+ pick -D | delete
-+ .sp
-+ Deletes all duplicate messages.
- .ti +2
- pick -s Re: | delete
- .sp
diff --git a/mail/mush/patches/patch-ak b/mail/mush/patches/patch-ak
deleted file mode 100644
index 7534a27e5ab..00000000000
--- a/mail/mush/patches/patch-ak
+++ /dev/null
@@ -1,207 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2006/01/08 17:04:58 joerg Exp $
-*** old/folders.c Sun Oct 25 11:59:14 1998
---- folders.c Sun Oct 25 11:58:30 1998
-***************
-*** 148,153 ****
---- 148,154 ----
- msg[msg_cnt].m_size = 0;
- msg[msg_cnt].m_offset = 0;
- msg[msg_cnt].m_lines = 0;
-+ msg[msg_cnt].m_headers = 0;
- }
- msg_cnt = 0, msg[0].m_offset = 0L;
- turnoff(glob_flags, CONT_PRNT);
-*** old/hdrs.c Sun Oct 25 11:59:10 1998
---- hdrs.c Sun Oct 25 11:58:30 1998
-***************
-*** 548,554 ****
---- 548,557 ----
- when '%': p2 = "%";
- when 't': p2 = to;
- when 's': p2 = subject;
-+ when 'h': p2 = sprintf(lines, "%d", msg[cnt].m_headers);
- when 'l': p2 = sprintf(lines, "%d", msg[cnt].m_lines);
-+ when 'b': p2 = sprintf(lines, "%d", msg[cnt].m_lines -
-+ msg[cnt].m_headers);
- when 'c': p2 = sprintf(lines, "%ld", msg[cnt].m_size);
- when 'i': (p2 = read_header_field(cnt, "message-id")) || (p2 = "");
- /* date formatting chars */
-*** old/msgs.c Sun Oct 25 11:59:14 1998
---- msgs.c Sun Oct 25 11:58:29 1998
-***************
-*** 797,803 ****
- int append;
- {
- char buf[BUFSIZ];
-! int lines = 0, msg_found = 0, had_error = 1;
- int get_status = 1, cnt;
- long bytes;
- struct msg old;
---- 797,803 ----
- int append;
- {
- char buf[BUFSIZ];
-! int headers = 0, lines = 0, msg_found = 0, had_error = 1;
- int get_status = 1, cnt;
- long bytes;
- struct msg old;
-***************
-*** 943,948 ****
---- 943,949 ----
- if (cnt && lines) {
- msg[cnt-1].m_size = bytes - msg[cnt-1].m_offset;
- msg[cnt-1].m_lines = lines;
-+ msg[cnt-1].m_headers = headers;
- }
- if (isoff(glob_flags, READ_ONLY) && fputs(buf, tmpf) == -1) {
- error(tempfile);
-***************
-*** 953,960 ****
---- 954,963 ----
- msg[cnt].m_flags = 0L;
- #ifdef MSG_SEPARATOR
- lines = 0;
-+ headers = 0;
- #else /* MSG_SEPARATOR */
- lines = 1; /* count the From_ line */
-+ headers = 1;
- if (warn)
- turnon(glob_flags, WARNING);
- strdup(msg[cnt].m_date_recv, date);
-***************
-*** 1021,1026 ****
---- 1024,1030 ----
- break;
- }
- lines++;
-+ headers++;
- }
- if (!msg[cnt].m_date_sent || !*msg[cnt].m_date_sent)
- if (!msg[cnt].m_date_recv || !*msg[cnt].m_date_recv) {
-***************
-*** 1042,1047 ****
---- 1046,1052 ----
- } else if (!msg_found && buf[0] != '\n') {
- /* Allow leading blank lines, but anything else is wrong */
- lines++;
-+ headers++;
- had_error++;
- break;
- }
-***************
-*** 1092,1097 ****
---- 1097,1103 ----
- else
- msg[cnt].m_size = ftell(fp) - msg[cnt].m_offset;
- msg[cnt].m_lines = lines;
-+ msg[cnt].m_headers = headers;
- /* remember where we were to seek to for when we append new mail */
- if (append)
- cnt++;
-*** old/mush.1 Sun Oct 25 11:59:15 1998
---- mush.1 Sun Oct 25 12:04:10 1998
-***************
-*** 4206,4214 ****
- .nf
- .ta 0.5i
- %a address of the author
- %c number of characters (bytes) in the message
- %f entire \*QFrom:\*U field (author)
-! %l number of lines in the message
- %i the message-id (may not be present)
- %n name of the author
- %s subject of the message
---- 4206,4216 ----
- .nf
- .ta 0.5i
- %a address of the author
-+ %b number of lines in the body of the message
- %c number of characters (bytes) in the message
- %f entire \*QFrom:\*U field (author)
-! %h number of header lines in the message
-! %l number of total lines in the message
- %i the message-id (may not be present)
- %n name of the author
- %s subject of the message
-*** old/pick.c Sun Oct 25 11:59:14 1998
---- pick.c Sun Oct 25 11:58:28 1998
-***************
-*** 297,307 ****
-
-
- static int
-! cmplines(m1, m2)
- struct msg **m1;
- struct msg **m2;
- {
-! int z = (int) (*m2)->m_lines - (int) (*m1)->m_lines;
- if (z > 0)
- return 1;
- else if (z < 0)
---- 297,308 ----
-
-
- static int
-! cmpreallines(m1, m2)
- struct msg **m1;
- struct msg **m2;
- {
-! int z = (int) (((*m2)->m_lines - (*m2)->m_headers) -
-! ((*m1)->m_lines - (*m1)->m_headers));
- if (z > 0)
- return 1;
- else if (z < 0)
-***************
-*** 340,356 ****
- }
-
- cnt = i;
-! qsort((char *) mlist, cnt, sizeof(struct msg *), cmplines);
-
- clear_msg_list(ret_list);
-
- lcur = -1;
-
- for (i = 0; i < cnt - 1; i++) {
-! lcur = mlist[i]->m_lines;
- mcur = mlist[i]->m_spare;
-
-! if (mlist[i + 1]->m_lines != lcur)
- /* Next message has not the same number of lines, skip */
- continue;
-
---- 341,357 ----
- }
-
- cnt = i;
-! qsort((char *) mlist, cnt, sizeof(struct msg *), cmpreallines);
-
- clear_msg_list(ret_list);
-
- lcur = -1;
-
- for (i = 0; i < cnt - 1; i++) {
-! lcur = mlist[i]->m_lines - mlist[i]->m_headers;
- mcur = mlist[i]->m_spare;
-
-! if (mlist[i + 1]->m_lines - mlist[i + 1]->m_headers != lcur)
- /* Next message has not the same number of lines, skip */
- continue;
-
-***************
-*** 374,380 ****
- }
- omsize = mlist[i]->m_size - (omsg - otext);
- for (j = i + 1; j < cnt; j++) {
-! if (mlist[j]->m_lines != lcur)
- /* Next message has not the same number of lines, skip */
- break;
- mid = mlist[j]->m_spare;
---- 375,381 ----
- }
- omsize = mlist[i]->m_size - (omsg - otext);
- for (j = i + 1; j < cnt; j++) {
-! if (mlist[j]->m_lines - mlist[j]->m_headers != lcur)
- /* Next message has not the same number of lines, skip */
- break;
- mid = mlist[j]->m_spare;
diff --git a/mail/mush/patches/patch-al b/mail/mush/patches/patch-al
deleted file mode 100644
index 940e9171c95..00000000000
--- a/mail/mush/patches/patch-al
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-al,v 1.2 2002/03/16 02:07:34 christos Exp $
-
---- dates.c.orig Fri Mar 15 21:01:54 2002
-+++ dates.c Fri Mar 15 21:06:33 2002
-@@ -101,7 +101,7 @@
- {
- long year, julian;
-
-- if (tym->tm_year < 100)
-+ if (tym->tm_year < 1000)
- year = tym->tm_year + 1900;
- if (year < 69)
- year += 100;
-@@ -375,6 +375,11 @@
- }
- if (Year > 1900)
- Year -= 1900;
-+ else if (Year < 0) {
-+ print("Unknown date format: %s\n", p);
-+ return NULL;
-+ }
-+
- if (!Month && (Month = month_to_n(month)) == -1) {
- print("bad month: %s\n", p);
- return NULL;
diff --git a/mail/mush/patches/patch-am b/mail/mush/patches/patch-am
deleted file mode 100644
index 193ab076f66..00000000000
--- a/mail/mush/patches/patch-am
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-am,v 1.2 2006/01/08 17:04:58 joerg Exp $
-
---- makefile.solaris.orig Mon Jan 3 16:19:32 2000
-+++ makefile.solaris Mon Jan 3 16:20:50 2000
-@@ -32,6 +32,8 @@
- #OTHERLIBS=/usr/src/mmdf/lib/libmmdf.a
- PROG= mush
-
-+all: $(PROG)
-+
- $(PROG): $(OBJS1) $(OBJS2)
- @echo loading...
- @$(CC) $(LDFLAGS) $(OBJS1) $(OBJS2) -o $(PROG) $(LIBS) $(OTHERLIBS)
-@@ -40,10 +42,10 @@
- $(OBJS2): $(HDRS1) $(HDRS2) $(HDRS3)
- loop.o: version.h
-
--BINDIR= /usr/local/bin
--LIBDIR= /usr/local/lib
--MRCDIR= /usr/local/lib
--MANDIR= /usr/local/man/man1
-+BINDIR= @PREFIX@/bin
-+LIBDIR= @PREFIX@/share/misc
-+MRCDIR= @PREFIX@/share/misc
-+MANDIR= @MANDIR@/man1
- MANEXT= 1
-
- install: mush
diff --git a/mail/mush/patches/patch-an b/mail/mush/patches/patch-an
deleted file mode 100644
index a011b6b7453..00000000000
--- a/mail/mush/patches/patch-an
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-an,v 1.2 2005/09/28 20:31:28 christos Exp $
-
---- curses.c.orig 2005-09-28 16:24:35.000000000 -0400
-+++ curses.c 2005-09-28 16:28:37.000000000 -0400
-@@ -11,11 +11,6 @@
- {
- char buf[80];
- extern char *UP;
--#ifndef M_UNIX
--#ifndef BSD44
-- extern char ttytype[];
--#endif
--#endif /* M_UNIX */
-
- if (argv && *++argv && !strcmp(*argv, "-?"))
- return help(0, "curses", cmd_help);
-@@ -57,12 +52,15 @@
- (void) signal(SIGTSTP, stop_start);
- (void) signal(SIGCONT, stop_start);
- #endif /* SIGCONT */
--#if !defined(SYSV) && !defined(USG) && !defined(__NCURSES_H)
-+#if !defined(SYSV) && !defined(USG) && !defined(BSD44)
- if (!UP || !*UP)
- #else /* ~SYSV && ~USG */
- if (!stdscr)
- #endif /* ~SYSV && ~USG */
- {
-+ char *ttytype = getenv("TERM");
-+ if (ttytype == NULL)
-+ ttytype = "*unknown*";
- print("Terminal type %s can not use the curses interface.\n", ttytype);
- return -1;
- }
diff --git a/mail/mush/patches/patch-ao b/mail/mush/patches/patch-ao
deleted file mode 100644
index 904d22e6f71..00000000000
--- a/mail/mush/patches/patch-ao
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2005/05/29 05:57:20 minskim Exp $
-
---- makefile.linux.orig 2005-05-29 00:51:20.300151928 -0500
-+++ makefile.linux
-@@ -30,9 +30,9 @@ DEBUG=-O6
- # apparently has the ncurses library installed as -lcurses, whereas the latter
- # has a separate -lncurses. RedHat for 5.0 recommends dropping -ltermcap
- # and using only -lcurses. Set CFLAGS and LIBS here as appropriate.
--CFLAGS= $(DEBUG) -DPOSIX -DSIGRET=void -fwritable-strings -DCURSES -DDEFINE_CURSES_SGTTY -I/usr/include/ncurses
-+CFLAGS+= -DPOSIX -DSIGRET=void -fwritable-strings -DCURSES -DDEFINE_CURSES_SGTTY -I/usr/include/ncurses
- #CFLAGS= $(DEBUG) -DPOSIX -DSIGRET=void -fwritable-strings -DCURSES -DDEFINE_CURSES_SGTTY -DNCURSES
--LDFLAGS= $(DEBUG)
-+#LDFLAGS= $(DEBUG)
- LIBS= -lncurses -ltermcap
- #LIBS= -lcurses -ltermcap
- #LIBS= -lcurses
-@@ -50,24 +50,20 @@ $(OBJS2): $(HDRS1) $(HDRS2) $(HDRS3)
- loop.o: version.h
-
- #PREFIX= /usr/packages/mush
--PREFIX= /usr
-+#PREFIX= /usr
- BINDIR= $(PREFIX)/bin
--LIBDIR= $(PREFIX)/lib
--MRCDIR= $(PREFIX)/lib
-+LIBDIR= $(PREFIX)/share/misc
-+MRCDIR= $(PREFIX)/share/misc
- MANDIR= $(PREFIX)/man/man1
- MANEXT= 1
-
- install: mush
- -mkdir $(PREFIX) $(PREFIX)/{bin,lib,man,man/man1}
-- cp mush $(BINDIR)
-- strip $(BINDIR)/mush
-- chmod 0755 $(BINDIR)/mush
-- cp mush.1 $(MANDIR)/mush.$(MANEXT)
-- chmod 0644 $(MANDIR)/mush.$(MANEXT)
-- cp cmd_help $(LIBDIR)
-- chmod 0644 $(LIBDIR)/cmd_help
-- cp Mushrc $(MRCDIR)/Mushrc
-- chmod 0644 $(MRCDIR)/Mushrc
-+ $(BSD_INSTALL_PROGRAM) mush $(BINDIR)
-+ $(BSD_INSTALL_MAN) mush.1 $(MANDIR)/mush.$(MANEXT)
-+ $(BSD_INSTALL_DATA_DIR) $(LIBDIR)
-+ $(BSD_INSTALL_DATA) cmd_help $(LIBDIR)
-+ $(BSD_INSTALL_DATA) Mushrc $(MRCDIR)/Mushrc
-
- clean:
- rm -f *.o *~ core TAGS tags a.out mush
diff --git a/mail/mutt-devel/DEINSTALL b/mail/mutt-devel/DEINSTALL
deleted file mode 100644
index 37c6800c5a5..00000000000
--- a/mail/mutt-devel/DEINSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.3 2006/06/15 20:40:16 jlam Exp $
-
-case ${STAGE} in
-DEINSTALL)
- ${RM} -f @DOCDIR@/samples
- ;;
-esac
diff --git a/mail/mutt-devel/DESCR b/mail/mutt-devel/DESCR
deleted file mode 100644
index 254cb041460..00000000000
--- a/mail/mutt-devel/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-The Mutt E-Mail Client by Michael Elkins <me@cs.hmc.edu>
-
-``All mail clients suck. This one just sucks less.'' -me, circa 1995
-
-Mutt is a small but very powerful text-based MIME mail client. Mutt
-is highly configurable, and is well suited to the mail power user with
-advanced features like key bindings, keyboard macros, mail threading,
-regular expression searches and a powerful pattern matching language
-for selecting groups of messages.
diff --git a/mail/mutt-devel/INSTALL b/mail/mutt-devel/INSTALL
deleted file mode 100644
index ce15b7d4513..00000000000
--- a/mail/mutt-devel/INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: INSTALL,v 1.4 2006/06/15 20:40:16 jlam Exp $
-
-case ${STAGE} in
-POST-INSTALL)
- ${RM} -f @DOCDIR@/samples
- ${LN} -sf ../../examples/mutt @DOCDIR@/samples
- ;;
-esac
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
deleted file mode 100644
index 52b358ae5fe..00000000000
--- a/mail/mutt-devel/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# $NetBSD: Makefile,v 1.57 2007/03/04 17:22:45 tonio Exp $
-
-DISTNAME= mutt-1.5.14
-PKGREVISION= 1
-CATEGORIES= mail
-MUTT_SITES= ftp://ftp.mutt.org/mutt/ \
- ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
- ftp://gd.tuwien.ac.at/infosys/mail/mutt/ \
- ftp://ftp.fu-berlin.de/unix/mail/mutt/
-MASTER_SITES= ${MUTT_SITES:=devel/}
-
-MAINTAINER= tonio@NetBSD.org
-HOMEPAGE= http://www.mutt.org/
-COMMENT= Text-based MIME mail client with PGP & S/MIME support
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= msgfmt
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \
- --with-docdir=${PREFIX}/share/doc/mutt \
- --without-included-gettext \
- --enable-pop \
- --enable-imap
-MAKE_ENV+= CHGRP=${CHGRP:Q} CHMOD=${CHMOD:Q}
-
-.if (${OPSYS} == "SunOS")
-CONFIGURE_ARGS+= --without-wc-funcs
-.endif
-
-# There is a problem using /bin/sh on old NetBSD releases, so use /bin/ksh
-# there.
-#
-.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-5]*-*)
-CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh
-.endif
-
-.include "options.mk"
-
-LDFLAGS+= ${_STRIPFLAG_CC}
-
-DOCDIR= ${PREFIX}/share/doc/mutt
-EGDIR= ${PREFIX}/share/examples/mutt
-CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
-CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
-FILES_SUBST+= DOCDIR=${DOCDIR:Q}
-INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}
-
-# Define WRKSRC explicitly so we can use its value below.
-WRKSRC= ${WRKDIR}/${DISTNAME}
-.if exists(${WRKSRC}/mutt_dotlock)
-PLIST_SUBST+= MUTT_DOTLOCK=
-.else
-PLIST_SUBST+= MUTT_DOTLOCK="@comment "
-.endif
-INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-
-# Fix some absolute paths in installed files.
-SUBST_CLASSES+= paths
-SUBST_MESSAGE.paths= Fix absolute path
-SUBST_STAGE.paths= post-build
-SUBST_FILES.paths= contrib/gpg.rc
-SUBST_SED.paths= -e 's,/usr/bin/gpg,gpg,g'
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt-devel/PLIST b/mail/mutt-devel/PLIST
deleted file mode 100644
index 1730029be63..00000000000
--- a/mail/mutt-devel/PLIST
+++ /dev/null
@@ -1,110 +0,0 @@
-@comment $NetBSD: PLIST,v 1.14 2007/03/04 17:22:45 tonio Exp $
-bin/flea
-bin/mutt
-bin/muttbug
-${MUTT_DOTLOCK}bin/mutt_dotlock
-bin/pgpewrap
-bin/pgpring
-${WITHSMIME}bin/smime_keys
-man/man1/flea.1
-man/man1/mutt.1
-man/man1/mutt_dotlock.1
-man/man1/muttbug.1
-man/man5/mutt-mbox.5
-man/man5/mutt-mmdf.5
-man/man5/muttrc.5
-share/doc/mutt/COPYRIGHT
-share/doc/mutt/ChangeLog
-share/doc/mutt/ChangeLog.old
-share/doc/mutt/GPL
-share/doc/mutt/INSTALL
-share/doc/mutt/NEWS
-share/doc/mutt/PGP-Notes.txt
-share/doc/mutt/README
-share/doc/mutt/README.SECURITY
-share/doc/mutt/README.SSL
-share/doc/mutt/TODO
-share/doc/mutt/advancedusage.html
-share/doc/mutt/applying-patches.txt
-share/doc/mutt/configuration.html
-share/doc/mutt/devel-notes.txt
-share/doc/mutt/gettingstarted.html
-share/doc/mutt/index.html
-share/doc/mutt/intro.html
-share/doc/mutt/manual.html
-share/doc/mutt/manual.txt
-share/doc/mutt/mimesupport.html
-share/doc/mutt/miscellany.html
-share/doc/mutt/patch-notes.txt
-share/doc/mutt/reference.html
-share/doc/mutt/smime-notes.txt
-share/doc/mutt/tuning.html
-share/examples/mutt/Mush.rc
-share/examples/mutt/Muttrc
-share/examples/mutt/Muttrc.dist
-share/examples/mutt/Pine.rc
-share/examples/mutt/Tin.rc
-share/examples/mutt/ca-bundle.crt
-share/examples/mutt/colors.default
-share/examples/mutt/colors.linux
-share/examples/mutt/gpg.rc
-share/examples/mutt/iconv/iconv.aix-3.2.5.rc
-share/examples/mutt/iconv/iconv.aix-4.1.5.rc
-share/examples/mutt/iconv/iconv.aix-4.2.0.rc
-share/examples/mutt/iconv/iconv.aix-4.3.2.rc
-share/examples/mutt/iconv/iconv.freebsd-3.3.rc
-share/examples/mutt/iconv/iconv.glibc-2.1.3.rc
-share/examples/mutt/iconv/iconv.glibc-2.1.90.rc
-share/examples/mutt/iconv/iconv.hpux-10.01.rc
-share/examples/mutt/iconv/iconv.hpux-10.20.rc
-share/examples/mutt/iconv/iconv.hpux-11.00.rc
-share/examples/mutt/iconv/iconv.irix-6.5.rc
-share/examples/mutt/iconv/iconv.osf1-4.0a.rc
-share/examples/mutt/iconv/iconv.osf1-4.0d.rc
-share/examples/mutt/iconv/iconv.solaris-2.4.rc
-share/examples/mutt/iconv/iconv.solaris-2.5.1.rc
-share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc
-share/examples/mutt/iconv/iconv.solaris-2.6.rc
-share/examples/mutt/iconv/iconv.solaris-2.7.rc
-share/examples/mutt/mime.types
-share/examples/mutt/mime.types.dist
-share/examples/mutt/pgp2.rc
-share/examples/mutt/pgp5.rc
-share/examples/mutt/pgp6.rc
-share/examples/mutt/sample.mailcap
-share/examples/mutt/sample.muttrc
-share/examples/mutt/sample.muttrc-tlr
-share/examples/mutt/smime.rc
-share/examples/mutt/smime_keys_test.pl
-share/locale/bg/LC_MESSAGES/mutt.mo
-share/locale/ca/LC_MESSAGES/mutt.mo
-share/locale/cs/LC_MESSAGES/mutt.mo
-share/locale/da/LC_MESSAGES/mutt.mo
-share/locale/de/LC_MESSAGES/mutt.mo
-share/locale/el/LC_MESSAGES/mutt.mo
-share/locale/eo/LC_MESSAGES/mutt.mo
-share/locale/es/LC_MESSAGES/mutt.mo
-share/locale/et/LC_MESSAGES/mutt.mo
-share/locale/eu/LC_MESSAGES/mutt.mo
-share/locale/fr/LC_MESSAGES/mutt.mo
-share/locale/ga/LC_MESSAGES/mutt.mo
-share/locale/gl/LC_MESSAGES/mutt.mo
-share/locale/hu/LC_MESSAGES/mutt.mo
-share/locale/id/LC_MESSAGES/mutt.mo
-share/locale/it/LC_MESSAGES/mutt.mo
-share/locale/ja/LC_MESSAGES/mutt.mo
-share/locale/ko/LC_MESSAGES/mutt.mo
-share/locale/lt/LC_MESSAGES/mutt.mo
-share/locale/nl/LC_MESSAGES/mutt.mo
-share/locale/pl/LC_MESSAGES/mutt.mo
-share/locale/pt_BR/LC_MESSAGES/mutt.mo
-share/locale/ru/LC_MESSAGES/mutt.mo
-share/locale/sk/LC_MESSAGES/mutt.mo
-share/locale/sv/LC_MESSAGES/mutt.mo
-share/locale/tr/LC_MESSAGES/mutt.mo
-share/locale/uk/LC_MESSAGES/mutt.mo
-share/locale/zh_CN/LC_MESSAGES/mutt.mo
-share/locale/zh_TW/LC_MESSAGES/mutt.mo
-@dirrm share/examples/mutt/iconv
-@dirrm share/examples/mutt
-@dirrm share/doc/mutt
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
deleted file mode 100644
index eee07c4ee0f..00000000000
--- a/mail/mutt-devel/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.38 2007/03/04 17:22:45 tonio Exp $
-
-SHA1 (mutt-1.5.14.tar.gz) = 7be098c13302fab8a954095d17a9a64e1e1519c1
-RMD160 (mutt-1.5.14.tar.gz) = ed4eeaf75d37757ed5b370e9763b6f8524df5ca7
-Size (mutt-1.5.14.tar.gz) = 3441678 bytes
-SHA1 (patch-1.5.14.rr.compressed.1.gz) = c0a74886515fed94826b1d5f8d2a7c42a9ea6f26
-RMD160 (patch-1.5.14.rr.compressed.1.gz) = 0756a878cc309636df164cfe21507e8554142c4f
-Size (patch-1.5.14.rr.compressed.1.gz) = 10558 bytes
-SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
-SHA1 (patch-ab) = 4f9e8cbcec719263998d61fcc9a707548d804477
-SHA1 (patch-ac) = b48ff9f66ff2b483b5aa0c312e08bd22c7cf03be
-SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
-SHA1 (patch-ag) = 84637d95fa9aa0cf58a6e6b2c82b783efa21cf66
-SHA1 (patch-ah) = 4227c5768b900e58fa4a679e6ad67efc974a70b5
-SHA1 (patch-ai) = 7d9883198a22615fb1792a41fce3ee9821f48f08
-SHA1 (patch-al) = c803e21197de3317f42e073da5731b1b4371eabd
diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk
deleted file mode 100644
index f143b3b2298..00000000000
--- a/mail/mutt-devel/options.mk
+++ /dev/null
@@ -1,124 +0,0 @@
-# $NetBSD: options.mk,v 1.23 2007/03/04 17:22:45 tonio Exp $
-
-# Global and legacy options
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.mutt
-PKG_OPTIONS_REQUIRED_GROUPS= display
-PKG_OPTIONS_GROUP.display= slang ncurses ncursesw curses
-PKG_SUPPORTED_OPTIONS= ssl smime sasl mutt-hcache idn mutt-compressed-mbox debug
-PKG_SUGGESTED_OPTIONS= ssl smime curses
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Slang
-###
-.if !empty(PKG_OPTIONS:Mslang)
-. include "../../devel/libslang/buildlink3.mk"
-CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang}
-.endif
-
-###
-### ncurses
-###
-.if !empty(PKG_OPTIONS:Mncurses)
-USE_NCURSES= yes
-. include "../../devel/ncurses/buildlink3.mk"
-CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses}
-.endif
-
-###
-### SASLv2
-###
-.if !empty(PKG_OPTIONS:Msasl)
-. include "../../security/cyrus-sasl/buildlink3.mk"
-CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
-.endif
-
-### curses
-###
-.if !empty(PKG_OPTIONS:Mcurses)
-. include "../../mk/curses.buildlink3.mk"
-.endif
-
-###
-### ncursesw
-###
-.if !empty(PKG_OPTIONS:Mncursesw)
-. include "../../devel/ncursesw/buildlink3.mk"
-.else
-SUBST_CLASSES+= curse
-SUBST_MESSAGE.curse= Fixing mutt to avoid ncursesw
-SUBST_STAGE.curse= post-patch
-SUBST_FILES.curse= configure.in configure
-SUBST_SED.curse= -e 's,for lib in ncurses ncursesw,for lib in ncurses,'
-.endif
-
-###
-### SSL
-###
-.if !empty(PKG_OPTIONS:Mssl)
-. include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
-.else
-CONFIGURE_ARGS+= --without-ssl
-.endif
-
-###
-### S/MIME
-###
-.if !empty(PKG_OPTIONS:Msmime)
-USE_TOOLS+= perl:run
-REPLACE_PERL+= *.pl */*.pl
-. include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-smime
-PLIST_SUBST+= WITHSMIME=''
-.else
-CONFIGURE_ARGS+= --disable-smime
-PLIST_SUBST+= WITHSMIME='@comment '
-.endif
-
-###
-### Header cache
-###
-.if !empty(PKG_OPTIONS:Mmutt-hcache)
-. include "../../databases/db4/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-hcache
-CONFIGURE_ARGS+= --without-gdbm
-#
-# BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate
-# since the real -I and -L flags are added by buildlink already.
-#
-CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BUILDLINK_PREFIX.db4}/include
-CONFIGURE_ENV+= BDB_LIB_DIR=${BUILDLINK_PREFIX.db4}/lib
-CONFIGURE_ENV+= BDB_LIB=${BUILDLINK_LDADD.db4:S/^-l//:Q}
-.else
-CONFIGURE_ARGS+= --disable-hcache
-.endif
-
-###
-### Compressed mail boxes
-###
-.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox)
-PATCH_SITES= http://www.spinnaker.de/mutt/compressed/
-PATCHFILES+= patch-1.5.14.rr.compressed.1.gz
-PATCH_DIST_STRIP= -p1
-CONFIGURE_ARGS+= --enable-compressed
-.endif
-
-###
-### Internationalized Domain Names
-###
-.if !empty(PKG_OPTIONS:Midn)
-. include "../../devel/libidn/buildlink3.mk"
-CONFIGURE_ARGS+= --with-idn=${BUILDLINK_PREFIX.libidn}
-.else
-CONFIGURE_ARGS+= --disable-idn
-.endif
-
-###
-### Enable debugging support
-###
-.if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+= --enable-debug
-.endif
diff --git a/mail/mutt-devel/patches/patch-aa b/mail/mutt-devel/patches/patch-aa
deleted file mode 100644
index 504355f7d57..00000000000
--- a/mail/mutt-devel/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2004/07/21 22:37:10 jlam Exp $
-
---- send.c.orig Sun Feb 1 12:10:58 2004
-+++ send.c
-@@ -1689,6 +1689,13 @@ full_fcc:
- }
- }
-
-+#ifdef CRYPT_BACKEND_CLASSIC_PGP
-+ {
-+ /* Extend the PGP expiry time while messages are being sent. */
-+ extern time_t PgpExptime;
-+ PgpExptime = time (NULL) + PgpTimeout;
-+ }
-+#endif
-
- rv = 0;
-
diff --git a/mail/mutt-devel/patches/patch-ab b/mail/mutt-devel/patches/patch-ab
deleted file mode 100644
index 1f95a8635bb..00000000000
--- a/mail/mutt-devel/patches/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2007/03/04 17:22:46 tonio Exp $
-
---- Makefile.in.orig 2007-03-04 13:33:38.000000000 +0100
-+++ Makefile.in
-@@ -170,7 +170,7 @@ DEBUGGER = @DEBUGGER@
- # @rm -rf makedoc
- # $(HOST_CC) $(AM_CFLAGS) $(LDFLAGS) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) -o makedoc
- DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
-- -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
-+ -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" \
- -DHAVE_CONFIG_H=1
-
- DEPDIR = @DEPDIR@
-@@ -279,7 +279,7 @@ infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
--localedir = @localedir@
-+localedir = $(prefix)/share/locale
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
-@@ -1035,8 +1035,8 @@ install-exec-hook:
- ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
- fi
- if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
-- chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
-- chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
-+ ${CHGRP} @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
-+ ${CHMOD} @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
- { echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \
- fi
-
diff --git a/mail/mutt-devel/patches/patch-ac b/mail/mutt-devel/patches/patch-ac
deleted file mode 100644
index 8de0b48a4c4..00000000000
--- a/mail/mutt-devel/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2004/07/21 22:37:10 jlam Exp $
-
---- curs_main.c.orig Wed Nov 5 04:41:31 2003
-+++ curs_main.c
-@@ -1048,6 +1048,11 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);
- cp = _("Open mailbox");
-
- buf[0] = '\0';
-+ if (option (OPTCHANGEFOLDERNEXT) && Context && Context->path)
-+ {
-+ strfcpy (buf, Context->path, sizeof (buf));
-+ mutt_pretty_mailbox (buf);
-+ }
- mutt_buffy (buf, sizeof (buf));
-
- if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
diff --git a/mail/mutt-devel/patches/patch-ad b/mail/mutt-devel/patches/patch-ad
deleted file mode 100644
index 32d848acfe2..00000000000
--- a/mail/mutt-devel/patches/patch-ad
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ad,v 1.8 2006/08/16 10:42:05 tonio Exp $
-
---- contrib/Makefile.in.orig 2006-08-14 16:09:28.000000000 +0200
-+++ contrib/Makefile.in
-@@ -365,21 +365,20 @@ uninstall-am: uninstall-info-am uninstal
-
-
- install-data-local:
-- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/iconv
- for f in $(SAMPLES) ; do \
-- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ; \
-+ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(sysconfdir) ; \
- done
- for f in $(srcdir)/iconv/*.rc ; do \
-- $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv ; \
-+ $(INSTALL) -m 644 $$f $(DESTDIR)$(sysconfdir)/iconv ; \
- done
-
- uninstall-local:
- for f in $(SAMPLES) ; do \
-- rm -f $(DESTDIR)$(docdir)/samples/$$f ; \
-+ rm -f $(DESTDIR)$(sysconfdir)/$$f ; \
- done
-- -rm -rf $(DESTDIR)$(docdir)/samples/iconv
-- -rmdir $(DESTDIR)$(docdir)/samples
-- -rmdir $(DESTDIR)$(docdir)
-+ -rm -rf $(DESTDIR)$(sysconfdir)/iconv
-+ -rmdir $(DESTDIR)$(sysconfdir)
- dist-hook: Makefile $(DISTFILES)
- mkdir -p $(distdir)/iconv
- for file in $(srcdir)/iconv/*.rc ; do \
diff --git a/mail/mutt-devel/patches/patch-ag b/mail/mutt-devel/patches/patch-ag
deleted file mode 100644
index bf14dc065c1..00000000000
--- a/mail/mutt-devel/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2005/10/03 14:16:53 tonio Exp $
-
---- doc/Makefile.in.orig 2005-09-15 14:19:54.000000000 +0000
-+++ doc/Makefile.in
-@@ -79,8 +79,8 @@ install: all instdoc
- ./instdoc $(srcdir)/dotlock.man \
- $(DESTDIR)$(mandir)/man1/mutt_dotlock.1
- ./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
-- ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
-- ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
-+ ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mutt-mbox.5
-+ ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mutt-mmdf.5
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
- for f in $(topsrcdir_DOCFILES) ; do \
- $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
diff --git a/mail/mutt-devel/patches/patch-ah b/mail/mutt-devel/patches/patch-ah
deleted file mode 100644
index ea0e144b4c4..00000000000
--- a/mail/mutt-devel/patches/patch-ah
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/07/21 22:37:10 jlam Exp $
-
---- init.h.orig Sun Feb 1 12:15:17 2004
-+++ init.h
-@@ -280,6 +280,13 @@ struct option_t MuttVars[] = {
- ** .pp
- ** Character set your terminal uses to display and enter textual data.
- */
-+ { "change_folder_next", DT_BOOL, R_NONE, OPTCHANGEFOLDERNEXT, 0 },
-+ /*
-+ ** .pp
-+ ** When this variable is set, the change-folder command will start at the
-+ ** next folder after the current folder in your mailbox list instead of
-+ ** starting at the first folder.
-+ */
- { "check_new", DT_BOOL, R_NONE, OPTCHECKNEW, 1 },
- /*
- ** .pp
diff --git a/mail/mutt-devel/patches/patch-ai b/mail/mutt-devel/patches/patch-ai
deleted file mode 100644
index 41b8414f77e..00000000000
--- a/mail/mutt-devel/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2005/09/03 16:57:07 tonio Exp $
-
---- mutt.h.orig 2005-09-03 10:51:23.000000000 +0200
-+++ mutt.h 2005-09-03 10:52:23.000000000 +0200
-@@ -336,6 +336,7 @@
- OPTBEEP,
- OPTBEEPNEW,
- OPTBOUNCEDELIVERED,
-+ OPTCHANGEFOLDERNEXT,
- OPTBRAILLEFRIENDLY,
- OPTCHECKNEW,
- OPTCOLLAPSEUNREAD,
diff --git a/mail/mutt-devel/patches/patch-al b/mail/mutt-devel/patches/patch-al
deleted file mode 100644
index d31cce3a744..00000000000
--- a/mail/mutt-devel/patches/patch-al
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-al,v 1.5 2007/03/04 13:43:45 tonio Exp $
-
---- configure.orig 2006-09-01 09:01:21.000000000 +0200
-+++ configure
-@@ -17512,6 +17512,7 @@ if test "${with_bdb+set}" = set; then
- withval=$with_bdb; ac_bdb_prefix=$withval
- fi
-
-+ if test x$BDB_INCLUDE_DIR = x -o test x$BDB_LIB_DIR = x -o test x$BDB_LIB = x; then
- if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_cv_vlopen != xyes; then
- test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr"
- for d in $ac_bdb_prefix; do
-@@ -17618,6 +17619,9 @@ echo "${ECHO_T}yes" >&6; }
- echo "${ECHO_T}no" >&6; }
- fi
- fi
-+ else
-+ ac_cv_dbcreate=yes
-+ fi
-
- if test x$ac_cv_vlopen = xyes; then
- CPPFLAGS="$OLDCPPFLAGS"
diff --git a/mail/mutt/DESCR b/mail/mutt/DESCR
deleted file mode 100644
index 254cb041460..00000000000
--- a/mail/mutt/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-The Mutt E-Mail Client by Michael Elkins <me@cs.hmc.edu>
-
-``All mail clients suck. This one just sucks less.'' -me, circa 1995
-
-Mutt is a small but very powerful text-based MIME mail client. Mutt
-is highly configurable, and is well suited to the mail power user with
-advanced features like key bindings, keyboard macros, mail threading,
-regular expression searches and a powerful pattern matching language
-for selecting groups of messages.
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
deleted file mode 100644
index 3b72e28af5e..00000000000
--- a/mail/mutt/Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-# $NetBSD: Makefile,v 1.148 2007/01/07 09:13:58 rillig Exp $
-
-DISTNAME= mutt-1.4.2.2i
-PKGREVISION= 3
-PKGNAME= ${DISTNAME:C/i$//}
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.mutt.org/mutt/ \
- ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
- ftp://gd.tuwien.ac.at/infosys/mail/mutt/ \
- ftp://ftp.fu-berlin.de/unix/mail/mutt/
-
-MAINTAINER= tron@NetBSD.org
-HOMEPAGE= http://www.mutt.org/
-COMMENT= Text-based MIME mail client with PGP support
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-.include "../../mk/bsd.prefs.mk"
-
-WRKSRC= ${WRKDIR}/${DISTNAME:C/i$$//}
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= msgfmt
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \
- --with-docdir=${PREFIX}/share/doc/mutt \
- --without-included-gettext \
- --enable-pop \
- --enable-imap
-MAKE_ENV+= CHGRP=${CHGRP:Q}
-
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+= --without-wc-funcs
-.endif
-
-.if ${LOWER_OPSYS} == "irix5.3"
-CONFIGURE_ENV+= ac_cv_header_inttypes_h=no
-.endif
-
-SUBST_CLASSES+= gpg
-SUBST_MESSAGE.gpg= Fixing path to GnuPG binary.
-SUBST_STAGE.gpg= post-patch
-SUBST_FILES.gpg= contrib/gpg.rc
-SUBST_SED.gpg= -e "s,/usr/bin/gpg,gpg,g"
-
-SUBST_CLASSES+= paths
-SUBST_MESSAGE.paths= Fixing pathnames in manual page.
-SUBST_STAGE.paths= post-patch
-SUBST_FILES.paths= doc/mutt.man
-SUBST_SED.paths= -e "s,/usr/local/doc/mutt/,${DOCDIR}/,g"
-SUBST_SED.paths+= -e "s,/etc/,${PKG_SYSCONFDIR}/,g"
-SUBST_SED.paths+= -e "s,/usr/local/,${PREFIX}/,g"
-
-.if ${OPSYS} == "Interix"
-SUBST_CLASSES+= mgroup
-SUBST_MESSAGE.mgroup= Configuring mail group.
-SUBST_STAGE.mgroup= post-patch
-SUBST_FILES.mgroup= configure
-SUBST_SED.mgroup= -e "s,DOTLOCK_GROUP='mail',DOTLOCK_GROUP='+Administrators',"
-
-CPPFLAGS+= -D__BROKEN_INTERIX_FORK
-.endif
-
-# There is a problem using /bin/sh on old NetBSD releases, so use /bin/ksh
-# there.
-#
-.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-5]*-*)
-CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh
-.endif
-
-.include "options.mk"
-
-LDFLAGS+= ${_STRIPFLAG_CC}
-
-DOCDIR= ${PREFIX}/share/doc/mutt
-EGDIR= ${PREFIX}/share/examples/mutt
-CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
-CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
-FILES_SUBST+= DOCDIR=${DOCDIR:Q}
-
-INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
-
-.if exists(${WRKSRC}/mutt_dotlock)
-PLIST_SUBST+= MUTT_DOTLOCK=
-.else
-PLIST_SUBST+= MUTT_DOTLOCK="@comment "
-.endif
-INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-
-# Pre-create some directories and symlinks used during the installation
-# process.
-#
-pre-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA_DIR} ${DOCDIR}
- ${RM} -f ${DOCDIR}/samples
- ${LN} -sf ${EGDIR} ${DOCDIR}/samples
-
-post-install:
-.if (${PKG_INSTALLATION_TYPE} == "pkgviews")
- ${MV} ${PREFIX}/${PKGMANDIR}/man5/mutt-mbox.5 ${PREFIX}/${PKGMANDIR}/man5/mbox.5
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt/PLIST b/mail/mutt/PLIST
deleted file mode 100644
index 9ad5b1d4517..00000000000
--- a/mail/mutt/PLIST
+++ /dev/null
@@ -1,97 +0,0 @@
-@comment $NetBSD: PLIST,v 1.12 2006/06/20 09:14:46 tron Exp $
-bin/flea
-bin/mutt
-bin/muttbug
-${MUTT_DOTLOCK}bin/mutt_dotlock
-bin/pgpewrap
-bin/pgpring
-man/man1/flea.1
-man/man1/mutt.1
-man/man1/muttbug.1
-man/man5/mutt-mbox.5
-man/man5/muttrc.5
-share/doc/mutt/COPYRIGHT
-share/doc/mutt/ChangeLog
-share/doc/mutt/GPL
-share/doc/mutt/INSTALL
-share/doc/mutt/NEWS
-share/doc/mutt/PGP-Notes.txt
-share/doc/mutt/README
-share/doc/mutt/README.SECURITY
-share/doc/mutt/README.SSL
-share/doc/mutt/TODO
-share/doc/mutt/applying-patches.txt
-share/doc/mutt/devel-notes.txt
-share/doc/mutt/html/manual-1.html
-share/doc/mutt/html/manual-2.html
-share/doc/mutt/html/manual-3.html
-share/doc/mutt/html/manual-4.html
-share/doc/mutt/html/manual-5.html
-share/doc/mutt/html/manual-6.html
-share/doc/mutt/html/manual-7.html
-share/doc/mutt/html/manual.html
-share/doc/mutt/manual.txt
-share/doc/mutt/patch-notes.txt
-share/examples/mutt/Mush.rc
-share/examples/mutt/Muttrc
-share/examples/mutt/Pine.rc
-share/examples/mutt/Tin.rc
-share/examples/mutt/gpg.rc
-share/examples/mutt/iconv/iconv.aix-3.2.5.rc
-share/examples/mutt/iconv/iconv.aix-4.1.5.rc
-share/examples/mutt/iconv/iconv.aix-4.2.0.rc
-share/examples/mutt/iconv/iconv.aix-4.3.2.rc
-share/examples/mutt/iconv/iconv.freebsd-3.3.rc
-share/examples/mutt/iconv/iconv.glibc-2.1.3.rc
-share/examples/mutt/iconv/iconv.glibc-2.1.90.rc
-share/examples/mutt/iconv/iconv.hpux-10.01.rc
-share/examples/mutt/iconv/iconv.hpux-10.20.rc
-share/examples/mutt/iconv/iconv.hpux-11.00.rc
-share/examples/mutt/iconv/iconv.irix-6.5.rc
-share/examples/mutt/iconv/iconv.osf1-4.0a.rc
-share/examples/mutt/iconv/iconv.osf1-4.0d.rc
-share/examples/mutt/iconv/iconv.solaris-2.4.rc
-share/examples/mutt/iconv/iconv.solaris-2.5.1.rc
-share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc
-share/examples/mutt/iconv/iconv.solaris-2.6.rc
-share/examples/mutt/iconv/iconv.solaris-2.7.rc
-share/examples/mutt/mime.types
-share/examples/mutt/pgp2.rc
-share/examples/mutt/pgp5.rc
-share/examples/mutt/pgp6.rc
-share/examples/mutt/sample.mailcap
-share/examples/mutt/sample.muttrc
-share/examples/mutt/sample.muttrc-tlr
-@comment This entry must be specified after share/examples/mutt!
-share/doc/mutt/samples
-share/locale/bg/LC_MESSAGES/mutt.mo
-share/locale/ca/LC_MESSAGES/mutt.mo
-share/locale/cs/LC_MESSAGES/mutt.mo
-share/locale/da/LC_MESSAGES/mutt.mo
-share/locale/de/LC_MESSAGES/mutt.mo
-share/locale/el/LC_MESSAGES/mutt.mo
-share/locale/eo/LC_MESSAGES/mutt.mo
-share/locale/es/LC_MESSAGES/mutt.mo
-share/locale/et/LC_MESSAGES/mutt.mo
-share/locale/fr/LC_MESSAGES/mutt.mo
-share/locale/gl/LC_MESSAGES/mutt.mo
-share/locale/hu/LC_MESSAGES/mutt.mo
-share/locale/id/LC_MESSAGES/mutt.mo
-share/locale/it/LC_MESSAGES/mutt.mo
-share/locale/ja/LC_MESSAGES/mutt.mo
-share/locale/ko/LC_MESSAGES/mutt.mo
-share/locale/lt/LC_MESSAGES/mutt.mo
-share/locale/nl/LC_MESSAGES/mutt.mo
-share/locale/pl/LC_MESSAGES/mutt.mo
-share/locale/pt_BR/LC_MESSAGES/mutt.mo
-share/locale/ru/LC_MESSAGES/mutt.mo
-share/locale/sk/LC_MESSAGES/mutt.mo
-share/locale/sv/LC_MESSAGES/mutt.mo
-share/locale/tr/LC_MESSAGES/mutt.mo
-share/locale/uk/LC_MESSAGES/mutt.mo
-share/locale/zh_CN/LC_MESSAGES/mutt.mo
-share/locale/zh_TW/LC_MESSAGES/mutt.mo
-@dirrm share/examples/mutt/iconv
-@dirrm share/examples/mutt
-@dirrm share/doc/mutt/html
-@dirrm share/doc/mutt
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
deleted file mode 100644
index 72aabbcc2dd..00000000000
--- a/mail/mutt/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.33 2006/12/11 12:46:51 salo Exp $
-
-SHA1 (mutt-1.4.2.2i.tar.gz) = 0ee12f734f21186b143fa96a5ea79f72397747fb
-RMD160 (mutt-1.4.2.2i.tar.gz) = a749c13e9b56b0f3cf09ce5eabae3fd2edce4c0a
-Size (mutt-1.4.2.2i.tar.gz) = 2676306 bytes
-SHA1 (patch-aa) = 057c11486bb855e321853a106992c8792b75b812
-SHA1 (patch-ab) = 46518ebcd144bdb19da3f2238455d25544539e23
-SHA1 (patch-ac) = acfece3438c1cadc43247c590045699be7212ede
-SHA1 (patch-ad) = 8baac1337c1ab65e98055915f045e99d91015677
-SHA1 (patch-ag) = c369b0b5d4855e50a016530f81190b2cbd47cef1
-SHA1 (patch-ah) = 04549728683b4250a26f6d6c7a212b8d505014d2
-SHA1 (patch-ai) = 317b736d6b9a896e1ee185cce37a1c2184c02cde
-SHA1 (patch-aj) = a0ee2bc9a7b9e743e313101899de3d991a9d2cad
-SHA1 (patch-ak) = 689305356812d04bd3b490c436ed898a4b308136
-SHA1 (patch-al) = d03611108f76c33e87ac89a6e7eefc012297df86
-SHA1 (patch-am) = faa80ebf308eddfcbbe5aeab2f52d2d356d540cf
diff --git a/mail/mutt/options.mk b/mail/mutt/options.mk
deleted file mode 100644
index 0d7276aac86..00000000000
--- a/mail/mutt/options.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-# $NetBSD: options.mk,v 1.11 2006/10/14 20:34:36 tron Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.mutt
-PKG_OPTIONS_REQUIRED_GROUPS= display
-PKG_OPTIONS_GROUP.display= slang ncurses ncursesw curses
-PKG_SUPPORTED_OPTIONS= ssl buffy-size
-PKG_SUGGESTED_OPTIONS= ssl curses
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Slang
-###
-.if !empty(PKG_OPTIONS:Mslang)
-. include "../../devel/libslang/buildlink3.mk"
-CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang}
-.endif
-
-###
-### ncurses
-###
-.if !empty(PKG_OPTIONS:Mncurses)
-USE_NCURSES= yes
-. include "../../devel/ncurses/buildlink3.mk"
-CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses}
-.endif
-
-###
-### curses
-###
-.if !empty(PKG_OPTIONS:Mcurses)
-. include "../../mk/curses.buildlink3.mk"
-.endif
-
-###
-### ncursesw
-###
-.if !empty(PKG_OPTIONS:Mncursesw)
-. include "../../devel/ncursesw/buildlink3.mk"
-.else
-SUBST_CLASSES+= curse
-SUBST_MESSAGE.curse= Fixing mutt to avoid ncursesw
-SUBST_STAGE.curse= post-patch
-SUBST_FILES.curse= configure.in configure
-SUBST_SED.curse= -e 's,for lib in ncurses ncursesw,for lib in ncurses,'
-.endif
-
-###
-### SSL
-###
-.if !empty(PKG_OPTIONS:Mssl)
-. include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
-.else
-CONFIGURE_ARGS+= --without-ssl
-.endif
-
-###
-### configure option --enable-buffy-size
-###
-.if !empty(PKG_OPTIONS:Mbuffy-size)
-CONFIGURE_ARGS+= --enable-buffy-size
-.endif
diff --git a/mail/mutt/patches/patch-aa b/mail/mutt/patches/patch-aa
deleted file mode 100644
index 2dda924cd5b..00000000000
--- a/mail/mutt/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2004/02/02 07:05:33 tron Exp $
-
---- send.c.orig Wed Jan 30 23:50:59 2002
-+++ send.c Mon Feb 2 08:00:16 2004
-@@ -1611,6 +1611,13 @@
- }
- }
-
-+#ifdef HAVE_PGP
-+ {
-+ /* Extend the expiry time while messages keep getting sent. */
-+ extern time_t PgpExptime;
-+ PgpExptime = time (NULL) + PgpTimeout;
-+ }
-+#endif /* HAVE_PGP */
-
- rv = 0;
-
diff --git a/mail/mutt/patches/patch-ab b/mail/mutt/patches/patch-ab
deleted file mode 100644
index 5f236987175..00000000000
--- a/mail/mutt/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.13 2006/07/14 19:55:56 tron Exp $
-
---- Makefile.in.orig 2006-07-14 19:38:58.000000000 +0100
-+++ Makefile.in 2006-07-14 20:45:15.000000000 +0100
-@@ -167,7 +167,7 @@
- DBX = @DBX@
- DEBUGGER = @DEBUGGER@
- DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
-- -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
-+ -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" \
- -DHAVE_CONFIG_H=1
-
- DEPDIR = @DEPDIR@
-@@ -267,7 +267,7 @@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
--localstatedir = @localstatedir@
-+localstatedir = $(prefix)/share/locale
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-@@ -985,7 +985,7 @@
- ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
- fi
- if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
-- chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
-+ $(CHGRP) @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
- chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
- { echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \
- fi
diff --git a/mail/mutt/patches/patch-ac b/mail/mutt/patches/patch-ac
deleted file mode 100644
index 9322408414a..00000000000
--- a/mail/mutt/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2004/02/20 14:02:04 wiz Exp $
---- curs_main.c.orig Wed Jan 16 21:44:25 2002
-+++ curs_main.c Mon Feb 2 08:17:26 2004
-@@ -989,6 +989,11 @@
- cp = _("Open mailbox");
-
- buf[0] = '\0';
-+ if (option (OPTCHANGEFOLDERNEXT) && Context && Context->path)
-+ {
-+ strfcpy (buf, Context->path, sizeof (buf));
-+ mutt_pretty_mailbox (buf);
-+ }
- mutt_buffy (buf, sizeof (buf));
-
- if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
diff --git a/mail/mutt/patches/patch-ad b/mail/mutt/patches/patch-ad
deleted file mode 100644
index aded4370a80..00000000000
--- a/mail/mutt/patches/patch-ad
+++ /dev/null
@@ -1,91 +0,0 @@
-$NetBSD: patch-ad,v 1.9 2006/12/11 12:46:51 salo Exp $
-
-Security fixes for CVE-2006-5297 and CVE-2006-5298, from mutt git.
-
---- lib.c.orig 2002-04-29 19:12:18.000000000 +0200
-+++ lib.c 2006-12-11 13:24:17.000000000 +0100
-@@ -346,13 +346,84 @@ int safe_rename (const char *src, const
- return 0;
- }
-
-+/* Create a temporary directory next to a file name */
-+
-+int mutt_mkwrapdir (const char *path, char *newfile, size_t nflen,
-+ char *newdir, size_t ndlen)
-+{
-+ const char *basename;
-+ char parent[_POSIX_PATH_MAX];
-+ char *p;
-+ int rv;
-+
-+ strfcpy (parent, NONULL (path), sizeof (parent));
-+
-+ if ((p = strrchr (parent, '/')))
-+ {
-+ *p = '\0';
-+ basename = p + 1;
-+ }
-+ else
-+ {
-+ strfcpy (parent, ".", sizeof (parent));
-+ basename = path;
-+ }
-+
-+ do
-+ {
-+ snprintf (newdir, ndlen, "%s/%s", parent, ".muttXXXXXX");
-+ mktemp (newdir);
-+ }
-+ while ((rv = mkdir (newdir, 0700)) == -1 && errno == EEXIST);
-+
-+ if (rv == -1)
-+ return -1;
-+
-+ snprintf (newfile, nflen, "%s/%s", newdir, NONULL(basename));
-+ return 0;
-+}
-+
-+int mutt_put_file_in_place (const char *path, const char *safe_file, const char *safe_dir)
-+{
-+ int rv;
-+
-+ rv = safe_rename (safe_file, path);
-+ unlink (safe_file);
-+ rmdir (safe_dir);
-+ return rv;
-+}
-+
- int safe_open (const char *path, int flags)
- {
- struct stat osb, nsb;
- int fd;
-
-+ if (flags & O_EXCL)
-+ {
-+ char safe_file[_POSIX_PATH_MAX];
-+ char safe_dir[_POSIX_PATH_MAX];
-+
-+ if (mutt_mkwrapdir (path, safe_file, sizeof (safe_file),
-+ safe_dir, sizeof (safe_dir)) == -1)
-+ return -1;
-+
-+ if ((fd = open (safe_file, flags, 0600)) < 0)
-+ {
-+ rmdir (safe_dir);
-+ return fd;
-+ }
-+
-+ if (mutt_put_file_in_place (path, safe_file, safe_dir) == -1)
-+ {
-+ close (fd);
-+ return -1;
-+ }
-+ }
-+ else
-+ {
- if ((fd = open (path, flags, 0600)) < 0)
- return fd;
-+ }
-
- /* make sure the file is not symlink */
- if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 ||
diff --git a/mail/mutt/patches/patch-ag b/mail/mutt/patches/patch-ag
deleted file mode 100644
index 269f3f71163..00000000000
--- a/mail/mutt/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2004/07/17 00:33:15 schmonz Exp $
-
---- doc/Makefile.in.orig 2001-11-06 14:12:31.000000000 -0500
-+++ doc/Makefile.in
-@@ -74,10 +74,8 @@ install: all instdoc
- ./instdoc $(srcdir)/mutt.man $(DESTDIR)$(mandir)/man1/mutt.1
- ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
- echo ".so $(mandir)/man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttbug.1
-- ./instdoc $(srcdir)/dotlock.man \
-- $(DESTDIR)$(mandir)/man1/mutt_dotlock.1
- ./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
-- ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
-+ ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mutt-mbox.5
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
- for f in $(srcdir_DOCFILES) ; do \
- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
diff --git a/mail/mutt/patches/patch-ah b/mail/mutt/patches/patch-ah
deleted file mode 100644
index 697b872f7a7..00000000000
--- a/mail/mutt/patches/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2004/02/20 14:02:04 wiz Exp $
---- init.h.orig Wed Jul 24 10:41:29 2002
-+++ init.h Mon Feb 2 08:17:26 2004
-@@ -278,6 +278,13 @@
- ** .pp
- ** Character set your terminal uses to display and enter textual data.
- */
-+ { "change_folder_next", DT_BOOL, R_NONE, OPTCHANGEFOLDERNEXT, 0 },
-+ /*
-+ ** .pp
-+ ** When this variable is set, the change-folder command will start at the
-+ ** next folder after the current folder in your mailbox list instead of
-+ ** starting at the first folder.
-+ */
- { "check_new", DT_BOOL, R_NONE, OPTCHECKNEW, 1 },
- /*
- ** .pp
diff --git a/mail/mutt/patches/patch-ai b/mail/mutt/patches/patch-ai
deleted file mode 100644
index 7caf46885ba..00000000000
--- a/mail/mutt/patches/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ai,v 1.6 2004/02/20 14:02:04 wiz Exp $
---- mutt.h.orig Wed Jul 24 11:46:58 2002
-+++ mutt.h Mon Feb 2 08:17:26 2004
-@@ -322,6 +322,7 @@
- OPTBEEP,
- OPTBEEPNEW,
- OPTBOUNCEDELIVERED,
-+ OPTCHANGEFOLDERNEXT,
- OPTCHECKNEW,
- OPTCOLLAPSEUNREAD,
- OPTCONFIRMAPPEND,
diff --git a/mail/mutt/patches/patch-aj b/mail/mutt/patches/patch-aj
deleted file mode 100644
index e54f90d7546..00000000000
--- a/mail/mutt/patches/patch-aj
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aj,v 1.6 2004/02/20 14:02:04 wiz Exp $
---- buffy.c.orig Mon Mar 25 12:30:23 2002
-+++ buffy.c Mon Feb 2 08:17:26 2004
-@@ -440,7 +440,7 @@
- {
- case 0:
-
-- s = '\0';
-+ *s = '\0';
- break;
-
- case 1:
-@@ -449,7 +449,7 @@
- tmp = tmp->next;
- if (!tmp)
- {
-- s = '\0';
-+ *s = '\0';
- mutt_buffy_check (1); /* buffy was wrong - resync things */
- break;
- }
-@@ -475,7 +475,7 @@
- }
- if (count >= 3)
- {
-- s = '\0';
-+ *s = '\0';
- mutt_buffy_check (1); /* buffy was wrong - resync things */
- break;
- }
diff --git a/mail/mutt/patches/patch-ak b/mail/mutt/patches/patch-ak
deleted file mode 100644
index 0da29364412..00000000000
--- a/mail/mutt/patches/patch-ak
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ak,v 1.5 2004/02/02 07:21:24 tron Exp $
-
---- pgp.c.orig Wed Jan 9 16:39:28 2002
-+++ pgp.c Sun Feb 1 23:32:50 2004
-@@ -55,7 +55,7 @@
-
-
- char PgpPass[STRING];
--static time_t PgpExptime = 0; /* when does the cached passphrase expire? */
-+time_t PgpExptime = 0; /* when does the cached passphrase expire? */
-
- void pgp_void_passphrase (void)
- {
-@@ -737,14 +737,14 @@
-
- if (pgp_copy_checksig (pgperr, s->fpout) >= 0)
- badsig = 0;
--
-- safe_fclose (&pgperr);
-
- if ((rv = mutt_wait_filter (thepid)))
- badsig = -1;
-
- dprint (1, (debugfile, "pgp_verify_one: mutt_wait_filter returned %d.\n", rv));
- }
-+
-+ safe_fclose (&pgperr);
-
- state_attach_puts (_("[-- End of PGP output --]\n\n"), s);
-
diff --git a/mail/mutt/patches/patch-al b/mail/mutt/patches/patch-al
deleted file mode 100644
index 94af6df0801..00000000000
--- a/mail/mutt/patches/patch-al
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-al,v 1.8 2006/04/11 13:26:01 tron Exp $
-
---- pop_lib.c.orig 2005-12-26 06:28:37.000000000 -0800
-+++ pop_lib.c 2005-12-26 06:28:40.000000000 -0800
-@@ -155,8 +155,10 @@
-
- if (!pop_data->expire)
- msg = _("Unable to leave messages on server.");
-+/*
- if (!pop_data->cmd_top)
- msg = _("Command TOP is not supported by server.");
-+*/
- if (!pop_data->cmd_uidl)
- msg = _("Command UIDL is not supported by server.");
- break;
diff --git a/mail/mutt/patches/patch-am b/mail/mutt/patches/patch-am
deleted file mode 100644
index 8e781fe6e07..00000000000
--- a/mail/mutt/patches/patch-am
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-am,v 1.1 2006/01/01 19:40:43 ben Exp $
-
---- sendlib.c.orig Fri May 31 09:59:39 2002
-+++ sendlib.c
-@@ -1803,6 +1803,7 @@ send_msg (const char *path, char **args,
- */
- setsid ();
-
-+#if !defined(__BROKEN_INTERIX_FORK)
- /* next we close all open files */
- #if defined(OPEN_MAX)
- for (fd = 0; fd < OPEN_MAX; fd++)
-@@ -1815,9 +1816,27 @@ send_msg (const char *path, char **args,
- close (1);
- close (2);
- #endif
-+#endif
-
- /* now the second fork() */
-- if ((pid = fork ()) == 0)
-+ pid = fork ();
-+
-+#if defined(__BROKEN_INTERIX_FORK)
-+ /* next we close all open files */
-+#if defined(OPEN_MAX)
-+ for (fd = 0; fd < OPEN_MAX; fd++)
-+ close (fd);
-+#elif defined(_POSIX_OPEN_MAX)
-+ for (fd = 0; fd < _POSIX_OPEN_MAX; fd++)
-+ close (fd);
-+#else
-+ close (0);
-+ close (1);
-+ close (2);
-+#endif
-+#endif
-+
-+ if (pid == 0)
- {
- /* "msg" will be opened as stdin */
- if (open (msg, O_RDONLY, 0) < 0)
diff --git a/mail/nail/DESCR b/mail/nail/DESCR
deleted file mode 100644
index defc064fb3a..00000000000
--- a/mail/nail/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Nail is a mail user agent derived from Berkeley Mail 8.1. It is
-intended to provide the functionality of the POSIX.2 mailx command
-with built-in support for MIME messages. This means it can handle
-international character sets as well as attachments. In recent
-system environments, nail is Unicode/UTF-8 capable. It further
-contains some minor enhancements like the ability to set a "From:"
-Address.
diff --git a/mail/nail/Makefile b/mail/nail/Makefile
deleted file mode 100644
index 3c9ccb805f0..00000000000
--- a/mail/nail/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile,v 1.34 2007/02/22 19:26:41 wiz Exp $
-
-DISTNAME= nail-11.25
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nail/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= cjep@NetBSD.org
-HOMEPAGE= http://nail.sourceforge.net/
-COMMENT= BSD mail utility with MIME extensions
-
-BUILD_DEFS+= USE_INET6
-
-MAKE_ENV+= "SYSCONFDIR=${PKG_SYSCONFDIR}"
-
-.include "../../mk/bsd.prefs.mk"
-
-# IPv6 support
-#
-.if ${USE_INET6} == "YES"
-MAKE_ENV+= "IPv6=-DHAVE_IPv6_FUNCS"
-.endif
-
-.if (${OPSYS} == "SunOS" || ${OPSYS} == "IRIX")
-MAKE_ENV+= "SENDMAIL=/usr/lib/sendmail"
-.endif
-
-EGDIR= ${PREFIX}/share/examples/nail
-
-CONF_FILES= ${EGDIR}/nail.rc ${PKG_SYSCONFDIR}/nail.rc
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/nail ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/nail.1 ${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/nail.rc ${EGDIR}
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/nail/PLIST b/mail/nail/PLIST
deleted file mode 100644
index 690ff6f5d14..00000000000
--- a/mail/nail/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/09 10:37:17 cjep Exp $
-bin/nail
-man/man1/nail.1
-share/examples/nail/nail.rc
-@dirrm share/examples/nail
diff --git a/mail/nail/distinfo b/mail/nail/distinfo
deleted file mode 100644
index 79a9c01dd98..00000000000
--- a/mail/nail/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.25 2005/12/20 16:12:17 joerg Exp $
-
-SHA1 (nail-11.25.tar.bz2) = dd15a5bdedb74175763ababa8be70989334963e4
-RMD160 (nail-11.25.tar.bz2) = d72a5a4760cc43bcc2e9223e2eca4f0a8de7605f
-Size (nail-11.25.tar.bz2) = 267959 bytes
-SHA1 (patch-aa) = 43690fb1728d14f5c3876978a9002f17245d617e
-SHA1 (patch-ab) = fc028d32fb268e89ade8a5fba09611b3eb73bc29
-SHA1 (patch-ac) = 8115bf791af56fda0a9c134be6767b00f1f5679f
-SHA1 (patch-ad) = 86e2f7b607b4d254aa2286fc38df84062ad76ba4
diff --git a/mail/nail/patches/patch-aa b/mail/nail/patches/patch-aa
deleted file mode 100644
index 0ed7b3555f2..00000000000
--- a/mail/nail/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2005/02/24 16:35:37 wiz Exp $
-
---- Makefile.orig 2005-02-19 15:02:59.000000000 +0100
-+++ Makefile
-@@ -6,14 +6,14 @@
- # See the file INSTALL if you need help.
- #
-
--PREFIX = /usr/local
-+PREFIX ?= /usr/local
- BINDIR = $(PREFIX)/bin
- MANDIR = $(PREFIX)/share/man
--SYSCONFDIR = /etc
-+SYSCONFDIR ?= /etc
-
- MAILRC = $(SYSCONFDIR)/nail.rc
--MAILSPOOL = /var/mail
--SENDMAIL = /usr/lib/sendmail
-+MAILSPOOL ?= /var/mail
-+SENDMAIL ?= /usr/sbin/sendmail
-
- DESTDIR =
-
-@@ -59,7 +59,8 @@ SHELL = /bin/sh
- ###########################################################################
-
- FEATURES = -DMAILRC='"$(MAILRC)"' -DMAILSPOOL='"$(MAILSPOOL)"' \
-- -DSENDMAIL='"$(SENDMAIL)"' $(IPv6)
-+ -DSENDMAIL='"$(SENDMAIL)"' $(IPv6) \
-+ -DMIMEPATH='"$(SYSCONFDIR)/mime.types"'
-
- OBJ = aux.o base64.o cache.o cmd1.o cmd2.o cmd3.o cmdtab.o collect.o \
- dotlock.o edit.o fio.o getname.o getopt.o head.o hmac.o \
diff --git a/mail/nail/patches/patch-ab b/mail/nail/patches/patch-ab
deleted file mode 100644
index a2a8efd036d..00000000000
--- a/mail/nail/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2004/08/16 15:34:25 cjep Exp $
-
---- mime.c.orig 2004-08-15 13:31:27.000000000 +0100
-+++ mime.c
-@@ -62,7 +62,7 @@ static char sccsid[] = "@(#)mime.c 2.20
- * You won't guess what these are for.
- */
- static const char basetable[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
--static char *mimetypes_world = "/etc/mime.types";
-+static char *mimetypes_world = MIMEPATH;
- static char *mimetypes_user = "~/.mime.types";
- char *us_ascii = "us-ascii";
-
diff --git a/mail/nail/patches/patch-ac b/mail/nail/patches/patch-ac
deleted file mode 100644
index 78507fbb8ca..00000000000
--- a/mail/nail/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2005/02/24 16:35:37 wiz Exp $
-
---- nail.rc.orig 2005-01-15 15:33:16.000000000 +0100
-+++ nail.rc
-@@ -58,5 +58,8 @@ set autocollapse
- ignore received in-reply-to message-id references
- ignore mime-version content-transfer-encoding
-
-+# Be xBSD compliant
-+set bsdcompat
-+
- # Only include selected header fields when forwarding messages.
- fwdretain subject date from to
diff --git a/mail/nail/patches/patch-ad b/mail/nail/patches/patch-ad
deleted file mode 100644
index ceabd481409..00000000000
--- a/mail/nail/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/12/20 16:12:17 joerg Exp $
-
---- lex.c.orig 2005-12-20 16:07:57.000000000 +0000
-+++ lex.c
-@@ -79,7 +79,6 @@ setfile(char *name, int newmail)
- char isedit;
- char *who = name[1] ? name + 1 : myname;
- static int shudclob;
-- extern int errno;
- size_t offset;
- int omsgCount = 0;
- struct shortcut *sh;
diff --git a/mail/newmail/DESCR b/mail/newmail/DESCR
deleted file mode 100644
index edab1f0f679..00000000000
--- a/mail/newmail/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-newmail looks at mailboxes and determines if any new mail has arrived.
-The mailboxes to be examined are specified as command line arguments. A
-directory can be specified and newmail will check every mailbox inside.
-
-newmail is designed to be run every 15 minutes or so by a user's shell.
-
-Andrew Stevenson
-andrew@ugh.net.au
diff --git a/mail/newmail/Makefile b/mail/newmail/Makefile
deleted file mode 100644
index 78ee1068f0e..00000000000
--- a/mail/newmail/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2005/11/07 20:31:56 tv Exp $
-
-DISTNAME= newmail-1.0.1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.ugh.net.au/pub/unix/newmail/
-
-MAINTAINER= andrew@ugh.net.au
-COMMENT= Program to check multiple local mailboxes for new mail
-
-WRKSRC= ${WRKDIR}/newmail
-
-.include "../../devel/sysexits/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/newmail/PLIST b/mail/newmail/PLIST
deleted file mode 100644
index f7b577a7571..00000000000
--- a/mail/newmail/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/11/21 18:27:18 nra Exp $
-bin/newmail
-man/man1/newmail.1
diff --git a/mail/newmail/distinfo b/mail/newmail/distinfo
deleted file mode 100644
index 622d666513a..00000000000
--- a/mail/newmail/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/01/24 19:08:09 joerg Exp $
-
-SHA1 (newmail-1.0.1.tar.gz) = 031387e2ba10e5e4ba801dab25d86fce3b55e02c
-RMD160 (newmail-1.0.1.tar.gz) = 411e94b61909400a580fbad887f1ad730738679e
-Size (newmail-1.0.1.tar.gz) = 3476 bytes
-SHA1 (patch-aa) = 3d81434a8d98390df7964cc701c83496791de267
diff --git a/mail/newmail/patches/patch-aa b/mail/newmail/patches/patch-aa
deleted file mode 100644
index 4c472a0cc39..00000000000
--- a/mail/newmail/patches/patch-aa
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/01/24 19:08:09 joerg Exp $
-
---- newmail.c.orig 1999-10-14 04:49:42.000000000 +0000
-+++ newmail.c
-@@ -28,6 +28,22 @@
- static void usage();
- static void version();
-
-+#ifdef DT_REG
-+#define DIRENT_IS_REG(x) ((x) == DT_REG)
-+#elif defined(DTTOIF)
-+#define DIRENT_IS_REG(x) (S_ISREG(DTTOIF((x))))
-+#else
-+#error "Neither DT_REG nor DTTOIF is defined."
-+#endif
-+
-+#ifdef DT_DIR
-+#define DIRENT_IS_DIR(x) ((x) == DT_DIR)
-+#elif defined(DTTOIF)
-+#define DIRENT_IS_DIR(x) (S_ISDIR(DTTOIF((x))))
-+#else
-+#error "Neither DT_REG nor DTTOIF is defined."
-+#endif
-+
- unsigned char no_mail_message,
- individual_messages,
- use_exit_val;
-@@ -98,7 +114,7 @@ int main(int argc, char *argv[]) {
- continue;
- }
- /* see if its a regular file */
-- if (S_ISREG(DTTOIF(curr_file->d_type))) {
-+ if (DIRENT_IS_REG(curr_file->d_type)) {
- /* stat it for check_mailbox */
- if (stat(curr_file->d_name, &file_info) == -1) {
- err(EX_NOINPUT, "couldn't stat %s/%s", argv[ui], curr_file->d_name);
-@@ -106,7 +122,7 @@ int main(int argc, char *argv[]) {
- check_mailbox(curr_file->d_name, &file_info, &found_mail);
- } else if (warn_non_regular) {
- /* just check its not a directory before warning */
-- if (! S_ISDIR(DTTOIF(curr_file->d_type))) {
-+ if (! DIRENT_IS_DIR(curr_file->d_type)) {
- warnx("Found %s/%s: Not a regular file", argv[ui], curr_file->d_name);
- }
- } /* end of is dirent a regular file */
-@@ -148,19 +164,19 @@ void check_mailbox(const char *const fn,
-
- static void usage() {
-
-- fprintf(stderr,"usage: newmail [-deirv] directory|file directory|file ...
--
--where:
-- d: Prints messages when you do not have new mail
-- e: Exits with 0 on no new mail, 1 on new mail, > 1 on error
-- (normally exits with a value from sysexits(3)). May not be used
-- with -d or -i.
-- i: Prints a message for each mailbox that has new mail (and those
-- that don't if -d is also used)
-- r: Warns if it finds a non regular file
-- v: Print version number and exit
--
--directory|file are, respectively, directories to look in for mailboxes
-+ fprintf(stderr,"usage: newmail [-deirv] directory|file directory|file ...\n\
-+\n\
-+where:\n\
-+ d: Prints messages when you do not have new mail\n\
-+ e: Exits with 0 on no new mail, 1 on new mail, > 1 on error\n\
-+ (normally exits with a value from sysexits(3)). May not be used\n\
-+ with -d or -i.\n\
-+ i: Prints a message for each mailbox that has new mail (and those\n\
-+ that don't if -d is also used)\n\
-+ r: Warns if it finds a non regular file\n\
-+ v: Print version number and exit\n\
-+ \n\
-+directory|file are, respectively, directories to look in for mailboxes\n\
- and mailboxes.\n");
-
- exit(EX_USAGE);
diff --git a/mail/newspipe/DESCR b/mail/newspipe/DESCR
deleted file mode 100644
index 9daa081a2c6..00000000000
--- a/mail/newspipe/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Newspipe is an RSS/Atom aggregator with a difference: it allows
-you to keep track of your feeds through email. You create an OPML
-file listing your feeds and Newspipe will collect them, convert
-them to e-mail messages and send them to your mailbox.
-
-This means you can read, organize and archive news feeds using your
-current mail client (or even webmail), without needing to use a
-separate program. Newspipe can send you news items as plaintext or
-HTML mail, both as single items or grouped in a digest.
diff --git a/mail/newspipe/Makefile b/mail/newspipe/Makefile
deleted file mode 100644
index 38c83582023..00000000000
--- a/mail/newspipe/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2007/02/22 19:26:42 wiz Exp $
-#
-
-DISTNAME= newspipe.1.1.9
-PKGNAME= ${DISTNAME:S/./-/}
-PKGREVISION= 2
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=newspipe/}
-EXTRACT_SUFX= .zip
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://newspipe.sourceforge.net/
-COMMENT= Read RSS/Atom feeds as email messages
-
-WRKSRC= ${WRKDIR}
-
-DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-DEPENDS+= ${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser
-DEPENDS+= ${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text
-
-NO_BUILD= yes
-PYTHON_PATCH_SCRIPTS= *.py
-
-SUBST_CLASSES+= bin
-SUBST_STAGE.bin= do-configure
-SUBST_FILES.bin= newspipe.py newspipe
-SUBST_SED.bin= -e 's|@LOCALBASE@|${LOCALBASE}|g'
-SUBST_SED.bin+= -e 's|@PREFIX@|${PREFIX}|g'
-SUBST_SED.bin+= -e 's|@PYTHONBIN@|${PYTHONBIN}|g'
-
-INSTALLATION_DIRS= bin share/newspipe share/doc/newspipe
-INSTALLATION_DIRS+= share/examples/newspipe
-
-do-install:
- cd ${WRKSRC}; \
- ${INSTALL_SCRIPT} newspipe ${PREFIX}/bin; \
- for f in cache.py newspipe.py opml.py; do \
- ${INSTALL_SCRIPT} $${f} ${PREFIX}/share/newspipe; \
- done; \
- for f in manual.html readme; do \
- ${INSTALL_DATA} $${f} ${PREFIX}/share/doc/newspipe; \
- done; \
- for f in newspipe.ini test.opml; do \
- ${INSTALL_DATA} $${f} ${PREFIX}/share/examples/newspipe; \
- done
-
-.include "../../lang/python/application.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/newspipe/PLIST b/mail/newspipe/PLIST
deleted file mode 100644
index 56dfbe2eca5..00000000000
--- a/mail/newspipe/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/12/03 06:34:01 schmonz Exp $
-bin/newspipe
-share/doc/newspipe/manual.html
-share/doc/newspipe/readme
-share/examples/newspipe/newspipe.ini
-share/examples/newspipe/test.opml
-share/newspipe/cache.py
-share/newspipe/newspipe.py
-share/newspipe/opml.py
-@dirrm share/newspipe
-@dirrm share/examples/newspipe
-@dirrm share/doc/newspipe
diff --git a/mail/newspipe/distinfo b/mail/newspipe/distinfo
deleted file mode 100644
index bedd4e166d5..00000000000
--- a/mail/newspipe/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/12/03 06:34:01 schmonz Exp $
-
-SHA1 (newspipe.1.1.9.zip) = 6adb2553a32c997f8d51495ef75659b81b08144e
-RMD160 (newspipe.1.1.9.zip) = d322545faead198dad908f675038558b133db0cf
-Size (newspipe.1.1.9.zip) = 76060 bytes
-SHA1 (patch-aa) = 4d1577f8f6376b1ef6f317348697680470795c6f
-SHA1 (patch-ab) = 69933506636914f28d0c2f9746862e8a7bec67c2
diff --git a/mail/newspipe/patches/patch-aa b/mail/newspipe/patches/patch-aa
deleted file mode 100644
index 0f26991a810..00000000000
--- a/mail/newspipe/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/12/03 06:34:01 schmonz Exp $
-
---- newspipe.py.orig 2005-07-17 21:23:28.000000000 -0400
-+++ newspipe.py
-@@ -57,6 +57,7 @@ except ImportError:
- import dummy_threading as _threading
- has_threading = False
-
-+sys.path.append("@LOCALBASE@/share/html2text")
- has_html2text = True
- try:
- from html2text import *
diff --git a/mail/newspipe/patches/patch-ab b/mail/newspipe/patches/patch-ab
deleted file mode 100644
index 81f41254e04..00000000000
--- a/mail/newspipe/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/12/03 06:34:01 schmonz Exp $
-
---- newspipe.orig 2005-12-03 01:21:02.000000000 -0500
-+++ newspipe
-@@ -0,0 +1,7 @@
-+#!/bin/sh
-+set -e
-+if [ ! -d ~/.newspipe ]; then
-+ mkdir ~/.newspipe
-+fi
-+cd ~/.newspipe
-+exec @PYTHONBIN@ @PREFIX@/share/newspipe/newspipe.py $*
diff --git a/mail/nmh/DESCR b/mail/nmh/DESCR
deleted file mode 100644
index 800b19e2a9d..00000000000
--- a/mail/nmh/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-nmh (new MH) is an electronic mail handling system. It was originally
-based on the package MH-6.8.3, and is intended to be a (mostly)
-compatible drop-in replacement for MH.
-
-Although development of nmh is ongoing, it appears to be generally
-stable and is in current use. But it is possible that I may break
-things as changes are made.
-
-nmh is currently being developed and maintained by Richard Coleman
-<coleman@math.gatech.edu>. Please send bug reports and suggestions to
-the nmh development mailing list at nmh-workers@math.gatech.edu.
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
deleted file mode 100644
index ade072febcd..00000000000
--- a/mail/nmh/Makefile
+++ /dev/null
@@ -1,110 +0,0 @@
-# $NetBSD: Makefile,v 1.64 2007/02/22 19:26:42 wiz Exp $
-
-DISTNAME= nmh-1.0.4
-PKGREVISION= 7
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.mhost.com/pub/nmh/ \
- ftp://ftp.gw.com/pub/unix/mail/mh/nmh/
-
-MAINTAINER= kim@tac.nyc.ny.us
-HOMEPAGE= http://www.nongnu.org/nmh/
-COMMENT= Cleaned up MH mailer suite
-
-CONFLICTS= ja-mh-[0-9]*
-CONFLICTS+= ja-mh6-[0-9]*
-
-# We choose DOT_LOCKING in our patches because ".lock" files are
-# the most common locking mechanism supported by mail software.
-# It also works well over NFS.
-
-# Locks supported by `mail.local' are ".lock" and flock(2).
-
-.include "../../mk/bsd.prefs.mk"
-# Avoids SEGV in nmh's private version of strcasecmp() under gcc4
-.if !empty(PKGSRC_COMPILER:Mgcc*)
-CFLAGS+= -O1
-.endif
-
-.if !empty(LOWER_OPSYS:Mirix5*)
-CPPFLAGS+= -DIRIX5 # for a patch with extra typedefs
-.endif
-
-.include "options.mk"
-
-# Mail Transport Agent - either "smtp" or "sendmail"
-NMH_MTA?= smtp
-
-GNU_CONFIGURE= yes
-
-CONFIGURE_ARGS+= --libdir=${PREFIX}/libexec/nmh
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --enable-nmh-pop
-CONFIGURE_ARGS+= --with-mts=${NMH_MTA:Q}
-
-.if defined(NMH_EDITOR)
-CONFIGURE_ARGS+= --with-editor=${NMH_EDITOR:Q}
-.endif
-
-.if defined(NMH_PAGER)
-CONFIGURE_ARGS+= --with-pager=${NMH_PAGER:Q}
-.endif
-
-.if defined(KERBEROS)
-PKG_USE_KERBEROS= yes
-.if ${OPSYS} == "NetBSD"
-LIBS+= -lroken -lcrypt -lcom_err
-.endif
-CONFIGURE_ARGS+= --with-krb4
-.else
-CONFIGURE_ARGS+= --without-krb4
-.endif
-
-DOCDIR= share/doc/nmh
-EGDIR= ${PREFIX}/share/examples/nmh
-
-BUILD_DEFS+= NMH_MTA NMH_EDITOR NMH_PAGER NMH_HASH_BACKUP
-
-PKG_SYSCONFSUBDIR= nmh
-CONF_FILES= # empty
-.for f in MailAliases \
- components \
- digestcomps \
- distcomps \
- forwcomps \
- mhl.body \
- mhl.digest \
- mhl.format \
- mhl.forward \
- mhl.headers \
- mhl.reply \
- mhn.defaults \
- mts.conf \
- rcvdistcomps \
- rcvdistcomps.outbox \
- replcomps \
- replgroupcomps \
- scan.MMDDYY \
- scan.YYYYMMDD \
- scan.default \
- scan.mailx \
- scan.nomime \
- scan.size \
- scan.time \
- scan.timely \
- scan.unseen \
- tmac.h
-CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
-.endfor
-
-# This hopefully makes sure the permissions and ownership are right.
-pre-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
- for f in `${GREP} '^${DOCDIR}/' ${PKGDIR}/PLIST`; do \
- ${INSTALL_DATA} ${WRKSRC}/`${BASENAME} $$f` ${PREFIX}/${DOCDIR}; \
- done
- ${INSTALL_DATA} ${FILESDIR}/mhn.defaults.dist ${EGDIR}/mhn.defaults
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/nmh/PLIST b/mail/nmh/PLIST
deleted file mode 100644
index de6feed3288..00000000000
--- a/mail/nmh/PLIST
+++ /dev/null
@@ -1,153 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2005/01/16 19:19:46 jmmv Exp $
-bin/ali
-bin/anno
-bin/burst
-bin/comp
-bin/dist
-bin/flist
-bin/flists
-bin/folder
-bin/folders
-bin/forw
-bin/inc
-bin/mark
-bin/mhbuild
-bin/mhlist
-bin/mhmail
-bin/mhn
-bin/mhparam
-bin/mhpath
-bin/mhshow
-bin/mhstore
-bin/msgchk
-bin/msh
-bin/next
-bin/packf
-bin/pick
-bin/prev
-bin/prompter
-bin/refile
-bin/repl
-bin/rmf
-bin/rmm
-bin/scan
-bin/send
-bin/sendfiles
-bin/show
-bin/sortm
-bin/viamail
-bin/whatnow
-bin/whom
-libexec/nmh/ap
-libexec/nmh/conflict
-libexec/nmh/dp
-libexec/nmh/fmtdump
-libexec/nmh/install-mh
-libexec/nmh/mhl
-libexec/nmh/mhtest
-libexec/nmh/post
-libexec/nmh/rcvdist
-libexec/nmh/rcvpack
-libexec/nmh/rcvstore
-libexec/nmh/rcvtty
-libexec/nmh/slocal
-libexec/nmh/spost
-man/man1/ali.1
-man/man1/anno.1
-man/man1/burst.1
-man/man1/comp.1
-man/man1/dist.1
-man/man1/flist.1
-man/man1/flists.1
-man/man1/folder.1
-man/man1/folders.1
-man/man1/forw.1
-man/man1/inc.1
-man/man1/mark.1
-man/man1/mh-chart.1
-man/man1/mhbuild.1
-man/man1/mhl.1
-man/man1/mhlist.1
-man/man1/mhmail.1
-man/man1/mhn.1
-man/man1/mhparam.1
-man/man1/mhpath.1
-man/man1/mhshow.1
-man/man1/mhstore.1
-man/man1/msgchk.1
-man/man1/msh.1
-man/man1/next.1
-man/man1/nmh.1
-man/man1/packf.1
-man/man1/pick.1
-man/man1/prev.1
-man/man1/prompter.1
-man/man1/rcvdist.1
-man/man1/rcvpack.1
-man/man1/rcvstore.1
-man/man1/rcvtty.1
-man/man1/refile.1
-man/man1/repl.1
-man/man1/rmf.1
-man/man1/rmm.1
-man/man1/scan.1
-man/man1/send.1
-man/man1/sendfiles.1
-man/man1/show.1
-man/man1/slocal.1
-man/man1/sortm.1
-man/man1/vmh.1
-man/man1/whatnow.1
-man/man1/whom.1
-man/man5/mh-alias.5
-man/man5/mh-draft.5
-man/man5/mh-format.5
-man/man5/mh-mail.5
-man/man5/mh-profile.5
-man/man5/mh-sequence.5
-man/man5/mh-tailor.5
-man/man5/mh_profile.5
-man/man8/ap.8
-man/man8/conflict.8
-man/man8/dp.8
-man/man8/fmtdump.8
-man/man8/install-mh.8
-man/man8/mh-mts.8
-man/man8/post.8
-share/doc/nmh/COMPLETION-ZSH
-share/doc/nmh/COPYRIGHT
-share/doc/nmh/DIFFERENCES
-share/doc/nmh/FAQ
-share/doc/nmh/MAIL.FILTERING
-share/doc/nmh/README
-share/doc/nmh/TODO
-share/examples/nmh/MailAliases
-share/examples/nmh/components
-share/examples/nmh/digestcomps
-share/examples/nmh/distcomps
-share/examples/nmh/forwcomps
-share/examples/nmh/mhl.body
-share/examples/nmh/mhl.digest
-share/examples/nmh/mhl.format
-share/examples/nmh/mhl.forward
-share/examples/nmh/mhl.headers
-share/examples/nmh/mhl.reply
-share/examples/nmh/mhn.defaults
-share/examples/nmh/mts.conf
-share/examples/nmh/rcvdistcomps
-share/examples/nmh/rcvdistcomps.outbox
-share/examples/nmh/replcomps
-share/examples/nmh/replgroupcomps
-share/examples/nmh/scan.MMDDYY
-share/examples/nmh/scan.YYYYMMDD
-share/examples/nmh/scan.default
-share/examples/nmh/scan.mailx
-share/examples/nmh/scan.nomime
-share/examples/nmh/scan.size
-share/examples/nmh/scan.time
-share/examples/nmh/scan.timely
-share/examples/nmh/scan.unseen
-share/examples/nmh/tmac.h
-@dirrm share/examples/nmh
-@dirrm share/doc/nmh
-@dirrm libexec/nmh
diff --git a/mail/nmh/distinfo b/mail/nmh/distinfo
deleted file mode 100644
index d93d8fcb6e4..00000000000
--- a/mail/nmh/distinfo
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: distinfo,v 1.12 2006/12/16 13:18:54 schwarz Exp $
-
-SHA1 (nmh-1.0.4.tar.gz) = 71441a884d898db2fd9184a92e663682536425f5
-RMD160 (nmh-1.0.4.tar.gz) = 32f0a0cb7aa76f7d7efc59d99b6e5aeeea519037
-Size (nmh-1.0.4.tar.gz) = 683215 bytes
-SHA1 (patch-aa) = 9bb5d1f8344751fc5414751cddfecaacd044c925
-SHA1 (patch-ab) = e6d0ef2fbd549bacd160972f45e66067f443e6fb
-SHA1 (patch-ac) = 110189a119fcdbfd78a1becd1d3b83482d156192
-SHA1 (patch-ad) = f1dcbd4ef8ffdff07d12dc1fa6036a7a7164af34
-SHA1 (patch-ae) = e8faef23ca86c5a838e1d0deef1696cb5aace084
-SHA1 (patch-af) = 90464f24d1b0b4887ee91dcd0d5be0fd82e714e2
-SHA1 (patch-ag) = c40467987ed6ae34bc59729003b2561541552117
-SHA1 (patch-ah) = 00c12fcc73ce630879688bd3628208755efc0a85
-SHA1 (patch-ai) = bb6ce79960d022b13bf3060d6dd4121dc0ce9a18
-SHA1 (patch-aj) = 32c6e81b02bc6888f719c8b9cfdca13838dd8130
-SHA1 (patch-ak) = 82d517241594920a21e514cfa7ae646f44c89d87
-SHA1 (patch-al) = 31407afcb1687fb5c29cecda3d9c078890ae3157
-SHA1 (patch-am) = 27e6c13ee80a5b907696c87ea261675661a176da
-SHA1 (patch-an) = e76f9a32b98e4e33325b04afff5209fa5e452f43
-SHA1 (patch-ao) = f9072835d2f2faac018803784a8deac56a694f93
-SHA1 (patch-ap) = 6ce802de091a1fa5d8fd2086d20597334bd39db9
-SHA1 (patch-aq) = eac9f24e310a64cb2a9e471f813e099acaab624a
-SHA1 (patch-ar) = 5e684c49b99e5ab3ef651bad35b966d1ebb2ad9e
-SHA1 (patch-as) = 017aa17dfee30429e11ade6486ca11a7cb01a971
-SHA1 (patch-at) = a6ecaa1ea5b03958fa02aebd1477d33be9b659e9
-SHA1 (patch-au) = e6e9604422cc7e17c1a543ce93265ed79359d379
-SHA1 (patch-av) = 265b73b22d62c34031b0554bcd5aed3372a89daf
-SHA1 (patch-aw) = b89b413b9c48050986dd278834a2839e957cfc82
-SHA1 (patch-ax) = d63d97b1bc0f8ba73061da09256d4f728b1066ef
-SHA1 (patch-ay) = 70da99e2192917180376f78e5452342df9440213
-SHA1 (patch-az) = 04704392993194936c300220f8b13bd5143f0b59
-SHA1 (patch-ba) = cf2098d7124bd6bbd1da09acf467196570dee044
-SHA1 (patch-bb) = 75bce49233ced39551f5b145ff44d4a04b996589
-SHA1 (patch-bc) = 86d8906800e4a0621366b3a19736b90bcb99a270
-SHA1 (patch-bd) = 994b773c80508891d744b39784094108fdb5ca51
-SHA1 (patch-be) = 1e244675d7a6b4279924599f55e89d78f765c144
-SHA1 (patch-bf) = f30740c6ec201c66493f26f9e0cbf88023323a4a
-SHA1 (patch-bg) = 0bdf466cf238d431b49d3b16aad55e988c13f646
-SHA1 (patch-bh) = f6d5371d0366e9fd7b432208beec399c05ade010
-SHA1 (patch-bi) = 3ad7237c2331bf957aa1736cf2182f6a14d45ed1
-SHA1 (patch-ca) = 126d53b3af216754c40b828d7c444a6ee077073f
-SHA1 (patch-cb) = 6e498988c08e393fdd4e8e27f2ff6ce457e2c803
-SHA1 (patch-cd) = 501fe014d4eca0b2f66d0213bd2f002ba12b9ee0
-SHA1 (patch-ce) = b93b07c3ee82e6ab8599f362e14ad2dbe1955325
-SHA1 (patch-ci) = 98f1c80281656d05c460bdb237de3efbf80b9e32
-SHA1 (patch-cj) = cb6a8ca83a7a94651668a70c697c4ec5fa402b48
-SHA1 (patch-ck) = 8577047243b5538b2bab5878c11782b2499df46a
diff --git a/mail/nmh/files/mhn.defaults.dist b/mail/nmh/files/mhn.defaults.dist
deleted file mode 100644
index 48980d3a302..00000000000
--- a/mail/nmh/files/mhn.defaults.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-#: $NetBSD: mhn.defaults.dist,v 1.1 2000/03/02 05:11:44 kim Exp $
-#:
-mhstore-store-application/PostScript: %m%P.ps
-mhstore-store-text: %m%P.txt
-mhstore-store-text/richtext: %m%P.rt
-mhstore-store-video/mpeg: %m%P.mpg
-#:
-#: If you install more packages you could enable these
-#:
-#: mhshow-show-application/PostScript: %plpr -Pps
-#: mhshow-show-application/x-ivs: %pivs_replay -o '%F'
-#: mhshow-show-image: %pxv '%f'
-#: mhshow-show-text/richtext: %prichtext -p '%F'
-#: mhshow-show-video/mpeg: %pmpeg_play '%f'" >> $TMP
diff --git a/mail/nmh/options.mk b/mail/nmh/options.mk
deleted file mode 100644
index 9a39eb5b8a8..00000000000
--- a/mail/nmh/options.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:51 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.nmh
-PKG_SUPPORTED_OPTIONS= nmh-backup-hash
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Prepend a "#" instead of a "," to the name of a message that is
-### "removed" by rmm.
-###
-.if !empty(PKG_OPTIONS:Mnmh-backup-hash)
-post-configure: nmh-hash-backup
-
-nmh-hash-backup:
- cd ${WRKSRC}; file=config.h; \
- ${SED} -e 's/^\(#define *BACKUP_PREFIX\) *.*/\1 "#"/' \
- $$file > $$file.new; \
- ${MV} -f $$file.new $$file
-.endif
diff --git a/mail/nmh/patches/patch-aa b/mail/nmh/patches/patch-aa
deleted file mode 100644
index fff8b1b283a..00000000000
--- a/mail/nmh/patches/patch-aa
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhbuildsbr.c.orig 1999-09-12 13:50:12.000000000 +0000
-+++ uip/mhbuildsbr.c
-@@ -40,8 +40,6 @@
- #endif
-
-
--extern int errno;
--
- extern int debugsw;
- extern int verbosw;
-
-@@ -174,7 +172,7 @@ static int InitFTP (CT);
- static int openFTP (CT, char **);
- static int InitMail (CT);
- static int openMail (CT, char **);
--static char *fgetstr (char *, int, FILE *);
-+static char *mh_fgetstr (char *, int, FILE *);
- static int user_content (FILE *, char *, char *, CT *);
- static void set_id (CT, int);
- static int compose_content (CT);
-@@ -374,7 +372,7 @@ finish_field:
- * read and parse the composition file
- * and the directives it contains.
- */
-- while (fgetstr (buf, sizeof(buf) - 1, in)) {
-+ while (mh_fgetstr (buf, sizeof(buf) - 1, in)) {
- struct part *part;
- CT p;
-
-@@ -2829,7 +2827,7 @@ openMail (CT ct, char **file)
-
-
- static char *
--fgetstr (char *s, int n, FILE *stream)
-+mh_fgetstr (char *s, int n, FILE *stream)
- {
- char *cp, *ep;
-
-@@ -2931,7 +2929,7 @@ user_content (FILE *in, char *file, char
-
- again_descr:
- ct->c_descr = add (buffer + i + 1, ct->c_descr);
-- if (!fgetstr (buffer, sizeof(buffer) - 1, in))
-+ if (!mh_fgetstr (buffer, sizeof(buffer) - 1, in))
- adios (NULL, "end-of-file after %s: field in plaintext", DESCR_FIELD);
- switch (buffer[0]) {
- case ' ':
-@@ -2954,7 +2952,7 @@ again_descr:
- rock_and_roll:
- headers = -1;
- pos = ftell (in);
-- if ((cp = fgetstr (buffer, sizeof(buffer) - 1, in)) == NULL)
-+ if ((cp = mh_fgetstr (buffer, sizeof(buffer) - 1, in)) == NULL)
- break;
- if (buffer[0] == '#') {
- char *bp;
-@@ -3297,7 +3295,7 @@ use_forw:
- ct->c_ctparams = (void *) m;
-
- pp = &m->mp_parts;
-- while (fgetstr (buffer, sizeof(buffer) - 1, in)) {
-+ while (mh_fgetstr (buffer, sizeof(buffer) - 1, in)) {
- struct part *part;
- CT p;
-
diff --git a/mail/nmh/patches/patch-ab b/mail/nmh/patches/patch-ab
deleted file mode 100644
index 57534ebccac..00000000000
--- a/mail/nmh/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2006/03/02 21:28:23 joerg Exp $
-
---- sbr/context_read.c.orig 2006-03-02 16:47:03.000000000 +0000
-+++ sbr/context_read.c
-@@ -9,8 +9,6 @@
- #include <errno.h>
- #include <pwd.h>
-
--extern int errno;
--
- void
- context_read (void)
- {
diff --git a/mail/nmh/patches/patch-ac b/mail/nmh/patches/patch-ac
deleted file mode 100644
index e1b8684bc47..00000000000
--- a/mail/nmh/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2006/03/02 21:28:23 joerg Exp $
-
---- sbr/discard.c.orig 2006-03-02 20:24:08.000000000 +0000
-+++ sbr/discard.c
-@@ -51,7 +51,7 @@ discard (FILE *io)
- # endif
- #endif
-
--#ifdef _FSTDIO
-+#if defined(_FSTDIO) || defined(__DragonFly__)
- fpurge (io);
- #else
- # ifdef LINUX_STDIO
diff --git a/mail/nmh/patches/patch-ad b/mail/nmh/patches/patch-ad
deleted file mode 100644
index f20c31ed59f..00000000000
--- a/mail/nmh/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2006/03/02 21:28:23 joerg Exp $
-
---- sbr/lock_file.c.orig 2006-03-02 20:27:38.000000000 +0000
-+++ sbr/lock_file.c
-@@ -40,8 +40,6 @@
-
- #include <signal.h>
-
--extern int errno;
--
- #ifdef LOCKDIR
- char *lockdir = LOCKDIR;
- #endif
diff --git a/mail/nmh/patches/patch-ae b/mail/nmh/patches/patch-ae
deleted file mode 100644
index 8129c05aa49..00000000000
--- a/mail/nmh/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- sbr/m_draft.c.orig 2006-03-02 20:28:13.000000000 +0000
-+++ sbr/m_draft.c
-@@ -8,9 +8,6 @@
- #include <h/mh.h>
- #include <errno.h>
-
--extern int errno;
--
--
- char *
- m_draft (char *folder, char *msg, int use, int *isdf)
- {
diff --git a/mail/nmh/patches/patch-af b/mail/nmh/patches/patch-af
deleted file mode 100644
index 83066c84505..00000000000
--- a/mail/nmh/patches/patch-af
+++ /dev/null
@@ -1,115 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- sbr/m_getfld.c.orig 2006-03-02 20:29:22.000000000 +0000
-+++ sbr/m_getfld.c
-@@ -261,6 +261,9 @@ m_getfld (int state, unsigned char *name
- bp = sp = (unsigned char *) iob->_IO_read_ptr - 1;
- j = (cnt = ((long) iob->_IO_read_end -
- (long) iob->_IO_read_ptr) + 1) < i ? cnt : i;
-+#elif defined(__DragonFly__)
-+ bp = sp = (unsigned char *) ((struct __FILE_public *)iob)->_p - 1;
-+ j = (cnt = ((struct __FILE_public *)iob)->_r+1) < i ? cnt : i;
- #else
- bp = sp = (unsigned char *) iob->_ptr - 1;
- j = (cnt = iob->_cnt+1) < i ? cnt : i;
-@@ -273,6 +276,8 @@ m_getfld (int state, unsigned char *name
- #ifdef LINUX_STDIO
- iob->_IO_read_ptr = iob->_IO_read_end;
- if (__underflow(iob) == EOF) {
-+#elif defined(__DragonFly__)
-+ if (__srget(iob) == EOF) {
- #else
- if (_filbuf(iob) == EOF) {
- #endif
-@@ -286,6 +291,9 @@ m_getfld (int state, unsigned char *name
- } else {
- #ifdef LINUX_STDIO
- iob->_IO_read_ptr = bp + 1;
-+#elif defined(__DragonFly__)
-+ ((struct __FILE_public *)iob)->_p = bp + 1;
-+ ((struct __FILE_public *)iob)->_r = cnt - 1;
- #else
- iob->_ptr = bp + 1;
- iob->_cnt = cnt - 1;
-@@ -330,6 +338,9 @@ m_getfld (int state, unsigned char *name
- #ifdef LINUX_STDIO
- cnt = (long) iob->_IO_read_end - (long) iob->_IO_read_ptr;
- bp = (unsigned char *) --iob->_IO_read_ptr;
-+#elif defined(__DragonFly__)
-+ cnt = ((struct __FILE_public *)iob)->_r++;
-+ bp = (unsigned char *) --((struct __FILE_public *)iob)->_p;
- #else
- cnt = iob->_cnt++;
- bp = (unsigned char *) --iob->_ptr;
-@@ -344,6 +355,11 @@ m_getfld (int state, unsigned char *name
- j = ep - (unsigned char *) iob->_IO_read_ptr;
- memcpy (cp, iob->_IO_read_ptr, j);
- iob->_IO_read_ptr = ep;
-+#elif defined(__DragonFly__)
-+ j = ep - (unsigned char *) ((struct __FILE_public *)iob)->_p;
-+ memcpy (cp, ((struct __FILE_public *)iob)->_p, j);
-+ ((struct __FILE_public *)iob)->_p = ep;
-+ ((struct __FILE_public *)iob)->_r -= j;
- #else
- j = ep - (unsigned char *) iob->_ptr;
- memcpy (cp, iob->_ptr, j);
-@@ -363,6 +379,9 @@ m_getfld (int state, unsigned char *name
- #ifdef LINUX_STDIO
- c += bp - (unsigned char *) iob->_IO_read_ptr;
- memcpy( cp, iob->_IO_read_ptr, c);
-+#elif defined(__DragonFly__)
-+ c += bp - (unsigned char *) ((struct __FILE_public *)iob)->_p;
-+ memcpy( cp, ((struct __FILE_public *)iob)->_p, c);
- #else
- c += bp - (unsigned char *) iob->_ptr;
- memcpy( cp, iob->_ptr, c);
-@@ -373,6 +392,9 @@ m_getfld (int state, unsigned char *name
- /* the dest buffer is full */
- #ifdef LINUX_STDIO
- iob->_IO_read_ptr += c;
-+#elif defined(__DragonFly__)
-+ ((struct __FILE_public *)iob)->_r -= c;
-+ ((struct __FILE_public *)iob)->_p += c;
- #else
- iob->_cnt -= c;
- iob->_ptr += c;
-@@ -392,6 +414,9 @@ m_getfld (int state, unsigned char *name
- iob->_IO_read_ptr = iob->_IO_read_end;
- c = __underflow(iob);
- iob->_IO_read_ptr++; /* NOT automatic! */
-+#elif defined(__DragonFly__)
-+ *cp++ =j = *(((struct __FILE_public *)iob)->_p + c);
-+ c = __srget(iob);
- #else
- *cp++ = j = *(iob->_ptr + c);
- c = _filbuf(iob);
-@@ -401,6 +426,9 @@ m_getfld (int state, unsigned char *name
- if (c != EOF) {
- #ifdef LINUX_STDIO
- --iob->_IO_read_ptr;
-+#elif defined(__DragonFly__)
-+ --((struct __FILE_public *)iob)->_p;
-+ ++((struct __FILE_public *)iob)->_r;
- #else
- --iob->_ptr;
- ++iob->_cnt;
-@@ -424,6 +452,9 @@ m_getfld (int state, unsigned char *name
- #ifdef LINUX_STDIO
- bp = (unsigned char *) --iob->_IO_read_ptr;
- cnt = (long) iob->_IO_read_end - (long) iob->_IO_read_ptr;
-+#elif defined(__DragonFly__)
-+ bp = (unsigned char *) --((struct __FILE_public *)iob)->_p;
-+ cnt = ++((struct __FILE_public *)iob)->_r;
- #else
- bp = (unsigned char *) --iob->_ptr;
- cnt = ++iob->_cnt;
-@@ -486,6 +517,9 @@ m_getfld (int state, unsigned char *name
- memcpy( buf, bp, c );
- #ifdef LINUX_STDIO
- iob->_IO_read_ptr += c;
-+#elif defined(__DragonFly__)
-+ ((struct __FILE_public *)iob)->_r -= c;
-+ ((struct __FILE_public *)iob)->_p += c;
- #else
- iob->_cnt -= c;
- iob->_ptr += c;
diff --git a/mail/nmh/patches/patch-ag b/mail/nmh/patches/patch-ag
deleted file mode 100644
index 6f1e62d0964..00000000000
--- a/mail/nmh/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- sbr/makedir.c.orig 2006-03-02 20:51:25.000000000 +0000
-+++ sbr/makedir.c
-@@ -14,8 +14,6 @@
- #include <sys/param.h>
- #include <sys/file.h>
-
--extern int errno;
--
- int
- makedir (char *dir)
- {
diff --git a/mail/nmh/patches/patch-ah b/mail/nmh/patches/patch-ah
deleted file mode 100644
index 44beb1533b0..00000000000
--- a/mail/nmh/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- sbr/ruserpass.c.orig 2006-03-02 20:52:29.000000000 +0000
-+++ sbr/ruserpass.c
-@@ -65,7 +65,6 @@ ruserpass(char *host, char **aname, char
- char *hdir, buf[BUFSIZ];
- int t, usedefault = 0;
- struct stat stb;
-- extern int errno;
-
- hdir = getenv("HOME");
- if (hdir == NULL)
diff --git a/mail/nmh/patches/patch-ai b/mail/nmh/patches/patch-ai
deleted file mode 100644
index 08280f0269e..00000000000
--- a/mail/nmh/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/annosbr.c.orig 2006-03-02 20:53:09.000000000 +0000
-+++ uip/annosbr.c
-@@ -10,8 +10,6 @@
- #include <fcntl.h>
- #include <errno.h>
-
--extern int errno;
--
- /*
- * static prototypes
- */
diff --git a/mail/nmh/patches/patch-aj b/mail/nmh/patches/patch-aj
deleted file mode 100644
index 2b25c0445f9..00000000000
--- a/mail/nmh/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/folder.c.orig 2006-03-02 20:53:46.000000000 +0000
-+++ uip/folder.c
-@@ -62,8 +62,6 @@ static struct swit switches[] = {
- { NULL, 0 }
- };
-
--extern int errno;
--
- static int fshort = 0; /* output only folder names */
- static int fcreat = 0; /* should we ask to create new folders? */
- static int fpack = 0; /* are we packing the folder? */
diff --git a/mail/nmh/patches/patch-ak b/mail/nmh/patches/patch-ak
deleted file mode 100644
index d121f9f559f..00000000000
--- a/mail/nmh/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhbuild.c.orig 2006-03-02 20:54:32.000000000 +0000
-+++ uip/mhbuild.c
-@@ -64,8 +64,6 @@ static struct swit switches[] = {
- };
-
-
--extern int errno;
--
- /* mhbuildsbr.c */
- extern int checksw;
- extern char *tmp; /* directory to place temp files */
diff --git a/mail/nmh/patches/patch-al b/mail/nmh/patches/patch-al
deleted file mode 100644
index d2bc143fb90..00000000000
--- a/mail/nmh/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhcachesbr.c.orig 2006-03-02 20:55:34.000000000 +0000
-+++ uip/mhcachesbr.c
-@@ -34,7 +34,6 @@
- #endif
-
-
--extern int errno;
- extern int debugsw;
-
- extern pid_t xpid; /* mhshowsbr.c or mhbuildsbr.c */
diff --git a/mail/nmh/patches/patch-am b/mail/nmh/patches/patch-am
deleted file mode 100644
index f912118c653..00000000000
--- a/mail/nmh/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhlistsbr.c.orig 2006-03-02 20:57:04.000000000 +0000
-+++ uip/mhlistsbr.c
-@@ -16,8 +16,6 @@
- #include <h/mime.h>
- #include <h/mhparse.h>
-
--extern int errno;
--
- /* mhmisc.c */
- int part_ok (CT, int);
- int type_ok (CT, int);
diff --git a/mail/nmh/patches/patch-an b/mail/nmh/patches/patch-an
deleted file mode 100644
index 9536ba168b7..00000000000
--- a/mail/nmh/patches/patch-an
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-an,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhoutsbr.c.orig 2006-03-02 20:57:31.000000000 +0000
-+++ uip/mhoutsbr.c
-@@ -22,7 +22,6 @@
- #endif
-
-
--extern int errno;
- extern int ebcdicsw;
-
- static char ebcdicsafe[0x100] = {
diff --git a/mail/nmh/patches/patch-ao b/mail/nmh/patches/patch-ao
deleted file mode 100644
index 6822e0c2839..00000000000
--- a/mail/nmh/patches/patch-ao
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhmisc.c.orig 2006-03-02 20:57:53.000000000 +0000
-+++ uip/mhmisc.c
-@@ -10,7 +10,6 @@
- #include <h/mime.h>
- #include <h/mhparse.h>
-
--extern int errno;
- extern int debugsw;
-
- /*
diff --git a/mail/nmh/patches/patch-ap b/mail/nmh/patches/patch-ap
deleted file mode 100644
index cc671bfba2f..00000000000
--- a/mail/nmh/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhfree.c.orig 2006-03-02 20:58:16.000000000 +0000
-+++ uip/mhfree.c
-@@ -11,8 +11,6 @@
- #include <h/mime.h>
- #include <h/mhparse.h>
-
--extern int errno;
--
- /*
- * prototypes
- */
diff --git a/mail/nmh/patches/patch-aq b/mail/nmh/patches/patch-aq
deleted file mode 100644
index 34fb7a658fe..00000000000
--- a/mail/nmh/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhlist.c.orig 2006-03-02 20:58:40.000000000 +0000
-+++ uip/mhlist.c
-@@ -69,8 +69,6 @@ static struct swit switches[] = {
- };
-
-
--extern int errno;
--
- /* mhparse.c */
- extern int checksw;
- extern char *tmp; /* directory to place temp files */
diff --git a/mail/nmh/patches/patch-ar b/mail/nmh/patches/patch-ar
deleted file mode 100644
index 6a2d64fec28..00000000000
--- a/mail/nmh/patches/patch-ar
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhparse.c.orig 2006-03-02 20:59:04.000000000 +0000
-+++ uip/mhparse.c
-@@ -22,7 +22,6 @@
- #endif
-
-
--extern int errno;
- extern int debugsw;
-
- extern int endian; /* mhmisc.c */
diff --git a/mail/nmh/patches/patch-as b/mail/nmh/patches/patch-as
deleted file mode 100644
index 7b805c61c2e..00000000000
--- a/mail/nmh/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhn.c.orig 2006-03-02 20:59:32.000000000 +0000
-+++ uip/mhn.c
-@@ -127,8 +127,6 @@ static struct swit switches[] = {
- };
-
-
--extern int errno;
--
- /* mhparse.c */
- extern int checksw;
- extern char *tmp; /* directory to place temp files */
diff --git a/mail/nmh/patches/patch-at b/mail/nmh/patches/patch-at
deleted file mode 100644
index f3cf514eb7e..00000000000
--- a/mail/nmh/patches/patch-at
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-at,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhshowsbr.c.orig 2006-03-02 20:59:58.000000000 +0000
-+++ uip/mhshowsbr.c
-@@ -31,7 +31,6 @@
- # define siglongjmp(env,val) longjmp(env,val)
- #endif
-
--extern int errno;
- extern int debugsw;
-
- int pausesw = 1;
diff --git a/mail/nmh/patches/patch-au b/mail/nmh/patches/patch-au
deleted file mode 100644
index 56f3a4a3d5f..00000000000
--- a/mail/nmh/patches/patch-au
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhstoresbr.c.orig 2006-03-02 21:00:24.000000000 +0000
-+++ uip/mhstoresbr.c
-@@ -17,8 +17,6 @@
- #include <h/mime.h>
- #include <h/mhparse.h>
-
--extern int errno;
--
- /*
- * The list of top-level contents to display
- */
diff --git a/mail/nmh/patches/patch-av b/mail/nmh/patches/patch-av
deleted file mode 100644
index d855a011f63..00000000000
--- a/mail/nmh/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhshow.c.orig 2006-03-02 21:00:48.000000000 +0000
-+++ uip/mhshow.c
-@@ -83,8 +83,6 @@ static struct swit switches[] = {
- };
-
-
--extern int errno;
--
- /* mhparse.c */
- extern int checksw;
- extern char *tmp; /* directory to place temp files */
diff --git a/mail/nmh/patches/patch-aw b/mail/nmh/patches/patch-aw
deleted file mode 100644
index 8db06e56df4..00000000000
--- a/mail/nmh/patches/patch-aw
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhstore.c.orig 2006-03-02 21:01:09.000000000 +0000
-+++ uip/mhstore.c
-@@ -65,8 +65,6 @@ static struct swit switches[] = {
- };
-
-
--extern int errno;
--
- /* mhparse.c */
- extern int checksw;
- extern char *tmp; /* directory to place temp files */
diff --git a/mail/nmh/patches/patch-ax b/mail/nmh/patches/patch-ax
deleted file mode 100644
index 99e56cbf0f8..00000000000
--- a/mail/nmh/patches/patch-ax
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mshcmds.c.orig 2006-03-02 21:02:23.000000000 +0000
-+++ uip/mshcmds.c
-@@ -18,8 +18,6 @@
- #include <h/msh.h>
- #include <h/picksbr.h>
-
--extern int errno;
--
- static char delim3[] = "-------"; /* from burst.c */
-
- static int mhlnum;
-@@ -3006,7 +3004,6 @@ process (int msgnum, char *proc, int vec
- strncpy (tmpfil, m_scratch ("", invo_name), sizeof(tmpfil));
- if ((out = fopen (tmpfil, "w")) == NULL) {
- int olderr;
-- extern int errno;
- char newfil[80];
-
- olderr = errno;
diff --git a/mail/nmh/patches/patch-ay b/mail/nmh/patches/patch-ay
deleted file mode 100644
index dd364c44fef..00000000000
--- a/mail/nmh/patches/patch-ay
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/scansbr.c.orig 2006-03-02 21:05:07.000000000 +0000
-+++ uip/scansbr.c
-@@ -245,6 +245,8 @@ body:;
- while (state == BODY) {
- #ifdef LINUX_STDIO
- if (scnout->_IO_write_ptr == scnout->_IO_write_end) {
-+#elif defined(__DragonFly__)
-+ if (((struct __FILE_public *)scnout)->_w <= 0) {
- #else
- if (scnout->_cnt <= 0) {
- #endif
-@@ -255,6 +257,10 @@ body:;
- state = m_getfld(state, name, scnout->_IO_write_ptr,
- (long)scnout->_IO_write_ptr-(long)scnout->_IO_write_end , inb);
- scnout->_IO_write_ptr += msg_count;
-+#elif defined(__DragonFly__)
-+ state = m_getfld( state, name, ((struct __FILE_public *)scnout)->_p, -(((struct __FILE_public *)scnout)->_w), inb );
-+ ((struct __FILE_public *)scnout)->_w -= msg_count;
-+ ((struct __FILE_public *)scnout)->_p += msg_count;
- #else
- state = m_getfld( state, name, scnout->_ptr, -(scnout->_cnt), inb );
- scnout->_cnt -= msg_count;
diff --git a/mail/nmh/patches/patch-az b/mail/nmh/patches/patch-az
deleted file mode 100644
index 137b96921fa..00000000000
--- a/mail/nmh/patches/patch-az
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-az,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/dropsbr.c.orig 2006-03-02 21:07:50.000000000 +0000
-+++ uip/dropsbr.c
-@@ -31,8 +31,6 @@
-
- #include <fcntl.h>
-
--extern int errno;
--
- /*
- * static prototypes
- */
diff --git a/mail/nmh/patches/patch-ba b/mail/nmh/patches/patch-ba
deleted file mode 100644
index 16cb135c526..00000000000
--- a/mail/nmh/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.5 2006/03/02 21:28:23 joerg Exp $
-
---- uip/packf.c.orig 2006-03-02 21:08:22.000000000 +0000
-+++ uip/packf.c
-@@ -31,8 +31,6 @@ static struct swit switches[] = {
- { NULL, 0 }
- };
-
--extern int errno;
--
- static int md = NOTOK;
- static int mbx_style = MBOX_FORMAT;
- static int mapping = 0;
diff --git a/mail/nmh/patches/patch-bb b/mail/nmh/patches/patch-bb
deleted file mode 100644
index b43f2662b55..00000000000
--- a/mail/nmh/patches/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/prompter.c.orig 2006-03-02 21:09:23.000000000 +0000
-+++ uip/prompter.c
-@@ -60,8 +60,6 @@ static struct swit switches[] = {
- { NULL, 0 }
- };
-
--extern int errno;
--
- #ifdef HAVE_TERMIOS_H
- static struct termios tio;
- # define ERASE tio.c_cc[VERASE]
diff --git a/mail/nmh/patches/patch-bc b/mail/nmh/patches/patch-bc
deleted file mode 100644
index 7f1f2ac5e54..00000000000
--- a/mail/nmh/patches/patch-bc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/refile.c.orig 2006-03-02 21:09:49.000000000 +0000
-+++ uip/refile.c
-@@ -47,8 +47,6 @@ static struct swit switches[] = {
- { NULL, 0 }
- };
-
--extern int errno;
--
- static char maildir[BUFSIZ];
-
- struct st_fold {
diff --git a/mail/nmh/patches/patch-bd b/mail/nmh/patches/patch-bd
deleted file mode 100644
index 59dbb37f844..00000000000
--- a/mail/nmh/patches/patch-bd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/scan.c.orig 2006-03-02 21:11:26.000000000 +0000
-+++ uip/scan.c
-@@ -47,8 +47,6 @@ static struct swit switches[] = {
- { NULL, 0 }
- };
-
--extern int errno;
--
- /*
- * global for sbr/formatsbr.c - yech!
- */
diff --git a/mail/nmh/patches/patch-be b/mail/nmh/patches/patch-be
deleted file mode 100644
index 59ab75d4c50..00000000000
--- a/mail/nmh/patches/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-be,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/send.c.orig 2006-03-02 21:11:50.000000000 +0000
-+++ uip/send.c
-@@ -111,8 +111,6 @@ extern char *altmsg; /* .. */
- extern char *annotext;
- extern char *distfile;
-
--extern int errno;
--
- int
- main (int argc, char **argv)
- {
diff --git a/mail/nmh/patches/patch-bf b/mail/nmh/patches/patch-bf
deleted file mode 100644
index 18d861ab358..00000000000
--- a/mail/nmh/patches/patch-bf
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/viamail.c.orig 2006-03-02 21:12:25.000000000 +0000
-+++ uip/viamail.c
-@@ -48,7 +48,6 @@ static struct swit switches[] = {
- { NULL, 0 }
- };
-
--extern int errno;
- extern int debugsw;
- extern int splitsw;
- extern int verbsw;
diff --git a/mail/nmh/patches/patch-bg b/mail/nmh/patches/patch-bg
deleted file mode 100644
index 585ddf80803..00000000000
--- a/mail/nmh/patches/patch-bg
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bg,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/rcvstore.c.orig 2006-03-02 21:12:52.000000000 +0000
-+++ uip/rcvstore.c
-@@ -38,8 +38,6 @@ static struct swit switches[] = {
- { NULL, 0 }
- };
-
--extern int errno;
--
- /*
- * name of temporary file to store incoming message
- */
diff --git a/mail/nmh/patches/patch-bh b/mail/nmh/patches/patch-bh
deleted file mode 100644
index b1a627e16be..00000000000
--- a/mail/nmh/patches/patch-bh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bh,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhtest.c.orig 2006-03-02 21:13:22.000000000 +0000
-+++ uip/mhtest.c
-@@ -63,8 +63,6 @@ static struct swit switches[] = {
- };
-
-
--extern int errno;
--
- int ebcdicsw = 0; /* hack for linking purposes */
-
- /* mhparse.c */
diff --git a/mail/nmh/patches/patch-bi b/mail/nmh/patches/patch-bi
deleted file mode 100644
index f4984aa8f57..00000000000
--- a/mail/nmh/patches/patch-bi
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bi,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/inc.c.orig 2006-03-02 21:13:52.000000000 +0000
-+++ uip/inc.c
-@@ -113,8 +113,6 @@ static struct swit switches[] = {
- { NULL, 0 }
- };
-
--extern int errno;
--
- /*
- * flags for the mail source
- */
diff --git a/mail/nmh/patches/patch-ca b/mail/nmh/patches/patch-ca
deleted file mode 100644
index 3165fa77a55..00000000000
--- a/mail/nmh/patches/patch-ca
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-ca,v 1.5 2005/01/16 19:19:46 jmmv Exp $
-
-Use ${INSTALL_SCRIPT} to install scripts
-Install configuration files as <conf-file>.dist
-
---- etc/Makefile.in.orig Wed Mar 15 07:40:47 2000
-+++ etc/Makefile.in Sat Apr 15 17:13:49 2000
-@@ -15,6 +15,7 @@
- bindir = @bindir@
- libdir = @libdir@
- etcdir = @sysconfdir@
-+egdir = @prefix@/share/examples/nmh
-
- mailspool = @mailspool@
- masquerade = @masquerade@
-@@ -23,6 +24,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
-
- # Path to search for programs to handle MIME
- # content. Used to create mhn.defaults
-@@ -76,31 +78,31 @@
- install: install-files install-scripts
-
- install-files:
-- $(top_srcdir)/mkinstalldirs $(etcdir)
-+ $(top_srcdir)/mkinstalldirs $(egdir)
- for file in $(DIST_FILES); do \
-- if [ -f $(etcdir)/$$file ]; then \
-- mv $(etcdir)/$$file $(etcdir)/$$file.old; \
-+ if [ -f $(egdir)/$$file ]; then \
-+ mv $(egdir)/$$file $(egdir)/$$file.old; \
- fi; \
-- $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file; \
-+ $(INSTALL_DATA) $(srcdir)/$$file $(egdir)/$$file; \
- done
- for file in $(GEN_FILES); do \
-- if [ -f $(etcdir)/$$file ]; then \
-- mv $(etcdir)/$$file $(etcdir)/$$file.old; \
-+ if [ -f $(egdir)/$$file ]; then \
-+ mv $(egdir)/$$file $(egdir)/$$file.old; \
- fi; \
-- $(INSTALL_DATA) $$file $(etcdir)/$$file; \
-+ $(INSTALL_DATA) $$file $(egdir)/$$file; \
- done
-
- install-scripts:
- $(top_srcdir)/mkinstalldirs $(bindir)
- for script in $(SCRIPTS); do \
-- $(INSTALL_PROGRAM) $(srcdir)/$$script $(bindir)/$$script; \
-+ $(INSTALL_SCRIPT) $(srcdir)/$$script $(bindir)/$$script; \
- done
-
- uninstall: uninstall-files uninstall-scripts
-
- uninstall-files:
- for file in $(FILES); do \
-- rm -f $(etcdir)/$$file; \
-+ rm -f $(egdir)/$$file; \
- done
-
- uninstall-scripts:
diff --git a/mail/nmh/patches/patch-cb b/mail/nmh/patches/patch-cb
deleted file mode 100644
index 7f8d5788779..00000000000
--- a/mail/nmh/patches/patch-cb
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-cb,v 1.7 2000/04/15 07:56:16 simonb Exp $
-
---- config.h.in.orig Sat Mar 18 07:19:43 2000
-+++ config.h.in Sat Apr 15 17:13:49 2000
-@@ -1,5 +1,12 @@
- /* config.h.in. Generated automatically from configure.in by autoheader. */
-
-+/* Define if you have the <sys/param.h> header file. */
-+#undef HAVE_SYS_PARAM_H
-+
-+#ifdef HAVE_SYS_PARAM_H
-+# include <sys/param.h>
-+#endif
-+
- /****** BEGIN USER CONFIGURATION SECTION *****/
-
- /*
-@@ -72,6 +79,11 @@
- #define FIX_NON_Y2K_COMPLIANT_MUA_DATES 1
-
- /*
-+ * Replace & in the GCOS field with the login name.
-+ */
-+#define GCOS_HACK 1
-+
-+/*
- * Directs inc/slocal to extract the envelope sender from "From "
- * line. If inc/slocal is saving message to folder, then this
- * sender information is then used to create a Return-Path
-@@ -424,9 +436,6 @@
-
- /* Define if you have the <sys/ndir.h> header file. */
- #undef HAVE_SYS_NDIR_H
--
--/* Define if you have the <sys/param.h> header file. */
--#undef HAVE_SYS_PARAM_H
-
- /* Define if you have the <sys/time.h> header file. */
- #undef HAVE_SYS_TIME_H
diff --git a/mail/nmh/patches/patch-cd b/mail/nmh/patches/patch-cd
deleted file mode 100644
index 3062f2ae1e6..00000000000
--- a/mail/nmh/patches/patch-cd
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-cd,v 1.4 2006/12/16 13:18:54 schwarz Exp $
-
---- sbr/fmt_scan.c.orig 1999-09-26 19:45:56.000000000 +0200
-+++ sbr/fmt_scan.c 2006-12-10 22:42:29.000000000 +0100
-@@ -24,6 +24,9 @@
-
- #define NFMTS MAXARGS
-
-+#ifdef IRIX5
-+typedef signed long long int int64_t;
-+#endif
- extern char *formataddr (); /* hook for custom address formatting */
-
- #ifdef LBL
-@@ -282,8 +285,8 @@
- char *cp, *ep, *sp;
- char *savestr, *str = NULL;
- char buffer[BUFSIZ], buffer2[BUFSIZ];
-- int i, c, ljust;
-- int value = 0;
-+ int i, ljust;
-+ int64_t c, value = 0;
- time_t t;
- struct format *fmt;
- struct comp *comp;
diff --git a/mail/nmh/patches/patch-ce b/mail/nmh/patches/patch-ce
deleted file mode 100644
index fd92e91af6c..00000000000
--- a/mail/nmh/patches/patch-ce
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ce,v 1.3 2002/10/15 10:47:00 agc Exp $
-
-Robert Elz's PR 18664 contains the rationale for this patch:
-
- A bug report (from Scott Lipcon) was submitted elsewhere:
-http://savannah.nongnu.org/bugs/?func=detailbug&bug_id=1393&group_id=2166
- and then today copied to the nmh-workers list.
-
- Basically, using "sortm -textfield subject" where a message
- in the folder contains "Subject:N" where "N" is alphanumeric
- will cause sortm to dump core (the "korean spam" aspect of the
- mail that caused the original bug report is irrelevant).
-
->How-To-Repeat:
- Use nmh. Put a message in a folder that contains "Subject:1234"
- and then run
- sortm +whatever-folder -textfield subject
- and watch for the core dump.
-
- Or, examine the code and be amazed ...
-
---- uip/sortm.c 2000/02/04 20:28:24 1.3
-+++ uip/sortm.c 2002/10/15 10:38:32
-@@ -439,9 +439,12 @@
- if(uprf(cp, "re:"))
- cp += 2;
- else {
-+#if 0
- if (isalnum(c))
- *cp2++ = isupper(c) ? tolower(c) : c;
-+#else
- break;
-+#endif
- }
- }
- cp++;
diff --git a/mail/nmh/patches/patch-ci b/mail/nmh/patches/patch-ci
deleted file mode 100644
index 8bc3288bbd2..00000000000
--- a/mail/nmh/patches/patch-ci
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ci,v 1.1 2002/10/30 16:57:03 kim Exp $
-
-Fix detection of non-mime messages when the charset is not enclosed
-in double quotes.
-
---- uip/show.c.orig Sun Sep 12 09:50:12 1999
-+++ uip/show.c Wed Oct 30 11:42:42 2002
-@@ -470,7 +470,7 @@
- *bp = '\0';
- } else {
- for (bp = dp; *bp; bp++)
-- if (isspace (*bp)) {
-+ if (!istoken (*bp)) {
- *bp = '\0';
- break;
- }
diff --git a/mail/nmh/patches/patch-cj b/mail/nmh/patches/patch-cj
deleted file mode 100644
index a1a93026e59..00000000000
--- a/mail/nmh/patches/patch-cj
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-cj,v 1.2 2005/01/16 19:19:46 jmmv Exp $
-
-Add manual links for folders and flists (PR#23466).
-
---- man/Makefile.in.orig 2000-01-27 20:14:58.000000000 +0000
-+++ man/Makefile.in 2004-01-02 20:38:09.000000000 +0000
-@@ -17,6 +17,7 @@
- bindir = @bindir@
- libdir = @libdir@
- etcdir = @sysconfdir@
-+egdir = @prefix@/share/examples/nmh
- mandir = @mandir@
- manext1 = 1
- manext5 = 5
-@@ -78,6 +79,9 @@
- fmtdump.$(manext8) install-mh.$(manext8) mh-mts.$(manext8) \
- post.$(manext8)
-
-+LINK1 = flist.$(manext1) flists.$(manext1) \
-+ folder.$(manext1) folders.$(manext1)
-+
- # source for man pages
- DIST_MAN = ali.man anno.man ap.man burst.man comp.man conflict.man \
- dist.man dp.man flist.man fmtdump.man folder.man forw.man \
-@@ -129,8 +133,8 @@
-
- # install the include file for man pages
- install-hdr:
-- $(top_srcdir)/mkinstalldirs $(etcdir)
-- $(INSTALL_DATA) tmac.h $(etcdir)/tmac.h
-+ $(top_srcdir)/mkinstalldirs $(egdir)
-+ $(INSTALL_DATA) tmac.h $(egdir)/tmac.h
-
- # install the man pages in man1
- install-man1:
-@@ -138,6 +142,14 @@
- for file in $(MAN1); do \
- $(INSTALL_DATA) $$file $(mandir)/man$(manext1) ; \
- done
-+ set $(LINK1); \
-+ while test $$# -ge 2; do \
-+ name=$$1; shift; \
-+ link=$$1; shift; \
-+ ln -sf $(mandir)/man$(manext1)/$${name} \
-+ $(mandir)/man$(manext1)/$${link};\
-+ done
-+
-
- # install the man pages in man5
- install-man5:
-@@ -163,7 +175,7 @@
-
- # uninstall the include file for man pages
- uninstall-hdr:
-- rm -f $(etcdir)/tmac.h
-+ rm -f $(egdir)/tmac.h
-
- # uninstall the man pages in man1
- uninstall-man1:
diff --git a/mail/nmh/patches/patch-ck b/mail/nmh/patches/patch-ck
deleted file mode 100644
index beddc85248d..00000000000
--- a/mail/nmh/patches/patch-ck
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ck,v 1.1 2006/12/16 13:18:54 schwarz Exp $
-
---- sbr/Makefile.in.orig 2006-12-10 23:23:02.000000000 +0100
-+++ sbr/Makefile.in 2006-12-10 23:23:42.000000000 +0100
-@@ -12,6 +12,7 @@
-
- CC = @CC@
- CFLAGS = @CFLAGS@
-+CPPFLAGS = @CPPFLAGS@
- DEFS = @DEFS@
- INCLUDES = -I.. -I. -I$(top_srcdir)
-
-@@ -24,7 +25,7 @@
-
- LIBOBJS = @LIBOBJS@
-
--COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
-+COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES) $(CFLAGS)
-
- .SUFFIXES:
- .SUFFIXES: .c .o
diff --git a/mail/nullmailer/DEINSTALL b/mail/nullmailer/DEINSTALL
deleted file mode 100644
index 08a441f9ab0..00000000000
--- a/mail/nullmailer/DEINSTALL
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.1 2005/08/20 02:20:45 schmonz Exp $
-
-VARBASE=@VARBASE@
-
-case "${STAGE}" in
-
-POST-DEINSTALL)
- ${RM} -f ${VARBASE}/spool/nullmailer/trigger
- ;;
-
-esac
diff --git a/mail/nullmailer/DESCR b/mail/nullmailer/DESCR
deleted file mode 100644
index 2a95450426b..00000000000
--- a/mail/nullmailer/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This is nullmailer, a sendmail/qmail/etc replacement MTA for hosts
-which relay to a fixed set of smart relays. It is designed to be
-simple to configure, secure, and easily extendable.
diff --git a/mail/nullmailer/INSTALL b/mail/nullmailer/INSTALL
deleted file mode 100644
index a403115d18a..00000000000
--- a/mail/nullmailer/INSTALL
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: INSTALL,v 1.1 2005/08/20 02:20:45 schmonz Exp $
-
-VARBASE=@VARBASE@
-
-case "${STAGE}" in
-
-POST-INSTALL)
- mkfifo ${VARBASE}/spool/nullmailer/trigger
- ;;
-esac
diff --git a/mail/nullmailer/MESSAGE b/mail/nullmailer/MESSAGE
deleted file mode 100644
index bf1f0ead918..00000000000
--- a/mail/nullmailer/MESSAGE
+++ /dev/null
@@ -1,35 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.5 2005/08/20 02:20:45 schmonz Exp $
-
-To use nullmailer, you will need to perform the following steps:
-
-1. Create a ${PKG_SYSCONFDIR}/nullmailer/remotes file.
- The file should contain a line with the name of your relay host
- and the relay protocol to be used, eg.
-
- smtp.relayhost.domain smtp
-
-2. Back up /etc/mailer.conf and copy nullmailer's from
- ${PREFIX}/share/examples/nullmailer/mailer.conf
-
-3. If you don't have PKG_RCD_SCRIPTS set in your /etc/mk.conf, copy
- ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/nullmailer to
- ${RCD_SCRIPTS_DIR}/nullmailer and add
-
- nullmailer=YES
-
- to /etc/rc.conf. Other MTA's, (eg. sendmail, exim), should be set
- to NO.
-
-4. Stop any other running MTA. Now start nullmailer by issuing the
- command
-
- ${RCD_SCRIPTS_DIR}/nullmailer start
-
-5. You may need to add further configuration files to the directory
- ${PKG_SYSCONFDIR}/nullmailer. These include the `adminaddr',
- `defaultdomain', `defaulthost', `idhost', `me', and `pausetime'
- files. This will depend on your local setup. See the
- nullmailer(7), nullmailer-queue(8), and nullmailer-send(8) manual
- pages for details.
-===========================================================================
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
deleted file mode 100644
index 87aaeeededa..00000000000
--- a/mail/nullmailer/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2007/03/09 12:01:24 schmonz Exp $
-
-DISTNAME= nullmailer-1.03
-CATEGORIES= mail
-MASTER_SITES= ${HOMEPAGE:Q}
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://untroubled.org/nullmailer/
-COMMENT= Simple relay-only mail transport agent
-
-USE_LANGUAGES= c c++
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --localstatedir=${VARBASE}/spool
-CONFIGURE_ARGS+= --bindir=${PREFIX}/libexec/nullmailer
-CONFIGURE_ARGS+= --sbindir=${PREFIX}/libexec/nullmailer
-
-INSTALL_TARGET= install install-data-local install-root
-
-.include "../../mk/bsd.prefs.mk"
-
-NULLMAILER_GROUP?= nullmail
-NULLMAILER_USER?= nullmail
-PKG_GROUPS= ${NULLMAILER_GROUP}
-PKG_USERS= ${NULLMAILER_USER}:${NULLMAILER_GROUP}
-
-MAKE_ENV+= NULLMAILER_GROUP=${NULLMAILER_GROUP:Q}
-MAKE_ENV+= NULLMAILER_USER=${NULLMAILER_USER:Q}
-
-FILES_SUBST+= VARBASE=${VARBASE:Q} \
- NULLMAILER_GROUP=${NULLMAILER_GROUP:Q} \
- NULLMAILER_USER=${NULLMAILER_USER:Q}
-
-RCD_SCRIPTS= nullmailer
-
-MAKE_DIRS+= ${PKG_SYSCONFDIR}/nullmailer
-.for i in nullmailer nullmailer/queue nullmailer/tmp
-OWN_DIRS_PERMS+= ${VARBASE}/spool/${i} ${NULLMAILER_USER} \
- ${NULLMAILER_GROUP} 700
-.endfor
-SPECIAL_PERMS+= libexec/nullmailer/mailq \
- ${NULLMAILER_USER} ${NULLMAILER_GROUP} 4555
-SPECIAL_PERMS+= libexec/nullmailer/nullmailer-queue \
- ${NULLMAILER_USER} ${NULLMAILER_GROUP} 4555
-SPECIAL_PERMS+= ${VARBASE}/spool/nullmailer/trigger \
- ${NULLMAILER_USER} ${NULLMAILER_GROUP} 0600
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= ${WRKDIR}/mailer.conf
-SUBST_FILES.paths+= doc/nullmailer-send.8 doc/nullmailer-queue.8
-SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+= -e 's,@VARBASE@,${VARBASE},g'
-SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_STAGE.paths= post-patch
-
-post-extract:
- ${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nullmailer
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nullmailer
- cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS BUGS COPYING ChangeLog \
- HOWTO NEWS README TODO ${PREFIX}/share/doc/nullmailer
- ${INSTALL_DATA} ${WRKDIR}/mailer.conf \
- ${PREFIX}/share/examples/nullmailer/
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/nullmailer/PLIST b/mail/nullmailer/PLIST
deleted file mode 100644
index 09d333c5ab8..00000000000
--- a/mail/nullmailer/PLIST
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2005/08/20 02:20:45 schmonz Exp $
-libexec/nullmailer/mailq
-libexec/nullmailer/nullmailer-inject
-libexec/nullmailer/nullmailer-queue
-libexec/nullmailer/nullmailer-send
-libexec/nullmailer/qmqp
-libexec/nullmailer/sendmail
-libexec/nullmailer/smtp
-man/man1/nullmailer-inject.1
-man/man1/sendmail.1
-man/man7/nullmailer.7
-man/man8/nullmailer-queue.8
-man/man8/nullmailer-send.8
-share/doc/nullmailer/AUTHORS
-share/doc/nullmailer/BUGS
-share/doc/nullmailer/COPYING
-share/doc/nullmailer/ChangeLog
-share/doc/nullmailer/HOWTO
-share/doc/nullmailer/NEWS
-share/doc/nullmailer/README
-share/doc/nullmailer/TODO
-share/examples/nullmailer/mailer.conf
-share/examples/rc.d/nullmailer
-@dirrm share/examples/nullmailer
-@dirrm share/doc/nullmailer
-@dirrm libexec/nullmailer
diff --git a/mail/nullmailer/distinfo b/mail/nullmailer/distinfo
deleted file mode 100644
index f585d1e8c6b..00000000000
--- a/mail/nullmailer/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.9 2006/07/01 19:33:30 schmonz Exp $
-
-SHA1 (nullmailer-1.03.tar.gz) = 95ed13bd0d4e05f5f66bb1a022e9424f892df3b2
-RMD160 (nullmailer-1.03.tar.gz) = b4b6244eb86a7c01330f0a65338a204c07794e23
-Size (nullmailer-1.03.tar.gz) = 172250 bytes
-SHA1 (patch-aa) = dc2ca7a43598e3057f7903319581d3d529d3326f
-SHA1 (patch-ab) = 533eb2fe3203a27809f598ffedeb4f17d5e364c5
-SHA1 (patch-ac) = bcd8e868b9e8dbe5379d2a181515f358fbf1e92c
diff --git a/mail/nullmailer/files/mailer.conf b/mail/nullmailer/files/mailer.conf
deleted file mode 100644
index 709ad35c994..00000000000
--- a/mail/nullmailer/files/mailer.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: mailer.conf,v 1.1 2003/02/17 05:20:21 salo Exp $
-#
-# Use "nullmailer" as replacement for "sendmail".
-#
-sendmail @PREFIX@/libexec/nullmailer/sendmail
-send-mail @PREFIX@/libexec/nullmailer/sendmail
-mailq @PREFIX@/libexec/nullmailer/mailq
diff --git a/mail/nullmailer/files/nullmailer.sh b/mail/nullmailer/files/nullmailer.sh
deleted file mode 100644
index bb719f9fb4c..00000000000
--- a/mail/nullmailer/files/nullmailer.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: nullmailer.sh,v 1.2 2005/08/20 02:20:45 schmonz Exp $
-#
-# PROVIDE: mail
-# REQUIRE: LOGIN
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="nullmailer"
-rcvar=${name}
-required_files="@PKG_SYSCONFDIR@/nullmailer/remotes"
-required_files="${required_files} @VARBASE@/spool/nullmailer/trigger"
-required_dirs="@VARBASE@/spool/nullmailer/queue @VARBASE@/spool/nullmailer/tmp"
-command="@PREFIX@/libexec/nullmailer/nullmailer-send"
-command_args="2>&1 | logger -t nullmailer -p mail.info &"
-
-nullmailer_user="@NULLMAILER_USER@"
-nullmailer_group="@NULLMAILER_GROUP@"
-
-if [ -f /etc/rc.subr ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- @ECHO_N@ " ${name}"
- ${command} ${nullmailer_flags} ${command_args}
-fi
diff --git a/mail/nullmailer/patches/patch-aa b/mail/nullmailer/patches/patch-aa
deleted file mode 100644
index c911f254ffd..00000000000
--- a/mail/nullmailer/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/01/03 19:12:52 schmonz Exp $
-
---- Makefile.in.orig 2005-11-02 12:41:35.000000000 -0500
-+++ Makefile.in
-@@ -596,10 +596,10 @@ install-data-local:
- chmod 600 $(DESTDIR)$(localstatedir)/trigger
-
- install-root:
-- chown nullmail $(DESTDIR)$(localstatedir)/*
-- chown nullmail $(DESTDIR)$(sbindir)/nullmailer-queue
-+ chown ${NULLMAILER_USER}:${NULLMAILER_GROUP} $(DESTDIR)$(localstatedir)/*
-+ chown ${NULLMAILER_USER}:${NULLMAILER_GROUP} $(DESTDIR)$(sbindir)/nullmailer-queue
- chmod u+s $(DESTDIR)$(sbindir)/nullmailer-queue
-- chown nullmail $(DESTDIR)$(bindir)/mailq
-+ chown ${NULLMAILER_USER}:${NULLMAILER_GROUP} $(DESTDIR)$(bindir)/mailq
- chmod u+s $(DESTDIR)$(bindir)/mailq
-
- dist-hook:
diff --git a/mail/nullmailer/patches/patch-ab b/mail/nullmailer/patches/patch-ab
deleted file mode 100644
index c8454a85a32..00000000000
--- a/mail/nullmailer/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2006/07/01 19:33:30 schmonz Exp $
-
---- doc/nullmailer-send.8.orig 2006-06-23 11:19:40.000000000 -0400
-+++ doc/nullmailer-send.8
-@@ -74,16 +74,16 @@ PLAIN method, use:
- Blank lines and lines starting with a pound are ignored.
- .SH FILES
- .TP
--.B /var/nullmailer/queue
-+.B /var/spool/nullmailer/queue
- The message queue.
- .TP
--.B /var/nullmailer/trigger
-+.B /var/spool/nullmailer/trigger
- A trigger file to cause immediate delivery.
- .TP
--.B /usr/local/etc/nullmailer
-+.B /etc/pkg/nullmailer
- The configuration directory.
- .TP
--.B /usr/local/libexec/nullmailer
-+.B /usr/pkg/libexec/nullmailer
- The protocol program directory.
- .SH SEE ALSO
- nullmailer-queue(8),
diff --git a/mail/nullmailer/patches/patch-ac b/mail/nullmailer/patches/patch-ac
deleted file mode 100644
index 12d965aefe1..00000000000
--- a/mail/nullmailer/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2006/07/01 19:33:30 schmonz Exp $
-
---- doc/nullmailer-queue.8.orig 2002-12-23 12:29:20.000000000 -0500
-+++ doc/nullmailer-queue.8
-@@ -30,13 +30,13 @@ This is provided to allow local daemons
- being bounced by your relay host.
- .SH OTHER FILES
- .TP
--.B /var/nullmailer/queue
-+.B /var/spool/nullmailer/queue
- The directory into which the completed messages are moved.
- .TP
--.B /var/nullmailer/tmp
-+.B /var/spool/nullmailer/tmp
- The directory in which messages are formed temporarily.
- .TP
--.B /var/nullmailer/trigger
-+.B /var/spool/nullmailer/trigger
- A pipe used to trigger
- .BR nullmailer-send
- to immediately start sending the message from the queue.
diff --git a/mail/oe2mbx/DESCR b/mail/oe2mbx/DESCR
deleted file mode 100644
index c83b04242f0..00000000000
--- a/mail/oe2mbx/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-liboe is a C library that reads Outlook Express 4 and 5.x mailboxes and
-returns a standard Unix mailbox to a function specified as a parameter to
-the converter
-
-oe2mbx is a C program using liboe to convert Outlook Express messages to
-the Unix mailbox format
diff --git a/mail/oe2mbx/Makefile b/mail/oe2mbx/Makefile
deleted file mode 100644
index 47727aced49..00000000000
--- a/mail/oe2mbx/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2007/02/22 19:20:05 wiz Exp $
-#
-
-DISTNAME= oe2mbx-1.21
-CATEGORIES= mail
-MASTER_SITES= # none
-
-MAINTAINER= zuntum@NetBSD.org
-HOMEPAGE= http://web.archive.org/2/www.gpl.no/liboe/
-COMMENT= Outlook Express messages to the Unix mailbox format converter
-
-# assumes fpos_t is an integral type
-NOT_FOR_PLATFORM= Linux-*-*
-
-WRKSRC= ${WRKDIR}/liboe-0.92
-MAKE_FILE= makefile
-
-MAKE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
- INSTALL_LIB=${INSTALL_LIB:Q} \
- INSTALL_DATA=${INSTALL_DATA:Q}
-
-BUILD_TARGET= liboe oe2mbx
-INSTALLATION_DIRS= bin lib include
-
-pre-build:
- cd ${WRKSRC} && ${MAKE_PROGRAM} clean
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/oe2mbx/PLIST b/mail/oe2mbx/PLIST
deleted file mode 100644
index 454836e8593..00000000000
--- a/mail/oe2mbx/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:44 zuntum Exp $
-bin/oe2mbx
-include/liboe.h
-lib/liboe.so
diff --git a/mail/oe2mbx/distinfo b/mail/oe2mbx/distinfo
deleted file mode 100644
index b5de2a592d1..00000000000
--- a/mail/oe2mbx/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:25 agc Exp $
-
-SHA1 (oe2mbx-1.21.tar.gz) = e3931f0eb8c27c4ba0f1118e6d3bb7342ec172e2
-RMD160 (oe2mbx-1.21.tar.gz) = 147b02fac16d2d5124ee069f2b11c236baf00235
-Size (oe2mbx-1.21.tar.gz) = 22817 bytes
-SHA1 (patch-aa) = 0b1d3ffa42263a21c8449421c3402c146f9e7d7f
diff --git a/mail/oe2mbx/patches/patch-aa b/mail/oe2mbx/patches/patch-aa
deleted file mode 100644
index 226a08eca3a..00000000000
--- a/mail/oe2mbx/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/02/05 16:27:39 zuntum Exp $
-
---- makefile.orig Sat Jun 17 17:30:36 2000
-+++ makefile
-@@ -1,22 +1,22 @@
- # MAKEFILE FOR LIBOE AND OE2MBX
- # Read README for info
-
--PREFIX = /usr
-+PREFIX ?= /usr
- LIBDIR = $(PREFIX)/lib
- BINDIR = $(PREFIX)/bin
- INCLUDEDIR = $(PREFIX)/include
-
- oe2mbx : src/oe2mbx.c lib/liboe.o
-- gcc src/oe2mbx.c lib/liboe.o -o bin/oe2mbx
-+ $(CC) $(CFLAGS) src/oe2mbx.c lib/liboe.o -o bin/oe2mbx
- dynamic : src/oe2mbx.c
-- gcc src/oe2mbx.c -DDYNAMIC -o bin/oe2mbx -loe
-+ $(CC) $(CFLAGS) src/oe2mbx.c -DDYNAMIC -o bin/oe2mbx -loe
- liboe : src/liboe.c
-- gcc -c src/liboe.c -o lib/liboe.so
-+ $(CC) $(CFLAGS) -c src/liboe.c -o lib/liboe.so
- lib/liboe.o : src/liboe.c
-- gcc -c src/liboe.c -o lib/liboe.o
-+ $(CC) $(CFLAGS) -c src/liboe.c -o lib/liboe.o
- install :
-- test -e bin/* && install bin/* $(BINDIR) && echo oe2mbx binary installed || echo oe2mbx binary not prepared
-- test -e lib/*.so && install lib/*.so $(LIBDIR) && install src/*.h $(INCLUDEDIR) && echo liboe library installed || echo liboe library not prepared
-+ test -r bin/* && ${INSTALL_PROGRAM} bin/* $(BINDIR) && echo oe2mbx binary installed || echo oe2mbx binary not prepared
-+ test -r lib/*.so && ${INSTALL_LIB} lib/*.so $(LIBDIR) && ${INSTALL_DATA} src/*.h $(INCLUDEDIR) && echo liboe library installed || echo liboe library not prepared
- clean :
-- test -e bin/* && rm -f bin/* || test .
-- test -e lib/* && rm -f lib/* || test .
-+ test -r bin/* && rm -f bin/* || test .
-+ test -r lib/* && rm -f lib/* || test .
diff --git a/mail/offlineimap/DESCR b/mail/offlineimap/DESCR
deleted file mode 100644
index 413830b555f..00000000000
--- a/mail/offlineimap/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-OfflineIMAP is a tool to simplify your e-mail reading.
-It synchronizes remote IMAP folders and local Maildir folders. It is fast
-flexible and safe. It is also useful if you want to use a mail reader that
-does not have IMAP support, has poor IMAP support, or does not provide
-disconnected operation.
diff --git a/mail/offlineimap/MESSAGE b/mail/offlineimap/MESSAGE
deleted file mode 100644
index cf517c184fe..00000000000
--- a/mail/offlineimap/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/08/10 10:09:21 seb Exp $
-
-To use a graphical user interface with ${PKGNAME} you could install
-the py-Tk package from the x11 category.
-
-===========================================================================
diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
deleted file mode 100644
index 797fac10dea..00000000000
--- a/mail/offlineimap/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2007/02/16 15:46:21 tonio Exp $
-#
-
-DISTNAME= offlineimap_${_OFFLINEIMAP_VER}
-PKGNAME= offlineimap-${_OFFLINEIMAP_VER}
-CATEGORIES= mail
-MASTER_SITES= http://software.complete.org/offlineimap/static/download_area/${_OFFLINEIMAP_VER}/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://software.complete.org/offlineimap
-COMMENT= Powerful IMAP/Maildir synchronization and reader support
-
-WRKSRC= ${WRKDIR}/offlineimap
-
-# This is only to placate pkglint
-_OFFLINEIMAP_VER= 4.0.16
-
-PYTHON_VERSIONS_ACCEPTED= 22 23 24
-PYDISTUTILSPKG= yes
-PYTHON_PATCH_SCRIPTS= bin/offlineimap
-PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
-
-INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/examples/offlineimap
-
-post-install:
-.for _f_ in offlineimap.conf offlineimap.conf.minimal
- ${INSTALL_DATA} ${WRKSRC}/${_f_} ${PREFIX}/share/examples/offlineimap/${_f_}
-.endfor
- ${INSTALL_MAN} ${WRKSRC}/offlineimap.1 ${PREFIX}/${PKGMANDIR}/man1/offlineimap.1
-
-.include "../../devel/py-cursespanel/buildlink3.mk"
-.include "../../devel/py-curses/buildlink3.mk"
-.include "../../lang/python/extension.mk"
-.include "../../lang/python/application.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/offlineimap/PLIST b/mail/offlineimap/PLIST
deleted file mode 100644
index 03fbd92e348..00000000000
--- a/mail/offlineimap/PLIST
+++ /dev/null
@@ -1,106 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/08/26 10:20:41 seb Exp $
-bin/offlineimap
-${PYSITELIB}/offlineimap/CustomConfig.py
-${PYSITELIB}/offlineimap/CustomConfig.pyc
-${PYSITELIB}/offlineimap/CustomConfig.pyo
-${PYSITELIB}/offlineimap/__init__.py
-${PYSITELIB}/offlineimap/__init__.pyc
-${PYSITELIB}/offlineimap/__init__.pyo
-${PYSITELIB}/offlineimap/accounts.py
-${PYSITELIB}/offlineimap/accounts.pyc
-${PYSITELIB}/offlineimap/accounts.pyo
-${PYSITELIB}/offlineimap/folder/Base.py
-${PYSITELIB}/offlineimap/folder/Base.pyc
-${PYSITELIB}/offlineimap/folder/Base.pyo
-${PYSITELIB}/offlineimap/folder/IMAP.py
-${PYSITELIB}/offlineimap/folder/IMAP.pyc
-${PYSITELIB}/offlineimap/folder/IMAP.pyo
-${PYSITELIB}/offlineimap/folder/LocalStatus.py
-${PYSITELIB}/offlineimap/folder/LocalStatus.pyc
-${PYSITELIB}/offlineimap/folder/LocalStatus.pyo
-${PYSITELIB}/offlineimap/folder/Maildir.py
-${PYSITELIB}/offlineimap/folder/Maildir.pyc
-${PYSITELIB}/offlineimap/folder/Maildir.pyo
-${PYSITELIB}/offlineimap/folder/UIDMaps.py
-${PYSITELIB}/offlineimap/folder/UIDMaps.pyc
-${PYSITELIB}/offlineimap/folder/UIDMaps.pyo
-${PYSITELIB}/offlineimap/folder/__init__.py
-${PYSITELIB}/offlineimap/folder/__init__.pyc
-${PYSITELIB}/offlineimap/folder/__init__.pyo
-${PYSITELIB}/offlineimap/imaplib.py
-${PYSITELIB}/offlineimap/imaplib.pyc
-${PYSITELIB}/offlineimap/imaplib.pyo
-${PYSITELIB}/offlineimap/imapserver.py
-${PYSITELIB}/offlineimap/imapserver.pyc
-${PYSITELIB}/offlineimap/imapserver.pyo
-${PYSITELIB}/offlineimap/imaputil.py
-${PYSITELIB}/offlineimap/imaputil.pyc
-${PYSITELIB}/offlineimap/imaputil.pyo
-${PYSITELIB}/offlineimap/init.py
-${PYSITELIB}/offlineimap/init.pyc
-${PYSITELIB}/offlineimap/init.pyo
-${PYSITELIB}/offlineimap/localeval.py
-${PYSITELIB}/offlineimap/localeval.pyc
-${PYSITELIB}/offlineimap/localeval.pyo
-${PYSITELIB}/offlineimap/mbnames.py
-${PYSITELIB}/offlineimap/mbnames.pyc
-${PYSITELIB}/offlineimap/mbnames.pyo
-${PYSITELIB}/offlineimap/repository/Base.py
-${PYSITELIB}/offlineimap/repository/Base.pyc
-${PYSITELIB}/offlineimap/repository/Base.pyo
-${PYSITELIB}/offlineimap/repository/IMAP.py
-${PYSITELIB}/offlineimap/repository/IMAP.pyc
-${PYSITELIB}/offlineimap/repository/IMAP.pyo
-${PYSITELIB}/offlineimap/repository/LocalStatus.py
-${PYSITELIB}/offlineimap/repository/LocalStatus.pyc
-${PYSITELIB}/offlineimap/repository/LocalStatus.pyo
-${PYSITELIB}/offlineimap/repository/Maildir.py
-${PYSITELIB}/offlineimap/repository/Maildir.pyc
-${PYSITELIB}/offlineimap/repository/Maildir.pyo
-${PYSITELIB}/offlineimap/repository/__init__.py
-${PYSITELIB}/offlineimap/repository/__init__.pyc
-${PYSITELIB}/offlineimap/repository/__init__.pyo
-${PYSITELIB}/offlineimap/syncmaster.py
-${PYSITELIB}/offlineimap/syncmaster.pyc
-${PYSITELIB}/offlineimap/syncmaster.pyo
-${PYSITELIB}/offlineimap/threadutil.py
-${PYSITELIB}/offlineimap/threadutil.pyc
-${PYSITELIB}/offlineimap/threadutil.pyo
-${PYSITELIB}/offlineimap/ui/Blinkenlights.py
-${PYSITELIB}/offlineimap/ui/Blinkenlights.pyc
-${PYSITELIB}/offlineimap/ui/Blinkenlights.pyo
-${PYSITELIB}/offlineimap/ui/Curses.py
-${PYSITELIB}/offlineimap/ui/Curses.pyc
-${PYSITELIB}/offlineimap/ui/Curses.pyo
-${PYSITELIB}/offlineimap/ui/Noninteractive.py
-${PYSITELIB}/offlineimap/ui/Noninteractive.pyc
-${PYSITELIB}/offlineimap/ui/Noninteractive.pyo
-${PYSITELIB}/offlineimap/ui/TTY.py
-${PYSITELIB}/offlineimap/ui/TTY.pyc
-${PYSITELIB}/offlineimap/ui/TTY.pyo
-${PYSITELIB}/offlineimap/ui/Tk.py
-${PYSITELIB}/offlineimap/ui/Tk.pyc
-${PYSITELIB}/offlineimap/ui/Tk.pyo
-${PYSITELIB}/offlineimap/ui/UIBase.py
-${PYSITELIB}/offlineimap/ui/UIBase.pyc
-${PYSITELIB}/offlineimap/ui/UIBase.pyo
-${PYSITELIB}/offlineimap/ui/__init__.py
-${PYSITELIB}/offlineimap/ui/__init__.pyc
-${PYSITELIB}/offlineimap/ui/__init__.pyo
-${PYSITELIB}/offlineimap/ui/debuglock.py
-${PYSITELIB}/offlineimap/ui/debuglock.pyc
-${PYSITELIB}/offlineimap/ui/debuglock.pyo
-${PYSITELIB}/offlineimap/ui/detector.py
-${PYSITELIB}/offlineimap/ui/detector.pyc
-${PYSITELIB}/offlineimap/ui/detector.pyo
-${PYSITELIB}/offlineimap/version.py
-${PYSITELIB}/offlineimap/version.pyc
-${PYSITELIB}/offlineimap/version.pyo
-man/man1/offlineimap.1
-share/examples/offlineimap/offlineimap.conf
-share/examples/offlineimap/offlineimap.conf.minimal
-@dirrm share/examples/offlineimap
-@dirrm ${PYSITELIB}/offlineimap/ui
-@dirrm ${PYSITELIB}/offlineimap/repository
-@dirrm ${PYSITELIB}/offlineimap/folder
-@dirrm ${PYSITELIB}/offlineimap
diff --git a/mail/offlineimap/distinfo b/mail/offlineimap/distinfo
deleted file mode 100644
index 9461c3984ad..00000000000
--- a/mail/offlineimap/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2007/02/16 15:46:21 tonio Exp $
-
-SHA1 (offlineimap_4.0.16.tar.gz) = fcbd16b1838d3dde328b939de2256b9480216e43
-RMD160 (offlineimap_4.0.16.tar.gz) = 0182994bab7a244c45d59c5cdbd620451c21f29c
-Size (offlineimap_4.0.16.tar.gz) = 174917 bytes
diff --git a/mail/p5-Email-Abstract/DESCR b/mail/p5-Email-Abstract/DESCR
deleted file mode 100644
index e7e5eef5752..00000000000
--- a/mail/p5-Email-Abstract/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-"Email::Abstract" provides module writers with the ability to write
-representation-independent mail handling code. For instance, in
-the cases of "Mail::Thread" or "Mail::ListDetector", a key part of
-the code involves reading the headers from a mail object. Where
-previously one would either have to specify the mail class required,
-or to build a new object from scratch, "Email::Abstract" can be
-used to perform certain simple operations on an object regardless
-of its underlying representation.
-
-"Email::Abstract" currently supports "Mail::Internet", "MIME::Entity",
-"Mail::Message", "Email::Simple" and "Email::MIME". Other
-representations are encouraged to create their own "Email::Abstract::*"
-class by copying "Email::Abstract::EmailSimple". All modules
-installed under the "Email::Abstract" hierarchy will be automatically
-picked up and used.
diff --git a/mail/p5-Email-Abstract/Makefile b/mail/p5-Email-Abstract/Makefile
deleted file mode 100644
index 7811b5bf64a..00000000000
--- a/mail/p5-Email-Abstract/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2006/10/26 14:54:07 obache Exp $
-
-DISTNAME= Email-Abstract-2.131
-PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5ema
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Email/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://search.cpan.org/dist/Email-Abstract/
-COMMENT= Perl5 module for writing representation-independent mail handling code
-
-DEPENDS+= p5-Email-Simple>=1.91:../../mail/p5-Email-Simple
-DEPENDS+= p5-Module-Pluggable>=1.5:../../devel/p5-Module-Pluggable
-
-PERL5_PACKLIST= auto/Email/Abstract/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Email-Abstract/PLIST b/mail/p5-Email-Abstract/PLIST
deleted file mode 100644
index 81477cf9a25..00000000000
--- a/mail/p5-Email-Abstract/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/04/18 16:40:26 wiz Exp $
diff --git a/mail/p5-Email-Abstract/distinfo b/mail/p5-Email-Abstract/distinfo
deleted file mode 100644
index 90a6091b466..00000000000
--- a/mail/p5-Email-Abstract/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/10/26 14:54:07 obache Exp $
-
-SHA1 (Email-Abstract-2.131.tar.gz) = 6cc1641e33466ac3fc294a9ecb6d91e46f7fd0bd
-RMD160 (Email-Abstract-2.131.tar.gz) = e7a1b9cd278db464b57d315d42c6062713a34b17
-Size (Email-Abstract-2.131.tar.gz) = 8595 bytes
diff --git a/mail/p5-Email-Simple/DESCR b/mail/p5-Email-Simple/DESCR
deleted file mode 100644
index cbcf2d7b724..00000000000
--- a/mail/p5-Email-Simple/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-"Email::Simple" is the first deliverable of the "Perl Email Project", a
-reaction against the complexity and increasing bugginess of the
-"Mail::*" modules. In contrast, "Email::*" modules are meant to be
-simple to use and to maintain, pared to the bone, fast, minimal in their
-external dependencies, and correct.
diff --git a/mail/p5-Email-Simple/Makefile b/mail/p5-Email-Simple/Makefile
deleted file mode 100644
index 134a9f70002..00000000000
--- a/mail/p5-Email-Simple/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2006/10/26 14:31:48 obache Exp $
-
-DISTNAME= Email-Simple-1.995
-PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5ems
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Email/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://search.cpan.org/dist/Email-Simple/
-COMMENT= Perl5 module for simple parsing of RFC2822 message format and headers
-
-PERL5_PACKLIST= auto/Email/Simple/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Email-Simple/PLIST b/mail/p5-Email-Simple/PLIST
deleted file mode 100644
index 4350f8e5c3e..00000000000
--- a/mail/p5-Email-Simple/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/04/18 16:27:39 wiz Exp $
diff --git a/mail/p5-Email-Simple/distinfo b/mail/p5-Email-Simple/distinfo
deleted file mode 100644
index 909f201a5ac..00000000000
--- a/mail/p5-Email-Simple/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/10/26 14:31:48 obache Exp $
-
-SHA1 (Email-Simple-1.995.tar.gz) = f3019c408e6db3c92bc4fdb18b79f8ff28be7f5c
-RMD160 (Email-Simple-1.995.tar.gz) = 090de3c7d206b6149047c9fbff178b520e8d6bc3
-Size (Email-Simple-1.995.tar.gz) = 17684 bytes
diff --git a/mail/p5-Email-Valid/DESCR b/mail/p5-Email-Valid/DESCR
deleted file mode 100644
index 3c9afd9f307..00000000000
--- a/mail/p5-Email-Valid/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This module determines whether an email address is well-formed, and
-optionally, whether a mail host exists for the domain.
diff --git a/mail/p5-Email-Valid/Makefile b/mail/p5-Email-Valid/Makefile
deleted file mode 100644
index a1642ff4fcf..00000000000
--- a/mail/p5-Email-Valid/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/10/26 14:41:53 obache Exp $
-
-DISTNAME= Email-Valid-0.176
-PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5emv
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Email/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://search.cpan.org/dist/Email-Valid/
-COMMENT= Perl5 module for testing validity of an email address
-
-DEPENDS+= p5-MailTools-[0-9]*:../../mail/p5-MailTools
-DEPENDS+= p5-Net-DNS-[0-9]*:../../net/p5-Net-DNS
-
-PERL5_PACKLIST= auto/Email/Valid/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Email-Valid/PLIST b/mail/p5-Email-Valid/PLIST
deleted file mode 100644
index dd545ac43be..00000000000
--- a/mail/p5-Email-Valid/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:45 zuntum Exp $
diff --git a/mail/p5-Email-Valid/distinfo b/mail/p5-Email-Valid/distinfo
deleted file mode 100644
index e439f0b7a66..00000000000
--- a/mail/p5-Email-Valid/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/10/26 14:41:53 obache Exp $
-
-SHA1 (Email-Valid-0.176.tar.gz) = 0fbecf815c7821488574c24456b396427d3f963c
-RMD160 (Email-Valid-0.176.tar.gz) = 53a693a839b3fc1fb361f7e24a29a4136f89829a
-Size (Email-Valid-0.176.tar.gz) = 9718 bytes
diff --git a/mail/p5-GMail-IMAPD/DESCR b/mail/p5-GMail-IMAPD/DESCR
deleted file mode 100644
index 662e78399bb..00000000000
--- a/mail/p5-GMail-IMAPD/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-The GMail-IMAPD module allows users to access their Gmail account with an
-IMAP client by running a server which accepts IMAP connections.
diff --git a/mail/p5-GMail-IMAPD/Makefile b/mail/p5-GMail-IMAPD/Makefile
deleted file mode 100644
index 0d9156a0a86..00000000000
--- a/mail/p5-GMail-IMAPD/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/08/09 08:03:33 jmmv Exp $
-
-DISTNAME= GMail-IMAPD-0.93
-PKGNAME= p5-${DISTNAME}
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=GMail/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://search.cpan.org/~krs/GMail-IMAPD-0.93/
-COMMENT= IMAP gateway for the GMail web service
-
-DEPENDS+= p5-Crypt-SSLeay>=0.51:../../security/p5-Crypt-SSLeay
-DEPENDS+= p5-libwww>=5.80:../../www/p5-libwww
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-PERL5_PACKLIST= auto/GMail/IMAPD/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-GMail-IMAPD/PLIST b/mail/p5-GMail-IMAPD/PLIST
deleted file mode 100644
index 841da22de96..00000000000
--- a/mail/p5-GMail-IMAPD/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/08/09 08:03:33 jmmv Exp $
diff --git a/mail/p5-GMail-IMAPD/distinfo b/mail/p5-GMail-IMAPD/distinfo
deleted file mode 100644
index e6e3108293f..00000000000
--- a/mail/p5-GMail-IMAPD/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/08/09 08:03:33 jmmv Exp $
-
-SHA1 (GMail-IMAPD-0.93.tar.gz) = 0d65e6c8470aabbe73148e0aaa5e611e6e8da6a2
-RMD160 (GMail-IMAPD-0.93.tar.gz) = b842b620da0d129dcdf28003ac604b91a03d972c
-Size (GMail-IMAPD-0.93.tar.gz) = 22749 bytes
-SHA1 (patch-aa) = c1c9179cb17dbaa4b4943c62a01349ef3466d750
diff --git a/mail/p5-GMail-IMAPD/patches/patch-aa b/mail/p5-GMail-IMAPD/patches/patch-aa
deleted file mode 100644
index bd6a9938ee1..00000000000
--- a/mail/p5-GMail-IMAPD/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/08/09 08:03:33 jmmv Exp $
-
---- lib/GMail/IMAPD/Gmail.pm.orig 2006-01-20 07:01:58.000000000 +0100
-+++ lib/GMail/IMAPD/Gmail.pm
-@@ -105,7 +105,7 @@ sub login {
-
- if ( $res->is_success() ) {
- update_tokens( $self, $res );
-- if ( $res->content() =~ /var url = "(.*?)";/ ) {
-+ if ( $res->content() =~ /var url = ["'](.*?)["'];/ ) {
- $req = HTTP::Request->new( GET => "$SSL_MAIL_URL/$1" );
- $req->header( 'Cookie' => $self->{_cookie} );
- $res = $self->{_ua}->request( $req );
diff --git a/mail/p5-IMAP-Admin/DESCR b/mail/p5-IMAP-Admin/DESCR
deleted file mode 100644
index e10de12239a..00000000000
--- a/mail/p5-IMAP-Admin/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
- IMAP::Admin provides basic IMAP server adminstration. It
-provides functions for creating and deleting mailboxes and
-setting various information such as quotas and access
-rights.
-
- Its interface should, in theory, work with any RFC compliant
-IMAP server, but it was currently only tested against Carnegie
-Mellon University's Cyrus IMAP and Mirapoint's IMAP servers.
-It does a CAPABILITY check for specific extensions to see if
-they are supported.
diff --git a/mail/p5-IMAP-Admin/Makefile b/mail/p5-IMAP-Admin/Makefile
deleted file mode 100644
index d90ebbda222..00000000000
--- a/mail/p5-IMAP-Admin/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2007/02/22 19:26:42 wiz Exp $
-#
-
-DISTNAME= IMAP-Admin-1.6.1
-PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5iad
-PKGREVISION= 2
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=IMAP/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Perl5 module for administration of RFC-2060 IMAP servers
-
-USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/IMAP/Admin/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-IMAP-Admin/PLIST b/mail/p5-IMAP-Admin/PLIST
deleted file mode 100644
index cfcde44cac9..00000000000
--- a/mail/p5-IMAP-Admin/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:47 zuntum Exp $
diff --git a/mail/p5-IMAP-Admin/distinfo b/mail/p5-IMAP-Admin/distinfo
deleted file mode 100644
index 4ede90b7832..00000000000
--- a/mail/p5-IMAP-Admin/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 09:59:25 agc Exp $
-
-SHA1 (IMAP-Admin-1.6.1.tar.gz) = 894b9c7fb1db471fe45a290db44224112a06b55d
-RMD160 (IMAP-Admin-1.6.1.tar.gz) = 56ab03a80fd7c846495554606b454985b5bd2de8
-Size (IMAP-Admin-1.6.1.tar.gz) = 13587 bytes
diff --git a/mail/p5-MIME-Lite-HTML/DESCR b/mail/p5-MIME-Lite-HTML/DESCR
deleted file mode 100644
index 3104c5508e4..00000000000
--- a/mail/p5-MIME-Lite-HTML/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-MIME::Lite::HTML is a Perl mail client interface for sending message that
-supports HTML format and builds them for you. It provides routines to
-transform a HTML page in MIME::Lite mail.
diff --git a/mail/p5-MIME-Lite-HTML/Makefile b/mail/p5-MIME-Lite-HTML/Makefile
deleted file mode 100644
index bc464ced780..00000000000
--- a/mail/p5-MIME-Lite-HTML/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/04/18 18:55:18 cube Exp $
-
-DISTNAME= MIME-Lite-HTML-1.21
-PKGNAME= p5-${DISTNAME}
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MIME/}
-
-MAINTAINER= cube@NetBSD.org
-COMMENT= Perl5 module to transform a HTML page into a MIME-Lite mail
-
-DEPENDS+= p5-MIME-Lite>=3.01:../../mail/p5-MIME-Lite
-DEPENDS+= p5-libwww>=5.805:../../www/p5-libwww
-
-PERL5_PACKLIST= auto/MIME/Lite/HTML/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-MIME-Lite-HTML/PLIST b/mail/p5-MIME-Lite-HTML/PLIST
deleted file mode 100644
index f9761dc2a37..00000000000
--- a/mail/p5-MIME-Lite-HTML/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/04/18 18:55:18 cube Exp $
diff --git a/mail/p5-MIME-Lite-HTML/distinfo b/mail/p5-MIME-Lite-HTML/distinfo
deleted file mode 100644
index 1cbe6b3261b..00000000000
--- a/mail/p5-MIME-Lite-HTML/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/04/18 18:55:18 cube Exp $
-
-SHA1 (MIME-Lite-HTML-1.21.tar.gz) = a6a4abe0b733d73d62119a2b74d6c1302cef61cc
-RMD160 (MIME-Lite-HTML-1.21.tar.gz) = a6b65c1dc5b8cced8a4c69da57840ec7a1890586
-Size (MIME-Lite-HTML-1.21.tar.gz) = 63121 bytes
diff --git a/mail/p5-MIME-Lite/DESCR b/mail/p5-MIME-Lite/DESCR
deleted file mode 100644
index e30c0f1e23b..00000000000
--- a/mail/p5-MIME-Lite/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-MIME::Lite is intended as a simple, standalone module for generating (not
-parsing!) MIME messages... specifically, it allows you to output a simple,
-decent single- or multi-part message with text or binary attachments. It
-does not require that you have the Mail:: or MIME:: modules installed.
diff --git a/mail/p5-MIME-Lite/Makefile b/mail/p5-MIME-Lite/Makefile
deleted file mode 100644
index 87366fed891..00000000000
--- a/mail/p5-MIME-Lite/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/03/10 06:06:33 hiramatsu Exp $
-
-DISTNAME= MIME-Lite-3.01
-PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5mil
-CATEGORIES= www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MIME/}
-
-MAINTAINER= norm@sandbox.org.uk
-COMMENT= Perl5 module for simple creation of MIME email messages
-
-PERL5_PACKLIST= auto/MIME/Lite/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-MIME-Lite/PLIST b/mail/p5-MIME-Lite/PLIST
deleted file mode 100644
index 52c80e05142..00000000000
--- a/mail/p5-MIME-Lite/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:49 zuntum Exp $
diff --git a/mail/p5-MIME-Lite/distinfo b/mail/p5-MIME-Lite/distinfo
deleted file mode 100644
index 887ba1b2f06..00000000000
--- a/mail/p5-MIME-Lite/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/03/10 06:06:33 hiramatsu Exp $
-
-SHA1 (MIME-Lite-3.01.tar.gz) = 8c1ce3591bf0b8422b19851f89dd813169d495f3
-RMD160 (MIME-Lite-3.01.tar.gz) = b080220052eedcee0b59591b48bcccfc31d31da3
-Size (MIME-Lite-3.01.tar.gz) = 49778 bytes
diff --git a/mail/p5-MIME-Types/DESCR b/mail/p5-MIME-Types/DESCR
deleted file mode 100644
index 0f28506994e..00000000000
--- a/mail/p5-MIME-Types/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-A start for a more detailed data-structure to keep knowledge about
-various data types are defined by MIME. Some basic treatments with
-mime types are implemented.
-
-The first special data item is whether a data type is binary or ascii.
-This is required for correctly encoding e-mail attachments, and
-implemented for the Mail::Box v2.01 module.
diff --git a/mail/p5-MIME-Types/Makefile b/mail/p5-MIME-Types/Makefile
deleted file mode 100644
index acaafd3363f..00000000000
--- a/mail/p5-MIME-Types/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2006/05/02 04:33:51 jlam Exp $
-
-DISTNAME= MIME-Types-1.16
-PKGNAME= p5-${DISTNAME}
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MIME/}
-
-MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://perl.overmeer.net/mimetypes/
-COMMENT= Definition of MIME types
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-PERL5_PACKLIST= auto/MIME/Types/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-MIME-Types/PLIST b/mail/p5-MIME-Types/PLIST
deleted file mode 100644
index 9097a92186b..00000000000
--- a/mail/p5-MIME-Types/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/17 02:42:04 minskim Exp $
diff --git a/mail/p5-MIME-Types/distinfo b/mail/p5-MIME-Types/distinfo
deleted file mode 100644
index 972b62e72ae..00000000000
--- a/mail/p5-MIME-Types/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/05/02 04:33:51 jlam Exp $
-
-SHA1 (MIME-Types-1.16.tar.gz) = 6635a0373eea1306515250590ade00a506ba7163
-RMD160 (MIME-Types-1.16.tar.gz) = 67a30801fb0902e5f81e1062b5daa40b78a12b72
-Size (MIME-Types-1.16.tar.gz) = 16850 bytes
diff --git a/mail/p5-MIME-tools/DESCR b/mail/p5-MIME-tools/DESCR
deleted file mode 100644
index d3e6cbfe3bf..00000000000
--- a/mail/p5-MIME-tools/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-MIME-tools is a collection of Perl5 MIME:: modules for parsing,
-decoding, and generating single- or multipart (even nested multipart)
-MIME messages.
diff --git a/mail/p5-MIME-tools/Makefile b/mail/p5-MIME-tools/Makefile
deleted file mode 100644
index abc18f87d11..00000000000
--- a/mail/p5-MIME-tools/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.28 2006/11/05 17:15:54 joerg Exp $
-#
-
-DISTNAME= MIME-tools-5.420
-PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5mit
-CATEGORIES= perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MIME/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://search.cpan.org/dist/MIME-tools/
-COMMENT= Perl5 modules for encoding and decoding MIME messages
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-DEPENDS+= p5-IO-stringy-[0-9]*:../../devel/p5-IO-stringy
-DEPENDS+= p5-MIME-Base64>=3.03:../../converters/p5-MIME-Base64
-DEPENDS+= p5-MailTools-[0-9]*:../../mail/p5-MailTools
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/MIME-tools/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-MIME-tools/PLIST b/mail/p5-MIME-tools/PLIST
deleted file mode 100644
index 4fc117b0cf8..00000000000
--- a/mail/p5-MIME-tools/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:50 zuntum Exp $
diff --git a/mail/p5-MIME-tools/distinfo b/mail/p5-MIME-tools/distinfo
deleted file mode 100644
index 7142cd67738..00000000000
--- a/mail/p5-MIME-tools/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.10 2006/05/17 21:53:00 wiz Exp $
-
-SHA1 (MIME-tools-5.420.tar.gz) = cabeda2fb536c1ab426e3c20435318f5b2257c6c
-RMD160 (MIME-tools-5.420.tar.gz) = 6197cc6884b42c8112c45272cb0f7d3eb3eef55b
-Size (MIME-tools-5.420.tar.gz) = 387747 bytes
diff --git a/mail/p5-Mail-Audit/DESCR b/mail/p5-Mail-Audit/DESCR
deleted file mode 100644
index 12457b000b2..00000000000
--- a/mail/p5-Mail-Audit/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-`Mail::Audit' was inspired by Tom Christiansen's audit_mail and
-deliverlib programs. It allows a piece of email to be logged, examined,
-accepted into a mailbox, filtered, resent elsewhere, rejected, and so
-on. It's designed to allow you to easily create filter programs to stick
-in a .forward file or similar.
diff --git a/mail/p5-Mail-Audit/Makefile b/mail/p5-Mail-Audit/Makefile
deleted file mode 100644
index b2a83583a7f..00000000000
--- a/mail/p5-Mail-Audit/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:01 jlam Exp $
-
-DISTNAME= Mail-Audit-2.1
-PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5mau
-PKGREVISION= 2
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://search.cpan.org/dist/Mail-Audit/
-COMMENT= Perl5 module for filtering mail
-
-DEPENDS+= p5-MailTools-[0-9]*:../../mail/p5-MailTools
-DEPENDS+= p5-Mail-ListDetector-[0-9]*:../../mail/p5-Mail-ListDetector
-DEPENDS+= p5-MIME-tools-[0-9]*:../../mail/p5-MIME-tools
-# We need Net::SMTP from p5-Net.
-DEPENDS+= p5-Net>=1.0:../../net/p5-Net
-
-PERL5_PACKLIST= auto/Mail/Audit/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-Audit/PLIST b/mail/p5-Mail-Audit/PLIST
deleted file mode 100644
index 9d381c7d95a..00000000000
--- a/mail/p5-Mail-Audit/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:51 zuntum Exp $
diff --git a/mail/p5-Mail-Audit/distinfo b/mail/p5-Mail-Audit/distinfo
deleted file mode 100644
index 7152499def9..00000000000
--- a/mail/p5-Mail-Audit/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/02/02 12:08:14 salo Exp $
-
-SHA1 (Mail-Audit-2.1.tar.gz) = 4fbfc782c8230025b793c2e15eff231acfa55f57
-RMD160 (Mail-Audit-2.1.tar.gz) = c59d006f1f9aa544e854be089f3fe793a8694d4f
-Size (Mail-Audit-2.1.tar.gz) = 21669 bytes
-SHA1 (patch-aa) = 8d1646afb5ac34de60fa19c2aa15c80210c9d6a7
-SHA1 (patch-ab) = e7d95c44d63dc2e78f30774e0c1092e59268376d
diff --git a/mail/p5-Mail-Audit/patches/patch-aa b/mail/p5-Mail-Audit/patches/patch-aa
deleted file mode 100644
index ccc30e263c7..00000000000
--- a/mail/p5-Mail-Audit/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/02/02 12:08:14 salo Exp $
-
-Security fix for SA18656, from Debian.
-
---- Audit.pm.orig 2002-03-03 18:11:20.000000000 +0100
-+++ Audit.pm 2006-02-02 12:48:52.000000000 +0100
-@@ -4,7 +4,13 @@
-
- my $logging;
- my $loglevel=3;
--my $logfile = "/tmp/".getpwuid($>)."-audit.log";
-+my $logfile;
-+if (exists $ENV{HOME} and defined $ENV{HOME} and -d $ENV{HOME}) {
-+ $logfile = "$ENV{HOME}/.mail_audit.log"
-+}
-+else {
-+ (undef,$logfile) = tempfile("mail_audit.log-XXXXX",TMPDIR=>1);
-+}
-
- # ----------------------------------------------------------
- # no user-modifiable parts below this line.
-@@ -18,6 +24,7 @@
- use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $ASSUME_MSGPREFIX);
- # @ISA will depend on whether the message is MIME; if it is, we'll be MIME::Entity. if not, we'll be Mail::Internet.
- use Fcntl ':flock';
-+use File::Temp qw(tempfile);
-
- $ASSUME_MSGPREFIX = 0;
-
diff --git a/mail/p5-Mail-Audit/patches/patch-ab b/mail/p5-Mail-Audit/patches/patch-ab
deleted file mode 100644
index 456e8e845bb..00000000000
--- a/mail/p5-Mail-Audit/patches/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/02/02 12:08:14 salo Exp $
-
-Security fix for SA18656, from Debian.
-
---- Audit/MimeEntity.pm.orig 2002-01-18 01:23:32.000000000 +0100
-+++ Audit/MimeEntity.pm 2006-02-02 12:48:52.000000000 +0100
-@@ -4,6 +4,7 @@
-
- use strict;
- use File::Path;
-+use File::Temp qw(tempdir)
- use MIME::Parser;
- use MIME::Entity;
- use Mail::Audit::MailInternet;
-@@ -12,10 +13,12 @@
-
- $VERSION = '2.0';
-
--$MIME_PARSER_TMPDIR = "/tmp/".getpwuid($>)."-mailaudit";
--
- my $parser = MIME::Parser->new();
-
-+# Create a tempdir using File::Temp::tempdir, have it be destroyed at
-+# END{} time.
-+$MIME_PARSER_TMPDIR = tempdir(CLEANUP => 1);
-+
- my @to_rmdir;
-
- sub autotype_new {
-@@ -23,8 +26,6 @@
- my $mailinternet = shift;
-
- $parser->ignore_errors(1);
-- mkdir ($MIME_PARSER_TMPDIR, 0777);
-- if (! -d $MIME_PARSER_TMPDIR) { $MIME_PARSER_TMPDIR = "/tmp" }
- $parser->output_under($MIME_PARSER_TMPDIR);
-
- # todo: add eval error trapping. if there's a problem, return Mail::Audit::MailInternet as a fallback.
diff --git a/mail/p5-Mail-Box/DESCR b/mail/p5-Mail-Box/DESCR
deleted file mode 100644
index f87c738e5be..00000000000
--- a/mail/p5-Mail-Box/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-MailBox is a library for the Perl programming language, designed to handle
-various kinds of e-mail. It can be used to construct messages, send them,
-access various kinds of message folders, filter spam and virussen, and so on.
-
-The MailBox distribution is quite large, with about 140 related modules.
diff --git a/mail/p5-Mail-Box/Makefile b/mail/p5-Mail-Box/Makefile
deleted file mode 100644
index c8c97dc627a..00000000000
--- a/mail/p5-Mail-Box/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2007/01/13 21:24:58 abs Exp $
-
-DISTNAME= Mail-Box-2.066
-PKGREVISION= 1
-PKGNAME= p5-${DISTNAME}
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/}
-
-MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://perl.overmeer.net/mailbox/
-COMMENT= Set of packages which implement methods to handle e-mail
-
-DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate
-DEPENDS+= p5-IO-stringy-[0-9]*:../../devel/p5-IO-stringy
-DEPENDS+= p5-Scalar-List-Utils>=1.13:../../devel/p5-Scalar-List-Utils
-DEPENDS+= p5-Object-Realize-Later>=0.14:../../devel/p5-Object-Realize-Later
-DEPENDS+= p5-MIME-Types>=1.004:../../mail/p5-MIME-Types
-DEPENDS+= p5-URI>=1.23:../../www/p5-URI
-DEPENDS+= p5-Test-Simple>=0.47:../../devel/p5-Test-Simple
-DEPENDS+= p5-User-Identity>=0.07:../../mail/p5-User-Identity
-DEPENDS+= p5-MailTools-[0-9]*:../../mail/p5-MailTools
-DEPENDS+= p5-MIME-tools-[0-9]*:../../mail/p5-MIME-tools
-DEPENDS+= p5-Digest-HMAC-[0-9]*:../../security/p5-Digest-HMAC
-DEPENDS+= p5-File-Remove-[0-9]*:../../sysutils/p5-File-Remove
-DEPENDS+= p5-Test-Harness>=2.62:../../devel/p5-Test-Harness
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-PERL5_PACKLIST= auto/Mail/Box/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-Box/PLIST b/mail/p5-Mail-Box/PLIST
deleted file mode 100644
index c2e2b95539c..00000000000
--- a/mail/p5-Mail-Box/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/04/23 17:38:58 adrianp Exp $
diff --git a/mail/p5-Mail-Box/distinfo b/mail/p5-Mail-Box/distinfo
deleted file mode 100644
index 6c73f94dc54..00000000000
--- a/mail/p5-Mail-Box/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/09/16 15:29:36 hira Exp $
-
-SHA1 (Mail-Box-2.066.tar.gz) = cfdef08ec2381d6ba051dd83e8c05d37062bd671
-RMD160 (Mail-Box-2.066.tar.gz) = 7fd9c21b6949c9901824a4225d33541928136a81
-Size (Mail-Box-2.066.tar.gz) = 589834 bytes
-SHA1 (patch-aa) = 7e8c160c7cec4eac27873395a64a5bff6937f25b
diff --git a/mail/p5-Mail-Box/patches/patch-aa b/mail/p5-Mail-Box/patches/patch-aa
deleted file mode 100644
index 66e1cdc3514..00000000000
--- a/mail/p5-Mail-Box/patches/patch-aa
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/09/16 15:29:36 hira Exp $
-
---- Makefile.PL.orig 2006-08-06 13:49:57.000000000 +0100
-+++ Makefile.PL 2006-08-06 13:51:08.000000000 +0100
-@@ -163,76 +163,8 @@
- exit 1;
- }
-
--print <<'OPTIONAL';
--
--* Now, let me ask you whether you want some optional modules to be
--* installed as well. You can always install these modules later, by
--* hand, without a need to re-install MailBox.
--*
--OPTIONAL
--
--foreach my $optional (@optional)
--{ my ($module, $version, %args) = @$optional;
-- my $requirements = $args{requires} || sub {1};
-- next unless $requirements->();
--
-- print "\n";
-- eval "require $module";
-- if($@)
-- { if($@ =~ m/^Can't locate /)
-- { print "**** Optional $module is not installed\n" }
-- else { print "**** Optional $module compilation failed:\n$@\n" }
-- }
-- elsif($module->VERSION < $version )
-- { print "**** Optional $module too old: requires $version but is ",
-- $module->VERSION,"\n";
-- }
-- else
-- { my $v = $module->VERSION;
-- my $r = $v eq $version ? ''
-- : $version == 0 ? " (any version will do)"
-- : " (at least $version required)";
--
-- print "**** Found optional $module version $v$r\n";
-- next;
-- }
--
-- my $reason = $args{reason};
-- $reason =~ s/^/ /gm;
-- $reason =~ s/\A /Use:/;
-- print $reason;
--
-- if(my $warn = $args{warning})
-- { $warn =~ s/^/ /gm;
-- $warn =~ s/\A /WARN/;
-- print $warn;
-- }
--
-- my $install = $default_install_answer
-- || prompt( "Do you want to install $module? yes/no/all"
-- , -t STDIN ? 'y' : 'n');
--
-- $install = $default_install_answer = 'y'
-- if $install eq 'a';
--
-- next unless $install eq 'y';
--
-- my $distr = $args{distr} || $module;
--
-- $prereq{$distr} = $version;
-- print " Added $distr version $version to the requirements\n";
--}
--
--my $tests = $ENV{MAILBOX_RUN_TESTS}
-- || prompt "Do you want to run the (large set of) tests? yes/no", "yes";
--
--if($tests =~ m/n/i)
--{ open F, ">", "skiptests";
-- close F;
--}
--else
--{ unlink "skiptests";
--}
-+open F, ">", "skiptests";
-+close F;
-
- print <<'MAKEFILE';
-
diff --git a/mail/p5-Mail-ClamAV/DESCR b/mail/p5-Mail-ClamAV/DESCR
deleted file mode 100644
index 8ff5f21ec52..00000000000
--- a/mail/p5-Mail-ClamAV/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Clam AntiVirus is an anti-virus toolkit for UNIX. This module provides
-a simple interface to its C API.
diff --git a/mail/p5-Mail-ClamAV/Makefile b/mail/p5-Mail-ClamAV/Makefile
deleted file mode 100644
index a383c6ec826..00000000000
--- a/mail/p5-Mail-ClamAV/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2007/02/21 22:10:47 wiz Exp $
-
-DISTNAME= Mail-ClamAV-0.20
-PKGNAME= p5-${DISTNAME}
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://search.cpan.org/dist/Mail-ClamAV/
-COMMENT= Perl5 module for mail/clamav virus scanner
-
-DEPENDS+= p5-Inline>=0.40:../../devel/p5-Inline
-
-# this version needs clamav>=0.90
-BUILDLINK_API_DEPENDS.clamav+= clamav>=0.90
-
-PERL5_PACKLIST= auto/Mail/ClamAV/.packlist
-PTHREAD_OPTS+= require
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.clamav
-PKG_SUPPORTED_OPTIONS= curl
-PKG_SUGGESTED_OPTIONS= curl
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mcurl)
-. include "../../www/curl/buildlink3.mk"
-.endif
-
-# avoid having PERL5_SITELIB, PERL5_SITEARCH and PERL5_ARCHLIB set in
-# the environment, which confuses the 'install' target of modules
-# which use Inline, such as this one.
-#
-# XXX do these environment variables really need to be set in targets
-# XXX other than 'install'?
-do-build:
- @cd ${WRKSRC} && \
- ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_TARGET}
-
-.include "../../lang/perl5/module.mk"
-.include "../../mail/clamav/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-ClamAV/PLIST b/mail/p5-Mail-ClamAV/PLIST
deleted file mode 100644
index 59c747652cc..00000000000
--- a/mail/p5-Mail-ClamAV/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/08 15:39:57 grant Exp $
diff --git a/mail/p5-Mail-ClamAV/distinfo b/mail/p5-Mail-ClamAV/distinfo
deleted file mode 100644
index 9bf5962260c..00000000000
--- a/mail/p5-Mail-ClamAV/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.7 2007/02/21 22:10:47 wiz Exp $
-
-SHA1 (Mail-ClamAV-0.20.tar.gz) = 474e55ff77a8c1f3b0c996a97c34aa04e56a1113
-RMD160 (Mail-ClamAV-0.20.tar.gz) = 33b0627ccb542eda82f79e625d3f66ffe040bdfd
-Size (Mail-ClamAV-0.20.tar.gz) = 14377 bytes
diff --git a/mail/p5-Mail-DKIM/DESCR b/mail/p5-Mail-DKIM/DESCR
deleted file mode 100644
index 72c0e9d0946..00000000000
--- a/mail/p5-Mail-DKIM/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This Perl module implements the various components of the DKIM message-signing
-and verifying standard for Internet mail.
diff --git a/mail/p5-Mail-DKIM/Makefile b/mail/p5-Mail-DKIM/Makefile
deleted file mode 100644
index 45496aa0516..00000000000
--- a/mail/p5-Mail-DKIM/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2007/02/15 21:39:56 heinz Exp $
-#
-
-DISTNAME= Mail-DKIM-0.22
-PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5mdk
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/}
-
-MAINTAINER= heinz@NetBSD.org
-HOMEPAGE= http://search.cpan.org/dist/Mail-DKIM/
-COMMENT= Perl5 module for DKIM-based mail-signing and -verifying
-
-DEPENDS+= p5-Crypt-OpenSSL-RSA-[0-9]*:../../security/p5-Crypt-OpenSSL-RSA
-DEPENDS+= p5-Digest-SHA-[0-9]*:../../security/p5-Digest-SHA
-DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
-DEPENDS+= p5-Error-[0-9]*:../../devel/p5-Error
-DEPENDS+= p5-MailTools-[0-9]*:../../mail/p5-MailTools
-DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
-DEPENDS+= p5-Net-DNS-[0-9]*:../../net/p5-Net-DNS
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Mail/DKIM/.packlist
-PERL5_INSTALLVENDORLIB_RELPATH=${PERL5_INSTALLVENDORLIB:S/^${LOCALBASE}\///}
-CHECK_INTERPRETER_SKIP+=${PERL5_INSTALLVENDORLIB_RELPATH}/Mail/DKIM.pm
-CHECK_INTERPRETER_SKIP+=${PERL5_INSTALLVENDORLIB_RELPATH}/Mail/DKIM/*
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-DKIM/PLIST b/mail/p5-Mail-DKIM/PLIST
deleted file mode 100644
index c8484f876a0..00000000000
--- a/mail/p5-Mail-DKIM/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/02/24 23:02:38 heinz Exp $
diff --git a/mail/p5-Mail-DKIM/distinfo b/mail/p5-Mail-DKIM/distinfo
deleted file mode 100644
index f96357169db..00000000000
--- a/mail/p5-Mail-DKIM/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2007/02/15 21:39:56 heinz Exp $
-
-SHA1 (Mail-DKIM-0.22.tar.gz) = affa94da9bc3396cf7ce6f256f1cadba8ebd6f28
-RMD160 (Mail-DKIM-0.22.tar.gz) = 14d6fc87f2614ec942d020da7478bbb95e540aa2
-Size (Mail-DKIM-0.22.tar.gz) = 41227 bytes
diff --git a/mail/p5-Mail-Ezmlm/DESCR b/mail/p5-Mail-Ezmlm/DESCR
deleted file mode 100644
index 0049d9df914..00000000000
--- a/mail/p5-Mail-Ezmlm/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 object methods for ezmlm mailing lists.
diff --git a/mail/p5-Mail-Ezmlm/Makefile b/mail/p5-Mail-Ezmlm/Makefile
deleted file mode 100644
index a54b8768953..00000000000
--- a/mail/p5-Mail-Ezmlm/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/04/22 09:22:11 rillig Exp $
-#
-
-DISTNAME= Ezmlm-0.05.1
-PKGNAME= p5-Mail-${DISTNAME}
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/}
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://guy.rucus.net/ezmlm/
-COMMENT= Perl5 module for managing ezmlm mailing lists
-
-DEPENDS+= qmail>=1.03:../../mail/qmail
-DEPENDS+= {ezmlm>=0.53,ezmlm-idx>=0.40}:../../mail/ezmlm
-
-WRKSRC= ${WRKDIR}/Ezmlm-0.05
-
-MAKE_ENV+= BSD_BATCH_INSTALL=1 # skip interactive config stage
-
-SUBST_CLASSES+= paths
-SUBST_STAGE.paths= do-configure
-SUBST_FILES.paths= Ezmlm.pm
-SUBST_SED.paths= -e 's|@LOCALBASE@|${LOCALBASE}|g'
-SUBST_SED.paths+= -e 's|@QMAILDIR@|${QMAILDIR}|g'
-SUBST_SED.paths+= -e 's|@MYSQLBASE@|${LOCALBASE}/bin|g'
-SUBST_MESSAGE.paths= Configuring paths.
-
-PERL5_PACKLIST= auto/Mail/Ezmlm/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-Ezmlm/PLIST b/mail/p5-Mail-Ezmlm/PLIST
deleted file mode 100644
index 24ce3d4e3ad..00000000000
--- a/mail/p5-Mail-Ezmlm/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/12/28 06:08:12 schmonz Exp $
diff --git a/mail/p5-Mail-Ezmlm/distinfo b/mail/p5-Mail-Ezmlm/distinfo
deleted file mode 100644
index 9091f1975af..00000000000
--- a/mail/p5-Mail-Ezmlm/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/12/28 06:08:12 schmonz Exp $
-
-SHA1 (Ezmlm-0.05.1.tar.gz) = bd28a8e992b177caf7ae41ed471d9ac2704db53f
-RMD160 (Ezmlm-0.05.1.tar.gz) = b7f365a5c8d42b396877765c060410c819fd36ae
-Size (Ezmlm-0.05.1.tar.gz) = 11619 bytes
-SHA1 (patch-aa) = 8a16b2164aeab5aa4bd2a2c3ab4f52eef638b183
diff --git a/mail/p5-Mail-Ezmlm/patches/patch-aa b/mail/p5-Mail-Ezmlm/patches/patch-aa
deleted file mode 100644
index bc776030d6a..00000000000
--- a/mail/p5-Mail-Ezmlm/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/12/28 06:08:12 schmonz Exp $
-
---- Ezmlm.pm.orig 2005-03-08 08:10:46.000000000 -0500
-+++ Ezmlm.pm
-@@ -56,9 +56,9 @@ $VERSION = '0.05';
- require 5.005;
-
- # == Begin site dependant variables ==
--$EZMLM_BASE = '/usr/local/bin'; #Autoinserted by Makefile.PL
--$QMAIL_BASE = '/var/qmail'; #Autoinserted by Makefile.PL
--$MYSQL_BASE = ''; #Autoinserted by Makefile.PL
-+$EZMLM_BASE = '@LOCALBASE@/bin';
-+$QMAIL_BASE = '@QMAILDIR@';
-+$MYSQL_BASE = '@MYSQLBASE@';
- # == End site dependant variables ==
-
- use Carp;
diff --git a/mail/p5-Mail-IMAPClient/DESCR b/mail/p5-Mail-IMAPClient/DESCR
deleted file mode 100644
index 05df6fcf0fc..00000000000
--- a/mail/p5-Mail-IMAPClient/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
- Mail::IMAPClient module provides perl routines that simplify a
-sockets connection to and an IMAP conversation with an IMAP server.
-
- This module was developed on Solaris 2.5.1 and 2.6 against Netscape
-IMAP servers versions 3.6 and 4.1. However, since it is written in
-perl and designed for flexibility, it should run on any OS with a
-TCP/IP stack and a version of perl that includes Socket.pm and
-IO::Socket.pm. It also should be able to talk to any IMAP server,
-even those that have, um, proprietary features (assuming that the
-programmer knows what those features are).
-
- To date, the test suite runs successfully with the following IMAP
-servers:
-
--Netscape Messenger v3.6
--Netscape Messenger v4.1
--UW-IMAP (I think it was 4.5)
--Cyrus IMAP4 v1.5.19
--Mirapoint Message Server Appliances (OS versions 1.6.1 and 1.7.1)
diff --git a/mail/p5-Mail-IMAPClient/Makefile b/mail/p5-Mail-IMAPClient/Makefile
deleted file mode 100644
index c4e701e1cad..00000000000
--- a/mail/p5-Mail-IMAPClient/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2007/02/22 19:26:42 wiz Exp $
-#
-
-DISTNAME= Mail-IMAPClient-2.2.9
-PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5mic
-PKGREVISION= 2
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Perl5 module for talking to RFC-2060 IMAP servers
-
-PERL5_PACKLIST= auto/Mail/IMAPClient/.packlist
-
-pre-configure:
- @cd ${WRKSRC} && ${TOUCH} ${TOUCH_FLAGS} test.txt
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-IMAPClient/PLIST b/mail/p5-Mail-IMAPClient/PLIST
deleted file mode 100644
index b39b96e90d0..00000000000
--- a/mail/p5-Mail-IMAPClient/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:53 zuntum Exp $
diff --git a/mail/p5-Mail-IMAPClient/distinfo b/mail/p5-Mail-IMAPClient/distinfo
deleted file mode 100644
index cae0ce2a6f1..00000000000
--- a/mail/p5-Mail-IMAPClient/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 09:59:25 agc Exp $
-
-SHA1 (Mail-IMAPClient-2.2.9.tar.gz) = 00d23579dfce7999c3c53e27a8cc186430d28609
-RMD160 (Mail-IMAPClient-2.2.9.tar.gz) = 3980d5227dc0342f5ba7cfd4dfbfce5fb8c10b7c
-Size (Mail-IMAPClient-2.2.9.tar.gz) = 376791 bytes
diff --git a/mail/p5-Mail-ListDetector/DESCR b/mail/p5-Mail-ListDetector/DESCR
deleted file mode 100644
index f9fc6513569..00000000000
--- a/mail/p5-Mail-ListDetector/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-This module analyzses Mail::Internet objects. It returns a
-Mail::ListDetector::List object representing the mailing list.
-
-The RFC2369 mailing list detector is also capable of matching some
-Mailman and Ezmlm messages. It is deliberately checked last to allow
-the more specific Mailman and Ezmlm parsing to happen first, and more
-accurately identify the type of mailing list involved.
diff --git a/mail/p5-Mail-ListDetector/Makefile b/mail/p5-Mail-ListDetector/Makefile
deleted file mode 100644
index 3ba7cfa14ba..00000000000
--- a/mail/p5-Mail-ListDetector/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/11/03 11:21:48 obache Exp $
-
-DISTNAME= Mail-ListDetector-0.34
-PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5mli
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://search.cpan.org/dist/Mail-ListDetector/
-COMMENT= Perl5 module to detect whether a message is from a mailing list
-
-DEPENDS+= p5-MailTools-[0-9]*:../../mail/p5-MailTools
-DEPENDS+= p5-Email-Abstract-[0-9]*:../../mail/p5-Email-Abstract
-DEPENDS+= p5-Email-Valid>=0.12:../../mail/p5-Email-Valid
-DEPENDS+= p5-URI>=1.10:../../www/p5-URI
-
-PERL5_PACKLIST= auto/Mail/ListDetector/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-ListDetector/PLIST b/mail/p5-Mail-ListDetector/PLIST
deleted file mode 100644
index 67149f5db53..00000000000
--- a/mail/p5-Mail-ListDetector/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:54 zuntum Exp $
diff --git a/mail/p5-Mail-ListDetector/distinfo b/mail/p5-Mail-ListDetector/distinfo
deleted file mode 100644
index bffa7ee0d06..00000000000
--- a/mail/p5-Mail-ListDetector/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/11/03 11:21:49 obache Exp $
-
-SHA1 (Mail-ListDetector-0.34.tar.gz) = 00c6dacd247670190126cc50e000cad9980683dc
-RMD160 (Mail-ListDetector-0.34.tar.gz) = d08413aa2a00401be8d28a39e677ae05acb895d8
-Size (Mail-ListDetector-0.34.tar.gz) = 39817 bytes
diff --git a/mail/p5-Mail-Mbox-MessageParser/DESCR b/mail/p5-Mail-Mbox-MessageParser/DESCR
deleted file mode 100644
index 1d0cd35cb29..00000000000
--- a/mail/p5-Mail-Mbox-MessageParser/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Mail::Mbox::MessageParser is a feature-poor but very fast mbox
-parser. It uses the best of three strategies for parsing a mailbox:
-either using cached folder information, GNU grep, or highly optimized
-Perl.
diff --git a/mail/p5-Mail-Mbox-MessageParser/Makefile b/mail/p5-Mail-Mbox-MessageParser/Makefile
deleted file mode 100644
index a5dda179664..00000000000
--- a/mail/p5-Mail-Mbox-MessageParser/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2007/02/24 23:08:35 wiz Exp $
-
-DISTNAME= Mail-Mbox-MessageParser-1.5000
-PKGNAME= p5-${DISTNAME}
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://search.cpan.org/dist/Mail-Mbox-MessageParser/
-COMMENT= Perl5 module for parsing mail messages
-
-DEPENDS+= p5-FileHandle-Unget-[0-9]*:../../devel/p5-FileHandle-Unget
-DEPENDS+= p5-Storable-[0-9]*:../../devel/p5-Storable
-
-PERL5_PACKLIST= auto/Mail/Mbox/MessageParser/.packlist
-MAKE_PARAMS+= < /dev/null
-
-USE_TOOLS+= grep gzip
-
-SETTINGS+= INSTALLDIRS=site
-# XXX: might need adaptation if the programs are not
-# in the base system
-SETTINGS+= BZIP=/usr/bin/bzip2
-SETTINGS+= BZIP2=/usr/bin/bzip2
-SETTINGS+= DIFF=/usr/bin/diff
-SETTINGS+= GREP=${GREP}
-SETTINGS+= GZIP=${GZIP_CMD}
-SETTINGS+= TZIP=
-
-MAKE_PARAMS+= ${SETTINGS}
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-Mbox-MessageParser/PLIST b/mail/p5-Mail-Mbox-MessageParser/PLIST
deleted file mode 100644
index 2cd6930e7a1..00000000000
--- a/mail/p5-Mail-Mbox-MessageParser/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/05/07 13:53:09 wiz Exp $
diff --git a/mail/p5-Mail-Mbox-MessageParser/distinfo b/mail/p5-Mail-Mbox-MessageParser/distinfo
deleted file mode 100644
index 5c40af7dbc5..00000000000
--- a/mail/p5-Mail-Mbox-MessageParser/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.5 2007/02/24 23:08:35 wiz Exp $
-
-SHA1 (Mail-Mbox-MessageParser-1.5000.tar.gz) = d9a446f2700a8808297a1a8ce4bb9f972bf3e13f
-RMD160 (Mail-Mbox-MessageParser-1.5000.tar.gz) = 410b46a68360b044124dc36442729e24e6d4eda6
-Size (Mail-Mbox-MessageParser-1.5000.tar.gz) = 279116 bytes
diff --git a/mail/p5-Mail-Milter/DESCR b/mail/p5-Mail-Milter/DESCR
deleted file mode 100644
index 16648526d3b..00000000000
--- a/mail/p5-Mail-Milter/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Mail::Milter is a set of modules useful to mail filter writers who are
-using the Sendmail::Milter and/or Sendmail::PMilter APIs to interface
-directly to the SMTP transaction.
diff --git a/mail/p5-Mail-Milter/Makefile b/mail/p5-Mail-Milter/Makefile
deleted file mode 100644
index d5a91a4c493..00000000000
--- a/mail/p5-Mail-Milter/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2007/03/19 16:40:27 tv Exp $
-#
-
-DISTNAME= Mail-Milter-0.07
-PKGNAME= p5-${DISTNAME}
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/} \
- ${MASTER_SITE_SOURCEFORGE:=pmilter/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://pmilter.sourceforge.net/
-COMMENT= Sendmail::Milter enhancement API modules
-
-DEPENDS+= p5-Sendmail-PMilter>=0.90:../../mail/p5-Sendmail-PMilter
-
-PERL5_PACKLIST= auto/Mail/Milter/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-Milter/PLIST b/mail/p5-Mail-Milter/PLIST
deleted file mode 100644
index 09211097fce..00000000000
--- a/mail/p5-Mail-Milter/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/03/29 18:30:59 tv Exp $
diff --git a/mail/p5-Mail-Milter/distinfo b/mail/p5-Mail-Milter/distinfo
deleted file mode 100644
index 495fea45425..00000000000
--- a/mail/p5-Mail-Milter/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/03/30 04:12:20 tv Exp $
-
-SHA1 (Mail-Milter-0.07.tar.gz) = ee1809ec178982bfde9855bf7a0d1b48dbb10415
-RMD160 (Mail-Milter-0.07.tar.gz) = 3b45f92fcadad7b9f1f461b9348d267124f30b27
-Size (Mail-Milter-0.07.tar.gz) = 31445 bytes
diff --git a/mail/p5-Mail-SPF-Query/DESCR b/mail/p5-Mail-SPF-Query/DESCR
deleted file mode 100644
index 26646815357..00000000000
--- a/mail/p5-Mail-SPF-Query/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-The SPF (Sender Policy Framework) protocol relies on sender domains to publish
-a DNS whitelist of their designated outbound mailers. Given an envelope
-sender, Mail::SPF::Query determines the legitimacy of an SMTP client IP.
diff --git a/mail/p5-Mail-SPF-Query/Makefile b/mail/p5-Mail-SPF-Query/Makefile
deleted file mode 100644
index e20e008753c..00000000000
--- a/mail/p5-Mail-SPF-Query/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:42 wiz Exp $
-
-DISTNAME= Mail-SPF-Query-1.999
-PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5msq
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/}
-
-MAINTAINER= heinz@NetBSD.org
-HOMEPAGE= http://www.openspf.org/
-COMMENT= Perl module for Sender-Policy-Framework queries
-
-DEPENDS+= p5-Net-DNS>=0.46:../../net/p5-Net-DNS
-DEPENDS+= p5-Net-CIDR-Lite>=0.15:../../net/p5-Net-CIDR-Lite
-DEPENDS+= p5-Sys-Hostname-Long-[0-9]*:../../sysutils/p5-Sys-Hostname-Long
-# needed URI::Escape >= 3.20 until 1.991. We keep the requirement.
-DEPENDS+= p5-URI>=1.18:../../www/p5-URI
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-PERL5_PACKLIST= auto/Mail/SPF/Query/.packlist
-USE_LANGUAGES= # empty
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-SPF-Query/PLIST b/mail/p5-Mail-SPF-Query/PLIST
deleted file mode 100644
index fb1849332c2..00000000000
--- a/mail/p5-Mail-SPF-Query/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/17 22:48:18 heinz Exp $
diff --git a/mail/p5-Mail-SPF-Query/distinfo b/mail/p5-Mail-SPF-Query/distinfo
deleted file mode 100644
index 72abe0a4cbd..00000000000
--- a/mail/p5-Mail-SPF-Query/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/02/15 23:37:39 heinz Exp $
-
-SHA1 (Mail-SPF-Query-1.999.tar.gz) = c8584cf056507127d7c2a8019d0d43da3824028b
-RMD160 (Mail-SPF-Query-1.999.tar.gz) = 008640c9af069361f51da1d1a84d93c684cf2d36
-Size (Mail-SPF-Query-1.999.tar.gz) = 54874 bytes
diff --git a/mail/p5-Mail-SRS/DESCR b/mail/p5-Mail-SRS/DESCR
deleted file mode 100644
index 81f26306e40..00000000000
--- a/mail/p5-Mail-SRS/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-The Sender Rewriting Scheme preserves .forward functionality in an
-SPF-compliant world.
-
-SPF requires the SMTP client IP to match the envelope sender
-(return-path). When a message is forwarded through an intermediate
-server, that intermediate server may need to rewrite the return-path to
-remain SPF compliant. If the message bounces, that intermediate server
-needs to validate the bounce and forward the bounce to the original
-sender.
-
-SRS provides a convention for return-path rewriting which allows
-multiple forwarding servers to compact the return-path. SRS also
-provides an authentication mechanism to ensure that purported bounces
-are not arbitrarily forwarded.
diff --git a/mail/p5-Mail-SRS/Makefile b/mail/p5-Mail-SRS/Makefile
deleted file mode 100644
index fe8ac90042c..00000000000
--- a/mail/p5-Mail-SRS/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2007/03/19 16:40:27 tv Exp $
-
-DISTNAME= Mail-SRS-0.31
-PKGNAME= p5-${DISTNAME}
-PKGREVISION= 2
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.libsrs2.org/
-COMMENT= SMTP envelope sender rewriting for SPF-compliant forwarding
-
-DEPENDS+= p5-DB_File>=1.806:../../databases/p5-DB_File
-DEPENDS+= p5-Digest-HMAC>=1.01:../../security/p5-Digest-HMAC
-DEPENDS+= p5-MLDBM>=2.01:../../databases/p5-MLDBM
-DEPENDS+= p5-Storable>=2.04:../../devel/p5-Storable
-BUILD_DEPENDS+= p5-Test-Simple>=0.40:../../devel/p5-Test-Simple
-
-PERL5_PACKLIST= auto/Mail/SRS/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-SRS/PLIST b/mail/p5-Mail-SRS/PLIST
deleted file mode 100644
index 766778f0cf2..00000000000
--- a/mail/p5-Mail-SRS/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/03/29 19:49:04 tv Exp $
diff --git a/mail/p5-Mail-SRS/distinfo b/mail/p5-Mail-SRS/distinfo
deleted file mode 100644
index adfba423f4e..00000000000
--- a/mail/p5-Mail-SRS/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:26 agc Exp $
-
-SHA1 (Mail-SRS-0.31.tar.gz) = 52e536cf796a9d1a83e6b685dbd1d5b8e6944c88
-RMD160 (Mail-SRS-0.31.tar.gz) = 5f91268b1f231050b0b047659c4c4f4e932a1d50
-Size (Mail-SRS-0.31.tar.gz) = 26605 bytes
-SHA1 (patch-aa) = c6f0fc852e19de651f58cefa36e9ab5d54a2a9f4
diff --git a/mail/p5-Mail-SRS/patches/patch-aa b/mail/p5-Mail-SRS/patches/patch-aa
deleted file mode 100644
index 5f16f48b5a0..00000000000
--- a/mail/p5-Mail-SRS/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/11/29 02:19:20 tv Exp $
-
---- Makefile.PL.orig 2004-06-23 17:53:43.000000000 -0400
-+++ Makefile.PL
-@@ -1,6 +1,8 @@
- use 5.006;
- use ExtUtils::MakeMaker;
-
-+open(STDIN, '</dev/null');
-+
- # Thanks to YAML
- my @programs = ();
- for (split "\n", <<'QUERIES') {
-@@ -27,7 +29,7 @@ WriteMakefile(
- 'Fcntl' => 0,
- 'Carp' => 0,
- 'Exporter' => 0,
-- 'Getopt::Long' => 2.30,
-+ 'Getopt::Long' => 0,
- }, # e.g., Module::Name => 1.1
- ABSTRACT_FROM => 'lib/Mail/SRS.pm', # retrieve abstract from module
- AUTHOR => 'Shevek <cpan@anarres.org>',
diff --git a/mail/p5-Mail-Sender-Easy/DESCR b/mail/p5-Mail-Sender-Easy/DESCR
deleted file mode 100644
index d8a96dbb04d..00000000000
--- a/mail/p5-Mail-Sender-Easy/DESCR
+++ /dev/null
@@ -1,20 +0,0 @@
-Mail::Sender's one problem is its a bit cumbersome to use, with so
-many options and things to open, close, the whole thing, parts,
-multiparts etc etc., and several ways to check for successs. Its
-hard to remember what needs done at what point with what data to
-do what you want and then which way you check what data based on
-what was done to see if it worked or not.
-
-This module's aim is to make all of that ``Easy''
-
-It does so by providing a single function (and method) to send mail
-based on an (IMHO) easier to work with hashref and returns true or
-false on success or failer and sets $@ to any errors.
-
-The EXAMPLE section shows an ``email or die'' that will send an
-email using SMTP Auth on port 26 with text and html parts, the html
-part has a smiley gif embedded inline and a PDF attached and a high
-priority flag and read and delivery receipt requests. It will take
-you seconds to customize it to send that to yourself (and its
-``Easy'' to understand what its going on without having to understand
-the intracacies of SMTP and MIME messages.
diff --git a/mail/p5-Mail-Sender-Easy/Makefile b/mail/p5-Mail-Sender-Easy/Makefile
deleted file mode 100644
index 5b89acd225f..00000000000
--- a/mail/p5-Mail-Sender-Easy/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/02 10:53:59 abs Exp $
-#
-
-DISTNAME= Mail-Sender-Easy-v0.0.5
-PKGNAME= p5-${DISTNAME:S:-v:-:}
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/D/DM/DMUEY/}
-
-MAINTAINER= abs@NetBSD.org
-HOMEPAGE= http://search.cpan.org/~dmuey/Mail-Sender/
-COMMENT= Simplified interface to Mail::Sender
-
-DEPENDS+= p5-Mail-Sender>=0:../../mail/p5-Mail-Sender
-DEPENDS+= p5-version>=0:../../devel/p5-version
-
-PERL5_PACKLIST= auto/Mail/Sender/Easy/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-Sender-Easy/PLIST b/mail/p5-Mail-Sender-Easy/PLIST
deleted file mode 100644
index dcae34964a7..00000000000
--- a/mail/p5-Mail-Sender-Easy/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/03/02 10:53:59 abs Exp $
diff --git a/mail/p5-Mail-Sender-Easy/distinfo b/mail/p5-Mail-Sender-Easy/distinfo
deleted file mode 100644
index 37cad95f374..00000000000
--- a/mail/p5-Mail-Sender-Easy/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/02 10:53:59 abs Exp $
-
-SHA1 (Mail-Sender-Easy-v0.0.5.tar.gz) = 52b1706773416f0169b351c67a23236e9beafd3b
-RMD160 (Mail-Sender-Easy-v0.0.5.tar.gz) = cdfc2ea3bd99acf5eba1b4473a9c578b6b646201
-Size (Mail-Sender-Easy-v0.0.5.tar.gz) = 6476 bytes
diff --git a/mail/p5-Mail-Sender/DESCR b/mail/p5-Mail-Sender/DESCR
deleted file mode 100644
index bf0b4647509..00000000000
--- a/mail/p5-Mail-Sender/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Mail::Sender provides an object oriented interface to sending mails.
-It doesn't need any outer program. It connects to a mail server
-directly from Perl, using Socket. It can handle attachments.
diff --git a/mail/p5-Mail-Sender/Makefile b/mail/p5-Mail-Sender/Makefile
deleted file mode 100644
index 0fd8c742587..00000000000
--- a/mail/p5-Mail-Sender/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/02 10:43:21 abs Exp $
-#
-
-DISTNAME= Mail-Sender-0.8.13
-PKGNAME= p5-${DISTNAME}
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/}
-
-MAINTAINER= abs@NetBSD.org
-HOMEPAGE= http://search.cpan.org/~jenda/Mail-Sender/
-COMMENT= Sending mails with attachments through an SMTP server
-
-DEPENDS+= p5-MIME-Base64>=0:../../converters/p5-MIME-Base64
-
-PERL5_PACKLIST= auto/Mail/Sender/.packlist
-
-BUILD_TARGET=pure_all
-INSTALL_TARGET=pure_install
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-Sender/PLIST b/mail/p5-Mail-Sender/PLIST
deleted file mode 100644
index 9049025c086..00000000000
--- a/mail/p5-Mail-Sender/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/03/02 10:43:21 abs Exp $
diff --git a/mail/p5-Mail-Sender/distinfo b/mail/p5-Mail-Sender/distinfo
deleted file mode 100644
index 192406ed1be..00000000000
--- a/mail/p5-Mail-Sender/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/02 10:43:21 abs Exp $
-
-SHA1 (Mail-Sender-0.8.13.tar.gz) = 02733c51a7a3149df176dc1ae19225580f498b46
-RMD160 (Mail-Sender-0.8.13.tar.gz) = a25a6b5271167ff3cc7d364b72452948d59b77a7
-Size (Mail-Sender-0.8.13.tar.gz) = 34728 bytes
diff --git a/mail/p5-Mail-Sendmail/DESCR b/mail/p5-Mail-Sendmail/DESCR
deleted file mode 100644
index ca2acf68cc3..00000000000
--- a/mail/p5-Mail-Sendmail/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-A platform independent Sendmail interface module. This module will
-allow you to send email from perl via sendmail. The only requirement
-is a network connection. It has good error reporting abilities in
-addition to good time zone detection.
diff --git a/mail/p5-Mail-Sendmail/Makefile b/mail/p5-Mail-Sendmail/Makefile
deleted file mode 100644
index 1dcbbc8ccf8..00000000000
--- a/mail/p5-Mail-Sendmail/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2007/03/10 01:17:23 wiz Exp $
-
-DISTNAME= Mail-Sendmail-0.79
-PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5mse
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://alma.ch/perl/
-COMMENT= Perl5 module dedicated to Sendmail
-
-DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
-
-PERL5_PACKLIST= auto/Mail/Sendmail/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-Sendmail/PLIST b/mail/p5-Mail-Sendmail/PLIST
deleted file mode 100644
index 0b96bf93936..00000000000
--- a/mail/p5-Mail-Sendmail/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:56 zuntum Exp $
diff --git a/mail/p5-Mail-Sendmail/distinfo b/mail/p5-Mail-Sendmail/distinfo
deleted file mode 100644
index 4733ddd813f..00000000000
--- a/mail/p5-Mail-Sendmail/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2007/03/10 01:17:23 wiz Exp $
-
-SHA1 (Mail-Sendmail-0.79.tar.gz) = 606d1dc108fad8ec962062b8dbdee0f7dfa82329
-RMD160 (Mail-Sendmail-0.79.tar.gz) = 6f593aecbbffed43c592e58d8dd2c342d70c8e93
-Size (Mail-Sendmail-0.79.tar.gz) = 16245 bytes
diff --git a/mail/p5-Mail-Webmail-Gmail/DESCR b/mail/p5-Mail-Webmail-Gmail/DESCR
deleted file mode 100644
index ebaf7c5b7bc..00000000000
--- a/mail/p5-Mail-Webmail-Gmail/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-The Mail-Webmail-Gmail module provides an interface to Google's mail web
-service.
diff --git a/mail/p5-Mail-Webmail-Gmail/Makefile b/mail/p5-Mail-Webmail-Gmail/Makefile
deleted file mode 100644
index c8f738f3c0f..00000000000
--- a/mail/p5-Mail-Webmail-Gmail/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/08/09 07:59:11 jmmv Exp $
-
-DISTNAME= Mail-Webmail-Gmail-1.08
-PKGNAME= p5-${DISTNAME}
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://search.cpan.org/~mincus/Mail-Webmail-Gmail-1.08/
-COMMENT= Interface to Google's webmail service
-
-DEPENDS+= p5-Crypt-SSLeay>=0.51:../../security/p5-Crypt-SSLeay
-DEPENDS+= p5-libwww>=5.80:../../www/p5-libwww
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-PERL5_PACKLIST= auto/Mail/Webmail/Gmail/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-Webmail-Gmail/PLIST b/mail/p5-Mail-Webmail-Gmail/PLIST
deleted file mode 100644
index c8b71878e9c..00000000000
--- a/mail/p5-Mail-Webmail-Gmail/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/08/09 07:59:11 jmmv Exp $
diff --git a/mail/p5-Mail-Webmail-Gmail/distinfo b/mail/p5-Mail-Webmail-Gmail/distinfo
deleted file mode 100644
index d62636c9e24..00000000000
--- a/mail/p5-Mail-Webmail-Gmail/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/08/09 07:59:11 jmmv Exp $
-
-SHA1 (Mail-Webmail-Gmail-1.08.tar.gz) = 5271fb52204e4e893f8cb2e936609c9de0ae1f1d
-RMD160 (Mail-Webmail-Gmail-1.08.tar.gz) = 1d15d46774ad7d9b5903ac7408f4a7a0f324a53c
-Size (Mail-Webmail-Gmail-1.08.tar.gz) = 23564 bytes
-SHA1 (patch-aa) = 11b0b888cc7897c366d5a91c90c775bf297e0bd3
diff --git a/mail/p5-Mail-Webmail-Gmail/patches/patch-aa b/mail/p5-Mail-Webmail-Gmail/patches/patch-aa
deleted file mode 100644
index 77497f21812..00000000000
--- a/mail/p5-Mail-Webmail-Gmail/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/08/09 07:59:11 jmmv Exp $
-
---- lib/Mail/Webmail/Gmail.pm.orig 2006-05-08 16:01:16.000000000 +0200
-+++ lib/Mail/Webmail/Gmail.pm
-@@ -108,7 +108,7 @@ sub login {
- }
-
- update_tokens( $self, $res );
-- if ( $res->content() !~ /var url = "(.*?)"/ ) {
-+ if ( $res->content() !~ /var url = ["'](.*?)["']/ ) {
- $self->{_error} = 1;
- $self->{_err_str} .= "Error: Could not login with those credentials - could not find final URL\n";
- $self->{_err_str} .= " Additionally, HTTP error: " . $res->status_line . "\n";
diff --git a/mail/p5-MailTools/DESCR b/mail/p5-MailTools/DESCR
deleted file mode 100644
index 139866dab7f..00000000000
--- a/mail/p5-MailTools/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-Contents of perl5 MailTools class:
-
-Mail::Address - Parse mail addresses
-Mail::Cap - Parse mailcap files
-Mail::Field - Base class for manipulation of mail header
-Mail::Filter - Filter mail through multiple subroutines
-Mail::Header - manipulate mail RFC822 compliant headers
-Mail::Internet - manipulate Internet format (RFC 822) mail messages
-Mail::Mailer - Simple interface to electronic mailing mechanisms
-Mail::Send - Simple electronic mail interface
-Mail::Util - mail utility functions
diff --git a/mail/p5-MailTools/Makefile b/mail/p5-MailTools/Makefile
deleted file mode 100644
index ef94a12c9df..00000000000
--- a/mail/p5-MailTools/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.39 2006/11/05 17:15:54 joerg Exp $
-
-DISTNAME= MailTools-1.74
-PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5mto
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://search.cpan.org/dist/MailTools/
-COMMENT= Perl5 modules related to mail applications
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
-
-BUILD_DEPENDS+= p5-Net>=1.09:../../net/p5-Net
-
-USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Mail/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-MailTools/PLIST b/mail/p5-MailTools/PLIST
deleted file mode 100644
index 8ff4f1e92a0..00000000000
--- a/mail/p5-MailTools/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:57 zuntum Exp $
diff --git a/mail/p5-MailTools/distinfo b/mail/p5-MailTools/distinfo
deleted file mode 100644
index 59dd3f62c65..00000000000
--- a/mail/p5-MailTools/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.17 2006/05/17 21:52:38 wiz Exp $
-
-SHA1 (MailTools-1.74.tar.gz) = 9c5e1ca734fc694e9559cc812adabbcecad7d3c7
-RMD160 (MailTools-1.74.tar.gz) = fe6f9e3193f6bcaf0944192fed4a1336421a909b
-Size (MailTools-1.74.tar.gz) = 47783 bytes
diff --git a/mail/p5-Net-LMTP/DESCR b/mail/p5-Net-LMTP/DESCR
deleted file mode 100644
index a81f5796b1f..00000000000
--- a/mail/p5-Net-LMTP/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This module implements a client interface to the LMTP protocol, enabling a
-perl5 application to talk to LMTP servers. This documentation assumes that
-you are familiar with the concepts of the LMTP protocol described in RFC2033.
-This module is based on Net::SMTP and shares more than %95 of its code with
-Net::SMTP.
diff --git a/mail/p5-Net-LMTP/Makefile b/mail/p5-Net-LMTP/Makefile
deleted file mode 100644
index a18abbb8ed7..00000000000
--- a/mail/p5-Net-LMTP/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2005/08/06 06:19:22 jlam Exp $
-#
-
-DISTNAME= Net-LMTP-0.02
-PKGNAME= p5-${DISTNAME}
-PKGREVISION= 1
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Net/}
-
-MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://search.cpan.org/~lhoward/${DISTNAME}/
-COMMENT= Local Mail Transfer Protocol Client
-
-PERL5_PACKLIST= auto/Net/LMTP/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Net-LMTP/PLIST b/mail/p5-Net-LMTP/PLIST
deleted file mode 100644
index 5f9ca2dbb6e..00000000000
--- a/mail/p5-Net-LMTP/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/25 21:17:06 adrianp Exp $
diff --git a/mail/p5-Net-LMTP/distinfo b/mail/p5-Net-LMTP/distinfo
deleted file mode 100644
index 3e052cd64b4..00000000000
--- a/mail/p5-Net-LMTP/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/02/25 21:17:06 adrianp Exp $
-
-SHA1 (Net-LMTP-0.02.tar.gz) = 2075fbb77b2e0878b385d1e62dfe05b4edc36e3f
-RMD160 (Net-LMTP-0.02.tar.gz) = ae26e4443f37df9bc804a932d9cf395d1fbe46c6
-Size (Net-LMTP-0.02.tar.gz) = 5633 bytes
diff --git a/mail/p5-Net-SMTP_auth/DESCR b/mail/p5-Net-SMTP_auth/DESCR
deleted file mode 100644
index a0c5352e3ed..00000000000
--- a/mail/p5-Net-SMTP_auth/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-The Perl 5 module Net::SMTP_auth is a small extension to the
-Net::SMTP module to authenticate to an SMTP server using one of
-the AUTH methods provided by Authen::SASL.
diff --git a/mail/p5-Net-SMTP_auth/Makefile b/mail/p5-Net-SMTP_auth/Makefile
deleted file mode 100644
index a5c499a695c..00000000000
--- a/mail/p5-Net-SMTP_auth/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/10/01 21:44:17 seb Exp $
-
-DISTNAME= Net-SMTP_auth-0.08
-PKGNAME= p5-${DISTNAME}
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Net/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://search.cpan.org/dist/Net-SMTP_auth/
-COMMENT= Perl module adding SMTP AUTH support to Net::SMTP module
-
-PERL5_PACKLIST= auto/Net/SMTP_auth/.packlist
-
-# Also depends on MIME::Base64 and Net::SMTP bundled with perl
-DEPENDS+= p5-Authen-SASL>=2.03:../../security/p5-Authen-SASL
-DEPENDS+= p5-Digest-HMAC>=1.0:../../security/p5-Digest-HMAC
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Net-SMTP_auth/PLIST b/mail/p5-Net-SMTP_auth/PLIST
deleted file mode 100644
index 0d07f5ff24a..00000000000
--- a/mail/p5-Net-SMTP_auth/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/10/01 21:44:17 seb Exp $
diff --git a/mail/p5-Net-SMTP_auth/distinfo b/mail/p5-Net-SMTP_auth/distinfo
deleted file mode 100644
index cc918188dd4..00000000000
--- a/mail/p5-Net-SMTP_auth/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/10/01 21:44:17 seb Exp $
-
-SHA1 (Net-SMTP_auth-0.08.tar.gz) = 8beed886833a17732055df7d14fc579eea19b654
-RMD160 (Net-SMTP_auth-0.08.tar.gz) = 1cc6f43c592db9edb32bf1f32dfba1d0d5a70a15
-Size (Net-SMTP_auth-0.08.tar.gz) = 5365 bytes
diff --git a/mail/p5-Sendmail-AccessDB/DESCR b/mail/p5-Sendmail-AccessDB/DESCR
deleted file mode 100644
index db59b345dcb..00000000000
--- a/mail/p5-Sendmail-AccessDB/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-a package for making it easy to abstract the "SpamFriend" and
-"SpamHater" features in sendmail, as well as those for whitelisting
-certain hosts/addresses/etc.. Especially useful for making sure that
-addresses you whitelisted as "always accept for" in /etc/mail/access
-also get whitelisted in Milter-based applications as well (be they
-senders or recipients)
diff --git a/mail/p5-Sendmail-AccessDB/Makefile b/mail/p5-Sendmail-AccessDB/Makefile
deleted file mode 100644
index 8bfcaee2117..00000000000
--- a/mail/p5-Sendmail-AccessDB/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:01 jlam Exp $
-
-DISTNAME= Sendmail-AccessDB-0.07
-PKGNAME= p5-${DISTNAME}
-PKGREVISION= 2
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Sendmail/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.megacity.org/software.html
-COMMENT= Perl5 module for manipulating the sendmail accessdb
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-PERL5_PACKLIST= auto/Sendmail/AccessDB/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Sendmail-AccessDB/PLIST b/mail/p5-Sendmail-AccessDB/PLIST
deleted file mode 100644
index 1760bea219f..00000000000
--- a/mail/p5-Sendmail-AccessDB/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/17 09:15:04 grant Exp $
diff --git a/mail/p5-Sendmail-AccessDB/distinfo b/mail/p5-Sendmail-AccessDB/distinfo
deleted file mode 100644
index 99a8d7260c3..00000000000
--- a/mail/p5-Sendmail-AccessDB/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:26 agc Exp $
-
-SHA1 (Sendmail-AccessDB-0.07.tar.gz) = 2f9249ffcb710c488fa000c8219c941a3c353742
-RMD160 (Sendmail-AccessDB-0.07.tar.gz) = bc9a68ad05762edabb76eb79507265752af80975
-Size (Sendmail-AccessDB-0.07.tar.gz) = 14768 bytes
diff --git a/mail/p5-Sendmail-PMilter/DESCR b/mail/p5-Sendmail-PMilter/DESCR
deleted file mode 100644
index e9e977a1107..00000000000
--- a/mail/p5-Sendmail-PMilter/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-Sendmail::PMilter is a mail filtering API implementing the Sendmail
-milter protocol in pure Perl. This allows Sendmail servers (and perhaps
-other MTAs implementing milter) to filter and modify mail in transit
-during the SMTP connection, all in Perl.
-
-It should be noted that PMilter 0.90 and later is NOT compatible with
-scripts written for PMilter 0.5 and earlier. The API has been reworked
-significantly, and the enhanced APIs and rule logic provided by PMilter
-0.5 and earlier has been factored out for inclusion in a separate package
-to be called Mail::Milter.
-
-So, in short, this package should be regarded as a drop-in replacement
-for Sendmail::Milter, with only some very minor API extensions related
-to the milter protocol itself. (Sendmail::PMilter includes a wrapper
-module named Sendmail::Milter to allow old milter scripts to continue
-working as-is with this package.)
diff --git a/mail/p5-Sendmail-PMilter/Makefile b/mail/p5-Sendmail-PMilter/Makefile
deleted file mode 100644
index 61d916593e1..00000000000
--- a/mail/p5-Sendmail-PMilter/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2007/03/19 16:40:27 tv Exp $
-#
-
-DISTNAME= Sendmail-PMilter-0.95
-PKGNAME= p5-${DISTNAME}
-PKGREVISION= 2
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pmilter/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://pmilter.sourceforge.net/
-COMMENT= Pure-Perl Milter protocol API
-
-# Though it doesn't exist yet, just in case:
-CONFLICTS+= p5-Sendmail-Milter-[0-9]*
-
-MAKE_ENV+= PERL_MM_USE_DEFAULT=1
-
-PERL5_PACKLIST= auto/Sendmail/PMilter/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Sendmail-PMilter/PLIST b/mail/p5-Sendmail-PMilter/PLIST
deleted file mode 100644
index 1a2f589157a..00000000000
--- a/mail/p5-Sendmail-PMilter/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/03/29 18:14:02 tv Exp $
diff --git a/mail/p5-Sendmail-PMilter/distinfo b/mail/p5-Sendmail-PMilter/distinfo
deleted file mode 100644
index 090dd04540d..00000000000
--- a/mail/p5-Sendmail-PMilter/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 09:59:26 agc Exp $
-
-SHA1 (Sendmail-PMilter-0.95.tar.gz) = 6788d44723c9de85f1783141521f8b8e24d2bf4e
-RMD160 (Sendmail-PMilter-0.95.tar.gz) = f525bf447ebb0af1242cb295be0e8b18d7b63590
-Size (Sendmail-PMilter-0.95.tar.gz) = 28832 bytes
diff --git a/mail/p5-User-Identity/DESCR b/mail/p5-User-Identity/DESCR
deleted file mode 100644
index 1ee15975d8e..00000000000
--- a/mail/p5-User-Identity/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-User::Identity helps maintaining user information from various
-sources. It abstracts the information used about a human begin
-(usually configuration information) from its storage. It tries to be
-smart in detecting defaults and such.
diff --git a/mail/p5-User-Identity/Makefile b/mail/p5-User-Identity/Makefile
deleted file mode 100644
index 08c576b5d65..00000000000
--- a/mail/p5-User-Identity/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2005/08/06 06:19:22 jlam Exp $
-
-DISTNAME= User-Identity-0.90
-PKGNAME= p5-${DISTNAME}
-PKGREVISION= 1
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=User/}
-
-MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://perl.overmeer.net/userid/
-COMMENT= Helps maintaining user information from various sources
-
-DEPENDS+= p5-Geography-Countries-[0-9]*:../../misc/p5-Geography-Countries
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-PERL5_PACKLIST= auto/User/Identity/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-User-Identity/PLIST b/mail/p5-User-Identity/PLIST
deleted file mode 100644
index 30cf23a8c7c..00000000000
--- a/mail/p5-User-Identity/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/17 02:25:44 minskim Exp $
diff --git a/mail/p5-User-Identity/distinfo b/mail/p5-User-Identity/distinfo
deleted file mode 100644
index e7aab10d254..00000000000
--- a/mail/p5-User-Identity/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:26 agc Exp $
-
-SHA1 (User-Identity-0.90.tar.gz) = ad062b4c9f9c35c8883bb164c6dde7a1366792ea
-RMD160 (User-Identity-0.90.tar.gz) = f6d03d094b5c67e3f006ed266dee43b0a34b7e33
-Size (User-Identity-0.90.tar.gz) = 25502 bytes
diff --git a/mail/p5-razor-agents/DESCR b/mail/p5-razor-agents/DESCR
deleted file mode 100644
index 754a90ee927..00000000000
--- a/mail/p5-razor-agents/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-Vipul's Razor is a distributed, collaborative, spam detection and
-filtering network. Through user contribution, Razor establishes a
-distributed and constantly updating catalogue of spam in propagation that
-is consulted by email clients to filter out known spam. Detection is done
-with statistical and randomized signatures that efficiently spot mutating
-spam content. User input is validated through reputation assignments based
-on consensus on report and revoke assertions which in turn is used for
-computing confidence values associated with individual signatures.
-
-Razor Agents are written in Perl and will work on most Unix operating
-systems and others OSes for which perl is available.
-
-Vipul's Razor v2 is almost a complete rewrite of Razor v1.
diff --git a/mail/p5-razor-agents/Makefile b/mail/p5-razor-agents/Makefile
deleted file mode 100644
index 9551222f48c..00000000000
--- a/mail/p5-razor-agents/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2006/07/15 12:38:39 heinz Exp $
-
-DISTNAME= razor-agents-2.82
-PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5ra
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=razor/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= heinz@NetBSD.org
-HOMEPAGE= http://razor.sourceforge.net/
-COMMENT= Distributed and collaborative spam detection network
-
-# Net::Ping, Getopt::Long, File::Copy are also needed (from the perl package)
-DEPENDS+= p5-Net-DNS-[0-9]*:../../net/p5-Net-DNS
-DEPENDS+= p5-Time-HiRes-[0-9]*:../../time/p5-Time-HiRes
-DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
-DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-PERL5_PACKLIST= auto/razor-agents/.packlist
-CHECK_INTERPRETER_SKIP+=${PERL5_INSTALLVENDORARCH}/Razor2/*
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-razor-agents/PLIST b/mail/p5-razor-agents/PLIST
deleted file mode 100644
index 2f70a7ccee6..00000000000
--- a/mail/p5-razor-agents/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/06/19 22:39:15 heinz Exp $
diff --git a/mail/p5-razor-agents/distinfo b/mail/p5-razor-agents/distinfo
deleted file mode 100644
index 0824872d16f..00000000000
--- a/mail/p5-razor-agents/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.12 2006/07/15 12:38:39 heinz Exp $
-
-SHA1 (razor-agents-2.82.tar.bz2) = 76b9efdd2b09726e68b19ecf8bd98293ac646db8
-RMD160 (razor-agents-2.82.tar.bz2) = 4015686818e24084319ae2c13c82bbf74df54035
-Size (razor-agents-2.82.tar.bz2) = 79021 bytes
diff --git a/mail/pear-Mail/DESCR b/mail/pear-Mail/DESCR
deleted file mode 100644
index ec15133898e..00000000000
--- a/mail/pear-Mail/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-PEAR's Mail:: package defines the interface for implementing mailers under
-the PEAR hierarchy, and provides supporting functions useful in multiple
-mailer backends. Currently supported are native PHP mail() function, sendmail
-and SMTP. This package also provides a RFC 822 Email address list validation
-utility class.
diff --git a/mail/pear-Mail/Makefile b/mail/pear-Mail/Makefile
deleted file mode 100644
index 43226444012..00000000000
--- a/mail/pear-Mail/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:42 wiz Exp $
-
-DISTNAME= Mail-1.1.14
-CATEGORIES= mail
-
-CONFLICTS= php-pear-Mail-[0-9]*
-
-DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_SMTP-[0-9]*:../../net/pear-Net_SMTP
-
-MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://pear.php.net/package/Mail
-COMMENT= PHP Class that provides multiple interfaces for sending emails
-
-.include "../../lang/php/pear.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/pear-Mail/PLIST b/mail/pear-Mail/PLIST
deleted file mode 100644
index 17291a0ff32..00000000000
--- a/mail/pear-Mail/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/05/18 20:07:46 adrianp Exp $
diff --git a/mail/pear-Mail/distinfo b/mail/pear-Mail/distinfo
deleted file mode 100644
index 7c6e888a619..00000000000
--- a/mail/pear-Mail/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/10/14 12:11:56 adrianp Exp $
-
-SHA1 (pear/Mail-1.1.14.tgz) = 6c46636e0df3c0a813df3cbda1fd5afac987069d
-RMD160 (pear/Mail-1.1.14.tgz) = 72c0c7018b92ef97789f723a1970c41471bd165f
-Size (pear/Mail-1.1.14.tgz) = 17537 bytes
diff --git a/mail/pear-Mail_Mime/DESCR b/mail/pear-Mail_Mime/DESCR
deleted file mode 100644
index c11c603e774..00000000000
--- a/mail/pear-Mail_Mime/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Provides classes to deal with creation and manipulation of mime messages:
-
- * mime.php: Create mime email, with html, attachments, embedded images etc.
- * mimePart.php: Advanced method of creating mime messages.
- * mimeDecode.php - Decodes mime messages to a usable structure.
- * xmail.dtd: An XML DTD to acompany the getXML() method of the
- decoding class.
- * xmail.xsl: An XSLT stylesheet to transform the output of the
- getXML() method back to an email
diff --git a/mail/pear-Mail_Mime/Makefile b/mail/pear-Mail_Mime/Makefile
deleted file mode 100644
index f362c6901d9..00000000000
--- a/mail/pear-Mail_Mime/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2006/10/23 20:17:16 jdolecek Exp $
-
-DISTNAME= Mail_Mime-1.3.1
-CATEGORIES+= mail
-
-MAINTAINER= jdolecek@NetBSD.org
-COMMENT= PHP classes to create and decode mime messages
-
-CONFLICTS= php-pear-Mail_Mime-[0-9]*
-
-.include "../../lang/php/pear.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/pear-Mail_Mime/PLIST b/mail/pear-Mail_Mime/PLIST
deleted file mode 100644
index 29e969e7953..00000000000
--- a/mail/pear-Mail_Mime/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/11/01 20:32:37 jdolecek Exp $
diff --git a/mail/pear-Mail_Mime/distinfo b/mail/pear-Mail_Mime/distinfo
deleted file mode 100644
index 719a73f0fd7..00000000000
--- a/mail/pear-Mail_Mime/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/10/23 20:17:16 jdolecek Exp $
-
-SHA1 (pear/Mail_Mime-1.3.1.tgz) = bd36dc20f400cab31978c74231eec236c9b1d82b
-RMD160 (pear/Mail_Mime-1.3.1.tgz) = d918979f1167aca81cbdf48f8ae3792be6e5c379
-Size (pear/Mail_Mime-1.3.1.tgz) = 16481 bytes
diff --git a/mail/perdition-bdb/Makefile b/mail/perdition-bdb/Makefile
deleted file mode 100644
index 5feb0f80141..00000000000
--- a/mail/perdition-bdb/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/06/28 13:46:58 joerg Exp $
-#
-
-PKGREVISION= 2
-
-PERDITION_COMMENT= Berkeley DB user database module
-PERDITION_PKGNAME= bdb
-BUILD_DIRS= makebdb perdition/db/bdb
-
-BDB_ACCEPTED= db4
-
-.include "../../mk/bdb.buildlink3.mk"
-.include "../../mail/perdition/buildlink3.mk"
-.include "../perdition/Makefile.common"
diff --git a/mail/perdition-bdb/PLIST b/mail/perdition-bdb/PLIST
deleted file mode 100644
index eb7cc8a86e3..00000000000
--- a/mail/perdition-bdb/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2006/01/31 21:07:30 tv Exp $
-bin/makebdb
-lib/libperditiondb_bdb.la
-man/man1/makebdb.1
diff --git a/mail/perdition-gdbm/Makefile b/mail/perdition-gdbm/Makefile
deleted file mode 100644
index dd101d7a6dc..00000000000
--- a/mail/perdition-gdbm/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:57 joerg Exp $
-#
-
-PKGREVISION= 1
-
-PERDITION_COMMENT= GDBM user database module
-PERDITION_PKGNAME= gdbm
-BUILD_DIRS= makegdbm perdition/db/gdbm
-
-.include "../../databases/gdbm/buildlink3.mk"
-.include "../../mail/perdition/buildlink3.mk"
-.include "../perdition/Makefile.common"
diff --git a/mail/perdition-gdbm/PLIST b/mail/perdition-gdbm/PLIST
deleted file mode 100644
index cfca5b1738d..00000000000
--- a/mail/perdition-gdbm/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2006/01/31 21:07:30 tv Exp $
-bin/makegdbm
-lib/libperditiondb_gdbm.la
-man/man1/makegdbm.1
diff --git a/mail/perdition-ldap/Makefile b/mail/perdition-ldap/Makefile
deleted file mode 100644
index fd4033f7718..00000000000
--- a/mail/perdition-ldap/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/05/31 18:52:38 ghen Exp $
-#
-
-PKGREVISION= 2
-
-PERDITION_COMMENT= LDAP user database module
-PERDITION_PKGNAME= ldap
-
-CONFIGURE_ARGS+= --with-ldap-includes=${BUILDLINK_PREFIX.openldap-client}/include
-CONFIGURE_ARGS+= --with-ldap-libs=${BUILDLINK_PREFIX.openldap-client}/lib
-
-.include "../../databases/openldap-client/buildlink3.mk"
-.include "../perdition/Makefile.common"
diff --git a/mail/perdition-ldap/PLIST b/mail/perdition-ldap/PLIST
deleted file mode 100644
index 26b0f154603..00000000000
--- a/mail/perdition-ldap/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2006/01/31 21:07:30 tv Exp $
-lib/libperditiondb_ldap.la
-man/man8/perditiondb_ldap_makedb.8
-sbin/perditiondb_ldap_makedb
diff --git a/mail/perdition-mysql/Makefile b/mail/perdition-mysql/Makefile
deleted file mode 100644
index 8b9dac98ab5..00000000000
--- a/mail/perdition-mysql/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:57 joerg Exp $
-#
-
-PKGREVISION= 1
-
-PERDITION_COMMENT= MySQL user database module
-PERDITION_PKGNAME= mysql
-
-.include "../../mk/mysql.buildlink3.mk"
-.include "../perdition/Makefile.common"
diff --git a/mail/perdition-mysql/PLIST b/mail/perdition-mysql/PLIST
deleted file mode 100644
index d66300f7ccd..00000000000
--- a/mail/perdition-mysql/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2006/01/31 21:07:31 tv Exp $
-lib/libperditiondb_mysql.la
-man/man8/perditiondb_mysql_makedb.8
-sbin/perditiondb_mysql_makedb
diff --git a/mail/perdition-odbc/Makefile b/mail/perdition-odbc/Makefile
deleted file mode 100644
index f6f304d7f65..00000000000
--- a/mail/perdition-odbc/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:57 joerg Exp $
-#
-
-PKGREVISION= 1
-
-PERDITION_COMMENT= UnixODBC user database module
-PERDITION_PKGNAME= odbc
-
-CONFIGURE_ARGS+= --with-odbc-includes=${BUILDLINK_PREFIX.unixodbc}/include
-CONFIGURE_ARGS+= --with-odbc-libs=${BUILDLINK_PREFIX.unixodbc}/lib
-
-.include "../../databases/unixodbc/buildlink3.mk"
-.include "../perdition/Makefile.common"
diff --git a/mail/perdition-odbc/PLIST b/mail/perdition-odbc/PLIST
deleted file mode 100644
index 3b075e6a472..00000000000
--- a/mail/perdition-odbc/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2006/01/31 21:07:31 tv Exp $
-lib/libperditiondb_odbc.la
-man/man8/perditiondb_odbc_makedb.8
-sbin/perditiondb_odbc_makedb
diff --git a/mail/perdition-postgresql/Makefile b/mail/perdition-postgresql/Makefile
deleted file mode 100644
index 2bdbb925bd8..00000000000
--- a/mail/perdition-postgresql/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/12/28 12:12:58 joerg Exp $
-#
-
-PKGREVISION= 2
-
-PERDITION_COMMENT= PostgreSQL user database module
-PERDITION_PKGNAME= postgresql
-PERDITION_SKIP_DISABLE= pg
-
-.include "../../mk/pgsql.buildlink3.mk"
-.include "../perdition/Makefile.common"
diff --git a/mail/perdition-postgresql/PLIST b/mail/perdition-postgresql/PLIST
deleted file mode 100644
index 3077c05ba42..00000000000
--- a/mail/perdition-postgresql/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2006/01/31 21:07:31 tv Exp $
-lib/libperditiondb_postgresql.la
-man/man8/perditiondb_postgresql_makedb.8
-sbin/perditiondb_postgresql_makedb
diff --git a/mail/perdition/DESCR b/mail/perdition/DESCR
deleted file mode 100644
index 5561659060e..00000000000
--- a/mail/perdition/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-Perdition is a fully featured POP3 and IMAP4 proxy server. It is able to
-handle both SSL and non-SSL connections and redirect users to a
-real-server based on a database lookup. Perdition supports modular based
-database access. ODBC, MySQL, PostgreSQL, GDBM, POSIX Regular Expression
-and NIS modules ship with the distribution. The API for modules is open
-allowing abitary modules to be written to allow access to any data store.
-
-Perdition can be used to: Create large mail systems where a users mailbox
-may be stored on one of several hosts. Integrate different mail systems
-together. Migrate between different email infastructure. And in firewall
-applications.
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
deleted file mode 100644
index e0c62ac5e64..00000000000
--- a/mail/perdition/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2007/03/02 12:05:32 grant Exp $
-#
-
-PKGREVISION= 6
-
-PERDITION_COMMENT= main program
-
-.include "options.mk"
-
-OWN_DIRS+= ${PKG_SYSCONFDIR}
-.for f in Makefile.popmap perdition.conf popmap popmap.re
-CONF_FILES+= ${EGDIR}/perdition/$f ${PKG_SYSCONFDIR}/${f:.popmap=}
-.endfor
-RCD_SCRIPTS+= perdition.imap4 perdition.imap4s perdition.pop3 perdition.pop3s
-
-SUBST_CLASSES+= paths
-SUBST_STAGE.paths= pre-configure
-SUBST_FILES.paths= etc/perdition/perdition.conf
-SUBST_SED.paths= -e "s|/usr/lib/|${PREFIX}/lib/|g" \
- -e "s|/etc/perdition/|${PKG_SYSCONFDIR}/|g"
-SUBST_MESSAGE.paths= Fixing paths.
-
-.include "Makefile.common"
diff --git a/mail/perdition/Makefile.common b/mail/perdition/Makefile.common
deleted file mode 100644
index f9efa3a1c18..00000000000
--- a/mail/perdition/Makefile.common
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile.common,v 1.5 2007/03/02 23:44:13 tv Exp $
-#
-
-PERDITION_VERSION= 1.17
-DISTNAME= perdition-${PERDITION_VERSION}
-CATEGORIES= mail
-MASTER_SITES= http://www.vergenet.net/linux/perdition/download/1.17/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.vergenet.net/linux/perdition/
-COMMENT= IMAP/POP3 proxy redirector (${PERDITION_COMMENT})
-
-USE_TOOLS= gmake
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-PKG_SYSCONFSUBDIR= perdition
-
-CONFIGURE_ARGS+= --disable-daemon-map
-CONFIGURE_ARGS+= --localstatedir=/var
-
-EGDIR= ${PREFIX}/share/examples
-INSTALL_AM_MAKEFLAGS= sysconfdir=${EGDIR}
-INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
-
-.ifdef PERDITION_PKGNAME
-PKGNAME= ${DISTNAME:S/-/-${PERDITION_PKGNAME}-/}
-DEPENDS+= perdition-${PERDITION_VERSION}{,nb*}:../../mail/perdition
-BUILD_DIRS?= perdition/db/${PERDITION_PKGNAME}
-.endif
-
-PERDITION_SKIP_DISABLE?=${PERDITION_PKGNAME}
-.for f in mysql odbc pg gdbm bdb ldap ldap-doc
-. if empty(PERDITION_SKIP_DISABLE:M$f)
-CONFIGURE_ARGS+= --disable-$f
-. endif
-.endfor
-
-DESCR_SRC= ${PKGDIR}/../perdition/DESCR
-DISTINFO_FILE= ${PKGDIR}/../perdition/distinfo
-PATCHDIR= ${PKGDIR}/../perdition/patches
-
-.include "../../devel/popt/buildlink3.mk"
-.include "../../devel/vanessa_adt/buildlink3.mk"
-.include "../../devel/vanessa_logger/buildlink3.mk"
-.include "../../devel/vanessa_socket/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/perdition/PLIST b/mail/perdition/PLIST
deleted file mode 100644
index 3e65f2f2dc5..00000000000
--- a/mail/perdition/PLIST
+++ /dev/null
@@ -1,29 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2006/03/04 16:06:29 tv Exp $
-include/jain.h
-lib/libjain.la
-lib/libperditiondb_nis.la
-lib/libperditiondb_posix_regex.la
-man/man5/perditiondb.5
-man/man8/perdition.8
-man/man8/perdition.imap4.8
-man/man8/perdition.imap4s.8
-man/man8/perdition.imaps.8
-man/man8/perdition.pop3.8
-man/man8/perdition.pop3s.8
-sbin/perdition
-sbin/perdition.imap4
-sbin/perdition.imap4s
-sbin/perdition.imaps
-sbin/perdition.pop3
-sbin/perdition.pop3s
-${PERDITION_HAVE_PAM}share/examples/pam.d/perdition
-share/examples/perdition/Makefile
-share/examples/perdition/Makefile.popmap
-share/examples/perdition/perdition.conf
-share/examples/perdition/popmap
-share/examples/perdition/popmap.re
-share/examples/rc.d/perdition.imap4
-share/examples/rc.d/perdition.imap4s
-share/examples/rc.d/perdition.pop3
-share/examples/rc.d/perdition.pop3s
-@dirrm share/examples/perdition
diff --git a/mail/perdition/buildlink3.mk b/mail/perdition/buildlink3.mk
deleted file mode 100644
index d1689bbda05..00000000000
--- a/mail/perdition/buildlink3.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:57 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PERDITION_BUILDLINK3_MK:= ${PERDITION_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= perdition
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nperdition}
-BUILDLINK_PACKAGES+= perdition
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}perdition
-
-.if !empty(PERDITION_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.perdition+= perdition>=1.17
-BUILDLINK_ABI_DEPENDS.perdition?= perdition>=1.17nb1
-BUILDLINK_PKGSRCDIR.perdition?= ../../mail/perdition
-.endif # PERDITION_BUILDLINK3_MK
-
-# The following are included in Makefile.common for "configure"'s sake.
-#.include "../../devel/popt/buildlink3.mk"
-#.include "../../devel/vanessa_adt/buildlink3.mk"
-#.include "../../devel/vanessa_logger/buildlink3.mk"
-#.include "../../devel/vanessa_socket/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/perdition/distinfo b/mail/perdition/distinfo
deleted file mode 100644
index 842ac532aaf..00000000000
--- a/mail/perdition/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.6 2007/03/02 11:37:33 grant Exp $
-
-SHA1 (perdition-1.17.tar.gz) = 5e04f172db4a7ee2af5b7a28c19c231f955243fc
-RMD160 (perdition-1.17.tar.gz) = cc3c4679390132ece6858eca6483ffddead568e4
-Size (perdition-1.17.tar.gz) = 552149 bytes
-SHA1 (patch-aa) = 17c6bf55f77187cad59f779e6fbcd85d6921eab1
-SHA1 (patch-ab) = 7d7b8458c104437e83934b3b0fea573bd54aced0
-SHA1 (patch-ac) = 5096afa901f6f5766d9a8b0d2481c8f9c1356fe1
-SHA1 (patch-ad) = 7b53169a8571141016fa79e1fbf55439579c4d77
-SHA1 (patch-ae) = a3a41d06a7a63d479f4c8de29b6d7ee2a745dd87
-SHA1 (patch-af) = 0fa5a853c69ff6869e3a752fc592228d6e782079
-SHA1 (patch-ag) = 350cfc64f98611455292d4d052463e6828588338
diff --git a/mail/perdition/files/perdition.imap4.sh b/mail/perdition/files/perdition.imap4.sh
deleted file mode 100755
index b820a537af5..00000000000
--- a/mail/perdition/files/perdition.imap4.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: perdition.imap4.sh,v 1.1 2006/02/13 15:18:32 tv Exp $
-#
-# PROVIDE: perdition
-# REQUIRE: DAEMON LOGIN
-
-. /etc/rc.subr
-
-procname="perdition.imap4"
-name="perdition_imap4"
-rcvar=$name
-command="@PREFIX@/sbin/${procname}"
-pidfile="/var/run/${procname}/${procname}.pid"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/perdition/files/perdition.imap4s.sh b/mail/perdition/files/perdition.imap4s.sh
deleted file mode 100755
index f9c213e90df..00000000000
--- a/mail/perdition/files/perdition.imap4s.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: perdition.imap4s.sh,v 1.1 2006/02/13 15:18:32 tv Exp $
-#
-# PROVIDE: perdition
-# REQUIRE: DAEMON LOGIN
-
-. /etc/rc.subr
-
-procname="perdition.imap4s"
-name="perdition_imap4s"
-rcvar=$name
-command="@PREFIX@/sbin/${procname}"
-pidfile="/var/run/${procname}/${procname}.pid"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/perdition/files/perdition.pop3.sh b/mail/perdition/files/perdition.pop3.sh
deleted file mode 100755
index 42c4dc96c8c..00000000000
--- a/mail/perdition/files/perdition.pop3.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: perdition.pop3.sh,v 1.1 2006/02/13 15:18:32 tv Exp $
-#
-# PROVIDE: perdition
-# REQUIRE: DAEMON LOGIN
-
-. /etc/rc.subr
-
-procname="perdition.pop3"
-name="perdition_pop3"
-rcvar=$name
-command="@PREFIX@/sbin/${procname}"
-pidfile="/var/run/${procname}/${procname}.pid"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/perdition/files/perdition.pop3s.sh b/mail/perdition/files/perdition.pop3s.sh
deleted file mode 100755
index e68cc95a1fb..00000000000
--- a/mail/perdition/files/perdition.pop3s.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: perdition.pop3s.sh,v 1.1 2006/02/13 15:18:32 tv Exp $
-#
-# PROVIDE: perdition
-# REQUIRE: DAEMON LOGIN
-
-. /etc/rc.subr
-
-procname="perdition.pop3s"
-name="perdition_pop3s"
-rcvar=$name
-command="@PREFIX@/sbin/${procname}"
-pidfile="/var/run/${procname}/${procname}.pid"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/perdition/options.mk b/mail/perdition/options.mk
deleted file mode 100644
index da5430a6472..00000000000
--- a/mail/perdition/options.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2007/03/02 12:05:32 grant Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.perdition
-PKG_SUPPORTED_OPTIONS= ssl pam
-PKG_SUGGESTED_OPTIONS= ssl
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Build with PAM support.
-###
-.if !empty(PKG_OPTIONS:Mpam)
-. include "../../mk/pam.buildlink3.mk"
-PLIST_SUBST+= PERDITION_HAVE_PAM=
-.else
-# prevent recognition of PAM in the base system
-CONFIGURE_ENV+= ac_cv_header_security_pam_appl_h=no
-PLIST_SUBST+= PERDITION_HAVE_PAM="@comment "
-.endif
-
-###
-### Build with OpenSSL as the underlying crypto library.
-###
-.if !empty(PKG_OPTIONS:Mssl)
-. include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+= --with-ssl-includes=${BUILDLINK_PREFIX.openssl}/include
-CONFIGURE_ARGS+= --with-ssl-libraries=${BUILDLINK_PREFIX.openssl}/lib
-.else
-CONFIGURE_ARGS+= --disable-ssl
-.endif
diff --git a/mail/perdition/patches/patch-aa b/mail/perdition/patches/patch-aa
deleted file mode 100644
index ac36bf0a7e3..00000000000
--- a/mail/perdition/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/01/31 21:07:30 tv Exp $
-
---- makegdbm/Makefile.in.orig 2005-06-22 02:32:35.000000000 -0400
-+++ makegdbm/Makefile.in
-@@ -144,10 +144,10 @@ EXTRA_DIST = makegdbm.1
- makegdbm_SOURCES = makegdbm.c options.c options.h
-
-
--makegdbm_LDADD = -L../libjain -L../libjain/.libs/ -ljain -lgdbm -lpopt @dmalloc_lib@
-+makegdbm_LDADD = -L$(prefix)/lib -ljain -lgdbm -lpopt @dmalloc_lib@
-
-
--INCLUDES = -I$(top_srcdir)/libjain
-+INCLUDES = -I$(prefix)/include
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =
diff --git a/mail/perdition/patches/patch-ab b/mail/perdition/patches/patch-ab
deleted file mode 100644
index 72b741a733a..00000000000
--- a/mail/perdition/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/03/01 22:49:42 wiz Exp $
-
---- makebdb/Makefile.in.orig 2005-06-22 06:32:35.000000000 +0000
-+++ makebdb/Makefile.in
-@@ -144,10 +144,10 @@ EXTRA_DIST = makebdb.1
- makebdb_SOURCES = makebdb.c options.c options.h
-
-
--makebdb_LDADD = -L../libjain -L../libjain/.libs/ -ljain -ldb -lpopt @dmalloc_lib@
-+makebdb_LDADD = -L$(prefix)/lib -ljain -ldb4 -lpopt @dmalloc_lib@
-
-
--INCLUDES = -I$(top_srcdir)/libjain
-+INCLUDES = -I$(prefix)/include
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =
diff --git a/mail/perdition/patches/patch-ac b/mail/perdition/patches/patch-ac
deleted file mode 100644
index 287aaccc737..00000000000
--- a/mail/perdition/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/03/04 15:16:30 joerg Exp $
-
---- perdition/pam.c.orig 2006-03-04 15:10:45.000000000 +0000
-+++ perdition/pam.c
-@@ -31,6 +31,7 @@
- #include "config.h"
- #endif
-
-+#include <errno.h>
-
- #include "pam.h"
-
-@@ -52,8 +53,6 @@ int perdition_conv(
- ){
- char *pass;
-
-- extern int errno;
--
- if((
- *response=(struct pam_response *)malloc(sizeof(struct pam_response))
- )==NULL){
diff --git a/mail/perdition/patches/patch-ad b/mail/perdition/patches/patch-ad
deleted file mode 100644
index e64ecea59ad..00000000000
--- a/mail/perdition/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/03/04 15:35:49 joerg Exp $
-
---- makebdb/makebdb.c.orig 2006-03-04 15:18:34.000000000 +0000
-+++ makebdb/makebdb.c
-@@ -44,8 +44,6 @@
- #endif
-
-
--extern int errno;
--
- #define MAX_LINE_LENGTH 4096
- #define FIELD_DELIMITER ':'
-
diff --git a/mail/perdition/patches/patch-ae b/mail/perdition/patches/patch-ae
deleted file mode 100644
index a85eaaf30c7..00000000000
--- a/mail/perdition/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/03/04 15:35:49 joerg Exp $
-
---- makegdbm/makegdbm.c.orig 2006-03-04 15:21:12.000000000 +0000
-+++ makegdbm/makegdbm.c
-@@ -42,8 +42,6 @@
- #endif
-
-
--extern int errno;
--
- #define MAX_LINE_LENGTH 4096
- #define FIELD_DELIMITER ':'
-
diff --git a/mail/perdition/patches/patch-af b/mail/perdition/patches/patch-af
deleted file mode 100644
index 02aab9e2fdf..00000000000
--- a/mail/perdition/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/06/28 13:46:58 joerg Exp $
-
---- perdition/db/bdb/Makefile.in.orig 2006-06-28 13:34:23.000000000 +0000
-+++ perdition/db/bdb/Makefile.in
-@@ -142,7 +142,7 @@ libperditiondb_bdb_la_SOURCES = perdi
-
- libperditiondb_bdb_la_LDFLAGS = -version-info 0:0:0
-
--libperditiondb_bdb_la_LIBADD = -ldb
-+libperditiondb_bdb_la_LIBADD = -ldb4
-
- INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/perdition -I$(top_srcdir)/libjain -DPERDITIONDB_BDB_SYSCONFDIR=\"$(sysconfdir)/perdition\" @ssl_includes@
-
diff --git a/mail/perdition/patches/patch-ag b/mail/perdition/patches/patch-ag
deleted file mode 100644
index 4a718f7455e..00000000000
--- a/mail/perdition/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2007/03/02 11:37:33 grant Exp $
-
---- perdition/Makefile.in.orig 2005-06-22 16:32:35.000000000 +1000
-+++ perdition/Makefile.in
-@@ -155,7 +155,7 @@ INCLUDES = -I$(top_srcdir)/libjain -DPE
- LDADD = -L../libjain -L../libjain/.libs/ -ljain -lvanessa_adt -lvanessa_socket -lvanessa_logger -lpopt @pam_lib@ @socket_lib@ @nsl_lib@ @resolv_lib@ @dl_lib@ @ssl_lib@ @dmalloc_lib@
-
-
--perdition_LDFLAGS = -rdynamic
-+perdition_LDFLAGS =
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =
diff --git a/mail/pfqueue/DESCR b/mail/pfqueue/DESCR
deleted file mode 100644
index 6b0985b99d7..00000000000
--- a/mail/pfqueue/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-pfqueue is an effort to give postqueue/mailq/postsuper a console
-(ncurses) interface: it won't add any particular functionality to
-those provided with postfix itself, but will hopefully make them to
-use.
-
-It's a real-time queue scanner, that show per-queue lists of existing
-messages; the messages can be deleted, put on hold or released
-
-Just for example, it may be useful to inspect a traffic jam at a given
-time, to see what is falling into and unexpectedly crowding you deferred
-queue
diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile
deleted file mode 100644
index 3f766e188fa..00000000000
--- a/mail/pfqueue/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:59 rillig Exp $
-#
-
-DISTNAME= pfqueue-0.1.4
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pfqueue/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://pfqueue.sourceforge.net/
-COMMENT= Real-time queue scanner for postfix
-
-GNU_CONFIGURE= yes
-INCOMPAT_CURSES= NetBSD-1.*-*
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/pfqueue ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/pfqueue.1 ${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/pfqueue/PLIST b/mail/pfqueue/PLIST
deleted file mode 100644
index 18f72d8c0ba..00000000000
--- a/mail/pfqueue/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/12/28 15:51:16 xtraeme Exp $
-bin/pfqueue
-man/man1/pfqueue.1
diff --git a/mail/pfqueue/distinfo b/mail/pfqueue/distinfo
deleted file mode 100644
index 7887730592a..00000000000
--- a/mail/pfqueue/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:26 agc Exp $
-
-SHA1 (pfqueue-0.1.4.tar.gz) = 0b47055f3a012b9e827d83ba50850b1295d88b5d
-RMD160 (pfqueue-0.1.4.tar.gz) = 9932454d57f641c9fbfcb77456cd899f78ce7dae
-Size (pfqueue-0.1.4.tar.gz) = 103880 bytes
diff --git a/mail/php-imap/DESCR b/mail/php-imap/DESCR
deleted file mode 100644
index fbe4c2cdc96..00000000000
--- a/mail/php-imap/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-PHP is a programming language designed to be embedded into web pages.
-This module provides access to IMAP (Internet Mailbox Access Protocol)
-servers.
diff --git a/mail/php-imap/Makefile b/mail/php-imap/Makefile
deleted file mode 100644
index 5f50e315bd8..00000000000
--- a/mail/php-imap/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/06/04 16:26:54 joerg Exp $
-
-MODNAME= imap
-CATEGORIES+= mail
-COMMENT= PHP extension for IMAP (Internet Mailbox Access Protocol)
-
-CONFLICTS= php-imap-[0-9]*
-
-USE_PHP_EXT_PATCHES= yes
-
-CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.imap-uw}
-CONFIGURE_ARGS+= --with-${MODNAME}-ssl=${SSLBASE}
-CONFIGURE_ARGS+= --with-${MODNAME}-linkage
-
-CONFIGURE_ENV+= ac_cv_lib_pam_pam_start=no
-
-# Imap extension's config.m4 calls m4 macro PHP_SETUP_OPENSSL() which
-# expects PHP_ARG_WITH(openssl, ...) being called beforehand so that
-# PHP_OPENSSL is set. For a self contained extension build like for
-# this package this is not the case of course.
-
-CONFIGURE_ENV+= PHP_OPENSSL=${SSLBASE:Q}
-
-.include "../../mail/imap-uw/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../lang/php/ext.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/pine-pgp-filters/DESCR b/mail/pine-pgp-filters/DESCR
deleted file mode 100644
index a961567f9f5..00000000000
--- a/mail/pine-pgp-filters/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-pine-pgp-filters are simple, fast, Bourne Shell-based pgp filters
-for Pine. They use gnupg if it's available. It includes encrypt,
-decrypt, sign, and verify functions and a pseudo-filter to verify
-messages that were sent using MIME encoding to attach the signature.
diff --git a/mail/pine-pgp-filters/Makefile b/mail/pine-pgp-filters/Makefile
deleted file mode 100644
index db6380cd530..00000000000
--- a/mail/pine-pgp-filters/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:30:01 jlam Exp $
-#
-
-DISTNAME= pine-pgp-filters-1.1
-PKGREVISION= 3
-CATEGORIES= security mail
-MASTER_SITES= http://dougbarton.net/FreeBSD/Downloads/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://dougbarton.net/FreeBSD/Downloads/
-COMMENT= Filters to integrate Pine with gnupg or pgp
-
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
-
-DOCDIR= ${PREFIX}/share/doc/pine-pgp-filters
-DOCFILES= BUGS CHANGES INSTALL LICENSE README
-
-do-build:
-.for f in ${DOCFILES}
- ${SED} 's:/usr/local:${PREFIX}:g' ${WRKSRC}/${f} > ${WRKSRC}/${f}.gen
-.endfor
-
-post-install:
- ${RM} ${PREFIX}/libexec/ppf_*.orig
- ${INSTALL_DATA_DIR} ${DOCDIR}
-.for f in ${DOCFILES}
- ${INSTALL_DATA} ${WRKSRC}/${f}.gen ${DOCDIR}/${f}
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/pine-pgp-filters/PLIST b/mail/pine-pgp-filters/PLIST
deleted file mode 100644
index 39ad77c9d0c..00000000000
--- a/mail/pine-pgp-filters/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/02/19 00:55:46 wiz Exp $
-libexec/ppf_decrypt
-libexec/ppf_encrypt
-libexec/ppf_mime
-libexec/ppf_sign
-libexec/ppf_verify
-share/doc/pine-pgp-filters/BUGS
-share/doc/pine-pgp-filters/CHANGES
-share/doc/pine-pgp-filters/INSTALL
-share/doc/pine-pgp-filters/LICENSE
-share/doc/pine-pgp-filters/README
-@dirrm share/doc/pine-pgp-filters
diff --git a/mail/pine-pgp-filters/distinfo b/mail/pine-pgp-filters/distinfo
deleted file mode 100644
index 4c0b900b449..00000000000
--- a/mail/pine-pgp-filters/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:26 agc Exp $
-
-SHA1 (pine-pgp-filters-1.1.tar.gz) = e81d5ff8c3632d423728aeaed32236093a62a6db
-RMD160 (pine-pgp-filters-1.1.tar.gz) = cf97953b4bcee6cbecde3ee380c6c3d0e08df05c
-Size (pine-pgp-filters-1.1.tar.gz) = 6859 bytes
-SHA1 (patch-aa) = 0059bdd731355b7f94e1333c5c476774cffd3ca2
-SHA1 (patch-ab) = 271a81ba0bcc224040e663bf8961c81d136e6edd
-SHA1 (patch-ac) = 4e7ba38d8b4f1d393264fe207ab4ef8e312fcc40
diff --git a/mail/pine-pgp-filters/patches/patch-aa b/mail/pine-pgp-filters/patches/patch-aa
deleted file mode 100644
index 6544399e59f..00000000000
--- a/mail/pine-pgp-filters/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/02/07 15:54:04 abs Exp $
-
---- scripts/ppf_decrypt.orig 2003-09-06 23:25:42.000000000 +0100
-+++ scripts/ppf_decrypt
-@@ -11,11 +11,11 @@ trap "rm -f ${TDIR}/* ; rmdir ${TDIR} ;
- pgp_failed () {
- message_file="${1}"
-
-- echo '------------------------------------------------------------------------------' >${TDIR}/error
-+ echo '----------------------------------------------------------------------------' >${TDIR}/error
- echo "$0: ${2:-pgp command failed}" >>${TDIR}/error
- echo '' >>${TDIR}/error
- cat ${TDIR}/stderr >>${TDIR}/error
-- echo '------------------------------------------------------------------------------' >>${TDIR}/error
-+ echo '----------------------------------------------------------------------------' >>${TDIR}/error
- echo '' >>${TDIR}/error
- cp ${message_file} ${TDIR}/message
- cat ${TDIR}/error ${TDIR}/message > ${message_file}
-@@ -38,9 +38,9 @@ else
- pgp_failed ${1} "Can't find pgp on this system"
- fi
-
--echo '----------------------------- PGP Command Output -----------------------------' >${1}
-+echo '--------------------------- PGP Command Output -----------------------------' >${1}
- grep -v '^$' ${TDIR}/stderr >>${1}
--echo '------------------------------- End PGP Output -------------------------------' >>${1}
-+echo '----------------------------- End PGP Output -------------------------------' >>${1}
- echo '' >>${1}
- cat ${TDIR}/message >>${1}
-
diff --git a/mail/pine-pgp-filters/patches/patch-ab b/mail/pine-pgp-filters/patches/patch-ab
deleted file mode 100644
index 597499f4bdf..00000000000
--- a/mail/pine-pgp-filters/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/02/07 15:54:04 abs Exp $
-
---- scripts/ppf_mime.orig 2003-09-05 11:23:43.000000000 +0100
-+++ scripts/ppf_mime
-@@ -41,9 +41,9 @@ fi
- egrep -hi '^(From|Resent-From|To|Resent-To|Cc|Resent-cc|Bcc|Newsgroups|Followup-To|Date|Resent-Date|Organization|Subject|Resent-Subject|Reply-To):' ${TDIR}/fa[ab]
- echo ''
-
--echo '----------------------------- PGP Command Output -----------------------------'
-+echo '--------------------------- PGP Command Output -----------------------------'
- grep -v '^$' ${TDIR}/stderr
--echo '------------------------------- End PGP Output -------------------------------'
-+echo '----------------------------- End PGP Output -------------------------------'
-
- # Remove the MIME headers from the message
- sed -e '1,2d' -e '3s/^Content-.*//' ${TDIR}/message
diff --git a/mail/pine-pgp-filters/patches/patch-ac b/mail/pine-pgp-filters/patches/patch-ac
deleted file mode 100644
index 2581112fd46..00000000000
--- a/mail/pine-pgp-filters/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/02/07 15:54:05 abs Exp $
-
---- scripts/ppf_verify.orig 2003-09-06 23:26:42.000000000 +0100
-+++ scripts/ppf_verify
-@@ -11,11 +11,11 @@ trap "rm -f ${TDIR}/* ; rmdir ${TDIR} ;
- pgp_failed () {
- message_file="${1}"
-
-- echo '------------------------------------------------------------------------------' >${TDIR}/error
-+ echo '----------------------------------------------------------------------------' >${TDIR}/error
- echo "$0: ${2:-pgp command failed}" >>${TDIR}/error
- echo '' >>${TDIR}/error
- cat ${TDIR}/stderr >>${TDIR}/error
-- echo '------------------------------------------------------------------------------' >>${TDIR}/error
-+ echo '----------------------------------------------------------------------------' >>${TDIR}/error
- echo '' >>${TDIR}/error
- cp ${message_file} ${TDIR}/message
- cat ${TDIR}/error ${TDIR}/message > ${message_file}
-@@ -36,9 +36,9 @@ else
- pgp_failed ${1} "Can't find pgp on this system"
- fi
-
--echo '----------------------------- PGP Command Output -----------------------------' >${1}
-+echo '--------------------------- PGP Command Output -----------------------------' >${1}
- egrep -v '^$|pattern is:' ${TDIR}/stderr >>${1}
--echo '------------------------------- End PGP Output -------------------------------' >>${1}
-+echo '----------------------------- End PGP Output -------------------------------' >>${1}
- echo '' >>${1}
- cat ${TDIR}/message >>${1}
-
diff --git a/mail/pine/DESCR b/mail/pine/DESCR
deleted file mode 100644
index 1183c77b054..00000000000
--- a/mail/pine/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Pine is a tool for reading, sending, and managing electronic messages.
-It was designed specifically with novice computer users in mind, but can
-be tailored to accommodate the needs of "power users" as well. Pine uses
-Internet message protocols (e.g. RFC-822, SMTP, MIME, IMAP, NNTP) and
-runs on Unix and PCs.
diff --git a/mail/pine/MESSAGE b/mail/pine/MESSAGE
deleted file mode 100644
index 2a845f8e8fe..00000000000
--- a/mail/pine/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/05/07 20:00:53 reed Exp $
-
-If you want to use the spell checking feature of pine, set the
-environment variable SPELL to "${PREFIX}/bin/ispell -l".
-
-The optional configuration file "${PKG_SYSCONFDIR}/pine.conf" can be
-used to set system wide defaults. The format of this file is identical
-to the .pinerc file that is auto-generated by pine in your home directory.
-
-If you need PGP (or GPG) features, consider installing the
-security/pinepgp package.
-
-===========================================================================
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
deleted file mode 100644
index d0b978cb537..00000000000
--- a/mail/pine/Makefile
+++ /dev/null
@@ -1,121 +0,0 @@
-# $NetBSD: Makefile,v 1.113 2007/03/03 21:54:23 jwise Exp $
-
-DISTNAME= pine4.64
-PKGNAME= pine-4.64
-PKGREVISION= 1
-CATEGORIES= mail news
-MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \
- ftp://ftp.fu-berlin.de/unix/mail/pine/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= jwise@netbsd.org
-HOMEPAGE= http://www.washington.edu/pine/
-COMMENT= Program for Internet News and E-mail
-
-LICENSE= pine-license
-
-
-CONF_FILES= ${PREFIX}/share/examples/pine/pine.conf ${PKG_SYSCONFDIR}/pine.conf
-
-.include "../../mk/compiler.mk"
-
-.if ${OPSYS} == "SunOS"
-BUILDNAME= so5
-BUILDFILE= sol
-.elif ${OPSYS} == "Linux"
-BUILDNAME= lnx
-BUILDFILE= lnx
-.elif ${OPSYS} == "Darwin"
-BUILDNAME= osx
-BUILDFILE= osx
-LIBS+= -lcurses
-.elif ${OPSYS} == "IRIX"
-. if ${OS_VERSION} >= 6.5
-BUILDNAME= sg6
-. else
-BUILDNAME= sgi
-. endif
-BUILDFILE= sgi
-.else
-BUILDNAME= neb
-BUILDFILE= neb
-.endif
-
-.if !empty(CC_VERSION:Mgcc-*)
-UNLIMIT_RESOURCES+= datasize
-.endif
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.pine
-PKG_SUPPORTED_OPTIONS= ldap fancythreads
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mldap)
-. include "../../databases/openldap-client/buildlink3.mk"
-PINE_LDAPCFLAGS= LDAPCFLAGS="-DENABLE_LDAP"
-PINE_LDAPLIBS= LDAPLIBS="-lldap -llber"
-.endif
-
-.if !empty(PKG_OPTIONS:Mfancythreads)
-PATCH_SITES+= http://www.math.washington.edu/~chappa/pine/patches/pine4.64/
-PATCHFILES+= fancy.patch.gz
-PATCH_DIST_STRIP= -p1
-.endif
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-# Make sure the imap lib that comes with pine isn't
-# used (see http://www.securityfocus.com/advisories/2646)
-pre-patch:
- ${RM} -fr ${WRKSRC}/imap
-
-do-configure:
- ${CP} -f ${WRKSRC}/pine/osdep/os-${BUILDFILE}.h ${WRKSRC}/pine/osdep/os-${BUILDFILE}.h.orig
- ${SED} \
- -e 's@/usr/local/lib/@${PKG_SYSCONFDIR}/@' \
- -e 's@DEFAULT_DEBUG.*2@DEFAULT_DEBUG 0@' \
- <${WRKSRC}/pine/osdep/os-${BUILDFILE}.h.orig >${WRKSRC}/pine/osdep/os-${BUILDFILE}.h
- @${RM} -rf ${WRKSRC}/pico
- @${LN} -sf ${BUILDLINK_DIR}/include/pico ${WRKSRC}/pico
-
-do-build:
- cd ${WRKSRC} && ${_ULIMIT_CMD} \
- ${SETENV} ${MAKE_ENV} ./build ${BUILDNAME} \
- ${PINE_LDAPCFLAGS} ${PINE_LDAPLIBS} \
- PREFIX=${PREFIX} \
- CC="${CC} ${CFLAGS}" \
- EXTRALDFLAGS="${LDFLAGS} ${LIBS}"
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/rpdump ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/rpload ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pine
- ${INSTALL_MAN} ${WRKSRC}/doc/pine.1 ${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_MAN} ${WRKSRC}/doc/rpdump.1 ${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_MAN} ${WRKSRC}/doc/rpload.1 ${PREFIX}/${PKGMANDIR}/man1
- ( ${ECHO} '# (This file is not part of the pine distribution! - HF)' ; \
- ${PREFIX}/bin/pine -conf ) | ${SED} \
- -e 's|^\(use-only-domain-name\)=.*$$|\1=No|g' \
- -e 's|^\(feature-list\)=.*$$|\1=enable-mail-check-cue,enable-suspend,expanded-view-of-addressbooks,include-header-in-reply,include-text-in-reply,show-selected-in-boldface,signature-at-bottom|g' \
- -e 's|^\(sort-key\)=.*$$|\1=Arrival/Reverse|g' \
- >${PREFIX}/share/examples/pine/pine.conf
- ${INSTALL_DATA} ${FILESDIR}/pine.conf.fixed ${PREFIX}/share/examples/pine/
- ${INSTALL_DATA_DIR} ${PREFIX}/share/pine
- ${INSTALL_DATA_DIR} ${PREFIX}/share/pine/contrib
- ${INSTALL_DATA_DIR} ${PREFIX}/share/pine/contrib/utils
- ${INSTALL_DATA} ${WRKSRC}/doc/tech-notes.txt ${PREFIX}/share/pine/
- ${INSTALL_DATA} ${WRKSRC}/contrib/krb5-setup ${PREFIX}/share/pine/contrib
- ${INSTALL_DATA} ${WRKSRC}/contrib/ldap-setup ${PREFIX}/share/pine/contrib
- ${INSTALL_DATA} ${WRKSRC}/contrib/utils/* ${PREFIX}/share/pine/contrib/utils
- ${CHMOD} +x ${PREFIX}/share/pine/contrib/utils/*.sh
-
-# 2004e contains extensions needed by Pine 4.63
-BUILDLINK_API_DEPENDS.imap-uw+= imap-uw>=2004e
-.include "../../mail/imap-uw/buildlink3.mk"
-
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../editors/pico/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/pine/PLIST b/mail/pine/PLIST
deleted file mode 100644
index 83c76294ec1..00000000000
--- a/mail/pine/PLIST
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2006/01/12 21:02:54 adam Exp $
-bin/pine
-bin/rpdump
-bin/rpload
-man/man1/pine.1
-man/man1/rpdump.1
-man/man1/rpload.1
-share/examples/pine/pine.conf
-share/examples/pine/pine.conf.fixed
-share/pine/contrib/krb5-setup
-share/pine/contrib/ldap-setup
-share/pine/contrib/utils/ansiprt.c
-share/pine/contrib/utils/brk2pine.sh
-share/pine/contrib/utils/mailtrfc.sh
-share/pine/contrib/utils/pwd2pine
-share/pine/contrib/utils/sendit.sh
-share/pine/contrib/utils/sendtoall
-share/pine/contrib/utils/txtcc.sh
-share/pine/tech-notes.txt
-@dirrm share/pine/contrib/utils
-@dirrm share/pine/contrib
-@dirrm share/pine
-@dirrm share/examples/pine
diff --git a/mail/pine/distinfo b/mail/pine/distinfo
deleted file mode 100644
index eda720db976..00000000000
--- a/mail/pine/distinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: distinfo,v 1.33 2007/03/03 21:54:23 jwise Exp $
-
-SHA1 (fancy.patch.gz) = 6cb75bb64110d8c4e3f94f3725157b6fb28cccd6
-RMD160 (fancy.patch.gz) = 67ff35aa6906eff283549797e7bc6392294e4372
-Size (fancy.patch.gz) = 25129 bytes
-SHA1 (pine4.64.tar.bz2) = b88aeb64ec2fa30bbb38fda3a051d98dc0e19c5e
-RMD160 (pine4.64.tar.bz2) = 8661cd3c0875e46c8cd5eafa7c7c964f79a3b3fd
-Size (pine4.64.tar.bz2) = 3110790 bytes
-SHA1 (patch-aa) = 800f84f3c868e6d17798e9f98d8151bb734143b6
-SHA1 (patch-ab) = cfac4d24763dbd4285e03c6c25891469c5ac1953
-SHA1 (patch-ac) = 870d7d414e25b37e47c5f62447210fe7800c733b
-SHA1 (patch-ad) = 48a9a7b4014bfc5499aef3e52a929f6f56a67562
-SHA1 (patch-ae) = 0faf3a4161cba517a559a776d2a3a7fcb5116570
-SHA1 (patch-af) = 1cd12e0b7aea804528730ed7323e7ea1ac385466
-SHA1 (patch-ag) = 74d7e2dc9b986148825335f6f2b52bde963f9a67
-SHA1 (patch-al) = 0e25dad2c4caf71b4204f137eee3f85d7b9b507c
-SHA1 (patch-ap) = ad1733f86195ecbd2211f3af7671c1d1c35803bc
-SHA1 (patch-aq) = 127023252f8984651c861be23735d50ae85eaa1e
diff --git a/mail/pine/files/pine.conf.fixed b/mail/pine/files/pine.conf.fixed
deleted file mode 100644
index 6bfc0609c90..00000000000
--- a/mail/pine/files/pine.conf.fixed
+++ /dev/null
@@ -1,15 +0,0 @@
-###########################################################################
-#
-# $NetBSD: pine.conf.fixed,v 1.3 1998/08/07 11:09:47 agc Exp $
-#
-# pine.conf.fixed
-# Insert any statements from .../pine.conf here that you don't want your
-# users can change.
-###########################################################################
-# (This file is not part of the pine distribution!)
-###########################################################################
-
-# The following option does the equivalent of Pine's 3.9x behavior of
-# not allowing the From: field to change for any user regardless of whether
-# the allow-changing-from option is set in .pinerc.
-#feature-list=no-allow-changing-from
diff --git a/mail/pine/patches/patch-aa b/mail/pine/patches/patch-aa
deleted file mode 100644
index a21cb781b44..00000000000
--- a/mail/pine/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2001/12/15 08:31:38 martti Exp $
-
---- pine/makefile.gs5.orig Tue Oct 23 22:24:47 2001
-+++ pine/makefile.gs5 Fri Dec 14 19:24:02 2001
-@@ -49,7 +49,7 @@
- MAKE= make
- OPTIMIZE= # -O
- PROFILE= # -pg
--DEBUG= -g -DDEBUG
-+DEBUG= -DDEBUG # -g # XXX crashes on 'c'ompose w/o -DDEBUG
-
- CCLIENTDIR= ../c-client
- PICODIR= ../pico
-@@ -71,9 +71,9 @@
- # leaving out the UCB compatibility includes and libraries.
- # LDCC= $(PICODIR)/cc5.sol
-
--STDLIBS= -ltermlib
--LOCLIBS= $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
--LIBS= $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
-+STDLIBS= -lssl -lcrypto -ltermlib
-+LOCLIBS= -lpico -lc-client
-+LIBS= -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
- `cat $(CCLIENTDIR)/LDFLAGS`
-
- STDCFLAGS= -DSV4 -DSYSTYPE=\"GSO\" -DMOUSE
-@@ -95,7 +95,7 @@
-
- all: pine rpload rpdump
-
--pine: $(OFILES) $(LOCLIBS)
-+pine: $(OFILES)
- echo "char datestamp[]="\"`date`\"";" > date.c
- echo "char hoststamp[]="\"`uname -n`\"";" >> date.c
- $(LDCC) $(LDFLAGS) $(CFLAGS) -o pine $(OFILES) date.c $(LIBS)
diff --git a/mail/pine/patches/patch-ab b/mail/pine/patches/patch-ab
deleted file mode 100644
index a9bbd1a11da..00000000000
--- a/mail/pine/patches/patch-ab
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-ab,v 1.12 2004/05/13 18:29:54 adam Exp $
-
---- pine/makefile.lnx.orig 2003-11-25 06:47:42.000000000 +0000
-+++ pine/makefile.lnx
-@@ -47,9 +47,11 @@ LN= ln -s
- MAKE= make
- OPTIMIZE= # -O2
- PROFILE= # -pg
--DEBUG= -g -DDEBUG -DDEBUGJOURNAL
-+DEBUG= -DDEBUG -DDEBUGJOURNAL # -g
-
--CCLIENTDIR= ../c-client
-+CCLIENTDIR= ${PREFIX}
-+CCLIENTINC= ${CCLIENTDIR}/include/c-client
-+CCLIENTLIB= ${CCLIENTDIR}/lib
- PICODIR= ../pico
-
- # Only need to uncomment next two lines if you run make from this directory
-@@ -60,14 +62,13 @@ PICODIR= ../pico
- LDAPOFILES= addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
- mailview.o other.o pine.o strings.o takeaddr.o
-
--STDLIBS= -lncurses
--LOCLIBS= $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
--LIBS= $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
-- `cat $(CCLIENTDIR)/LDFLAGS`
-+STDLIBS= -lssl -lcrypto -lncurses
-+LOCLIBS= -lpico -lc-client
-+LIBS= -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
-
- STDCFLAGS= -DLNX -DSYSTYPE=\"LNX\" -DMOUSE
- CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
-- $(LOCALPINECFLAGS) $(STDCFLAGS)
-+ $(LOCALPINECFLAGS) $(STDCFLAGS) -I${CCLIENTINC}
-
- OFILES= addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \
- folder.o help.o helptext.o imap.o init.o mailcap.o mailcmd.o \
-@@ -79,20 +80,20 @@ HFILES= headers.h os.h pine.h context.h
- $(PICODIR)/headers.h $(PICODIR)/estruct.h \
- $(PICODIR)/edef.h $(PICODIR)/efunc.h \
- $(PICODIR)/pico.h $(PICODIR)/os.h \
-- $(CCLIENTDIR)/mail.h $(CCLIENTDIR)/osdep.h \
-- $(CCLIENTDIR)/rfc822.h $(CCLIENTDIR)/misc.h
-+ $(CCLIENTINC)/mail.h $(CCLIENTINC)/osdep.h \
-+ $(CCLIENTINC)/rfc822.h $(CCLIENTINC)/misc.h
-
- all: pine rpload rpdump
-
--pine: $(OFILES) $(LOCLIBS)
-+pine: $(OFILES)
- echo "char datestamp[]="\"`date`\"";" > date.c
- echo "char hoststamp[]="\"`hostname`\"";" >> date.c
- $(CC) $(LDFLAGS) $(CFLAGS) -o pine $(OFILES) date.c $(LIBS)
-
--rpload: rpload.o $(CCLIENTDIR)/c-client.a
-+rpload: rpload.o $(CCLIENTLIB)/libc-client.a
- $(CC) $(LDFLAGS) $(CFLAGS) -o rpload rpload.o $(LIBS)
-
--rpdump: rpdump.o $(CCLIENTDIR)/c-client.a
-+rpdump: rpdump.o $(CCLIENTLIB)/libc-client.a
- $(CC) $(LDFLAGS) $(CFLAGS) -o rpdump rpdump.o $(LIBS)
-
- pine-use: pine-use.c
-@@ -112,8 +113,8 @@ os.c: osdep/os-lnx.c
-
- $(OFILES): $(HFILES)
- addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o: adrbklib.h
--context.o: $(CCLIENTDIR)/misc.h
--send.o: $(CCLIENTDIR)/smtp.h
-+context.o: $(CCLIENTINC)/misc.h
-+send.o: $(CCLIENTINC)/smtp.h
- #$(LDAPOFILES): $(LDAPLIBS)
-
- helptext.c: pine.hlp
diff --git a/mail/pine/patches/patch-ac b/mail/pine/patches/patch-ac
deleted file mode 100644
index 1cec3f678a7..00000000000
--- a/mail/pine/patches/patch-ac
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-ac,v 1.19 2004/05/13 18:29:54 adam Exp $
-
---- pine/makefile.neb.orig 2003-11-25 06:47:56.000000000 +0000
-+++ pine/makefile.neb
-@@ -47,9 +47,11 @@ LN= ln -s
- MAKE= make
- OPTIMIZE= # -O
- PROFILE= # -pg
--DEBUG= -g -DDEBUG -DDEBUGJOURNAL
-+DEBUG= -DDEBUG -DDEBUGJOURNAL # -g
-
--CCLIENTDIR= ../c-client
-+CCLIENTDIR= ${PREFIX}
-+CCLIENTINC= ${CCLIENTDIR}/include/c-client
-+CCLIENTLIB= ${CCLIENTDIR}/lib
- PICODIR= ../pico
-
- # Only need to uncomment next two lines if you run make from this directory
-@@ -60,14 +62,13 @@ PICODIR= ../pico
- LDAPOFILES= addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
- mailview.o other.o pine.o strings.o takeaddr.o
-
--STDLIBS= -ltermlib
--LOCLIBS= $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
--LIBS= $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
-- `cat $(CCLIENTDIR)/LDFLAGS`
-+STDLIBS= -ltermlib -lssl -lcrypto -lcrypt
-+LOCLIBS= -lpico -lc-client
-+LIBS= -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
-
- STDCFLAGS= -DNETBSD -DSYSTYPE=\"NEB\" -DMOUSE
- CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
-- $(LOCALPINECFLAGS) $(STDCFLAGS)
-+ $(LOCALPINECFLAGS) $(STDCFLAGS) -I${CCLIENTINC}
-
- OFILES= addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \
- folder.o help.o helptext.o imap.o init.o mailcap.o mailcmd.o \
-@@ -79,20 +80,20 @@ HFILES= headers.h os.h pine.h context.h
- $(PICODIR)/headers.h $(PICODIR)/estruct.h \
- $(PICODIR)/edef.h $(PICODIR)/efunc.h \
- $(PICODIR)/pico.h $(PICODIR)/os.h \
-- $(CCLIENTDIR)/mail.h $(CCLIENTDIR)/osdep.h \
-- $(CCLIENTDIR)/rfc822.h $(CCLIENTDIR)/misc.h
-+ $(CCLIENTINC)/mail.h $(CCLIENTINC)/osdep.h \
-+ $(CCLIENTINC)/rfc822.h $(CCLIENTINC)/misc.h
-
- all: pine rpload rpdump
-
--pine: $(OFILES) $(LOCLIBS)
-+pine: $(OFILES)
- echo "char datestamp[]="\"`date`\"";" > date.c
- echo "char hoststamp[]="\"`hostname`\"";" >> date.c
- $(CC) $(LDFLAGS) $(CFLAGS) -o pine $(OFILES) date.c $(LIBS)
-
--rpload: rpload.o $(CCLIENTDIR)/c-client.a
-+rpload: rpload.o $(CCLIENTLIB)/libc-client.a
- $(CC) $(LDFLAGS) $(CFLAGS) -o rpload rpload.o $(LIBS)
-
--rpdump: rpdump.o $(CCLIENTDIR)/c-client.a
-+rpdump: rpdump.o $(CCLIENTLIB)/libc-client.a
- $(CC) $(LDFLAGS) $(CFLAGS) -o rpdump rpdump.o $(LIBS)
-
- pine-use: pine-use.c
-@@ -112,8 +113,8 @@ os.c: osdep/os-neb.c
-
- $(OFILES): $(HFILES)
- addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o: adrbklib.h
--context.o: $(CCLIENTDIR)/misc.h
--send.o: $(CCLIENTDIR)/smtp.h
-+context.o: $(CCLIENTINC)/misc.h
-+send.o: $(CCLIENTINC)/smtp.h
- #$(LDAPOFILES): $(LDAPLIBS)
-
- helptext.c: pine.hlp
diff --git a/mail/pine/patches/patch-ad b/mail/pine/patches/patch-ad
deleted file mode 100644
index 3950f2d7170..00000000000
--- a/mail/pine/patches/patch-ad
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ad,v 1.12 2005/12/05 20:50:34 rillig Exp $
-
---- pine/signals.c.orig 2004-11-04 22:33:05.000000000 +0000
-+++ pine/signals.c
-@@ -53,6 +53,7 @@
- ====*/
-
- #include "headers.h"
-+#include <signal.h>
-
- /* nto defines SA_RESTART but doesn't support it yet (00/12/29 - hubert) */
- #if defined(NTO)
-@@ -109,7 +110,9 @@ init_signals()
- if(CUSHION_SIG){
- signal(SIGILL, auger_in_signal);
- signal(SIGTRAP, auger_in_signal);
-+#ifdef SIGEMT
- signal(SIGEMT, auger_in_signal);
-+#endif
- signal(SIGBUS, auger_in_signal);
- signal(SIGSEGV, auger_in_signal);
- signal(SIGSYS, auger_in_signal);
-@@ -197,7 +200,9 @@ end_signals(blockem)
- }
-
- signal(SIGTRAP, blockem ? SIG_IGN : SIG_DFL);
-+#ifdef SIGEMT
- signal(SIGEMT, blockem ? SIG_IGN : SIG_DFL);
-+#endif
- signal(SIGBUS, blockem ? SIG_IGN : SIG_DFL);
- signal(SIGSEGV, blockem ? SIG_IGN : SIG_DFL);
- signal(SIGSYS, blockem ? SIG_IGN : SIG_DFL);
diff --git a/mail/pine/patches/patch-ae b/mail/pine/patches/patch-ae
deleted file mode 100644
index b1977706f98..00000000000
--- a/mail/pine/patches/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2004/05/13 18:29:54 adam Exp $
-
---- pine/osdep/os-lnx.h.orig 2003-05-23 16:07:00.000000000 +0000
-+++ pine/osdep/os-lnx.h
-@@ -295,5 +295,6 @@
- #define MAX_ADDR_EXPN (1000) /* Longest expanded addr */
- #define MAX_ADDR_FIELD (10000) /* Longest fully-expanded addr field */
-
-+#include <sys/time.h> /* Needed by gettimeofday */
-
- #endif /* _OS_INCLUDED */
diff --git a/mail/pine/patches/patch-af b/mail/pine/patches/patch-af
deleted file mode 100644
index d5be4de97f1..00000000000
--- a/mail/pine/patches/patch-af
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-af,v 1.10 2004/05/20 07:56:34 adam Exp $
-
---- pine/makefile.osx.orig 2003-12-17 22:12:52.000000000 +0000
-+++ pine/makefile.osx
-@@ -50,7 +50,9 @@ OPTIMIZE= # -O
- PROFILE= # -pg
- DEBUG= -g -DDEBUG -DDEBUGJOURNAL
-
--CCLIENTDIR= ../c-client
-+CCLIENTDIR= ${PREFIX}
-+CCLIENTINC= ${CCLIENTDIR}/include/c-client
-+CCLIENTLIB= ${CCLIENTDIR}/lib
- PICODIR= ../pico
-
- # Only need to uncomment next two lines if you run make from this directory
-@@ -61,16 +63,14 @@ PICODIR= ../pico
- LDAPOFILES= addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
- mailview.o other.o pine.o strings.o takeaddr.o
-
--STDLIBS= -lncurses
--LOCLIBS= $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
--LIBS= $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
-- -framework Carbon -framework ApplicationServices \
-- `cat $(CCLIENTDIR)/LDFLAGS`
-+STDLIBS= -lssl -lcrypto -lcurses -framework Carbon
-+LOCLIBS= -lpico -lc-client
-+LIBS= -L$(PREFIX)/lib $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
-
- # Use BSDDEF instead of BSD because other systems use BSD internally.
- STDCFLAGS= -Dconst= -DSYSTYPE=\"OSX\"
- CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
-- $(LOCALPINECFLAGS) $(STDCFLAGS)
-+ $(LOCALPINECFLAGS) $(STDCFLAGS) -I${CCLIENTINC}
-
- OFILES= addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \
- folder.o help.o helptext.o imap.o init.o mailcap.o mailcmd.o \
-@@ -82,20 +82,20 @@ HFILES= headers.h os.h pine.h context.h
- $(PICODIR)/headers.h $(PICODIR)/estruct.h \
- $(PICODIR)/edef.h $(PICODIR)/efunc.h \
- $(PICODIR)/pico.h $(PICODIR)/os.h \
-- $(CCLIENTDIR)/mail.h $(CCLIENTDIR)/osdep.h \
-- $(CCLIENTDIR)/rfc822.h $(CCLIENTDIR)/misc.h
-+ $(CCLIENTINC)/mail.h $(CCLIENTINC)/osdep.h \
-+ $(CCLIENTINC)/rfc822.h $(CCLIENTINC)/misc.h
-
- all: pine rpload rpdump
-
--pine: $(OFILES) $(LOCLIBS)
-+pine: $(OFILES)
- echo "char datestamp[]="\"`date`\"";" > date.c
- echo "char hoststamp[]="\"`hostname`\"";" >> date.c
- $(CC) $(LDFLAGS) $(CFLAGS) -o pine $(OFILES) date.c $(LIBS)
-
--rpload: rpload.o $(CCLIENTDIR)/c-client.a
-+rpload: rpload.o $(CCLIENTLIB)/libc-client.a
- $(CC) $(LDFLAGS) $(CFLAGS) -o rpload rpload.o $(LIBS)
-
--rpdump: rpdump.o $(CCLIENTDIR)/c-client.a
-+rpdump: rpdump.o $(CCLIENTLIB)/libc-client.a
- $(CC) $(LDFLAGS) $(CFLAGS) -o rpdump rpdump.o $(LIBS)
-
- pine-use: pine-use.c
-@@ -115,8 +115,8 @@ os.c: osdep/os-osx.c
-
- $(OFILES): $(HFILES)
- addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o: adrbklib.h
--context.o: $(CCLIENTDIR)/misc.h
--send.o: $(CCLIENTDIR)/smtp.h
-+context.o: $(CCLIENTINC)/misc.h
-+send.o: $(CCLIENTINC)/smtp.h
- #$(LDAPOFILES): $(LDAPLIBS)
-
- helptext.c: pine.hlp
diff --git a/mail/pine/patches/patch-ag b/mail/pine/patches/patch-ag
deleted file mode 100644
index 48a1ce3a328..00000000000
--- a/mail/pine/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2004/05/13 18:29:54 adam Exp $
-
---- pine/osdep/os-osx.h.orig 2003-12-17 22:20:52.000000000 +0000
-+++ pine/osdep/os-osx.h
-@@ -310,6 +310,7 @@ void free();
- #define MAX_ADDR_EXPN (1000) /* Longest expanded addr */
- #define MAX_ADDR_FIELD (10000) /* Longest fully-expanded addr field */
-
-+#include <sys/unistd.h> /* needed for F_OK and friends */
- /* The following are changed to avoid OSX conflicts */
- #define Fixed PineFixed
- #define Handle PineHandle
diff --git a/mail/pine/patches/patch-al b/mail/pine/patches/patch-al
deleted file mode 100644
index 50229f93935..00000000000
--- a/mail/pine/patches/patch-al
+++ /dev/null
@@ -1,104 +0,0 @@
-$NetBSD: patch-al,v 1.15 2005/01/25 10:08:59 adam Exp $
-
---- build.orig 2004-12-27 17:36:53.000000000 +0000
-+++ build
-@@ -393,71 +393,6 @@ case $maketarg in
- echo "Including SSL functionality"
- fi
-
-- if [ -s c-client ] ; then rm -f c-client ; fi
-- ln -s imap/c-client c-client
-- if [ -s mtest ] ; then rm -f mtest ; fi
-- ln -s imap/mtest mtest
-- if [ -s mailutil ] ; then rm -f mailutil ; fi
-- ln -s imap/mailutil mailutil
-- if [ -s imapd ] ; then rm -f imapd ; fi
-- ln -s imap/imapd imapd
-- if [ -s ipopd ] ; then rm -f ipopd ; fi
-- ln -s imap/ipopd ipopd
-- echo "Making c-client library, imapd, and ipopd"
-- echo $S1 $S2 $S3 $S4 $K1 > imap/SPECIALS
-- cd "$PHOME/imap"
--# This "touch" tells the IMAP make not to give any warnings about IESG compliance.
-- if [ "$NOSSL" = "1" -o "$SSL" != "none" ] ; then touch ssl$SSL ; fi
-- if [ "$NOSSL" != "1" -a "$SSL" = "none" -a ! -f sslnone ]
-- then
-- echo "+-----------------------------------------------------------+"
-- echo "| It appears that you do not have OpenSSL or equivalent |"
-- echo "| installed on this system. |"
-- echo "| |"
-- echo "| Building PINE without SSL support will possibly introduce |"
-- echo "| problems when communicating with IMAP, POP3, or SMTP |"
-- echo "| servers that require TLS or SSL authentication. |"
-- echo "| In addition, your password may be vulnerable to a |"
-- echo "| snooping attack since it may be sent over the network |"
-- echo "| unencrypted. |"
-- echo "+-----------------------------------------------------------+"
-- echo ""
-- echo "Do you want to continue this build anyway? Type y or n please:"
-- read ans
-- case "$ans" in
-- y) echo "Building without SSL ..."
-- touch sslnone
-- ;;
--
-- *) echo "Terminating build"
-- exit 1
-- ;;
-- esac
-- fi
-- eval echo eval make "$makeargs" "SSLTYPE=$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
-- eval make "$makeargs" "SSLTYPE=$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
-- rc=$?
-- if [ $rc != "0" ]
-- then
-- echo "+---------------------------------------------+"
-- echo "| Problems building c-client |"
-- echo "| |"
-- echo "| Please check the output above for a |"
-- echo "| possible explanation for this failure |"
-- echo "+---------------------------------------------+"
-- echo ""
-- exit $rc
-- fi
-- echo ''
--
-- echo "Making Pico and Pilot"
-- cd "$PHOME/pico"
-- eval echo make "$makeargs" -f makefile.$picotarg
-- eval make "$makeargs" -f makefile.$picotarg
-- rc=$?
-- if [ $rc != "0" ] ; then exit $rc ; fi
-- echo ''
--
- echo "Making Pine and rpload/rpdump".
- if [ "$ALTDOCPATHS" = "1" ]
- then
-@@ -500,8 +435,6 @@ case $maketarg in
- fi
- cd "$PHOME"
- echo ''
-- echo "Links to executables are in bin directory:"
-- size bin/pine bin/mtest bin/imapd bin/pico bin/pilot bin/rpdump bin/rpload bin/mailutil bin/ipop2d bin/ipop3d
- case $maketarg in
- mnt) echo "Fixing stacksizes ..."
- fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
-@@ -527,18 +460,11 @@ case $maketarg in
-
-
- clean) # This only sort of works
-- rm -f c-client mtest mailutil imapd ipopd .pine.sedargs
-- echo "Cleaning c-client and imapd"
-- cd "$PHOME/imap"
-- make clean
- # this list of ssl* files matches with imap/Makefile
- rm -f sslnopwd sslunix.nopwd sslsco.nopwd sslunix sslsco sslnone
- echo "Cleaning Pine"
- cd "$PHOME/pine"
- make -f makefile.ult clean
-- echo "Cleaning pico"
-- cd "$PHOME/pico"
-- make $makeargs -f makefile.ult clean
- echo "Done"
- cd "$PHOME"
- ;;
diff --git a/mail/pine/patches/patch-ap b/mail/pine/patches/patch-ap
deleted file mode 100644
index b1980ac98d9..00000000000
--- a/mail/pine/patches/patch-ap
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-ap,v 1.4 2004/08/11 14:15:18 markd Exp $
-
---- pine/makefile.so5.orig 2004-04-03 11:16:17.000000000 +1200
-+++ pine/makefile.so5
-@@ -49,9 +49,11 @@ LN= ln -s
- MAKE= make
- OPTIMIZE= # -O
- PROFILE= # -pg
--DEBUG= -g -DDEBUG
-+DEBUG= -DDEBUG # -g
-
--CCLIENTDIR= ../c-client
-+CCLIENTDIR= ${PREFIX}
-+CCLIENTINC= ${CCLIENTDIR}/include/c-client
-+CCLIENTLIB= ${CCLIENTDIR}/lib
- PICODIR= ../pico
-
- # Only need to uncomment next two lines if you run make from this directory
-@@ -67,16 +69,16 @@ LDAPOFILES= addrbook.o adrbkcmd.o args
- # it only has /usr/ucb/cc) then change LDCC to the following line and
- # give that a try. This is still using the Solaris compiler but
- # leaving out the UCB compatibility includes and libraries.
--LDCC= $(PICODIR)/cc5.sol
-+LDCC= $(CC)
-
--STDLIBS= -ltermlib
--LOCLIBS= $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
--LIBS= $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
-- `cat $(CCLIENTDIR)/LDFLAGS`
-+STDLIBS= -lssl -lcrypto -lpam -ltermlib
-+LOCLIBS= -lpico -lc-client
-+LIBS= -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
-+ -lnsl -lsocket
-
- STDCFLAGS= -Dconst= -DSV4 -DSYSTYPE=\"SOL\" -DMOUSE
- CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
-- $(LOCALPINECFLAGS) $(STDCFLAGS)
-+ $(LOCALPINECFLAGS) $(STDCFLAGS) -I${CCLIENTINC}
-
- OFILES= addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \
- folder.o help.o helptext.o imap.o init.o mailcap.o mailcmd.o \
-@@ -88,20 +90,20 @@ HFILES= headers.h os.h pine.h context.h
- $(PICODIR)/headers.h $(PICODIR)/estruct.h \
- $(PICODIR)/edef.h $(PICODIR)/efunc.h \
- $(PICODIR)/pico.h $(PICODIR)/os.h \
-- $(CCLIENTDIR)/mail.h $(CCLIENTDIR)/osdep.h \
-- $(CCLIENTDIR)/rfc822.h $(CCLIENTDIR)/misc.h
-+ $(CCLIENTINC)/mail.h $(CCLIENTINC)/osdep.h \
-+ $(CCLIENTINC)/rfc822.h $(CCLIENTINC)/misc.h
-
- all: pine rpload rpdump
-
--pine: $(OFILES) $(LOCLIBS)
-+pine: $(OFILES)
- echo "char datestamp[]="\"`date`\"";" > date.c
- echo "char hoststamp[]="\"`hostname`\"";" >> date.c
- $(LDCC) $(LDFLAGS) $(CFLAGS) -o pine $(OFILES) date.c $(LIBS)
-
--rpload: rpload.o $(CCLIENTDIR)/c-client.a
-+rpload: rpload.o $(CCLIENTLIB)/libc-client.a
- $(CC) $(LDFLAGS) $(CFLAGS) -o rpload rpload.o $(LIBS)
-
--rpdump: rpdump.o $(CCLIENTDIR)/c-client.a
-+rpdump: rpdump.o $(CCLIENTLIB)/libc-client.a
- $(CC) $(LDFLAGS) $(CFLAGS) -o rpdump rpdump.o $(LIBS)
-
- pine-use: pine-use.c
-@@ -121,8 +123,8 @@ os.c: osdep/os-so5.c
-
- $(OFILES): $(HFILES)
- addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o: adrbklib.h
--context.o: $(CCLIENTDIR)/misc.h
--send.o: $(CCLIENTDIR)/smtp.h
-+context.o: $(CCLIENTINC)/misc.h
-+send.o: $(CCLIENTINC)/smtp.h
- #$(LDAPOFILES): $(LDAPLIBS)
-
- helptext.c: pine.hlp
diff --git a/mail/pine/patches/patch-aq b/mail/pine/patches/patch-aq
deleted file mode 100644
index 8c0b4894233..00000000000
--- a/mail/pine/patches/patch-aq
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2005/03/19 12:52:28 schwarz Exp $
-
---- pine/makefile.sgi.orig 2004-12-11 23:35:09.000000000 +0100
-+++ pine/makefile.sgi 2004-12-11 23:43:26.000000000 +0100
-@@ -47,9 +47,11 @@
- MAKE= make
- OPTIMIZE= # -O
- PROFILE= # -pg
--DEBUG= -g -DDEBUG
-+DEBUG= -DDEBUG # -g
-
--CCLIENTDIR= ../c-client
-+CCLIENTDIR= ${PREFIX}
-+CCLIENTINC= ${CCLIENTDIR}/include/c-client
-+CCLIENTLIB= ${CCLIENTDIR}/lib
- PICODIR= ../pico
-
- # Only need to uncomment next two lines if you run make from this directory
-@@ -63,14 +65,13 @@
- # Uncomment the line below *if* you're running IRIX < 5.0 *and* your
- # site is using NIS.
- #EXTRASTDLIBES= -lsun
--STDLIBS= -ltermlib $(EXTRASTDLIBES)
--LOCLIBS= $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
--LIBS= $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
-- `cat $(CCLIENTDIR)/LDFLAGS`
-+STDLIBS= -ltermlib -lssl -lcrypto -lcrypt $(EXTRASTDLIBES)
-+LOCLIBS= -lpico -lc-client
-+LIBS= -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
-
- STDCFLAGS= -DSGI -DSYSTYPE=\"SGI\" -DMOUSE
- CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
-- $(LOCALPINECFLAGS) $(STDCFLAGS)
-+ $(LOCALPINECFLAGS) $(STDCFLAGS) -I${CCLIENTINC}
-
- OFILES= addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \
- folder.o help.o helptext.o imap.o init.o mailcap.o mailcmd.o \
-@@ -82,20 +83,20 @@
- $(PICODIR)/headers.h $(PICODIR)/estruct.h \
- $(PICODIR)/edef.h $(PICODIR)/efunc.h \
- $(PICODIR)/pico.h $(PICODIR)/os.h \
-- $(CCLIENTDIR)/mail.h $(CCLIENTDIR)/osdep.h \
-- $(CCLIENTDIR)/rfc822.h $(CCLIENTDIR)/misc.h
-+ $(CCLIENTINC)/mail.h $(CCLIENTINC)/osdep.h \
-+ $(CCLIENTINC)/rfc822.h $(CCLIENTINC)/misc.h
-
- all: pine rpload rpdump
-
--pine: $(OFILES) $(LOCLIBS)
-+pine: $(OFILES)
- echo "char datestamp[]="\"`date`\"";" > date.c
- echo "char hoststamp[]="\"`hostname`\"";" >> date.c
- $(CC) $(LDFLAGS) $(CFLAGS) -o pine $(OFILES) date.c $(LIBS)
-
--rpload: rpload.o $(CCLIENTDIR)/c-client.a
-+rpload: rpload.o $(CCLIENTDIR)/libc-client.a
- $(CC) $(LDFLAGS) $(CFLAGS) -o rpload rpload.o $(LIBS)
-
--rpdump: rpdump.o $(CCLIENTDIR)/c-client.a
-+rpdump: rpdump.o $(CCLIENTDIR)/libc-client.a
- $(CC) $(LDFLAGS) $(CFLAGS) -o rpdump rpdump.o $(LIBS)
-
- pine-use: pine-use.c
-@@ -115,8 +116,8 @@
-
- $(OFILES): $(HFILES)
- addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o: adrbklib.h
--context.o: $(CCLIENTDIR)/misc.h
--send.o: $(CCLIENTDIR)/smtp.h
-+context.o: $(CCLIENTINC)/misc.h
-+send.o: $(CCLIENTINC/smtp.h
- #$(LDAPOFILES): $(LDAPLIBS)
-
- helptext.c: pine.hlp
diff --git a/mail/popa3d/DEINSTALL b/mail/popa3d/DEINSTALL
deleted file mode 100644
index c8f63d5e744..00000000000
--- a/mail/popa3d/DEINSTALL
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2001/11/25 23:55:35 zuntum Exp $
-
-case "${STAGE}" in
-POST-DEINSTALL)
- ${ECHO} ===========================================================================
- ${ECHO}
- ${ECHO} Remember to remove popa3d from /etc/inetd.conf and restart inetd.
- ${ECHO}
- ${ECHO} ===========================================================================
- ;;
-esac
diff --git a/mail/popa3d/DESCR b/mail/popa3d/DESCR
deleted file mode 100644
index e8823730d8b..00000000000
--- a/mail/popa3d/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-From the DESIGN-document:
-
-Well, the goals themselves are obvious; they're probably the same for most
-other POP3 servers as well. It's their priority that differs. For popa3d,
-the goals are:
-
-1. Security (to the extent that is possible with POP3 at all, of course).
-2. Reliability (again, as limited by the mailbox format and the protocol).
-3. RFC compliance (slightly relaxed to work with real-world POP3 clients).
-4. Performance (limited by the more important goals, above).
-
-popa3d can be run from inetd, or as a stand-alone server.
-
-Note that popa3d only uses flock(2) for locking and may not be safe
-on NFS or with mail systems that only use lock files.
diff --git a/mail/popa3d/MESSAGE b/mail/popa3d/MESSAGE
deleted file mode 100644
index bb8127e8a0c..00000000000
--- a/mail/popa3d/MESSAGE
+++ /dev/null
@@ -1,18 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2006/10/07 18:14:11 reed Exp $
-
-In order to enable POP service, you should add the following line
-to your /etc/inetd.conf:
-
- pop3 stream tcp nowait root ${PREFIX}/sbin/popa3d popa3d
-
-and send a HUP signal to inetd.
-
-Alternatively, if you want to run popa3d in standalone mode, you
-can add the following line to your /etc/rc.conf:
-
- popa3d=YES
-
-Note that popa3d only uses flock(2) for locking and may not be safe
-on NFS or with mail systems that only use lock files.
-===========================================================================
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
deleted file mode 100644
index f0686ca8908..00000000000
--- a/mail/popa3d/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD: Makefile,v 1.47 2007/01/07 09:13:59 rillig Exp $
-#
-
-DISTNAME= popa3d-1.0.2
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= http://www.openwall.com/popa3d/ \
- ftp://ftp.openwall.com/pub/projects/popa3d/ \
- ftp://ftp.false.com/pub/security/popa3d/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.openwall.com/popa3d/
-COMMENT= Secure, reliable, performant, and small pop3 server
-
-POPA3D_USER?= popa3d
-POPA3D_GROUP?= popa3d
-
-PKG_GROUPS= ${POPA3D_GROUP}
-PKG_USERS= ${POPA3D_USER}:${POPA3D_GROUP}
-
-RCD_SCRIPTS= popa3d
-
-FILES_SUBST+= POPA3D_USER=${POPA3D_USER:Q}
-FILES_SUBST+= POPA3D_GROUP=${POPA3D_GROUP:Q}
-
-SUBST_CLASSES+= params
-SUBST_STAGE.params= pre-configure
-SUBST_FILES.params= params.h
-SUBST_SED.params= -e 's,/var/empty,${PREFIX}/share/empty,' \
- -e 's,@@POPA3D_USER@@,"${POPA3D_USER}",'
-
-INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin
-
-do-install:
- ${INSTALL_PROGRAM} -m 500 ${WRKSRC}/popa3d ${PREFIX}/sbin
- ${INSTALL_DATA} ${WRKSRC}/popa3d.8 ${PREFIX}/${PKGMANDIR}/man8/
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/popa3d
- cd ${WRKSRC} && ${INSTALL_DATA} DESIGN INSTALL LICENSE \
- ${PREFIX}/share/doc/popa3d
- ${INSTALL_DATA_DIR} ${PREFIX}/share/empty
-
-.include "../../security/tcp_wrappers/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/popa3d/PLIST b/mail/popa3d/PLIST
deleted file mode 100644
index 9ca5df45351..00000000000
--- a/mail/popa3d/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2005/05/02 20:34:00 reed Exp $
-man/man8/popa3d.8
-sbin/popa3d
-share/doc/popa3d/DESIGN
-share/doc/popa3d/INSTALL
-share/doc/popa3d/LICENSE
-share/examples/rc.d/popa3d
-@dirrm share/doc/popa3d
-@comment empty dir to chroot to
-@exec ${MKDIR} %D/share/empty
-@dirrm share/empty
diff --git a/mail/popa3d/distinfo b/mail/popa3d/distinfo
deleted file mode 100644
index 0b9043e86d8..00000000000
--- a/mail/popa3d/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.19 2006/07/19 22:41:45 wiz Exp $
-
-SHA1 (popa3d-1.0.2.tar.gz) = 85779cfc657050352b3bcda5ca7f1dfe7ac4e92b
-RMD160 (popa3d-1.0.2.tar.gz) = 7cde1e5876b44644ded3ff2287c19ae7520ba409
-Size (popa3d-1.0.2.tar.gz) = 32848 bytes
-SHA1 (patch-aa) = bb4879169ae6ee60a46d19eb736497370021167c
-SHA1 (patch-ab) = 5a50a0f69324031c610fd1e47dda680e1408e8dd
diff --git a/mail/popa3d/files/popa3d.sh b/mail/popa3d/files/popa3d.sh
deleted file mode 100755
index 7de153bc05b..00000000000
--- a/mail/popa3d/files/popa3d.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: popa3d.sh,v 1.1 2002/11/07 03:50:08 dillo Exp $
-#
-# PROVIDE: popa3d
-# REQUIRE: DAEMON LOGIN
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="popa3d"
-rcvar=$name
-command="@PREFIX@/sbin/${name}"
-command_args="-D" # _must_ start as daemon from rc.d;
- # add more flags through ${${name}_flags}
-
-if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
- load_rc_config $name
- eval [ -z "\$${rcvar}" ] && eval ${rcvar}=NO
- run_rc_command "$1"
-else
- echo -n ' ${name}'
- ${command} ${popa3d_flags} ${command_args}
-fi
diff --git a/mail/popa3d/patches/patch-aa b/mail/popa3d/patches/patch-aa
deleted file mode 100644
index 5fc7c0a2ab8..00000000000
--- a/mail/popa3d/patches/patch-aa
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2006/07/19 22:41:45 wiz Exp $
-
---- params.h.orig 2006-03-05 12:44:52.000000000 +0000
-+++ params.h
-@@ -13,7 +13,7 @@
- /*
- * Are we going to be a standalone server or start via an inetd clone?
- */
--#define POP_STANDALONE 0
-+#define POP_STANDALONE 1
-
- #if POP_STANDALONE
-
-@@ -38,7 +38,7 @@
- * option is provided primarily as a way to meet conventions of certain
- * systems where all services obey libwrap access controls.
- */
--#define DAEMON_LIBWRAP 0
-+#define DAEMON_LIBWRAP 1
-
- #if DAEMON_LIBWRAP
- /*
-@@ -103,7 +103,7 @@
- * A pseudo-user to run as before authentication. The user and its UID
- * must not be used for any other purpose.
- */
--#define POP_USER POP_SERVER
-+#define POP_USER @@POPA3D_USER@@
-
- /*
- * An empty directory to chroot to before authentication. The directory
-@@ -154,8 +154,8 @@
- *
- * Note that there's no built-in password aging support.
- */
--#define AUTH_PASSWD 0
--#define AUTH_SHADOW 1
-+#define AUTH_PASSWD 1
-+#define AUTH_SHADOW 0
- #define AUTH_PAM 0
- #define AUTH_PAM_USERPASS 0
- #define USE_LIBPAM_USERPASS 0
-@@ -208,8 +208,8 @@
- *
- * *BSDs use flock(2), others typically use fcntl(2).
- */
--#define LOCK_FCNTL 1
--#define LOCK_FLOCK 0
-+#define LOCK_FCNTL 0
-+#define LOCK_FLOCK 1
-
- /*
- * How do we talk to syslogd? These should be fine for most systems.
diff --git a/mail/popa3d/patches/patch-ab b/mail/popa3d/patches/patch-ab
deleted file mode 100644
index 0ca9341c9d1..00000000000
--- a/mail/popa3d/patches/patch-ab
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2006/07/19 22:41:45 wiz Exp $
-
---- Makefile.orig 2006-03-05 10:36:20.000000000 +0000
-+++ Makefile
-@@ -1,30 +1,32 @@
--CC = gcc
-+#CC = gcc
- LD = $(CC)
--RM = rm -f
--MKDIR = mkdir -p
--INSTALL = install -c
--CFLAGS = -Wall -O2 -fomit-frame-pointer
-+#RM = rm -f
-+#MKDIR = mkdir -p
-+#INSTALL = install -c
-+CFLAGS += -Wall -O2 -fomit-frame-pointer
- # You may use OpenSSL's MD5 routines instead of the ones supplied here
- #CFLAGS += -DHAVE_OPENSSL
--LDFLAGS = -s
-+#LDFLAGS = -s
- LIBS =
- # Linux with glibc, FreeBSD, NetBSD
--#LIBS += -lcrypt
-+LIBS += -lcrypt
- # HP-UX trusted system
- #LIBS += -lsec
- # Solaris (POP_STANDALONE, POP_VIRTUAL)
--#LIBS += -lsocket -lnsl
-+.ifdef ${OPSYS} == "SunOS"
-+LIBS += -lsocket -lnsl
-+.endif
- # PAM
- #LIBS += -lpam
- # TCP wrappers
--#LIBS += -lwrap
-+LIBS += -lwrap
- # libwrap may also want this
- #LIBS += -lnsl
- # OpenSSL (-DHAVE_OPENSSL)
- #LIBS += -lcrypto
-
- DESTDIR =
--PREFIX = /usr/local
-+#PREFIX = /usr/local
- SBINDIR = $(PREFIX)/sbin
- MANDIR = $(PREFIX)/man
-
diff --git a/mail/poppassd/DESCR b/mail/poppassd/DESCR
deleted file mode 100644
index 9a26e9fc15f..00000000000
--- a/mail/poppassd/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-poppassd is password update daemon, using passwd and/or smbpasswd
-command as back end. It has integrated into qpopper package.
diff --git a/mail/poppassd/MESSAGE b/mail/poppassd/MESSAGE
deleted file mode 100644
index 5d8c4fdde77..00000000000
--- a/mail/poppassd/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2005/06/01 21:00:39 adrianp Exp $
-
-In order to enable poppassd service, you should add the following line
-to your /etc/services:
-
- poppass 106/tcp poppassd
-
-And /etc/inetd.conf:
-
- poppass stream tcp nowait root ${PREFIX}/libexec/poppassd poppassd
- poppass stream tcp6 nowait root ${PREFIX}/libexec/poppassd poppassd
-
-===========================================================================
diff --git a/mail/poppassd/Makefile b/mail/poppassd/Makefile
deleted file mode 100644
index 3af814f9d13..00000000000
--- a/mail/poppassd/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2007/01/07 09:13:59 rillig Exp $
-#
-
-DISTNAME= qpopper${VERSION}
-PKGNAME= poppassd-${VERSION}
-CATEGORIES= mail
-MASTER_SITES= ${QPOPPER_MASTER_SITES}
-
-PATCH_SITES= ${QPOPPER_PATCHSITES}
-PATCHFILES= ${QPOPPER_PATCHFILES}
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= mellon@fugue.com
-HOMEPAGE= ${QPOPPER_HOMEPAGE}
-COMMENT= Qualcomm's password change server mainly for Eudora
-
-.include "../../mail/qpopper/Makefile.common"
-
-CONFIGURE_ARGS+= --enable-poppassd --without-pam
-CONFIGURE_ENV+= CDEFS='-DSMBPASSWD_BINARY=\"${LOCALBASE}/bin/smbpasswd\"'
-MAKE_ENV+= ROOT_USER=${ROOT_USER:Q} ROOT_GROUP=${ROOT_GROUP:Q}
-
-.include "options.mk"
-
-INSTALLATION_DIRS= ${PKGMANDIR}/man8 share/doc libexec
-
-do-build:
-.for DIR in common password
- cd ${WRKSRC}/${DIR}; ${SETENV} ${MAKE_ENV} \
- ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_TARGET}
-.endfor
-
-# popper makefile doesn't have an install target...
-do-install:
- cd ${WRKSRC}/password; ${SETENV} ${MAKE_ENV} \
- ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
- ${INSTALL_MAN} ${WRKSRC}/man/poppassd.8 ${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_DATA} ${WRKSRC}/License.txt \
- ${PREFIX}/share/doc/poppassd.License;
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/poppassd/PLIST b/mail/poppassd/PLIST
deleted file mode 100644
index 8e3f6002496..00000000000
--- a/mail/poppassd/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:01:03 zuntum Exp $
-libexec/poppassd
-man/man8/poppassd.8
-share/doc/poppassd.License
diff --git a/mail/poppassd/distinfo b/mail/poppassd/distinfo
deleted file mode 100644
index 57805bf3c0f..00000000000
--- a/mail/poppassd/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.15 2006/05/05 02:52:33 taca Exp $
-
-SHA1 (qpopper4.0.9.tar.gz) = 5629aa86d92fe10565021980882dffb733ce73d9
-RMD160 (qpopper4.0.9.tar.gz) = b48a68cd9e282bfb3d78c6b53f3dee7c97bdf77d
-Size (qpopper4.0.9.tar.gz) = 2767261 bytes
-SHA1 (qpopper4.0.8-ipv6-20050515.diff.gz) = 3ccd51fa8fb1633c34dee19e6d50351cb649a3c1
-RMD160 (qpopper4.0.8-ipv6-20050515.diff.gz) = 0ca9a8893e31933d8bf33a3cfa4d88fde511ed5e
-Size (qpopper4.0.8-ipv6-20050515.diff.gz) = 11479 bytes
-SHA1 (patch-aa) = 0dd1bdc832d00bd640e7003afea28f0d90c2f975
-SHA1 (patch-ab) = 713698d5834b569a0ee08088567a71e218d50550
-SHA1 (patch-ac) = 2da65909cdbf8932c1ee7d65b41e115fa961a040
-SHA1 (patch-ad) = 01036ef18732b3a7576ac79e35ea9b027e2eef63
-SHA1 (patch-ae) = fa5febd4eedccdbd5610821b222a689193993bae
-SHA1 (patch-af) = 76ad4e1f557876dd1adf6c74f97512ad2fd8b92d
-SHA1 (patch-ag) = 6df76adb260bee99eb4165f5ac8dff7a2e685a8a
diff --git a/mail/poppassd/options.mk b/mail/poppassd/options.mk
deleted file mode 100644
index 11aee8c868a..00000000000
--- a/mail/poppassd/options.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2005/12/05 14:12:29 taca Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.poppassd
-PKG_SUPPORTED_OPTIONS= inet6
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ENV+= O_DEFS=${O_DEFS:Q} CFLAGS="-DINET6"
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
diff --git a/mail/poppassd/patches/patch-aa b/mail/poppassd/patches/patch-aa
deleted file mode 100644
index 13c33bf923e..00000000000
--- a/mail/poppassd/patches/patch-aa
+++ /dev/null
@@ -1,116 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/01/29 15:45:00 taca Exp $
-
---- man/poppassd.8.orig 2001-03-21 08:43:24.000000000 +0900
-+++ man/poppassd.8
-@@ -6,33 +6,36 @@
- .\" See License.txt file for terms and conditions for modification and
- .\" redistribution.
- .\"
--.TH POPAUTH 8
-+.TH POPPASSD 8
- .SH NAME
- poppassd \-\- password-changing daemon
- .SH SYNOPSIS
- .B poppassd
- [
--.B \-\?
-+.B \-h
- ] [
- .B \-d
- ] [
-+.B \-o
-+] [
- .BI \-l " tls-usage"
- ]
-+] [
-+.B \-P
-+]
- .if n .ti +9n
- [
- .B \-p
--[
- .I passwd-path
--]
- ] [
- .B \-R
-+] [
-+.B \-S
- ]
- .if n .ti +9n
- [
- .B \-s
--[
- .I smbpasswd-path
--]
- ] [
- .B \-v
- ]
-@@ -58,7 +61,7 @@ programs.
- .PP
- .SH OPTIONS
- .TP
--.B \-\?
-+.B \-h
- Prints a summary of options and exits.
- .TP
- .B \-d
-@@ -69,6 +72,14 @@ the default log facility is
- but can be changed using the
- .I \-y option.
- .TP
-+.B \-o
-+Report authentication error after "PASS" command.
-+Without this option, authentication error would report
-+after "NEWPASS" command.
-+This is compatible behavior as old
-+.I poppass
-+daemon.
-+.TP
- .B \-l " tls-usage"
- Sets TLS/SSL handling. Must have compiled with OpenSSL or SSL Plus.
-
-@@ -83,27 +94,37 @@ client to attempt TLS/SSL negotiation af
- Causes Qpopper to attempt TLS negotiation when a client first connects.
- This is for alternate-port support.
- .TP
--.B \-p " [ " passwd-path " ]"
-+.B \-P
-+Instructs
-+.I poppassd
-+to change the system password (which is the default).
-+.TP
-+.B \-p passwd-path
- Instructs
- .I poppassd
--to change the system password (which is the default) and optionally
--specifies the path to the executable to use. The default is /usr/bin/passwd.
-+to change the system password (which is the default) and specifies
-+the path to the executable to use. The default is /usr/bin/passwd.
- .TP
- .B \-R
- Disables the reverse DNS lookup normally done on the client IP address.
- .TP
--.B \-s " [ " smbpasswd-path " ]"
-+.B \-S
- Instructs
- .I poppassd
--to change the smb password and optionally
--specifies the path to the executable to use. The default is /usr/bin/smbpasswd.
-+to change the smb password.
- If this option is used,
- .I poppassd
- by default does not also change the system password. To change both, use this
- option and the
--.I \-p
-+.I \-P
- option.
- .TP
-+.B \-s smbpasswd-path
-+Instructs
-+.I poppassd
-+to change the smb password and specifies the path to the executable
-+to use. The default is /usr/bin/smbpasswd.
-+.TP
- .BI \-t " tracefile"
- Turns on debug tracing, and causes all trace and log output to be
- written to the file specified as
diff --git a/mail/poppassd/patches/patch-ab b/mail/poppassd/patches/patch-ab
deleted file mode 100644
index ab17035f484..00000000000
--- a/mail/poppassd/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2003/04/29 14:22:46 taca Exp $
-
---- password/Makefile.in.orig Fri Apr 5 04:38:33 2002
-+++ password/Makefile.in Thu May 2 14:22:07 2002
-@@ -30,7 +30,7 @@
- VPATH = @srcdir@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--installdir = @bindir@
-+installdir = @libexecdir@
-
- common_srcdir = ${top_srcdir}/common
- popper_srcdir = ${top_srcdir}/popper
-@@ -80,7 +80,7 @@
- all: ${poppassd}
-
- install:
-- ${INSTALL} -m 4755 -o root -g 0 poppassd ${installdir}/poppassd; \
-+ ${INSTALL} -m 555 -o ${ROOT_USER} -g ${ROOT_GROUP} poppassd ${installdir}/poppassd; \
- echo "Installed poppassd as ${installdir}/poppassd"
-
- poppassd: ${OBJS} ${common_dir}/libcommon.a
diff --git a/mail/poppassd/patches/patch-ac b/mail/poppassd/patches/patch-ac
deleted file mode 100644
index 58cd4397e9f..00000000000
--- a/mail/poppassd/patches/patch-ac
+++ /dev/null
@@ -1,406 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
-
---- password/poppassd.c.orig Mon Dec 5 10:45:21 2005
-+++ password/poppassd.c
-@@ -171,8 +171,13 @@
- /* LANMAN allows up to 14 char passwords (truncates if longer), but tacacs
- only seems to allow 11. */
-
-+#ifndef PASSWD_BINARY
- #define PASSWD_BINARY "/usr/bin/passwd" /* TBD: config.h */
-+#endif
-+
-+#ifndef SMBPASSWD_BINARY
- #define SMBPASSWD_BINARY "/usr/bin/smbpasswd" /* TBD: config.h */
-+#endif
-
- #include "config.h"
-
-@@ -180,6 +185,8 @@
- #include <sys/stat.h>
- #include <sys/wait.h>
-
-+#include <signal.h>
-+
- #if HAVE_SYS_NETINET_IN_H
- # include <sys/netinet/in.h>
- #endif
-@@ -257,7 +264,7 @@ int dochild (int master, char *slave
- int findpty (char **slave);
- void writestring (int fd, char *s);
- int talktochild (int master, char *user, char *oldpass, char *newpass,
-- char *emess, int asroot);
-+ char *emess);
- int match (char *str, char *pat);
- int expect (int master, char **expected, char *buf);
- void getemess (int master, char **expected, char *buf);
-@@ -274,7 +281,7 @@ void get_client_info ( POP *p, BOOL n
- char *sock_ntop ( struct sockaddr *p, int salen );
- int sock_port ( struct sockaddr *p, int salen );
- char *debug_str ( char *p, int inLen, int order );
--
-+void reapchild (int);
-
- /*
- * External prototypes
-@@ -295,6 +302,8 @@ pop_result auth_user ( POP *p, char *pas
-
- static char *P1[] =
- {
-+ "changing local password for *\nold password: ", /* BSD */
-+ "old password: ", /* NetBSD>=3.0 */
- "changing password for *\nold password: ", /* shadow */
- "enter login password: ", /* Solaris */
- "old smb password: ", /* smb */
-@@ -324,6 +333,7 @@ static char *P4[] =
- {
- "password changed. ", /* shadow */
- "password changed ", /* smb */
-+ "password changed for user *\n", /* smb */
- ""
- };
-
-@@ -338,6 +348,8 @@ char msg_buf [ 2048 ] = ""
- char *pwd_binary = PASSWD_BINARY;
- char *smb_binary = SMBPASSWD_BINARY;
-
-+int child_pid;
-+int child_status;
-
- /*
- * Be careful using TRACE in an 'if' statement!
-@@ -347,18 +359,19 @@ char *smb_binary = SM
- #define RUN_PASSWD 1
- #define RUN_SMBPASSWD 2
-
--
- int main ( int argc, char *argv[] )
- {
- char line [BUFSIZE] = "";
- char oldpass [BUFSIZE] = "";
- char newpass [BUFSIZE] = "";
- int nopt = -1;
-- static char options [] = "dl:p:Rs:t:vy:?";
-+ static char options [] = "dhl:oPp:RSs:t:vy:";
- int mode = 0;
- char *ptr = NULL;
- POP p;
- BOOL no_rev_lookup = FALSE;
-+ int compat_mode = 0;
-+ BOOL bad_user = FALSE;
-
- #ifdef HAS_SHADOW
- struct spwd *spwd;
-@@ -376,8 +389,6 @@ int main ( int argc, char *argv[] )
- pname = ptr + 1;
- }
-
-- openlog ( pname, POP_LOGOPTS, LOG_LOCAL2 );
--
- /*
- * Set up some stuff in -p- so we can call Qpopper routines
- */
-@@ -385,6 +396,17 @@ int main ( int argc, char *argv[] )
- p.AuthType = noauth;
- p.myname = pname;
-
-+#ifndef POP_FACILITY
-+# if defined(OSF1) || defined(LINUX)
-+# define POP_FACILITY LOG_MAIL
-+# else
-+# define POP_FACILITY LOG_LOCAL0
-+# endif /* OSF1 or Linux */
-+#endif /* POP_FACILITY not defined */
-+
-+ p.log_facility = (log_facility_type) POP_FACILITY;
-+ openlog ( pname, POP_LOGOPTS, p.log_facility );
-+
- /*
- * Handle command-line options
- */
-@@ -393,9 +415,9 @@ int main ( int argc, char *argv[] )
- {
- switch (nopt)
- {
-- case '?':
-- fprintf ( stderr, "%s [-?] [-d] [-l 0|1|2] [-p [passd-path]] "
-- "[-R] [-s [smbpasswd-path]]\n\t"
-+ case 'h':
-+ fprintf ( stderr, "%s [-h] [-d] [-l 0|1|2] [-p [passd-path]] "
-+ "[-P] [-R] [-S] [-s [smbpasswd-path]]\n\t"
- "[-t trace-file] [-v] [-y log-facility]\n",
- pname );
- exit (1);
-@@ -412,20 +434,34 @@ int main ( int argc, char *argv[] )
- verbose = TRUE;
- break;
-
-+ case 'S':
-+ mode |= RUN_SMBPASSWD;
-+ TRACE ( trace_file, POP_DEBUG, HERE,
-+ "Changing SMB password enabled" );
-+ break;
-+
-+
- case 's':
- mode |= RUN_SMBPASSWD;
- if ( optarg != NULL && *optarg != '\0' )
- smb_binary = optarg;
- TRACE ( trace_file, POP_DEBUG, HERE,
-- "Changing SMB passwords using %s", smb_binary );
-+ "Changing SMB password using %s", smb_binary );
-+ break;
-+
-+ case 'P':
-+ mode |= RUN_PASSWD;
-+ TRACE ( trace_file, POP_DEBUG, HERE,
-+ "Changing standard password enabled" );
- break;
-
-+
- case 'p':
- mode |= RUN_PASSWD;
- if ( optarg != NULL && *optarg != '\0' )
- pwd_binary = optarg;
- TRACE ( trace_file, POP_DEBUG, HERE,
-- "Changing standard passwords using %s", pwd_binary );
-+ "Changing standard password using %s", pwd_binary );
- break;
-
- case 't':
-@@ -476,6 +512,10 @@ int main ( int argc, char *argv[] )
- "Avoiding reverse lookups (-R)" );
- break;
-
-+ case 'o': /* compatibility mode */
-+ compat_mode = 1;
-+ break;
-+
- case 'y': /* log facility */
- if ( optarg == NULL || *optarg == '\0' ) {
- err_msg ( HERE, "-y value expected" );
-@@ -563,44 +603,50 @@ int main ( int argc, char *argv[] )
- return 1;
- }
-
-- WriteToClient ( "200 your new password please." );
-- ReadFromClient ( line );
-- sscanf ( line, "newpass %s", newpass );
--
-- /* new pass required */
-- if ( strlen (newpass) == 0 )
-- {
-- WriteToClient ("500 New password required.");
-- return 1;
-- }
--
- pw = getpwnam ( userid );
- if ( pw == NULL )
- {
-- WriteToClient ( "500 Invalid user or password" );
-- return 1;
-- }
-+ bad_user = TRUE;
-+ } else {
-
- #ifdef HAS_SHADOW
-- if ((spwd = getspnam(userid)) == NULL)
-- pw->pw_passwd = "";
-- else
-- pw->pw_passwd = spwd->sp_pwdp;
-+ if ((spwd = getspnam(userid)) == NULL)
-+ pw->pw_passwd = "";
-+ else
-+ pw->pw_passwd = spwd->sp_pwdp;
- #endif
-
-+ if ( chkPass ( userid, oldpass, pw, &p ) == FAILURE )
-+ {
-+ syslog ( LOG_ERR, "password failure for %s", userid );
-+ bad_user = TRUE;
-+ }
-+
-+ if ( pw->pw_uid <= BLOCK_UID )
-+ {
-+ syslog( LOG_ERR, "someone tried to change %s's password", userid );
-+ bad_user = TRUE;
-+ }
-+ }
-+ if (compat_mode && bad_user) {
-+ sleep(1); /* XXX */
-+ WriteToClient ( "500 Invalid user or password" );
-+ return 1;
-+ }
-
-- if ( chkPass ( userid, oldpass, pw, &p ) == FAILURE )
-- {
-- syslog ( LOG_ERR, "password failure for %s", userid );
-- WriteToClient ( "500 Invalid user or password" );
-- return 1;
-+ WriteToClient ( "200 your new password please." );
-+ ReadFromClient ( line );
-+ sscanf ( line, "newpass %s", newpass );
-+
-+ if (bad_user) {
-+ WriteToClient ( "500 Invalid user or password" );
-+ return 1;
- }
-
-- if ( pw->pw_uid <= BLOCK_UID )
--
-+ /* new pass required */
-+ if ( strlen (newpass) == 0 )
- {
-- syslog ( LOG_ERR, "someone tried to change %s's password", userid );
-- WriteToClient ( "500 Not a user account." );
-+ WriteToClient ("500 New password required.");
- return 1;
- }
-
-@@ -633,6 +679,20 @@ int main ( int argc, char *argv[] )
- return 0;
- }
-
-+/* catch child */
-+void
-+reapchild(sig)
-+ int sig;
-+{
-+ int status;
-+ int pid;
-+
-+ while ((pid = wait3(&status, WNOHANG, NULL)) > 0) {
-+ child_pid = pid;
-+ child_status = status;
-+ }
-+}
-+
-
- /* Run a child process to do the password change */
-
-@@ -653,6 +713,10 @@ void runchild ( char *userid, char *oldp
- exit ( 1 );
- }
-
-+ signal(SIGCHLD, reapchild);
-+ child_pid = 0;
-+ child_status = -1;
-+
- /* fork child process to talk to password program */
-
- pid = fork();
-@@ -665,7 +729,7 @@ void runchild ( char *userid, char *oldp
-
- if ( pid > 0 ) /* Parent */
- {
-- if (talktochild (master, userid, oldpass, newpass, emess, smb) == FAILURE)
-+ if (talktochild (master, userid, oldpass, newpass, emess) == FAILURE)
- {
- logit ( trace_file, LOG_ERR, HERE,
- "%s failed for %s", smb ? "smbpasswd" : "passwd", userid );
-@@ -677,10 +741,16 @@ void runchild ( char *userid, char *oldp
- wpid = waitpid ( pid, &wstat, 0 );
- if ( wpid < 0 )
- {
-- logit ( trace_file, LOG_ERR, HERE, "wait for child failed" );
-- WriteToClient ("500 Server error (wait failed), get help!");
-- exit(1);
-+ if (child_pid > 0) {
-+ wpid = child_pid;
-+ wstat = child_status;
-+ } else {
-+ logit ( trace_file, LOG_ERR, HERE, "wait for child failed" );
-+ WriteToClient ("500 Server error (wait failed), get help!");
-+ exit(1);
-+ }
- }
-+ signal(SIGCHLD, SIG_DFL);
-
- if ( pid != wpid )
- {
-@@ -702,7 +772,6 @@ void runchild ( char *userid, char *oldp
- WriteToClient ("500 Server error (abnormal exit), get help!");
- exit(1);
- }
--
- close ( master ); /* done with the pty */
- }
- else /* Child */
-@@ -784,6 +853,13 @@ int dochild (int master, char *slavedev,
- chdir ("/");
- umask (0);
-
-+#ifdef HAVE_SETLOGIN
-+ if (setlogin(userid) < 0) {
-+ err_msg ( HERE, "setlogin failed: %m" );
-+ return(0);
-+ }
-+#endif
-+
- /*
- * Become the user and run passwd. Linux shadowed passwd doesn't need
- * to be run as root with the username passed on the command line.
-@@ -883,20 +959,19 @@ void writestring (int fd, char *s)
- * that the password wasn't changed).
- */
- int talktochild (int master, char *userid, char *oldpass, char *newpass,
-- char *emess, int asroot)
-+ char *emess)
- {
-+ int n;
- char buf[BUFSIZE];
- char pswd[BUFSIZE+1];
-
- *emess = 0;
-
- TRACE ( trace_file, POP_DEBUG, HERE,
-- "talktochild; master=%d; userid=%s; asroot=%d",
-- master, userid, asroot );
-+ "talktochild; master=%d; userid=%s", master, userid);
-
- /* only get current password if not root */
-- if (!asroot)
-- {
-+ if (geteuid() == 0) {
- /* wait for current password prompt */
- if (!expect(master, P1, buf)) return FAILURE;
-
-@@ -926,6 +1001,10 @@ int talktochild (int master, char *useri
- if ( !expect(master, P4, buf) )
- TRACE ( trace_file, POP_DEBUG, HERE, "no response -- assuming OK" );
-
-+ while ((n = read(master, buf, sizeof buf)) > 0) {
-+ TRACE ( trace_file, POP_DEBUG, HERE, "reading remained output" );
-+ ;
-+ }
- return SUCCESS;
- }
-
-@@ -955,8 +1034,12 @@ int match (char *str, char *pat)
- strlen(pat), debug_str(pat, strlen(pat), 1) );
-
- while (*str && *pat) {
-- if (*pat == '*')
-- break;
-+ if (*pat == '*') {
-+ pat++;
-+ while (*str != '\0' && *str != '\n')
-+ *str++;
-+ continue;
-+ }
-
- /* ignore multiple space sequences */
- if (*pat == ' ' && isspace (*str)) {
-@@ -1055,7 +1138,11 @@ int expect (int master, char **expected,
- if ( m < 0 ) {
- err_msg ( HERE, "read error from child" );
- return FAILURE;
-- }
-+ } else if (m == 0) {
-+ TRACE ( trace_file, POP_DEBUG, HERE, "no data from child");
-+ return FAILURE;
-+ }
-+
- buf [ n + m ] = '\0';
-
- TRACE ( trace_file, POP_DEBUG, HERE, "...read: (%d) '%.128s'",
diff --git a/mail/poppassd/patches/patch-ad b/mail/poppassd/patches/patch-ad
deleted file mode 100644
index ebe2f3475dd..00000000000
--- a/mail/poppassd/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/10/20 14:18:42 taca Exp $
-
---- config.h.in.orig 2004-10-20 14:19:23.413009000 +0900
-+++ config.h.in
-@@ -58,6 +58,9 @@
- /* Define if you don't have vprintf but do have _doprnt. */
- #undef HAVE_DOPRNT
-
-+/* Define if you have setlogin system call. */
-+#undef HAVE_SETLOGIN
-+
- /* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
- #undef HAVE_SYS_WAIT_H
-
diff --git a/mail/poppassd/patches/patch-ae b/mail/poppassd/patches/patch-ae
deleted file mode 100644
index 27b43e144c4..00000000000
--- a/mail/poppassd/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/10/20 14:18:42 taca Exp $
-
---- configure.in.orig 2004-10-20 14:19:23.863020000 +0900
-+++ configure.in
-@@ -1440,6 +1440,7 @@ gethostbyname \
- gettimeofday \
- getusershell \
- mkdir \
-+setlogin \
- socket \
- strdup \
- strerror \
diff --git a/mail/poppassd/patches/patch-af b/mail/poppassd/patches/patch-af
deleted file mode 100644
index 649af79d5e7..00000000000
--- a/mail/poppassd/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/10/20 14:18:42 taca Exp $
-
---- configure.orig 2004-10-20 14:19:23.833010000 +0900
-+++ configure
-@@ -9227,6 +9227,7 @@ gethostbyname \
- gettimeofday \
- getusershell \
- mkdir \
-+setlogin \
- socket \
- strdup \
- strerror \
diff --git a/mail/poppassd/patches/patch-ag b/mail/poppassd/patches/patch-ag
deleted file mode 100644
index e5bf371fa51..00000000000
--- a/mail/poppassd/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/01/08 17:22:29 joerg Exp $
-
---- popper/popper.h.orig 2006-01-08 17:09:15.000000000 +0000
-+++ popper/popper.h
-@@ -287,8 +287,6 @@ typedef struct _pop_tls pop_
- # define WILDCARD_SHELL "/POPPER/ANY/SHELL/"
- #endif /* CHECK_SHELL */
-
--extern int errno;
--
- #if !( defined(BSD) && (BSD >= 199306) ) && !defined(__USE_BSD)
- extern int sys_nerr;
- # ifndef FREEBSD
diff --git a/mail/poppy/DESCR b/mail/poppy/DESCR
deleted file mode 100644
index cc71f3e4c39..00000000000
--- a/mail/poppy/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Poppy is a small perl script that allows you to perform simple tasks
-on a POP3 or IMAP server. It is of most use in a "limited resources
-environment" whether thats low disk space, slow internet connection,
-or no graphical environment.
-
-Poppy will individually show the mail headers along with the message's
-size of each message on the mail server and then allow you to read,
-delete, reply, or perform other tasks on that message.
diff --git a/mail/poppy/Makefile b/mail/poppy/Makefile
deleted file mode 100644
index 5c238287bcc..00000000000
--- a/mail/poppy/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:59 rillig Exp $
-#
-
-DISTNAME= poppy-3.1
-CATEGORIES= mail
-MASTER_SITES= http://www.cnpbagwell.com/
-
-MAINTAINER= zuntum@NetBSD.org
-HOMEPAGE= http://www.cnpbagwell.com/projects.html
-COMMENT= Client to perform simple tasks with a POP3/IMAP server
-
-NO_BUILD= YES
-USE_TOOLS+= perl:run
-REPLACE_PERL= poppy
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/poppy ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/poppy.1 ${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/poppy/PLIST b/mail/poppy/PLIST
deleted file mode 100644
index eb89ae61550..00000000000
--- a/mail/poppy/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:01:05 zuntum Exp $
-bin/poppy
-man/man1/poppy.1
diff --git a/mail/poppy/distinfo b/mail/poppy/distinfo
deleted file mode 100644
index 428b5febec3..00000000000
--- a/mail/poppy/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:26 agc Exp $
-
-SHA1 (poppy-3.1.tar.gz) = b282cbd81a10a705e0d02d475820484f34a2f524
-RMD160 (poppy-3.1.tar.gz) = 3c0468450112632e18d29b68c831740ceb4e7c8a
-Size (poppy-3.1.tar.gz) = 93897 bytes
diff --git a/mail/postfix-current/DESCR b/mail/postfix-current/DESCR
deleted file mode 100644
index dd023b67fac..00000000000
--- a/mail/postfix-current/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-Postfix aims to be an alternative to the widely-used sendmail
-program. Sendmail is responsible for 70% of all e-mail delivered
-on the Internet. With an estimated 100 million users, that's an
-estimated 10 billion (10^10) messages daily. A stunning number.
-
-Although IBM supported the Postfix development, it abstains from
-control over its evolution. The goal is to have Postfix installed
-on as many systems as possible. To this end, the software is given
-away with no strings attached to it, so that it can evolve with
-input from and under control by its users.
-
-In other words, IBM releases Postfix only once. I will be around
-to guide its development for a limited time.
diff --git a/mail/postfix-current/MESSAGE b/mail/postfix-current/MESSAGE
deleted file mode 100644
index f7fbfd64539..00000000000
--- a/mail/postfix-current/MESSAGE
+++ /dev/null
@@ -1,17 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/07/31 05:53:44 jlam Exp $
-
-Please run the following command to update main.cf and master.cf with
-the latest Postfix services and configuration directives:
-
- ${PREFIX}/sbin/postfix upgrade-configuration
-
-If you are upgrading from a previous Postfix installation, you may want
-to back up any existing configuration files before running the above
-command.
-
-Postfix may be activated by executing:
-
- ${PREFIX}/sbin/postfix start
-
-===========================================================================
diff --git a/mail/postfix-current/MESSAGE.NetBSD b/mail/postfix-current/MESSAGE.NetBSD
deleted file mode 100644
index 34adcc71d1d..00000000000
--- a/mail/postfix-current/MESSAGE.NetBSD
+++ /dev/null
@@ -1,13 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.2 2004/07/31 05:53:44 jlam Exp $
-
-If you are running NetBSD 1.5 (or newer), the existing /etc/rc.d/postfix
-can be forced to start ${PREFIX}/sbin/postfix instead of /usr/sbin/postfix,
-by adding the following lines to /etc/rc.conf.d/postfix:
-
- required_files='${PKG_SYSCONFDIR}/main.cf'
- start_cmd='${PREFIX}/sbin/postfix start'
- stop_cmd='${PREFIX}/sbin/postfix stop'
- reload_cmd='${PREFIX}/sbin/postfix reload'
-
-===========================================================================
diff --git a/mail/postfix-current/MESSAGE.sasl b/mail/postfix-current/MESSAGE.sasl
deleted file mode 100644
index efc0cd65bbc..00000000000
--- a/mail/postfix-current/MESSAGE.sasl
+++ /dev/null
@@ -1,34 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.sasl,v 1.3 2005/09/30 06:04:32 martti Exp $
-
-To enable SASL authentication in the SMTP server, you may want to edit
-
- ${SASLLIBDIR}/smtpd.conf
-
-and change the method used to check plaintext passwords. To use
-security/cyrus-saslauthd, you should change the contents of smtpd.conf
-to:
-
- pwcheck_method: saslauthd
-
-You may also want to edit
-
- ${PKG_SYSCONFDIR}/main.cf
-
-and set the smtpd_sasl_* variables to appropriate values.
-
-To enable SASL authentication in the SMTP client, you may want to edit
-
- ${PKG_SYSCONFDIR}/main.cf
-
-and set the smtp_sasl_* variables to appropriate values.
-
-The corresponding SASL authentication plugins will also need to be
-installed. Please consult:
-
- ${DOCDIR}/SASL_README
-
-and the SASL documentation for more information on setting up SASL
-authentication.
-
-===========================================================================
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
deleted file mode 100644
index 65b60383ed9..00000000000
--- a/mail/postfix-current/Makefile
+++ /dev/null
@@ -1,161 +0,0 @@
-# $NetBSD: Makefile,v 1.78 2007/02/15 06:38:13 martti Exp $
-
-DISTNAME= postfix-2.4-20070214
-#PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/
-DIST_SUBDIR= postfix
-
-MAINTAINER= martti@NetBSD.org
-HOMEPAGE= http://www.postfix.org/
-COMMENT= Postfix SMTP server and tools
-
-CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_TOOLS+= perl
-CHECK_HEADERS_SKIP+= src/global/mail_params.h
-
-.include "../../mk/bsd.prefs.mk"
-
-# POSTFIX_QUEUE_DIR is the default queue directory for Postfix. This is
-# merely a default, and may be changed by setting "queue_directory" in
-# ${PKG_SYSCONFDIR}/main.cf.
-#
-POSTFIX_QUEUE_DIR?= ${VARBASE}/spool/postfix
-BUILD_DEFS+= VARBASE POSTFIX_QUEUE_DIR
-
-# CCARGS is a list of options to pass to the preprocessor/compiler.
-# AUXLIBS is a list of options to pass to the linker.
-#
-CCARGS= # empty
-AUXLIBS= ${LDFLAGS}
-FIX_RPATH+= AUXLIBS
-
-# Set some default paths to override ${WRKSRC}/src/global/mail_params.h.
-CCARGS+= -DDEF_QUEUE_DIR=\"${POSTFIX_QUEUE_DIR}\"
-CCARGS+= -DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
-CCARGS+= -DDEF_COMMAND_DIR=\"${PREFIX}/sbin\"
-CCARGS+= -DDEF_CONFIG_DIR=\"${PKG_SYSCONFDIR}\"
-CCARGS+= -DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\"
-CCARGS+= -DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\"
-CCARGS+= -DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\"
-CCARGS+= -DDEF_MANPAGE_DIR=\"${PREFIX}/man\"
-CCARGS+= -DDEF_SAMPLE_DIR=\"${EXAMPLEDIR}\"
-CCARGS+= -DDEF_README_DIR=\"${DOCDIR}\"
-
-REPLACE_PERL+= auxiliary/qshape/qshape.pl
-
-# Override those same default paths in the installed example main.cf.
-SUBST_CLASSES+= postfix
-SUBST_STAGE.postfix= post-configure
-SUBST_FILES.postfix= conf/main.cf src/global/mail_params.h
-SUBST_SED.postfix= \
- -e 's|^\(queue_directory\) =.*|\1 = ${POSTFIX_QUEUE_DIR}|'
-SUBST_SED.postfix+= \
- -e 's|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|'
-SUBST_SED.postfix+= \
- -e 's|^\(daemon_directory\) =.*|\1 = ${LIBEXECDIR}|'
-SUBST_SED.postfix+= \
- -e 's|^\(sendmail_path\) =.*|\1 = ${PREFIX}/sbin/sendmail|'
-SUBST_SED.postfix+= \
- -e 's|^\(newaliases_path\) =.*|\1 = ${PREFIX}/bin/newaliases|'
-SUBST_SED.postfix+= \
- -e 's|^\(mailq_path\) =.*|\1 = ${PREFIX}/bin/mailq|'
-SUBST_SED.postfix+= \
- -e 's|^\(setgid_group\) =.*|\1 = maildrop|'
-SUBST_SED.postfix+= \
- -e 's|^\(manpage_directory\) =.*|\1 = ${PREFIX}/man|'
-SUBST_SED.postfix+= \
- -e 's|^\(sample_directory\) =.*|\1 = ${EXAMPLEDIR}|'
-SUBST_SED.postfix+= \
- -e 's|^\(readme_directory\) =.*|\1 = ${DOCDIR}|'
-SUBST_SED.postfix+= \
- -e '/^\#define DEF_SGID_GROUP[ ]/s,postdrop,maildrop,g'
-
-# options.mk appends to CCARGS and AUXLIBS the options needed to build
-# Postfix with support for various add-on modules.
-#
-.include "options.mk"
-
-PKG_SYSCONFSUBDIR= postfix
-LIBEXECDIR= ${PREFIX}/libexec/postfix
-DOCDIR= ${PREFIX}/share/doc/postfix
-EXAMPLEDIR= ${PREFIX}/share/examples/postfix
-
-FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR:Q}
-MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
-MESSAGE_SUBST+= DOCDIR=${DOCDIR}
-
-MESSAGE_SRC+= ${PKGDIR}/MESSAGE
-.if exists(${PKGDIR}/MESSAGE.${OPSYS})
-MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS}
-.endif
-PLIST_SRC+= ${PKGDIR}/PLIST
-
-BUILD_TARGET= # empty
-MAKE_ENV+= CC=${CC:Q} OPT=${CFLAGS:Q}
-MAKE_ENV+= AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
-
-RCD_SCRIPTS= postfix
-OWN_DIRS+= ${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc
-MAKE_DIRS+= ${PKG_SYSCONFDIR}
-
-PKG_GROUPS?= postfix maildrop
-PKG_USERS?= postfix:postfix
-PKG_GECOS.postfix= Postfix User
-PKG_HOME.postfix= ${POSTFIX_QUEUE_DIR}
-
-CONF_FILES= # empty
-.for i in main.cf master.cf postfix-files
-CONF_FILES+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i}
-.endfor
-CONF_FILES_PERMS= # empty
-.for i in post-install postfix-script
-CONF_FILES_PERMS+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i} \
- ${ROOT_USER} ${ROOT_GROUP} 755
-.endfor
-.if !empty(PKG_OPTIONS:Msasl)
-MAKE_DIRS+= ${SASLLIBDIR}
-CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
-.endif
-
-MAKE_ENV+= DEBUG= # empty
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= ${WRKDIR}/mailer.conf
-SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
-SUBST_STAGE.paths= post-patch
-
-post-extract:
- cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
- rm -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix
-
-do-configure:
- cd ${WRKSRC} && \
- env ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \
- 'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}'
-
-post-build:
-.if !empty(PKG_OPTIONS:Msasl)
- ${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf
-.endif
-
-do-install:
- ${INSTALL_DATA_DIR} ${LIBEXECDIR}
- ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
- ${INSTALL_DATA_DIR} ${DOCDIR}
- rm -f ${WRKSRC}/conf/*.orig
-.if !empty(PKG_OPTIONS:Msasl)
- ${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${EXAMPLEDIR}
-.endif
- ${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${EXAMPLEDIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${EXAMPLEDIR}
- ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLEDIR}/mailer.conf
- cd ${WRKSRC}; sh ./postfix-install -non-interactive \
- config_directory="${EXAMPLEDIR}"
- ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \
- ${PREFIX}/sbin/qshape
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/postfix-current/PLIST b/mail/postfix-current/PLIST
deleted file mode 100644
index b62e4f9ba24..00000000000
--- a/mail/postfix-current/PLIST
+++ /dev/null
@@ -1,173 +0,0 @@
-@comment $NetBSD: PLIST,v 1.12 2007/02/15 06:38:13 martti Exp $
-bin/mailq
-bin/newaliases
-libexec/postfix/anvil
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/discard
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/oqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/scache
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/tlsmgr
-libexec/postfix/trivial-rewrite
-libexec/postfix/verify
-libexec/postfix/virtual
-man/man1/mailq.1
-man/man1/newaliases.1
-man/man1/postalias.1
-man/man1/postcat.1
-man/man1/postconf.1
-man/man1/postdrop.1
-man/man1/postfix.1
-man/man1/postkick.1
-man/man1/postlock.1
-man/man1/postlog.1
-man/man1/postmap.1
-man/man1/postqueue.1
-man/man1/postsuper.1
-man/man1/sendmail.1
-man/man5/access.5
-man/man5/aliases.5
-man/man5/body_checks.5
-man/man5/bounce.5
-man/man5/canonical.5
-man/man5/cidr_table.5
-man/man5/generic.5
-man/man5/header_checks.5
-man/man5/ldap_table.5
-man/man5/master.5
-man/man5/mysql_table.5
-man/man5/nisplus_table.5
-man/man5/pcre_table.5
-man/man5/pgsql_table.5
-man/man5/postconf.5
-man/man5/regexp_table.5
-man/man5/relocated.5
-man/man5/tcp_table.5
-man/man5/transport.5
-man/man5/virtual.5
-man/man8/anvil.8
-man/man8/bounce.8
-man/man8/cleanup.8
-man/man8/defer.8
-man/man8/discard.8
-man/man8/error.8
-man/man8/flush.8
-man/man8/lmtp.8
-man/man8/local.8
-man/man8/master.8
-man/man8/oqmgr.8
-man/man8/pickup.8
-man/man8/pipe.8
-man/man8/proxymap.8
-man/man8/qmgr.8
-man/man8/qmqpd.8
-man/man8/scache.8
-man/man8/showq.8
-man/man8/smtp.8
-man/man8/smtpd.8
-man/man8/spawn.8
-man/man8/tlsmgr.8
-man/man8/trace.8
-man/man8/trivial-rewrite.8
-man/man8/verify.8
-man/man8/virtual.8
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/qshape
-sbin/sendmail
-share/doc/postfix/AAAREADME
-share/doc/postfix/ADDRESS_CLASS_README
-share/doc/postfix/ADDRESS_REWRITING_README
-share/doc/postfix/ADDRESS_VERIFICATION_README
-share/doc/postfix/BACKSCATTER_README
-share/doc/postfix/BASIC_CONFIGURATION_README
-share/doc/postfix/BUILTIN_FILTER_README
-share/doc/postfix/CDB_README
-share/doc/postfix/CONNECTION_CACHE_README
-share/doc/postfix/CONTENT_INSPECTION_README
-share/doc/postfix/DATABASE_README
-share/doc/postfix/DB_README
-share/doc/postfix/DEBUG_README
-share/doc/postfix/DSN_README
-share/doc/postfix/ETRN_README
-share/doc/postfix/FILTER_README
-share/doc/postfix/INSTALL
-share/doc/postfix/IPV6_README
-share/doc/postfix/LDAP_README
-share/doc/postfix/LINUX_README
-share/doc/postfix/LOCAL_RECIPIENT_README
-share/doc/postfix/MAILDROP_README
-share/doc/postfix/MILTER_README
-share/doc/postfix/MYSQL_README
-share/doc/postfix/NFS_README
-share/doc/postfix/OVERVIEW
-share/doc/postfix/PACKAGE_README
-share/doc/postfix/PCRE_README
-share/doc/postfix/PGSQL_README
-share/doc/postfix/QMQP_README
-share/doc/postfix/QSHAPE_README
-share/doc/postfix/RELEASE_NOTES
-share/doc/postfix/RESTRICTION_CLASS_README
-share/doc/postfix/SASL_README
-share/doc/postfix/SCHEDULER_README
-share/doc/postfix/SMTPD_ACCESS_README
-share/doc/postfix/SMTPD_POLICY_README
-share/doc/postfix/SMTPD_PROXY_README
-share/doc/postfix/STANDARD_CONFIGURATION_README
-share/doc/postfix/TLS_LEGACY_README
-share/doc/postfix/TLS_README
-share/doc/postfix/TUNING_README
-share/doc/postfix/ULTRIX_README
-share/doc/postfix/UUCP_README
-share/doc/postfix/VERP_README
-share/doc/postfix/VIRTUAL_README
-share/doc/postfix/XCLIENT_README
-share/doc/postfix/XFORWARD_README
-share/examples/postfix/LICENSE
-share/examples/postfix/TLS_LICENSE
-share/examples/postfix/access
-share/examples/postfix/aliases
-share/examples/postfix/bounce.cf.default
-share/examples/postfix/canonical
-share/examples/postfix/generic
-share/examples/postfix/header_checks
-share/examples/postfix/mailer.conf
-share/examples/postfix/main.cf
-share/examples/postfix/main.cf.default
-share/examples/postfix/makedefs.out
-share/examples/postfix/master.cf
-share/examples/postfix/post-install
-share/examples/postfix/postfix-files
-share/examples/postfix/postfix-script
-share/examples/postfix/relocated
-${SASL}share/examples/postfix/smtpd.conf
-share/examples/postfix/transport
-share/examples/postfix/virtual
-share/examples/rc.d/postfix
-@dirrm share/examples/postfix
-@dirrm share/doc/postfix
-@dirrm libexec/postfix
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
deleted file mode 100644
index cc6fcf94811..00000000000
--- a/mail/postfix-current/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.33 2007/02/15 06:38:13 martti Exp $
-
-SHA1 (postfix/postfix-2.4-20070214.tar.gz) = a50cde24a555c424b5366776fe802b19e8f05ad8
-RMD160 (postfix/postfix-2.4-20070214.tar.gz) = bbb542f8aca8100ff67271720bcef28762019af7
-Size (postfix/postfix-2.4-20070214.tar.gz) = 2909195 bytes
-SHA1 (patch-aa) = 3f45ca9b05bf080bd0f9ef3c9f8c24a1ef992edd
-SHA1 (patch-ag) = 8eb496390981c30842f2988c5dfdb17e8aa813ad
-SHA1 (patch-ai) = 7797f14838cf8278684139a287dcbdbb271641f6
diff --git a/mail/postfix-current/files/mailer.conf b/mail/postfix-current/files/mailer.conf
deleted file mode 100644
index 7122137ea38..00000000000
--- a/mail/postfix-current/files/mailer.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: mailer.conf,v 1.4 2004/07/31 05:53:44 jlam Exp $
-#
-# Use "postfix" as replacement for "sendmail".
-#
-sendmail @PREFIX@/sbin/sendmail
-send-mail @PREFIX@/sbin/sendmail
-mailq @PREFIX@/sbin/sendmail
-newaliases @PREFIX@/sbin/sendmail
-hoststat @PREFIX@/sbin/sendmail
-purgestat @PREFIX@/sbin/sendmail
diff --git a/mail/postfix-current/files/postfix.sh b/mail/postfix-current/files/postfix.sh
deleted file mode 100644
index 8f904f42da6..00000000000
--- a/mail/postfix-current/files/postfix.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: postfix.sh,v 1.4 2005/12/30 06:29:41 martti Exp $
-#
-
-# PROVIDE: mail
-# REQUIRE: LOGIN
-# we make mail start late, so that things like .forward's are not
-# processed until the system is fully operational
-
-. /etc/rc.subr
-
-name="postfix"
-rcvar=$name
-postfix_command="@PREFIX@/sbin/${name}"
-: ${required_files=`@PREFIX@/sbin/postconf -h config_directory`/main.cf}
-start_precmd="postfix_precmd"
-start_cmd="postfix_op"
-stop_cmd="postfix_op"
-reload_cmd="postfix_op"
-extra_commands="reload"
-: ${spooletcdir=`@PREFIX@/sbin/postconf -h queue_directory`/etc}
-required_dirs=$spooletcdir
-
-postfix_precmd()
-{
- # As this is called after the is_running and required_dir checks
- # are made in run_rc_command(), we can safely assume ${spooletcdir}
- # exists and postfix isn't running at this point (unless forcestart
- # is used).
- #
-
- [ ! -d ${spooletcdir} ] && mkdir -p ${spooletcdir}
- for f in localtime resolv.conf services; do
- if [ -f /etc/$f ]; then
- cmp -s /etc/$f ${spooletcdir}/$f || \
- cp -p /etc/$f ${spooletcdir}/$f
- fi
- done
-}
-
-postfix_op()
-{
- case ${rc_arg} in
- start)
- for _f in $required_dirs; do
- if [ ! -d "${_f}/." ]; then
- warn "${_f} is not a directory."
- if [ -z $rc_force ]; then
- return 1
- fi
- fi
- done
- for _f in $required_files; do
- if [ ! -r "${_f}" ]; then
- warn "${_f} is not readable."
- if [ -z $rc_force ]; then
- return 1
- fi
- fi
- done
- ${postfix_command} ${rc_arg}
- ;;
- *)
- ${postfix_command} ${rc_arg}
- ;;
- esac
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk
deleted file mode 100644
index e66c6d80119..00000000000
--- a/mail/postfix-current/options.mk
+++ /dev/null
@@ -1,101 +0,0 @@
-# $NetBSD: options.mk,v 1.14 2006/05/31 18:22:24 ghen Exp $
-
-# Global and legacy options
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.postfix
-PKG_SUPPORTED_OPTIONS= bdb ldap mysql mysql4 pcre pgsql sasl tls
-.include "../../mk/bsd.options.mk"
-
-###
-### Support "hash" (Berkeley DB) map type.
-###
-.if empty(PKG_OPTIONS:Mbdb)
-PKG_OPTIONS+= bdb # "hash" map type is mandatory
-.endif
-.if !empty(PKG_OPTIONS:Mbdb)
-. include "../../mk/bdb.buildlink3.mk"
-CCARGS+= -DHAS_DB
-AUXLIBS+= ${BDB_LIBS}
-.endif
-
-###
-### STARTTLS support
-###
-.if !empty(PKG_OPTIONS:Mtls)
-. include "../../security/openssl/buildlink3.mk"
-CCARGS+= -DUSE_TLS
-AUXLIBS+= -L${BUILDLINK_PREFIX.openssl}/lib \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \
- -lssl -lcrypto
-.endif
-
-###
-### Support "pcre" map type for regular expressions.
-###
-.if !empty(PKG_OPTIONS:Mpcre)
-. include "../../devel/pcre/buildlink3.mk"
-CCARGS+= -DHAS_PCRE
-AUXLIBS+= -L${BUILDLINK_PREFIX.pcre}/lib \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib \
- -lpcre
-.else
-CCARGS+= -DNO_PCRE
-.endif
-
-###
-### Support LDAP directories for table lookups.
-###
-.if !empty(PKG_OPTIONS:Mldap)
-. include "../../databases/openldap-client/buildlink3.mk"
-CCARGS+= -DHAS_LDAP
-AUXLIBS+= -L${BUILDLINK_PREFIX.openldap-client}/lib \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openldap-client}/lib \
- -lldap -llber
-.endif
-
-###
-### Support using a MySQL database server for table lookups.
-###
-.if !empty(PKG_OPTIONS:Mmysql4)
-. include "../../mk/mysql.buildlink3.mk"
-CCARGS+= -DHAS_MYSQL
-CCARGS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --include`
-AUXLIBS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --libs`
-.elif !empty(PKG_OPTIONS:Mmysql)
-. include "../../mk/mysql.buildlink3.mk"
-CCARGS+= -DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
-AUXLIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
- -lmysqlclient -lz -lm
-.endif
-
-###
-### Support using a PostgreSQL database server for table lookups.
-###
-.if !empty(PKG_OPTIONS:Mpgsql)
-. include "../../mk/pgsql.buildlink3.mk"
-. include "../../security/openssl/buildlink3.mk"
-CCARGS+= -DHAS_PGSQL -I${PGSQL_PREFIX}/include/pgsql
-AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \
- -L${BUILDLINK_PREFIX.openssl}/lib -lcrypt -lssl -lcrypto
-.endif
-
-###
-### SASL support for SMTP authentication.
-###
-.if !empty(PKG_OPTIONS:Msasl)
-. include "../../security/cyrus-sasl/buildlink3.mk"
-BUILDLINK_INCDIRS.cyrus-sasl= include/sasl
-SASLLIBDIR= ${PREFIX}/lib/sasl2
-PWCHECK_METHOD= auxprop
-CCARGS+= -DUSE_SASL_AUTH -DUSE_CYRUS_SASL
-AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
- -lsasl2
-PLIST_SUBST+= SASL=
-MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR}
-.else
-PLIST_SUBST+= SASL="@comment "
-.endif
diff --git a/mail/postfix-current/patches/patch-aa b/mail/postfix-current/patches/patch-aa
deleted file mode 100644
index dd6a159b4dc..00000000000
--- a/mail/postfix-current/patches/patch-aa
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-aa,v 1.15 2005/09/30 06:04:32 martti Exp $
-
---- postfix-install.orig 2005-08-14 04:51:38.000000000 +0300
-+++ postfix-install 2005-09-30 05:48:14.000000000 +0300
-@@ -359,26 +359,6 @@
- : ${tempdir=`pwd`}
- : ${config_directory=`bin/postconf -h -d config_directory`}
-
--# Find out the location of installed configuration files.
--
--test -z "$non_interactive" && for name in install_root tempdir config_directory
--do
-- while :
-- do
-- echo
-- eval echo Please specify \$${name}_prompt | ${FMT}
-- eval echo \$n "$name: [\$$name]\ \$c"
-- read ans
-- case $ans in
-- "") break;;
-- *) case $ans in
-- /*) eval $name=$ans; break;;
-- *) echo; echo $0: Error: $name should be an absolute path name. 1>&2;;
-- esac;;
-- esac
-- done
--done
--
- # In case some systems special-case pathnames beginning with //.
-
- case $install_root in
-@@ -725,10 +705,3 @@
- "sample_directory = $sample_directory" \
- "readme_directory = $readme_directory" \
- || exit 1
--
--# If Postfix is being installed locally from source code, do the
--# post-install processing now.
--
--test -n "$install_root" || {
-- bin/postfix post-install $post_install_options || exit 1
--}
diff --git a/mail/postfix-current/patches/patch-ag b/mail/postfix-current/patches/patch-ag
deleted file mode 100644
index 467aae7f1f1..00000000000
--- a/mail/postfix-current/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.15 2006/10/16 09:48:00 martti Exp $
-
---- src/util/sys_defs.h.orig 2006-10-16 12:39:27.000000000 +0000
-+++ src/util/sys_defs.h 2006-10-16 12:40:30.000000000 +0000
-@@ -42,7 +42,9 @@
- #define DEF_MAILBOX_LOCK "flock"
- #define HAS_SUN_LEN
- #define HAS_FSYNC
-+#ifndef HAS_DB
- #define HAS_DB
-+#endif
- #define HAS_SA_LEN
- #define DEF_DB_TYPE "hash"
- #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
diff --git a/mail/postfix-current/patches/patch-ai b/mail/postfix-current/patches/patch-ai
deleted file mode 100644
index 50b572e8670..00000000000
--- a/mail/postfix-current/patches/patch-ai
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD: patch-ai,v 1.16 2006/10/16 09:48:00 martti Exp $
-
---- makedefs.orig 2006-08-26 16:02:51.000000000 +0000
-+++ makedefs 2006-10-16 12:43:36.000000000 +0000
-@@ -118,6 +118,8 @@
- ;;
- FreeBSD.6*) SYSTYPE=FREEBSD6
- ;;
-+ DragonFly.1*) SYSTYPE=FREEBSD4
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- OpenBSD.3*) SYSTYPE=OPENBSD3
-@@ -184,13 +186,6 @@
- esac
- ;;
- ULTRIX.4*) SYSTYPE=ULTRIX4
-- if [ -f /usr/local/lib/libdb.a ]; then
-- SYSLIBS="$SYSLIBS -ldb"
-- CCARGS="$CCARGS -DHAS_DB"
-- if [ -d /usr/local/include/db ]; then
-- CCARGS="$CCARGS -I/usr/local/include/db"
-- fi
-- fi
- for l in syslog resolv; do
- if [ -f /usr/local/lib/lib$l.a ]; then
- SYSLIBS="$SYSLIBS -l$l"
-@@ -222,25 +217,8 @@
- esac;;
- # Tested with RedHat 3.03 on 20020729.
- Linux.1*) SYSTYPE=LINUX1
-- SYSLIBS="-ldb"
- ;;
- Linux.2*) SYSTYPE=LINUX2
-- # Postfix no longer needs DB 1.85 compatibility
-- if [ -f /usr/include/db.h ]
-- then
-- : we are all set
-- elif [ -f /usr/include/db/db.h ]
-- then
-- CCARGS="$CCARGS -I/usr/include/db"
-- else
-- # No, we're not going to try db1 db2 db3 etc.
-- # On a properly installed system, Postfix builds
-- # by including <db.h> and by linking with -ldb
-- echo "No <db.h> include file found." 1>&2
-- echo "Install the appropriate db*-devel package first." 1>&2
-- echo "See the RELEASE_NOTES file for more information." 1>&2
-- exit 1
-- fi
- # GDBM locks the DBM .pag file after open. This breaks postmap.
- # if [ -f /usr/include/gdbm-ndbm.h ]
- # then
-@@ -251,7 +229,6 @@
- # CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
- # GDBM_LIBS=gdbm
- # fi
-- SYSLIBS="-ldb"
- for name in nsl resolv $GDBM_LIBS
- do
- for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -279,25 +256,13 @@
- HP-UX.A.09.*) SYSTYPE=HPUX9
- SYSLIBS=-ldbm
- CCARGS="$CCARGS -DMISSING_USLEEP"
-- if [ -f /usr/lib/libdb.a ]; then
-- CCARGS="$CCARGS -DHAS_DB"
-- SYSLIBS="$SYSLIBS -ldb"
-- fi
- ;;
- HP-UX.B.10.*) SYSTYPE=HPUX10
- CCARGS="$CCARGS `nm /usr/lib/libc.a 2>/dev/null |
- (grep usleep >/dev/null || echo '-DMISSING_USLEEP')`"
-- if [ -f /usr/lib/libdb.a ]; then
-- CCARGS="$CCARGS -DHAS_DB"
-- SYSLIBS=-ldb
-- fi
- ;;
- HP-UX.B.11.*) SYSTYPE=HPUX11
- SYSLIBS=-lnsl
-- if [ -f /usr/lib/libdb.a ]; then
-- CCARGS="$CCARGS -DHAS_DB"
-- SYSLIBS="$SYSLIBS -ldb"
-- fi
- ;;
- ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543
- RANLIB=echo
diff --git a/mail/postfix/DESCR b/mail/postfix/DESCR
deleted file mode 100644
index dd023b67fac..00000000000
--- a/mail/postfix/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-Postfix aims to be an alternative to the widely-used sendmail
-program. Sendmail is responsible for 70% of all e-mail delivered
-on the Internet. With an estimated 100 million users, that's an
-estimated 10 billion (10^10) messages daily. A stunning number.
-
-Although IBM supported the Postfix development, it abstains from
-control over its evolution. The goal is to have Postfix installed
-on as many systems as possible. To this end, the software is given
-away with no strings attached to it, so that it can evolve with
-input from and under control by its users.
-
-In other words, IBM releases Postfix only once. I will be around
-to guide its development for a limited time.
diff --git a/mail/postfix/MESSAGE b/mail/postfix/MESSAGE
deleted file mode 100644
index 9e845bfedb6..00000000000
--- a/mail/postfix/MESSAGE
+++ /dev/null
@@ -1,17 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.8 2004/07/19 22:03:13 jlam Exp $
-
-Please run the following command to update main.cf and master.cf with
-the latest Postfix services and configuration directives:
-
- ${PREFIX}/sbin/postfix upgrade-configuration
-
-If you are upgrading from a previous Postfix installation, you may want
-to back up any existing configuration files before running the above
-command.
-
-Postfix may be activated by executing:
-
- ${PREFIX}/sbin/postfix start
-
-===========================================================================
diff --git a/mail/postfix/MESSAGE.NetBSD b/mail/postfix/MESSAGE.NetBSD
deleted file mode 100644
index dea3c22db1b..00000000000
--- a/mail/postfix/MESSAGE.NetBSD
+++ /dev/null
@@ -1,13 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.2 2004/07/19 03:25:11 jlam Exp $
-
-If you are running NetBSD 1.5 (or newer), the existing /etc/rc.d/postfix
-can be forced to start ${PREFIX}/sbin/postfix instead of /usr/sbin/postfix,
-by adding the following lines to /etc/rc.conf.d/postfix:
-
- required_files='${PKG_SYSCONFDIR}/main.cf'
- start_cmd='${PREFIX}/sbin/postfix start'
- stop_cmd='${PREFIX}/sbin/postfix stop'
- reload_cmd='${PREFIX}/sbin/postfix reload'
-
-===========================================================================
diff --git a/mail/postfix/MESSAGE.sasl b/mail/postfix/MESSAGE.sasl
deleted file mode 100644
index 5085a7bcb92..00000000000
--- a/mail/postfix/MESSAGE.sasl
+++ /dev/null
@@ -1,34 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.sasl,v 1.8 2005/03/28 08:53:07 jlam Exp $
-
-To enable SASL authentication in the SMTP server, you may want to edit
-
- ${SASLLIBDIR}/smtpd.conf
-
-and change the method used to check plaintext passwords. To use
-security/cyrus-saslauthd, you should change the contents of smtpd.conf
-to:
-
- pwcheck_method: saslauthd
-
-You may also want to edit
-
- ${PKG_SYSCONFDIR}/main.cf
-
-and set the smtpd_sasl_* variables to appropriate values.
-
-To enable SASL authentication in the SMTP client, you may want to edit
-
- ${PKG_SYSCONFDIR}/main.cf
-
-and set the smtp_sasl_* variables to appropriate values.
-
-The corresponding SASL authentication plugins will also need to be
-installed. Please consult:
-
- ${DOCDIR}/SASL_README
-
-and the SASL documentation for more information on setting up SASL
-authentication.
-
-===========================================================================
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
deleted file mode 100644
index 568f062e9cb..00000000000
--- a/mail/postfix/Makefile
+++ /dev/null
@@ -1,161 +0,0 @@
-# $NetBSD: Makefile,v 1.199 2007/02/20 16:49:29 joerg Exp $
-
-DISTNAME= postfix-2.3.7
-#PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/
-DIST_SUBDIR= postfix
-
-MAINTAINER= martti@NetBSD.org
-HOMEPAGE= http://www.postfix.org/
-COMMENT= Postfix SMTP server and tools
-
-CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_TOOLS+= perl
-CHECK_HEADERS_SKIP+= src/global/mail_params.h
-
-.include "../../mk/bsd.prefs.mk"
-
-# POSTFIX_QUEUE_DIR is the default queue directory for Postfix. This is
-# merely a default, and may be changed by setting "queue_directory" in
-# ${PKG_SYSCONFDIR}/main.cf.
-#
-POSTFIX_QUEUE_DIR?= ${VARBASE}/spool/postfix
-BUILD_DEFS+= VARBASE POSTFIX_QUEUE_DIR
-
-# CCARGS is a list of options to pass to the preprocessor/compiler.
-# AUXLIBS is a list of options to pass to the linker.
-#
-CCARGS= # empty
-AUXLIBS= ${LDFLAGS}
-FIX_RPATH+= AUXLIBS
-
-# Set some default paths to override ${WRKSRC}/src/global/mail_params.h.
-CCARGS+= -DDEF_QUEUE_DIR=\"${POSTFIX_QUEUE_DIR}\"
-CCARGS+= -DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
-CCARGS+= -DDEF_COMMAND_DIR=\"${PREFIX}/sbin\"
-CCARGS+= -DDEF_CONFIG_DIR=\"${PKG_SYSCONFDIR}\"
-CCARGS+= -DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\"
-CCARGS+= -DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\"
-CCARGS+= -DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\"
-CCARGS+= -DDEF_MANPAGE_DIR=\"${PREFIX}/man\"
-CCARGS+= -DDEF_SAMPLE_DIR=\"${EXAMPLEDIR}\"
-CCARGS+= -DDEF_README_DIR=\"${DOCDIR}\"
-
-REPLACE_PERL+= auxiliary/qshape/qshape.pl
-
-# Override those same default paths in the installed example main.cf.
-SUBST_CLASSES+= postfix
-SUBST_STAGE.postfix= post-configure
-SUBST_FILES.postfix= conf/main.cf src/global/mail_params.h
-SUBST_SED.postfix= \
- -e 's|^\(queue_directory\) =.*|\1 = ${POSTFIX_QUEUE_DIR}|'
-SUBST_SED.postfix+= \
- -e 's|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|'
-SUBST_SED.postfix+= \
- -e 's|^\(daemon_directory\) =.*|\1 = ${LIBEXECDIR}|'
-SUBST_SED.postfix+= \
- -e 's|^\(sendmail_path\) =.*|\1 = ${PREFIX}/sbin/sendmail|'
-SUBST_SED.postfix+= \
- -e 's|^\(newaliases_path\) =.*|\1 = ${PREFIX}/bin/newaliases|'
-SUBST_SED.postfix+= \
- -e 's|^\(mailq_path\) =.*|\1 = ${PREFIX}/bin/mailq|'
-SUBST_SED.postfix+= \
- -e 's|^\(setgid_group\) =.*|\1 = maildrop|'
-SUBST_SED.postfix+= \
- -e 's|^\(manpage_directory\) =.*|\1 = ${PREFIX}/man|'
-SUBST_SED.postfix+= \
- -e 's|^\(sample_directory\) =.*|\1 = ${EXAMPLEDIR}|'
-SUBST_SED.postfix+= \
- -e 's|^\(readme_directory\) =.*|\1 = ${DOCDIR}|'
-SUBST_SED.postfix+= \
- -e '/^\#define DEF_SGID_GROUP[ ]/s,postdrop,maildrop,g'
-
-# options.mk appends to CCARGS and AUXLIBS the options needed to build
-# Postfix with support for various add-on modules.
-#
-.include "options.mk"
-
-PKG_SYSCONFSUBDIR= postfix
-LIBEXECDIR= ${PREFIX}/libexec/postfix
-DOCDIR= ${PREFIX}/share/doc/postfix
-EXAMPLEDIR= ${PREFIX}/share/examples/postfix
-
-FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR:Q}
-MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
-MESSAGE_SUBST+= DOCDIR=${DOCDIR}
-
-MESSAGE_SRC+= ${PKGDIR}/MESSAGE
-.if exists(${PKGDIR}/MESSAGE.${OPSYS})
-MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS}
-.endif
-PLIST_SRC+= ${PKGDIR}/PLIST
-
-BUILD_TARGET= # empty
-MAKE_ENV+= CC=${CC:Q} OPT=${CFLAGS:Q}
-MAKE_ENV+= AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
-
-RCD_SCRIPTS= postfix
-OWN_DIRS+= ${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc
-MAKE_DIRS+= ${PKG_SYSCONFDIR}
-
-PKG_GROUPS?= postfix maildrop
-PKG_USERS?= postfix:postfix
-PKG_GECOS.postfix= Postfix User
-PKG_HOME.postfix= ${POSTFIX_QUEUE_DIR}
-
-CONF_FILES= # empty
-.for i in main.cf master.cf postfix-files
-CONF_FILES+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i}
-.endfor
-CONF_FILES_PERMS= # empty
-.for i in post-install postfix-script
-CONF_FILES_PERMS+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i} \
- ${ROOT_USER} ${ROOT_GROUP} 755
-.endfor
-.if !empty(PKG_OPTIONS:Msasl) || !empty(PKG_OPTIONS:Mdovecot-sasl)
-MAKE_DIRS+= ${SASLLIBDIR}
-CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
-.endif
-
-MAKE_ENV+= DEBUG= # empty
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= ${WRKDIR}/mailer.conf
-SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
-SUBST_STAGE.paths= post-patch
-
-post-extract:
- cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
- rm -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix
-
-do-configure:
- cd ${WRKSRC} && \
- env ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \
- 'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}'
-
-post-build:
-.if !empty(PKG_OPTIONS:Msasl)
- ${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf
-.endif
-
-do-install:
- ${INSTALL_DATA_DIR} ${LIBEXECDIR}
- ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
- ${INSTALL_DATA_DIR} ${DOCDIR}
- rm -f ${WRKSRC}/conf/*.orig
-.if !empty(PKG_OPTIONS:Msasl)
- ${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${EXAMPLEDIR}
-.endif
- ${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${EXAMPLEDIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${EXAMPLEDIR}
- ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLEDIR}/mailer.conf
- cd ${WRKSRC}; sh ./postfix-install -non-interactive \
- config_directory="${EXAMPLEDIR}"
- ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \
- ${PREFIX}/sbin/qshape
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST
deleted file mode 100644
index 47a9b66cbeb..00000000000
--- a/mail/postfix/PLIST
+++ /dev/null
@@ -1,173 +0,0 @@
-@comment $NetBSD: PLIST,v 1.16 2006/07/13 09:57:51 martti Exp $
-bin/mailq
-bin/newaliases
-libexec/postfix/anvil
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/discard
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/oqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/scache
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/tlsmgr
-libexec/postfix/trivial-rewrite
-libexec/postfix/verify
-libexec/postfix/virtual
-man/man1/mailq.1
-man/man1/newaliases.1
-man/man1/postalias.1
-man/man1/postcat.1
-man/man1/postconf.1
-man/man1/postdrop.1
-man/man1/postfix.1
-man/man1/postkick.1
-man/man1/postlock.1
-man/man1/postlog.1
-man/man1/postmap.1
-man/man1/postqueue.1
-man/man1/postsuper.1
-man/man1/sendmail.1
-man/man5/access.5
-man/man5/aliases.5
-man/man5/body_checks.5
-man/man5/bounce.5
-man/man5/canonical.5
-man/man5/cidr_table.5
-man/man5/generic.5
-man/man5/header_checks.5
-man/man5/ldap_table.5
-man/man5/master.5
-man/man5/mysql_table.5
-man/man5/nisplus_table.5
-man/man5/pcre_table.5
-man/man5/pgsql_table.5
-man/man5/postconf.5
-man/man5/regexp_table.5
-man/man5/relocated.5
-man/man5/tcp_table.5
-man/man5/transport.5
-man/man5/virtual.5
-man/man8/anvil.8
-man/man8/bounce.8
-man/man8/cleanup.8
-man/man8/defer.8
-man/man8/discard.8
-man/man8/error.8
-man/man8/flush.8
-man/man8/lmtp.8
-man/man8/local.8
-man/man8/master.8
-man/man8/oqmgr.8
-man/man8/pickup.8
-man/man8/pipe.8
-man/man8/proxymap.8
-man/man8/qmgr.8
-man/man8/qmqpd.8
-man/man8/scache.8
-man/man8/showq.8
-man/man8/smtp.8
-man/man8/smtpd.8
-man/man8/spawn.8
-man/man8/tlsmgr.8
-man/man8/trace.8
-man/man8/trivial-rewrite.8
-man/man8/verify.8
-man/man8/virtual.8
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/qshape
-sbin/sendmail
-share/doc/postfix/AAAREADME
-share/doc/postfix/ADDRESS_CLASS_README
-share/doc/postfix/ADDRESS_REWRITING_README
-share/doc/postfix/ADDRESS_VERIFICATION_README
-share/doc/postfix/BACKSCATTER_README
-share/doc/postfix/BASIC_CONFIGURATION_README
-share/doc/postfix/BUILTIN_FILTER_README
-share/doc/postfix/CDB_README
-share/doc/postfix/CONNECTION_CACHE_README
-share/doc/postfix/CONTENT_INSPECTION_README
-share/doc/postfix/DATABASE_README
-share/doc/postfix/DB_README
-share/doc/postfix/DEBUG_README
-share/doc/postfix/DSN_README
-share/doc/postfix/ETRN_README
-share/doc/postfix/FILTER_README
-share/doc/postfix/INSTALL
-share/doc/postfix/IPV6_README
-share/doc/postfix/LDAP_README
-share/doc/postfix/LINUX_README
-share/doc/postfix/LMTP_README
-share/doc/postfix/LOCAL_RECIPIENT_README
-share/doc/postfix/MAILDROP_README
-share/doc/postfix/MILTER_README
-share/doc/postfix/MYSQL_README
-share/doc/postfix/NFS_README
-share/doc/postfix/OVERVIEW
-share/doc/postfix/PACKAGE_README
-share/doc/postfix/PCRE_README
-share/doc/postfix/PGSQL_README
-share/doc/postfix/QMQP_README
-share/doc/postfix/QSHAPE_README
-share/doc/postfix/RELEASE_NOTES
-share/doc/postfix/RESTRICTION_CLASS_README
-share/doc/postfix/SASL_README
-share/doc/postfix/SCHEDULER_README
-share/doc/postfix/SMTPD_ACCESS_README
-share/doc/postfix/SMTPD_POLICY_README
-share/doc/postfix/SMTPD_PROXY_README
-share/doc/postfix/STANDARD_CONFIGURATION_README
-share/doc/postfix/TLS_README
-share/doc/postfix/TUNING_README
-share/doc/postfix/ULTRIX_README
-share/doc/postfix/UUCP_README
-share/doc/postfix/VERP_README
-share/doc/postfix/VIRTUAL_README
-share/doc/postfix/XCLIENT_README
-share/doc/postfix/XFORWARD_README
-share/examples/postfix/LICENSE
-share/examples/postfix/TLS_LICENSE
-share/examples/postfix/access
-share/examples/postfix/aliases
-share/examples/postfix/bounce.cf.default
-share/examples/postfix/canonical
-share/examples/postfix/generic
-share/examples/postfix/header_checks
-share/examples/postfix/mailer.conf
-share/examples/postfix/main.cf
-share/examples/postfix/main.cf.default
-share/examples/postfix/makedefs.out
-share/examples/postfix/master.cf
-share/examples/postfix/post-install
-share/examples/postfix/postfix-files
-share/examples/postfix/postfix-script
-share/examples/postfix/relocated
-${SASL}share/examples/postfix/smtpd.conf
-share/examples/postfix/transport
-share/examples/postfix/virtual
-share/examples/rc.d/postfix
-@dirrm share/examples/postfix
-@dirrm share/doc/postfix
-@dirrm libexec/postfix
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
deleted file mode 100644
index f033d04cf47..00000000000
--- a/mail/postfix/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.109 2007/02/15 06:24:04 martti Exp $
-
-SHA1 (postfix/postfix-2.3.7.tar.gz) = caac1243ea3cbb5f60380d5614f48cc21d3cff33
-RMD160 (postfix/postfix-2.3.7.tar.gz) = 5d3c1074f2ab02fba60cc5d7251af45bb15c9068
-Size (postfix/postfix-2.3.7.tar.gz) = 2785739 bytes
-SHA1 (patch-aa) = e53bc6644c2b7898b73f4604489021cb85514610
-SHA1 (patch-ag) = cb42a57876821b133df9520999d99f7e5efa541c
-SHA1 (patch-ai) = f82456cbac2840fb2da3e723c9942ad66e6437a0
diff --git a/mail/postfix/files/mailer.conf b/mail/postfix/files/mailer.conf
deleted file mode 100644
index 8b8d45a6fbe..00000000000
--- a/mail/postfix/files/mailer.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: mailer.conf,v 1.6 2004/07/18 19:16:31 jlam Exp $
-#
-# Use "postfix" as replacement for "sendmail".
-#
-sendmail @PREFIX@/sbin/sendmail
-send-mail @PREFIX@/sbin/sendmail
-mailq @PREFIX@/sbin/sendmail
-newaliases @PREFIX@/sbin/sendmail
-hoststat @PREFIX@/sbin/sendmail
-purgestat @PREFIX@/sbin/sendmail
diff --git a/mail/postfix/files/postfix.sh b/mail/postfix/files/postfix.sh
deleted file mode 100644
index 6c35eb99a21..00000000000
--- a/mail/postfix/files/postfix.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: postfix.sh,v 1.5 2005/12/30 06:29:41 martti Exp $
-#
-
-# PROVIDE: mail
-# REQUIRE: LOGIN
-# we make mail start late, so that things like .forward's are not
-# processed until the system is fully operational
-
-. /etc/rc.subr
-
-name="postfix"
-rcvar=$name
-postfix_command="@PREFIX@/sbin/${name}"
-: ${required_files=`@PREFIX@/sbin/postconf -h config_directory`/main.cf}
-start_precmd="postfix_precmd"
-start_cmd="postfix_op"
-stop_cmd="postfix_op"
-reload_cmd="postfix_op"
-extra_commands="reload"
-: ${spooletcdir=`@PREFIX@/sbin/postconf -h queue_directory`/etc}
-required_dirs=$spooletcdir
-
-postfix_precmd()
-{
- # As this is called after the is_running and required_dir checks
- # are made in run_rc_command(), we can safely assume ${spooletcdir}
- # exists and postfix isn't running at this point (unless forcestart
- # is used).
- #
-
- [ ! -d ${spooletcdir} ] && mkdir -p ${spooletcdir}
- for f in localtime resolv.conf services; do
- if [ -f /etc/$f ]; then
- cmp -s /etc/$f ${spooletcdir}/$f || \
- cp -p /etc/$f ${spooletcdir}/$f
- fi
- done
-}
-
-postfix_op()
-{
- case ${rc_arg} in
- start)
- for _f in $required_dirs; do
- if [ ! -d "${_f}/." ]; then
- warn "${_f} is not a directory."
- if [ -z $rc_force ]; then
- return 1
- fi
- fi
- done
- for _f in $required_files; do
- if [ ! -r "${_f}" ]; then
- warn "${_f} is not readable."
- if [ -z $rc_force ]; then
- return 1
- fi
- fi
- done
- ${postfix_command} ${rc_arg}
- ;;
- *)
- ${postfix_command} ${rc_arg}
- ;;
- esac
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk
deleted file mode 100644
index 05bfd3d5a25..00000000000
--- a/mail/postfix/options.mk
+++ /dev/null
@@ -1,110 +0,0 @@
-# $NetBSD: options.mk,v 1.24 2007/02/20 16:49:30 joerg Exp $
-
-# Global and legacy options
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.postfix
-PKG_SUPPORTED_OPTIONS= bdb ldap mysql mysql4 pcre pgsql sasl tls dovecot-sasl
-.include "../../mk/bsd.options.mk"
-
-###
-### Support "hash" (Berkeley DB) map type.
-###
-.if empty(PKG_OPTIONS:Mbdb)
-PKG_OPTIONS+= bdb # "hash" map type is mandatory
-.endif
-.if !empty(PKG_OPTIONS:Mbdb)
-. include "../../mk/bdb.buildlink3.mk"
-CCARGS+= -DHAS_DB
-AUXLIBS+= ${BDB_LIBS}
-.endif
-
-###
-### STARTTLS support
-###
-.if !empty(PKG_OPTIONS:Mtls)
-. include "../../security/openssl/buildlink3.mk"
-CCARGS+= -DUSE_TLS
-AUXLIBS+= -L${BUILDLINK_PREFIX.openssl}/lib \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \
- -lssl -lcrypto
-.endif
-
-###
-### Support "pcre" map type for regular expressions.
-###
-.if !empty(PKG_OPTIONS:Mpcre)
-. include "../../devel/pcre/buildlink3.mk"
-CCARGS+= -DHAS_PCRE
-AUXLIBS+= -L${BUILDLINK_PREFIX.pcre}/lib \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib \
- -lpcre
-.else
-CCARGS+= -DNO_PCRE
-.endif
-
-###
-### Support LDAP directories for table lookups.
-###
-.if !empty(PKG_OPTIONS:Mldap)
-. include "../../databases/openldap-client/buildlink3.mk"
-CCARGS+= -DHAS_LDAP
-AUXLIBS+= -L${BUILDLINK_PREFIX.openldap-client}/lib \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openldap-client}/lib \
- -lldap -llber
-.endif
-
-###
-### Support using a MySQL database server for table lookups.
-###
-.if !empty(PKG_OPTIONS:Mmysql4)
-. include "../../mk/mysql.buildlink3.mk"
-CCARGS+= -DHAS_MYSQL
-CCARGS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --include`
-AUXLIBS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --libs`
-.elif !empty(PKG_OPTIONS:Mmysql)
-. include "../../mk/mysql.buildlink3.mk"
-CCARGS+= -DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
-AUXLIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
- -lmysqlclient -lz -lm
-.endif
-
-###
-### Support using a PostgreSQL database server for table lookups.
-###
-.if !empty(PKG_OPTIONS:Mpgsql)
-. include "../../mk/pgsql.buildlink3.mk"
-. include "../../security/openssl/buildlink3.mk"
-CCARGS+= -DHAS_PGSQL -I${PGSQL_PREFIX}/include/pgsql
-AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \
- -L${BUILDLINK_PREFIX.openssl}/lib -lcrypt -lssl -lcrypto
-.endif
-
-###
-### SASL support for SMTP authentication.
-###
-.if !empty(PKG_OPTIONS:Msasl)
-. include "../../security/cyrus-sasl/buildlink3.mk"
-BUILDLINK_INCDIRS.cyrus-sasl= include/sasl
-SASLLIBDIR= ${PREFIX}/lib/sasl2
-PWCHECK_METHOD= auxprop
-CCARGS+= -DUSE_SASL_AUTH -DUSE_CYRUS_SASL
-AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
- -lsasl2
-PLIST_SUBST+= SASL=
-MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR}
-.else
-PLIST_SUBST+= SASL="@comment "
-.endif
-
-###
-### SASL support for SMTP authentication (via Dovecot).
-###
-.if !empty(PKG_OPTIONS:Mdovecot-sasl)
-DEPENDS+= dovecot-[0-9]*:../../mail/dovecot
-
-CCARGS+= -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\"dovecot\"
-.endif
diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa
deleted file mode 100644
index a6e11bd9b5f..00000000000
--- a/mail/postfix/patches/patch-aa
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-aa,v 1.17 2006/07/13 09:57:51 martti Exp $
-
---- postfix-install.orig 2005-08-14 01:51:38.000000000 +0000
-+++ postfix-install 2006-07-13 12:37:24.000000000 +0000
-@@ -359,26 +359,6 @@
- : ${tempdir=`pwd`}
- : ${config_directory=`bin/postconf -h -d config_directory`}
-
--# Find out the location of installed configuration files.
--
--test -z "$non_interactive" && for name in install_root tempdir config_directory
--do
-- while :
-- do
-- echo
-- eval echo Please specify \$${name}_prompt | ${FMT}
-- eval echo \$n "$name: [\$$name]\ \$c"
-- read ans
-- case $ans in
-- "") break;;
-- *) case $ans in
-- /*) eval $name=$ans; break;;
-- *) echo; echo $0: Error: $name should be an absolute path name. 1>&2;;
-- esac;;
-- esac
-- done
--done
--
- # In case some systems special-case pathnames beginning with //.
-
- case $install_root in
-@@ -725,10 +705,3 @@
- "sample_directory = $sample_directory" \
- "readme_directory = $readme_directory" \
- || exit 1
--
--# If Postfix is being installed locally from source code, do the
--# post-install processing now.
--
--test -n "$install_root" || {
-- bin/postfix post-install $post_install_options || exit 1
--}
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
deleted file mode 100644
index 522af62a4a1..00000000000
--- a/mail/postfix/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.23 2006/11/07 07:08:26 martti Exp $
-
---- src/util/sys_defs.h.orig 2006-09-28 22:55:47.000000000 +0000
-+++ src/util/sys_defs.h 2006-11-07 08:48:52.000000000 +0000
-@@ -42,7 +42,9 @@
- #define DEF_MAILBOX_LOCK "flock"
- #define HAS_SUN_LEN
- #define HAS_FSYNC
-+#ifndef HAS_DB
- #define HAS_DB
-+#endif
- #define HAS_SA_LEN
- #define DEF_DB_TYPE "hash"
- #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
deleted file mode 100644
index 595dbc57619..00000000000
--- a/mail/postfix/patches/patch-ai
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD: patch-ai,v 1.19 2006/11/07 07:08:26 martti Exp $
-
---- makedefs.orig 2006-08-26 15:54:59.000000000 +0000
-+++ makedefs 2006-11-07 08:49:41.000000000 +0000
-@@ -118,6 +118,8 @@
- ;;
- FreeBSD.6*) SYSTYPE=FREEBSD6
- ;;
-+ DragonFly.1*) SYSTYPE=FREEBSD4
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- OpenBSD.3*) SYSTYPE=OPENBSD3
-@@ -184,13 +186,6 @@
- esac
- ;;
- ULTRIX.4*) SYSTYPE=ULTRIX4
-- if [ -f /usr/local/lib/libdb.a ]; then
-- SYSLIBS="$SYSLIBS -ldb"
-- CCARGS="$CCARGS -DHAS_DB"
-- if [ -d /usr/local/include/db ]; then
-- CCARGS="$CCARGS -I/usr/local/include/db"
-- fi
-- fi
- for l in syslog resolv; do
- if [ -f /usr/local/lib/lib$l.a ]; then
- SYSLIBS="$SYSLIBS -l$l"
-@@ -222,25 +217,8 @@
- esac;;
- # Tested with RedHat 3.03 on 20020729.
- Linux.1*) SYSTYPE=LINUX1
-- SYSLIBS="-ldb"
- ;;
- Linux.2*) SYSTYPE=LINUX2
-- # Postfix no longer needs DB 1.85 compatibility
-- if [ -f /usr/include/db.h ]
-- then
-- : we are all set
-- elif [ -f /usr/include/db/db.h ]
-- then
-- CCARGS="$CCARGS -I/usr/include/db"
-- else
-- # No, we're not going to try db1 db2 db3 etc.
-- # On a properly installed system, Postfix builds
-- # by including <db.h> and by linking with -ldb
-- echo "No <db.h> include file found." 1>&2
-- echo "Install the appropriate db*-devel package first." 1>&2
-- echo "See the RELEASE_NOTES file for more information." 1>&2
-- exit 1
-- fi
- # GDBM locks the DBM .pag file after open. This breaks postmap.
- # if [ -f /usr/include/gdbm-ndbm.h ]
- # then
-@@ -251,7 +229,6 @@
- # CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
- # GDBM_LIBS=gdbm
- # fi
-- SYSLIBS="-ldb"
- for name in nsl resolv $GDBM_LIBS
- do
- for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -279,25 +256,13 @@
- HP-UX.A.09.*) SYSTYPE=HPUX9
- SYSLIBS=-ldbm
- CCARGS="$CCARGS -DMISSING_USLEEP"
-- if [ -f /usr/lib/libdb.a ]; then
-- CCARGS="$CCARGS -DHAS_DB"
-- SYSLIBS="$SYSLIBS -ldb"
-- fi
- ;;
- HP-UX.B.10.*) SYSTYPE=HPUX10
- CCARGS="$CCARGS `nm /usr/lib/libc.a 2>/dev/null |
- (grep usleep >/dev/null || echo '-DMISSING_USLEEP')`"
-- if [ -f /usr/lib/libdb.a ]; then
-- CCARGS="$CCARGS -DHAS_DB"
-- SYSLIBS=-ldb
-- fi
- ;;
- HP-UX.B.11.*) SYSTYPE=HPUX11
- SYSLIBS=-lnsl
-- if [ -f /usr/lib/libdb.a ]; then
-- CCARGS="$CCARGS -DHAS_DB"
-- SYSLIBS="$SYSLIBS -ldb"
-- fi
- ;;
- ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543
- RANLIB=echo
diff --git a/mail/postgrey/DESCR b/mail/postgrey/DESCR
deleted file mode 100644
index 4b6d7e6aa70..00000000000
--- a/mail/postgrey/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Postgrey is a Postfix policy server implementing greylisting developed
-by David Schweikert.
-
-Compared to greylist.pl included with Postfix (2.1.1), Postgrey has the
-following additional features:
-- Safer database handling: Postgrey does use the logging and transaction
- features of BerkeleyDB to maximize reliability.
-- Automatical cleaning of the database: Entries that were last seen
- more than a defined amount of time get removed automatically.
diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile
deleted file mode 100644
index 9565688b6d4..00000000000
--- a/mail/postgrey/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/06/18 01:04:04 rillig Exp $
-#
-
-DISTNAME= postgrey-1.24
-CATEGORIES= mail
-MASTER_SITES= http://isg.ee.ethz.ch/tools/postgrey/pub/ \
- http://isg.ee.ethz.ch/tools/postgrey/pub/old/
-
-MAINTAINER= kim@tac.nyc.ny.us
-HOMEPAGE= http://isg.ee.ethz.ch/tools/postgrey/
-COMMENT= Postfix Greylist Policy Server
-
-DEPENDS+= p5-BerkeleyDB-[0-9]*:../../databases/p5-BerkeleyDB
-DEPENDS+= p5-IO-Multiplex-[0-9]*:../../devel/p5-IO-Multiplex
-DEPENDS+= p5-Net-Server-[0-9]*:../../net/p5-Net-Server
-
-NO_CONFIGURE= yes
-USE_TOOLS+= perl:run
-
-.include "../../mk/bsd.prefs.mk"
-
-POSTGREY_USER?= postgrey
-POSTGREY_GROUP?= postgrey
-POSTGREY_DBDIR?= ${VARBASE}/db/${PKGBASE}
-
-PKG_SYSCONFSUBDIR?= postfix
-
-DOCDIR= share/doc/${PKGBASE}
-EGDIR= share/examples/${PKGBASE}
-
-RCD_SCRIPTS= postgrey
-PKG_GROUPS= ${POSTGREY_GROUP}
-PKG_USERS= ${POSTGREY_USER}:${POSTGREY_GROUP}
-
-PKG_GECOS.${POSTGREY_USER}= Postgrey Daemon User
-
-.for i in postgrey_whitelist_clients postgrey_whitelist_recipients
-CONF_FILES+= ${PREFIX}/${EGDIR}/${i} \
- ${PKG_SYSCONFDIR}/${i}
-.endfor
-
-OWN_DIRS_PERMS+= ${POSTGREY_DBDIR} \
- ${POSTGREY_USER} ${POSTGREY_GROUP} 0775
-
-FILES_SUBST+= PERL=${PERL5:Q}
-
-SUBST_CLASSES+= postgrey
-SUBST_STAGE.postgrey= pre-build
-SUBST_FILES.postgrey= postgrey
-# Perl
-SUBST_SED.postgrey= -e 's,/usr/bin/perl,${PERL5},g'
-# User
-SUBST_SED.postgrey+= -e "s,|| 'postgrey',|| '${POSTGREY_USER}',g"
-SUBST_SED.postgrey+= -e "s,default: postgrey,default: ${POSTGREY_USER},g"
-SUBST_SED.postgrey+= -e "s,C<postgrey>,C<${POSTGREY_USER}>,g"
-# Group
-SUBST_SED.postgrey+= -e "s,|| 'nogroup',|| '${POSTGREY_GROUP}',g"
-SUBST_SED.postgrey+= -e "s,default: nogroup,default: ${POSTGREY_GROUP},g"
-# Database
-SUBST_SED.postgrey+= -e 's,/var/spool/postfix/postgrey,${POSTGREY_DBDIR},g'
-# Config
-SUBST_SED.postgrey+= -e 's,/etc/postfix,${PKG_SYSCONFDIR},g'
-#
-SUBST_MESSAGE.postgrey= Fixing defaults.
-
-INSTALLATION_DIRS= sbin
-
-do-build:
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/postgrey ${PREFIX}/sbin/postgrey
- ${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
-.for i in COPYING Changes README
- ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${DOCDIR}/${i}
-.endfor
- ${INSTALL_DATA_DIR} ${PREFIX}/${EGDIR}
-.for i in postgrey_whitelist_clients postgrey_whitelist_recipients
- ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${EGDIR}/${i}
-.endfor
-
-.include "../../databases/db4/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/postgrey/PLIST b/mail/postgrey/PLIST
deleted file mode 100644
index ee7bc00ebd9..00000000000
--- a/mail/postgrey/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/02/19 01:01:39 wiz Exp $
-sbin/postgrey
-share/doc/postgrey/COPYING
-share/doc/postgrey/Changes
-share/doc/postgrey/README
-share/examples/postgrey/postgrey_whitelist_clients
-share/examples/postgrey/postgrey_whitelist_recipients
-share/examples/rc.d/postgrey
-@dirrm share/examples/postgrey
-@dirrm share/doc/postgrey
diff --git a/mail/postgrey/distinfo b/mail/postgrey/distinfo
deleted file mode 100644
index 37c4f9d117f..00000000000
--- a/mail/postgrey/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/03/30 09:06:16 is Exp $
-
-SHA1 (postgrey-1.24.tar.gz) = 3bc93536a4f49462f77ed69dd32ecd9884912c25
-RMD160 (postgrey-1.24.tar.gz) = 232c8fb70370f85ccd4542a11ae2880386a47e1c
-Size (postgrey-1.24.tar.gz) = 27444 bytes
diff --git a/mail/postgrey/files/postgrey.sh b/mail/postgrey/files/postgrey.sh
deleted file mode 100644
index a0c78ae341c..00000000000
--- a/mail/postgrey/files/postgrey.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: postgrey.sh,v 1.1.1.1 2004/12/22 15:51:38 kim Exp $
-#
-
-# PROVIDE: postgrey
-# BEFORE: mail
-# REQUIRE: DAEMON LOGIN
-
-. /etc/rc.subr
-
-name="@PKGBASE@"
-rcvar=$name
-pidfile="@VARBASE@/run/${name}.pid"
-command_interpreter="@PERL@"
-command="@PREFIX@/sbin/postgrey"
-command_args="-d --pidfile=${pidfile}"
-required_files="
- @PKG_SYSCONFDIR@/postgrey_whitelist_clients
- @PKG_SYSCONFDIR@/postgrey_whitelist_recipients
-"
-@PKGBASE@_flags=${@PKGBASE@_flags-"-i 2525"}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/prayer/DESCR b/mail/prayer/DESCR
deleted file mode 100644
index da8a9bc04ff..00000000000
--- a/mail/prayer/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
-Prayer is a small and fast HTTP to IMAP gateway written entirely in C.
- * Uses persistent connections to IMAP server and support servers.
- * Target folders remain SELECTed: not a simple-minded proxy.
- * Full caching (including sort/thread cache) for each open folder.
- * Up to five persistent IMAP connections (typically one or two in use):
- o INBOX and one other folder
- o Postponed message folder stream
- o Preferences stream
- o Folder transfer stream
- o Various optimisations/sharing to minimise actual IMAP connections
- * Directory cache: single round trip to IMAP server for directory listing.
- * Works well with UW IMAP server (even using Unix format mail folders).
- * Little discernible load on a Pentium III class system running Linux with
- 5,000 logins/day (400 logins/hour, 150 concurrent logins)
- * Uses 10% to 20% of the CPU and 400 MBytes of RAM on a PIII class system
- with 23,000 logins/day (1,700 logins/hour, 850 concurrent logins peak)
- * Aggressive HTTP/1.0 and 1.1 connection caching to reduce SSL overhead.
- * Optional gzip compression of pages tunable by IP address range.
- * Minimal use of fixed length buffers in C source code.
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
deleted file mode 100644
index 86798c201f1..00000000000
--- a/mail/prayer/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# $NetBSD: Makefile,v 1.29 2006/10/23 08:31:29 rillig Exp $
-#
-
-DISTNAME= prayer-1.0.12
-PKGREVISION= 4
-CATEGORIES= mail www
-MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
-
-MAINTAINER= abs@NetBSD.org
-HOMEPAGE= http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/
-COMMENT= Small, fast, web mail interface
-
-USE_TOOLS+= gmake perl
-PRAYER_USER= prayer
-PRAYER_GROUP= prayer
-PKG_GROUPS= ${PRAYER_GROUP}
-PKG_USERS= ${PRAYER_USER}:${PRAYER_GROUP}
-
-BUILD_DEFS+= PRAYER_USER PRAYER_GROUP VARBASE
-
-MAKE_ENV+= EGDIR=${EGDIR:Q}
-MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-MAKE_ENV+= BUILDLINK_PREFIX.db4="${BUILDLINK_PREFIX.db4}"
-MAKE_ENV+= BUILDLINK_PREFIX.imap-uw="${BUILDLINK_PREFIX.imap-uw}"
-MAKE_ENV+= SSLCERTS=${SSLCERTS:Q}
-MAKE_ENV+= PRAYER_USER=${PRAYER_USER} PRAYER_GROUP=${PRAYER_GROUP}
-MAKE_ENV+= ROOT_USER=${ROOT_USER} ROOT_GROUP=${ROOT_GROUP}
-
-PKG_SYSCONFSUBDIR= prayer
-EGDIR= ${PREFIX}/share/examples/prayer
-
-RCD_SCRIPTS= prayer
-
-CONF_FILES= ${EGDIR}/prayer.cf ${PKG_SYSCONFDIR}/prayer.cf
-CONF_FILES+= ${EGDIR}/prayer-accountd.cf ${PKG_SYSCONFDIR}/prayer-accountd.cf
-CONF_FILES+= ${EGDIR}/motd.html ${PKG_SYSCONFDIR}/motd.html
-CONF_FILES+= ${EGDIR}/welcome.html ${PKG_SYSCONFDIR}/welcome.html
-
-VAR_PREFIX= ${VARBASE}/spool/prayer
-
-OWN_DIRS_PERMS+=${VAR_PREFIX} ${PRAYER_USER} ${PRAYER_GROUP} 0750
-
-FILES_SUBST+= OPSYS=${OPSYS:Q}
-FILES_SUBST+= VAR_PREFIX=${VAR_PREFIX:Q}
-
-post-patch:
- ${FIND} ${WRKSRC} -name CVS -type d -print | ${SORT} -r | \
- ${XARGS} ${RM} -r
-
-pre-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
-
-.include "../../databases/db4/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mail/imap-uw/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/krb5.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/prayer/PLIST b/mail/prayer/PLIST
deleted file mode 100644
index 871806af7c1..00000000000
--- a/mail/prayer/PLIST
+++ /dev/null
@@ -1,94 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2006/02/19 09:24:53 wiz Exp $
-sbin/prayer
-sbin/prayer-cyclog
-sbin/prayer-sem-prune
-sbin/prayer-session
-sbin/prayer-ssl-prune
-share/examples/prayer/motd.html
-share/examples/prayer/prayer-accountd.cf
-share/examples/prayer/prayer.cf
-share/examples/prayer/welcome.html
-share/examples/rc.d/prayer
-share/prayer/help/abook_add.html
-share/prayer/help/abook_list.html
-share/prayer/help/abook_search.html
-share/prayer/help/abook_xfer.html
-share/prayer/help/attachments.html
-share/prayer/help/block.html
-share/prayer/help/compose/large.html
-share/prayer/help/compose/normal.html
-share/prayer/help/compose/postponed.html
-share/prayer/help/compose/role_list.html
-share/prayer/help/copy.html
-share/prayer/help/dictionary.html
-share/prayer/help/display.html
-share/prayer/help/favourites.html
-share/prayer/help/filter.html
-share/prayer/help/filter_select.html
-share/prayer/help/folders.html
-share/prayer/help/fullname.html
-share/prayer/help/include.html
-share/prayer/help/list.html
-share/prayer/help/manage.html
-share/prayer/help/passwd.html
-share/prayer/help/prefs/compose1.html
-share/prayer/help/prefs/compose2.html
-share/prayer/help/prefs/display1.html
-share/prayer/help/prefs/folder.html
-share/prayer/help/prefs/general.html
-share/prayer/help/quota.html
-share/prayer/help/redirect.html
-share/prayer/help/rename.html
-share/prayer/help/reply.html
-share/prayer/help/roles_entry.html
-share/prayer/help/roles_list.html
-share/prayer/help/search.html
-share/prayer/help/sieve.html
-share/prayer/help/spam.html
-share/prayer/help/toolbar.html
-share/prayer/help/transfer.html
-share/prayer/help/upload_select.html
-share/prayer/help/vacation.html
-share/prayer/help/vaclog.html
-share/prayer/help/welcome.html
-share/prayer/icons/addressbook-inactive.gif
-share/prayer/icons/addressbook.gif
-share/prayer/icons/back.gif
-share/prayer/icons/compose-inactive.gif
-share/prayer/icons/compose.gif
-share/prayer/icons/cross.gif
-share/prayer/icons/dir.gif
-share/prayer/icons/display-inactive.gif
-share/prayer/icons/display.gif
-share/prayer/icons/folders-inactive.gif
-share/prayer/icons/folders.gif
-share/prayer/icons/help-inactive.gif
-share/prayer/icons/help.gif
-share/prayer/icons/left-inactive.gif
-share/prayer/icons/left.gif
-share/prayer/icons/leftleft-inactive.gif
-share/prayer/icons/leftleft.gif
-share/prayer/icons/logout.gif
-share/prayer/icons/mailbox-inactive.gif
-share/prayer/icons/mailbox.gif
-share/prayer/icons/manage-inactive.gif
-share/prayer/icons/manage.gif
-share/prayer/icons/msg-answered.gif
-share/prayer/icons/msg-deleted.gif
-share/prayer/icons/msg-seen.gif
-share/prayer/icons/msg-unseen.gif
-share/prayer/icons/off.gif
-share/prayer/icons/on.gif
-share/prayer/icons/paperclip-small.gif
-share/prayer/icons/right-inactive.gif
-share/prayer/icons/right.gif
-share/prayer/icons/rightright-inactive.gif
-share/prayer/icons/rightright.gif
-share/prayer/icons/tick.gif
-share/prayer/icons/univheader.gif
-@dirrm share/prayer/icons
-@dirrm share/prayer/help/prefs
-@dirrm share/prayer/help/compose
-@dirrm share/prayer/help
-@dirrm share/prayer
-@dirrm share/examples/prayer
diff --git a/mail/prayer/distinfo b/mail/prayer/distinfo
deleted file mode 100644
index df6bc109993..00000000000
--- a/mail/prayer/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.12 2006/10/23 08:31:29 rillig Exp $
-
-SHA1 (prayer-1.0.12.tar.gz) = 8ea568f9e0e1fe925102e80451b3c9432f5fed15
-RMD160 (prayer-1.0.12.tar.gz) = 76edc3896d0936c87378f848334bc42d648317f3
-Size (prayer-1.0.12.tar.gz) = 544239 bytes
-SHA1 (patch-aa) = 715cc47f3f9708e3f97f5b58b4f5bf307c7806bd
-SHA1 (patch-ab) = 72f6b8768303222a8798ca07e83efccdefa8fe25
-SHA1 (patch-ac) = b7df87589bdc2fd2894f2028652e01aa0c181fa1
-SHA1 (patch-ad) = bd8f517d5bede0fd3d3f4e9a108cd0cd99d7c8ab
-SHA1 (patch-ae) = a04d4206e9b671be0fdce73a5093fb18778a1052
-SHA1 (patch-af) = 730ee832fcb6464d7909ff9f048d7c57ce86aba8
-SHA1 (patch-ag) = d932eeb11171da4084eb56e097a7880e67a18561
-SHA1 (patch-ah) = 7197f80ad71700276c79666090b62628c128ca21
-SHA1 (patch-ai) = 0b3edeea78d16c3792d540ea0a92943ed0bb7583
diff --git a/mail/prayer/files/prayer.sh b/mail/prayer/files/prayer.sh
deleted file mode 100644
index bb28d150fa1..00000000000
--- a/mail/prayer/files/prayer.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: prayer.sh,v 1.1 2005/01/09 00:07:47 schmonz Exp $
-#
-# This shell script takes care of starting and stopping prayer,
-# a program providing web access to a mail server using IMAP
-#
-
-## only for NetBSD
-# PROVIDE: prayer
-# REQUIRE: LOGIN
-# AFTER: mail
-# KEYWORD: shutdown
-##
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin
-export PATH
-
-if [ -f /etc/rc.subr ]
-then
- . /etc/rc.subr
-fi
-
-name="prayer"
-rcvar=$name
-command="@PREFIX@/sbin/prayer"
-command_args=""
-pidfile="@VAR_PREFIX@/pid/prayer"
-
-prayer_flags=${prayer_flags-""}
-OPSYS=@OPSYS@
-
-get_prayer_pid()
-{
- if [ -f ${pidfile} ]; then
- prayer_pid=`head -1 ${pidfile}`
- if ps -p ${prayer_pid} | fgrep ${name} >/dev/null; then
- :
- else
- prayer_pid=
- fi
- else
- prayer_pid=
- fi
-
-}
-
-prayer_start()
-{
- get_prayer_pid
-
- if [ -n "${prayer_pid}" ]; then
- echo "${command} already running as pid ${prayer_pid}."
- return 1
- fi
- echo "Starting ${name}."
- ${command} ${prayer_flags} ${command_args}
-}
-
-prayer_stop()
-{
- get_prayer_pid
-
- if [ -z "${prayer_pid}" ]; then
- echo "${command} not running? (check ${pidfile})."
- return 1
- fi
- echo "Stopping ${name}."
- kill -HUP ${prayer_pid}
- prayer_session_pid=`cat @VAR_PREFIX@/pid/prayer-session`
- if [ -n "${prayer_session_pid}" ]; then
- if ps -p ${prayer_session_pid} | fgrep ${name} >/dev/null; then
- kill -HUP ${prayer_session_pid}
- fi
- fi
-
- slaves=`ps -U prayer| cut -d' ' -f1`; kill -HUP $slaves
-
-}
-prayer_status()
-{
- get_prayer_pid
-
- if [ -z "${prayer_pid}" ]; then
- echo "${command} is not running? (check ${pidfile})."
- else
- echo "${command} is running as pid ${prayer_pid}."
- fi
-}
-
-if [ "${OPSYS}" = "NetBSD" ]; then
-
- stop_cmd=prayer_stop
-
- load_rc_config $name
- run_rc_command "$1"
-
-else # not NetBSD
- case ${1+"$@"} in
- start)
- prayer_start
- ;;
- stop)
- prayer_stop
- ;;
- restart)
- prayer_stop
- sleep 2
- prayer_start
- ;;
- status)
- prayer_status
- ;;
- *)
- echo "Usage: ${0} (start|stop|restart|status)"
- ;;
- esac
-fi
diff --git a/mail/prayer/patches/patch-aa b/mail/prayer/patches/patch-aa
deleted file mode 100644
index b046e239645..00000000000
--- a/mail/prayer/patches/patch-aa
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2006/10/23 08:31:29 rillig Exp $
-
---- Config.orig 2005-01-06 13:51:08.000000000 +0100
-+++ Config 2006-10-23 10:21:43.000000000 +0200
-@@ -15,9 +15,9 @@ DIRECT_ENABLE = false # Experime
- MUTEX_SEMAPHORE = false # Use SYSV mutexes rather than file locking
-
- # Following depend on the way that you have configured c-client
--CCLIENT_SSL_ENABLE = false # C-client was built with SSL support
--CCLIENT_PAM_ENABLE = false # C-client was built with PAM support
--CCLIENT_KERB_ENABLE = false # C-client was built with Kerberos support
-+CCLIENT_SSL_ENABLE = true # C-client was built with SSL support
-+CCLIENT_PAM_ENABLE = true # C-client was built with PAM support
-+CCLIENT_KERB_ENABLE = true # C-client was built with Kerberos support
-
- # Probably don't need the following
- ACCOUNTD_ENABLE = false # Only of use in Cambridge at the moment.
-@@ -31,13 +31,13 @@ CC = gcc
- # Location of make program (GNU make required)
- MAKE = gmake
- # Location of install program (GNU install or compatible required)
--INSTALL = install
-+INSTALL = install -c
-
- # Base Compiler options for GCC.
- #BASECFLAGS = -Wall -g
- #BASELDFLAGS = -g
--BASECFLAGS = -Wall -g -O2
--BASELDFLAGS = -g -O2
-+BASECFLAGS = -Wall
-+BASELDFLAGS =
- BASE_LIBS = -lcrypt
-
- # Base Compiler options for Sun SUNWspro compiler
-@@ -57,9 +57,9 @@ BASE_LIBS = -lcrypt
- # which points to ../../imap/c-client. This just reduces the amount of
- # noise output on each line when building the package.
- #
--CCLIENT_DIR=./c-client
--CCLIENT_INCLUDE=-I $(CCLIENT_DIR)
--CCLIENT_LIB=./$(CCLIENT_DIR)/c-client.a
-+CCLIENT_DIR=${BUILDLINK_PREFIX.imap-uw}
-+CCLIENT_INCLUDE=-I $(CCLIENT_DIR)/include/c-client
-+CCLIENT_LIB=$(CCLIENT_DIR)/lib/libc-client.a
- CCLIENT_SSL_ENABLE = true
-
- #
-@@ -102,8 +102,8 @@ PAM_INCLUDE =
- PAM_LIBS = -lpam
-
- # Kerberos (required if CCLIENT_KERB_ENABLE set)
--KERB_INCLUDE = -I/usr/kerberos/include
--KERB_LIBS = -L/usr/kerberos/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
-+KERB_INCLUDE = -I/usr/include
-+KERB_LIBS = -L/usr/lib -lgssapi -lcom_err -lkrb5 -lasn1 -lroken
-
- # SSL definitions (required if SSL_ENABLE or CCLIENT_SSL_ENABLE set)
- #
-@@ -127,8 +127,8 @@ DB_INCLUDE=
- DB_LIBS=-ldb
-
- # Following suitable for FreeBSD with DB 4 package installed
--#DB_INCLUDE=-I/usr/local/include/db4
--#DB_LIBS=-L/usr/local/lib -ldb4
-+DB_INCLUDE=-I${BUILDLINK_PREFIX.db4}/include/db4
-+DB_LIBS=-L${BUILDLINK_PREFIX.db4}/lib -ldb4
-
- ############################################################################
-
-@@ -142,16 +142,16 @@ BROOT=
-
- # Directory, User and group for read-write files: log files, sockets etc
- VAR_PREFIX = /var/spool/prayer
--RW_USER = prayer
--RW_GROUP = prayer
-+RW_USER = ${PRAYER_USER}
-+RW_GROUP = ${PRAYER_GROUP}
-
- # Root Directory, User and group for read-only configuration files.
- # Default configuration and permissions does not allow prayer user to
- # update prayer configuration file.
-
--PREFIX = /usr/local/prayer
--RO_USER = root
--RO_GROUP = prayer
-+#PREFIX = /usr/local/prayer
-+RO_USER = ${ROOT_USER}
-+RO_GROUP = ${PRAYER_GROUP}
-
- # Access permissions for general objects (wrt above users and groups)
- PUBLIC_EXEC = 0755
-@@ -164,6 +164,6 @@ PRIVATE_DIR = 0750
- PRIVATE_FILE = 0640
-
- # Location of configuration files and binaries
--PRAYER_CONFIG_FILE = ${PREFIX}/etc/prayer.cf
-+PRAYER_CONFIG_FILE = ${PKG_SYSCONFDIR}/prayer.cf
- BIN_DIR = ${PREFIX}/sbin
--ACCOUNTD_CONFIG_FILE = ${PREFIX}/etc/prayer-accountd.cf
-+ACCOUNTD_CONFIG_FILE = ${PKG_SYSCONFDIR}/prayer-accountd.cf
diff --git a/mail/prayer/patches/patch-ab b/mail/prayer/patches/patch-ab
deleted file mode 100644
index 9d8b3c13e3e..00000000000
--- a/mail/prayer/patches/patch-ab
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2005/01/09 00:07:47 schmonz Exp $
-
---- files/install.sh.orig 2004-06-18 09:58:46.000000000 -0400
-+++ files/install.sh
-@@ -67,21 +67,25 @@ if [ ! -d ${PREFIX}/etc ]; then
- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}/etc
- fi
-
--if [ ! -d ${PREFIX}/certs ]; then
-- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${PREFIX}/certs
-+if [ ! -d ${SSLCERTS} ]; then
-+ ${BSD_INSTALL_DATA_DIR} ${SSLCERTS}
- fi
-
- if [ ! -d ${BIN_DIR} ]; then
- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${BIN_DIR}
- fi
-
-+if [ ! -d "${PREFIX}/share/prayer" ]; then
-+ mkdir "${PREFIX}/share/prayer"
-+fi
-+
- for i in help icons
- do
-- if [ -d "${PREFIX}/${i}" ]; then
-+ if [ -d "${PREFIX}/share/prayer/${i}" ]; then
- echo Removing old ${i}
-- rm -rf ${PREFIX}/${i}
-+ rm -rf ${PREFIX}/share/prayer/${i}
- fi
- echo Copying ${i}
-- (tar cf - ${i}) | (cd ${PREFIX} ; tar xf -)
-- (cd ${PREFIX}; chown -R ${RO_USER}:${RO_GROUP} ${i})
-+ (tar cf - ${i}) | (cd ${PREFIX}/share/prayer ; tar xf -)
-+ (cd ${PREFIX}/share/prayer; chown -R ${RO_USER}:${RO_GROUP} ${i})
- done
diff --git a/mail/prayer/patches/patch-ac b/mail/prayer/patches/patch-ac
deleted file mode 100644
index bf21de0935a..00000000000
--- a/mail/prayer/patches/patch-ac
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2005/01/09 00:07:47 schmonz Exp $
-
---- files/Makefile.orig 2003-05-11 10:59:12.000000000 -0400
-+++ files/Makefile
-@@ -14,10 +14,10 @@ endif
- all: ./etc/prayer.cf ./init.d/prayer
-
- ./etc/prayer.cf: ./etc/prayer.cf.SRC
-- perl -pe "s&__PREFIX__&${PREFIX}&; s&__VAR_PREFIX__&${VAR_PREFIX}&; s&__BIN_DIR__&${BIN_DIR}&;" < ./etc/prayer.cf.SRC > ./etc/prayer.cf
-+ perl -pe "s&__PREFIX__&${PREFIX}&; s&__VAR_PREFIX__&${VAR_PREFIX}&; s&__BIN_DIR__&${BIN_DIR}&; s&__PKG_SYSCONFDIR__&${PKG_SYSCONFDIR}&;" < ./etc/prayer.cf.SRC > ./etc/prayer.cf
-
- ./init.d/prayer: ./init.d/prayer.SRC
-- perl -pe "s&__PREFIX__&${PREFIX}&; s&__VAR_PREFIX__&${VAR_PREFIX}&; s&__BIN_DIR__&${BIN_DIR}&; s&__PRAYER_CONFIG_FILE__&${PRAYER_CONFIG_FILE}&;" < ./init.d/prayer.SRC > ./init.d/prayer
-+ perl -pe "s&__PREFIX__&${PREFIX}&; s&__VAR_PREFIX__&${VAR_PREFIX}&; s&__BIN_DIR__&${BIN_DIR}&; s&__PKG_SYSCONFDIR__&${PKG_SYSCONFDIR}&; s&__PRAYER_CONFIG_FILE__&${PRAYER_CONFIG_FILE}&;" < ./init.d/prayer.SRC > ./init.d/prayer
-
-
- ifeq ($(strip $(SSL_ENABLE)), true)
-@@ -53,24 +53,24 @@ distclean:
- install-cert:
- if [ -f certs/prayer.pem ]; then \
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) \
-- -m $(PRIVATE_FILE) certs/prayer.pem ${BROOT}${PREFIX}/certs; \
-+ -m $(PRIVATE_FILE) certs/prayer.pem ${BROOT}${EGDIR}/prayer.pem; \
- fi
-
- install-config: etc/prayer.cf
-- $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
-- etc/prayer.cf ${BROOT}${PRAYER_CONFIG_FILE}
-+ $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
-+ etc/prayer.cf ${BROOT}${EGDIR}/prayer.cf
-
- install-aconfig:
-- $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
-- etc/prayer-accountd.cf ${BROOT}${ACCOUNTD_CONFIG_FILE}
-+ $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
-+ etc/prayer-accountd.cf ${BROOT}${EGDIR}/prayer-accountd.cf
-
- install-motd:
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
-- etc/motd.html ${BROOT}${PREFIX}/etc
-+ etc/motd.html ${BROOT}${EGDIR}/motd.html
-
- install-welcome:
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
-- etc/welcome.html ${BROOT}${PREFIX}/etc
-+ etc/welcome.html ${BROOT}${EGDIR}/welcome.html
-
- install:
- PREFIX=$(BROOT)$(PREFIX) VAR_PREFIX=$(BROOT)$(VAR_PREFIX) \
-@@ -79,13 +79,9 @@ install:
- PUBLIC_DIR=$(PUBLIC_DIR) PRIVATE_DIR=$(PRIVATE_DIR) \
- PUBLIC_FILE=$(PUBLIC_FILE) PRIVATE_FILE=$(PRIVATE_FILE) \
- PUBLIC_EXEC=$(PUBLIC_FILE) PRIVATE_EXEC=$(PRIVATE_EXEC) \
-- BIN_DIR=$(BIN_DIR) INSTALL=$(INSTALL) \
-+ BIN_DIR=$(BIN_DIR) INSTALL="$(INSTALL)" \
- ./install.sh
-- if [ ! -f $(BROOT)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi
-- if [ ! -f $(BROOT)$(PRAYER_CONFIG_FILE) ]; then $(MAKE) install-config; fi
-- if [ ! -f $(BROOT)$(ACCOUNTD_CONFIG_FILE) ]; then $(MAKE) install-aconfig; fi
-- if [ ! -f $(BROOT)$(PREFIX)/etc/motd.html ]; then $(MAKE) install-motd; fi
-- if [ ! -f $(BROOT)$(PREFIX)/etc/welcome.html ]; then $(MAKE) install-welcome; fi
-+ $(MAKE) install-cert install-config install-aconfig install-motd install-welcome
-
- redhat-install-init.d:
- install -D -o root -g root -m 755 \
diff --git a/mail/prayer/patches/patch-ad b/mail/prayer/patches/patch-ad
deleted file mode 100644
index 841005ab825..00000000000
--- a/mail/prayer/patches/patch-ad
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2005/01/09 00:07:47 schmonz Exp $
-
---- prayer/Makefile.orig 2005-01-06 07:24:44.000000000 -0500
-+++ prayer/Makefile
-@@ -94,8 +94,8 @@ ifeq ($(strip $(CCLIENT_KERB_ENABLE)), t
- SESSION_LIBS += $(KERB_LIBS)
- endif
-
--CFLAGS = $(BASECFLAGS) $(COMMON_SSL_INCLUDE) $(CCLIENT_INCLUDE)
--LDFLAGS = $(BASELDFLAGS)
-+CFLAGS += $(BASECFLAGS) $(COMMON_SSL_INCLUDE) $(CCLIENT_INCLUDE)
-+LDFLAGS += $(BASELDFLAGS)
-
- SHARED_OBJS = \
- pool.o list.o assoc.o memblock.o buffer.o string.o config.o user_agent.o \
-@@ -163,17 +163,17 @@ clean:
- -rm -f $(BIN) test core *.o *.flc *~ \#*\#
-
- install: all
-- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
-+ $(BSD_INSTALL_DATA_DIR) \
- $(BROOT)$(BIN_DIR)
-- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-+ $(BSD_INSTALL_PROGRAM) \
- prayer $(BROOT)$(BIN_DIR)
-- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-+ $(BSD_INSTALL_PROGRAM) \
- prayer-session $(BROOT)$(BIN_DIR)
-- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-+ $(BSD_INSTALL_PROGRAM) \
- prayer-ssl-prune $(BROOT)$(BIN_DIR)
-- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-+ $(BSD_INSTALL_PROGRAM) \
- prayer-sem-prune $(BROOT)$(BIN_DIR)
-- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-+ $(BSD_INSTALL_SCRIPT) \
- prayer-cyclog $(BROOT)$(BIN_DIR)
-
- prayer: $(PRAYER_OBJS)
diff --git a/mail/prayer/patches/patch-ae b/mail/prayer/patches/patch-ae
deleted file mode 100644
index 361629e31ec..00000000000
--- a/mail/prayer/patches/patch-ae
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2005/01/09 00:07:47 schmonz Exp $
-
---- files/etc/prayer.cf.SRC.orig 2004-04-30 11:02:21.000000000 -0400
-+++ files/etc/prayer.cf.SRC
-@@ -376,25 +376,25 @@ ispell_path = /usr/bin/ispell
- # <login_suffix_path>
-
- # Login page prefix
--#login_prefix_path = "$prefix/etc/login_prefix.html"
-+#login_prefix_path = "__PKG_SYSCONFDIR__/login_prefix.html"
-
- # Message of the day file
--#motd_path = "$prefix/etc/motd.html"
-+#motd_path = "__PKG_SYSCONFDIR__/motd.html"
-
- # Login page suffix
--#login_suffix_path = "$prefix/etc/login_suffix.html"
-+#login_suffix_path = "__PKG_SYSCONFDIR__/login_suffix.html"
-
- # Session banner (local HTML inserted into each page of login session)
--#session_banner_path = "$prefix/etc/session_banner.html"
-+#session_banner_path = "__PKG_SYSCONFDIR__/session_banner.html"
-
- # Welcome text displayed when user first logs in
--welcome_path = "$prefix/etc/welcome.html"
-+welcome_path = "__PKG_SYSCONFDIR__/welcome.html"
-
- # Location of help files
--help_dir = "$prefix/help"
-+help_dir = "__PREFIX__/share/prayer/help"
-
- # Location of icon files
--icon_dir = "$prefix/icons"
-+icon_dir = "__PREFIX__/share/prayer/icons"
-
- # Location of binary files
- bin_dir = "__BIN_DIR__"
diff --git a/mail/prayer/patches/patch-af b/mail/prayer/patches/patch-af
deleted file mode 100644
index daef5511466..00000000000
--- a/mail/prayer/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.5 2005/01/09 00:07:47 schmonz Exp $
-
---- prayer/mydb_db3.c.orig 2004-06-18 11:25:12.000000000 -0400
-+++ prayer/mydb_db3.c
-@@ -133,9 +133,11 @@ static int myinit(const char *dbdir, int
- dbenv->set_verbose(dbenv, DB_VERB_DEADLOCK, 1);
- dbenv->set_verbose(dbenv, DB_VERB_WAITSFOR, 1);
- }
-+#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 3
- if (CONFIG_DB_VERBOSE > 1) {
- dbenv->set_verbose(dbenv, DB_VERB_CHKPOINT, 1);
- }
-+#endif
- dbenv->set_lk_detect(dbenv, CONFIG_DEADLOCK_DETECTION);
-
- r = dbenv->set_lk_max(dbenv, 50000);
diff --git a/mail/prayer/patches/patch-ag b/mail/prayer/patches/patch-ag
deleted file mode 100644
index a3846b31845..00000000000
--- a/mail/prayer/patches/patch-ag
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/01/09 00:07:47 schmonz Exp $
-
---- prayer/response.c 2003-04-15 14:00:03.000000000 +0100
-+++ prayer/response.c 2005-01-05 18:32:01.000000000 +0000
-@@ -694,7 +694,12 @@
- } else
- bputs(b, "Content-Type: text/plain" CRLF);
-
-- bprintf(b, "Content-Length: %lu" CRLF, sbuf.st_size);
-+ /* Hack: cast sbuf.st_size to long here as we are only dealing
-+ * with small files. Otherwise, we will send "Content-Length: 0"
-+ * for the images from big-endian hosts where st_size is 64 bits,
-+ * which confuses browsers.
-+ */
-+ bprintf(b, "Content-Length: %lu" CRLF, (long)sbuf.st_size);
-
- /* Following stolen from Apache:
- *
-
diff --git a/mail/prayer/patches/patch-ah b/mail/prayer/patches/patch-ah
deleted file mode 100644
index a539ba849f4..00000000000
--- a/mail/prayer/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/01/24 19:55:53 joerg Exp $
-
---- prayer/prayer_shared.h.orig 2006-01-24 19:11:36.000000000 +0000
-+++ prayer/prayer_shared.h
-@@ -28,8 +28,6 @@
- #include <grp.h>
- #include <assert.h>
- #include <netdb.h>
--
--extern int errno; /* just in case */
- #endif
-
- #include "common.h"
diff --git a/mail/prayer/patches/patch-ai b/mail/prayer/patches/patch-ai
deleted file mode 100644
index 75e89fa9ba0..00000000000
--- a/mail/prayer/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/01/24 19:55:53 joerg Exp $
-
---- prayer/prayer_session.h.orig 2006-01-24 19:48:31.000000000 +0000
-+++ prayer/prayer_session.h
-@@ -25,8 +25,6 @@
- #include <grp.h>
- #include <netdb.h>
-
--extern int errno; /* just in case */
--
- #include "c-client.h"
-
- #define PRAYER_FULL_HDRS
diff --git a/mail/procmail/DESCR b/mail/procmail/DESCR
deleted file mode 100644
index 832c7d2f22e..00000000000
--- a/mail/procmail/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-This is ProcMail, the ultimate incoming mail processor.
diff --git a/mail/procmail/MESSAGE b/mail/procmail/MESSAGE
deleted file mode 100644
index 2369583d1b4..00000000000
--- a/mail/procmail/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:13 wiz Exp $
-
-Please note the following:
-
-- The system-wide procmailrc is ${PKG_SYSCONFDIR}/procmailrc
-- The system-wide procmailrc directory is ${PKG_SYSCONFDIR}/procmailrcs/
-
-===========================================================================
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
deleted file mode 100644
index ea512ae93e0..00000000000
--- a/mail/procmail/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD: Makefile,v 1.41 2007/02/22 19:26:42 wiz Exp $
-#
-
-DISTNAME= procmail-3.22
-PKGREVISION= 2
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.procmail.org/pub/procmail/
-
-MAINTAINER= kim@tac.nyc.ny.us
-HOMEPAGE= http://www.procmail.org/
-COMMENT= Local mail delivery agent
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-MAKE_ENV+= SHELL=${SH:Q} CHMOD=${CHMOD:Q}
-INSTALL_TARGET= install-suid install.man
-UNLIMIT_RESOURCES= datasize
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+= PROCMAIL_MAILSPOOLHOME PROCMAIL_TRUSTED_IDS
-
-PROCMAIL_TRUSTED_IDS?=\
-"root","daemon","uucp","mail","x400","network","list","slist","lists","news",0
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
-
-pre-configure:
- ${ECHO} "#define TRUSTED_IDS {${PROCMAIL_TRUSTED_IDS:Q}}" \
- >> ${WRKSRC}/config.h
- ${ECHO} "#undef ETCRC" >> ${WRKSRC}/config.h
- ${ECHO} "#undef ETCRCS" >> ${WRKSRC}/config.h
- ${ECHO} "#define ETCRC \"${PKG_SYSCONFDIR}/procmailrc\"" \
- >> ${WRKSRC}/config.h
- ${ECHO} "#define ETCRCS \"${PKG_SYSCONFDIR}/procmailrcs/\"" \
- >> ${WRKSRC}/config.h
-.if defined(PROCMAIL_MAILSPOOLHOME)
- ${ECHO} "#define MAILSPOOLHOME \"/${PROCMAIL_MAILSPOOLHOME}\"" \
- >> ${WRKSRC}/src/authenticate.h
-.endif
-
-.if ${OPSYS} == "SunOS"
-do-install:
- cd ${WRKSRC}/new; \
- for f in procmail formail lockfile; do \
- ${INSTALL_PROGRAM} $$f ${PREFIX}/bin/$$f; \
- done; \
- ${INSTALL_SCRIPT} mailstat ${PREFIX}/bin/mailstat; \
- for f in procmail.1 formail.1 lockfile.1; do \
- ${INSTALL_MAN} $$f ${PREFIX}/${PKGMANDIR}/man1/$$f; \
- done; \
- for f in procmailex.5 procmailrc.5 procmailsc.5; do \
- ${INSTALL_MAN} $$f ${PREFIX}/${PKGMANDIR}/man5/$$f; \
- done
- ${SH} ${WRKSRC}/suid.sh
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/procmail/PLIST b/mail/procmail/PLIST
deleted file mode 100644
index c6a22b1367e..00000000000
--- a/mail/procmail/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:01:07 zuntum Exp $
-bin/procmail
-bin/formail
-bin/lockfile
-bin/mailstat
-man/man1/procmail.1.gz
-man/man1/formail.1.gz
-man/man1/lockfile.1.gz
-man/man5/procmailex.5.gz
-man/man5/procmailrc.5.gz
-man/man5/procmailsc.5.gz
diff --git a/mail/procmail/distinfo b/mail/procmail/distinfo
deleted file mode 100644
index 48e0c6bdab5..00000000000
--- a/mail/procmail/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.10 2006/01/08 13:43:26 joerg Exp $
-
-SHA1 (procmail-3.22.tar.gz) = cd4e44c15559816453fd60349e5a32289f6f2965
-RMD160 (procmail-3.22.tar.gz) = e609ec94ea9ab3b93629c62b3e29add497806483
-Size (procmail-3.22.tar.gz) = 226817 bytes
-SHA1 (patch-aa) = 29d0b8bc73313fe655c97f7d5adafab5b9104309
-SHA1 (patch-ab) = 5233a6033198dc2baec135a6fba987e7e2b89ff2
-SHA1 (patch-ac) = fe2350e704546c2262d546bb615175dd0591ba8b
-SHA1 (patch-ad) = 569d357c6afb9d7644c8094878aec08d22ae609d
-SHA1 (patch-ae) = 91a3f83d41ba84e218a14c8bfc262fdbb1bc252c
-SHA1 (patch-af) = 889f937f50561308c644d5a4bd836eccabbb2938
-SHA1 (patch-ag) = 66ae907f1b7ccfa10b5278443a9d9b0277923e61
diff --git a/mail/procmail/hacks.mk b/mail/procmail/hacks.mk
deleted file mode 100644
index 01855ab68d1..00000000000
--- a/mail/procmail/hacks.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2005/12/23 04:36:45 jlam Exp $
-
-### [Fri Dec 23 04:33:11 UTC 2005 : jlam]
-### Inlining functions seems to cause strstr() to enter an infinite loop
-### on Solaris, so disable it. This fixes PR pkg/30999.
-###
-.if ${OPSYS} == "SunOS"
-PKG_HACKS+= solaris-inline
-CFLAGS+= -fno-inline-functions
-.endif
diff --git a/mail/procmail/patches/patch-aa b/mail/procmail/patches/patch-aa
deleted file mode 100644
index 1bbc8e62f7e..00000000000
--- a/mail/procmail/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.4 1998/08/07 11:09:50 agc Exp $
-
---- Makefile.orig Mon Apr 28 02:27:40 1997
-+++ Makefile Thu May 7 15:03:08 1998
-@@ -2,7 +2,7 @@
-
- # BASENAME should point to where the whole lot will be installed
- # change BASENAME to your home directory if need be
--BASENAME = /usr
-+BASENAME = $(PREFIX)
- # For display in the man pages
- VISIBLE_BASENAME= $(BASENAME)
-
-@@ -53,7 +53,7 @@
-
- # Makefile.0 - mark, don't (re)move this, a sed script needs it
-
--LOCKINGTEST=__defaults__
-+LOCKINGTEST=/tmp .
-
- #LOCKINGTEST=/tmp . # Uncomment and add any directories you see fit.
- # If LOCKINGTEST is defined, autoconf will NOT
-@@ -86,7 +86,7 @@
- #-Wimplicit -Wshadow -Wid-clash-6 #-Wuninitialized
-
- # The place to put your favourite extra cc flag
--CFLAGS0 = -O #$(GCC_WARNINGS)
-+CFLAGS0 = #-O #$(GCC_WARNINGS)
- LDFLAGS0= -s
- # Read my libs :-)
- LIBS=
diff --git a/mail/procmail/patches/patch-ab b/mail/procmail/patches/patch-ab
deleted file mode 100644
index 7e30a165a20..00000000000
--- a/mail/procmail/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2001/11/08 12:05:59 bouyer Exp $
-
---- config.h.orig Tue Sep 11 06:53:50 2001
-+++ config.h Thu Nov 8 12:45:46 2001
-@@ -73,11 +73,12 @@
- TRUSTED_IDS should be defined as a comma-separated null-terminated
- list of strings; if unauthorised users use the -f option, an extra
- >From_ field will be added in the header */
--
-+#if 0
- #define TRUSTED_IDS {"root","daemon","uucp","mail","x400","network",\
- "list","slist","lists","news",0}
-+#endif
-
--/*#define NO_fcntl_LOCK /* uncomment any of these three if you */
-+#define NO_fcntl_LOCK /* uncomment any of these three if you */
- /*#define NO_lockf_LOCK /* definitely do not want procmail to make */
- /*#define NO_flock_LOCK /* use of those kernel-locking methods */
- /* If you set LOCKINGTEST to a binary number
diff --git a/mail/procmail/patches/patch-ac b/mail/procmail/patches/patch-ac
deleted file mode 100644
index 428bb7c9a82..00000000000
--- a/mail/procmail/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2000/08/26 14:26:58 wiz Exp $
-
---- initmake.orig Sat Jan 29 07:52:13 2000
-+++ initmake
-@@ -433,8 +433,8 @@
- test -z "$MAKE" && echo "MAKE = make" >>_Makefile
- test a"$cc" != a"$CC" && echo "CC = $cc" >>_Makefile
-
--echo "CFLAGS = \$(CFLAGS1)$CFLAGS" >>_Makefile
--echo "LDFLAGS = $LDFLAGS" >>_Makefile
-+echo "CFLAGS += \$(CFLAGS1)$CFLAGS" >>_Makefile
-+echo "LDFLAGS += $LDFLAGS" >>_Makefile
- echo >>_Makefile
-
- MANSS=""
diff --git a/mail/procmail/patches/patch-ad b/mail/procmail/patches/patch-ad
deleted file mode 100644
index a19c80e8b66..00000000000
--- a/mail/procmail/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2000/08/26 14:26:58 wiz Exp $
-
---- src/recommend.c.orig Thu Nov 25 04:13:36 1999
-+++ src/recommend.c
-@@ -19,7 +19,6 @@
- { fprintf(stderr,"Please run this program via 'make recommend'\n");
- return EX_USAGE;
- }
-- strchr(mailspooldir,'\0')[-1]='\0'; /* strip last character */
- for(p=checkf;*p;p++)
- if(!stat(*p,&stbuf)&&stbuf.st_mode&S_ISGID)
- { if(stbuf.st_mode&S_ISGID)
diff --git a/mail/procmail/patches/patch-ae b/mail/procmail/patches/patch-ae
deleted file mode 100644
index bb4cd9aebda..00000000000
--- a/mail/procmail/patches/patch-ae
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2003/01/20 22:55:44 jschauma Exp $
-
-If the ``Housekeeping'' lines stay, `make install; make deinstall; make install' fails.
-
---- Makefile.1.orig Tue Sep 11 00:53:09 2001
-+++ Makefile.1 Mon Jan 20 17:21:22 2003
-@@ -88,7 +88,7 @@
- @-$(MKDIRS) $(MAN1DIR) 2>$(DEVNULL); exit 0
- @-test -d $(MAN5DIR) || $(RM) $(MAN5DIR); exit 0
- @-$(MKDIRS) $(MAN5DIR) 2>$(DEVNULL); exit 0
-- @chmod 0644 $(MANS)
-+ @${CHMOD} 0644 $(MANS)
- @for a in $(MANS1S); \
- do $(INSTALL) new/$$a.1 $(MAN1DIR)/$$a.$(MAN1SUFFIX) || exit 1; \
- if test "X$(MANCOMPRESS)" != "X"; \
-@@ -101,14 +101,12 @@
- then $(MANCOMPRESS) -c new/$$a.5 >$(MAN5DIR)/$$a.$(MAN5SUFFIX); \
- else :; fi; \
- done
-- echo Housekeeping file >install.man
-
- install.bin: $(BINS) $(BASENAME)
- @-$(MKDIRS) $(BINDIR) 2>$(DEVNULL); exit 0
-- @chmod 0755 $(BINS)
-+ @${CHMOD} 0755 $(BINS)
- $(INSTALL) $(BINS) $(BINDIR)
- @-dirname / >$(DEVNULL) || $(INSTALL) examples/dirname $(BINDIR)
-- echo Housekeeping file >install.bin
-
- install:
- @$(MAKE) install.man install.bin
diff --git a/mail/procmail/patches/patch-af b/mail/procmail/patches/patch-af
deleted file mode 100644
index c273905b3d1..00000000000
--- a/mail/procmail/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/01/11 06:55:00 simonb Exp $
-
---- src/pipes.c.orig Tue Sep 11 14:58:44 2001
-+++ src/pipes.c
-@@ -194,7 +194,7 @@ perr: progerr(line,excode,pwait==4
- makeblock(&temp,Stdfilled);
- tmemmove(temp.p,Stdout,Stdfilled);
- readdyn(&temp,&Stdfilled,Stdfilled+backlen+1);
-- Stdout=realloc(Stdout,&Stdfilled+1);
-+ Stdout=realloc(Stdout,Stdfilled+1);
- tmemmove(Stdout,temp.p,Stdfilled+1);
- freeblock(&temp);
- retStdout(Stdout,pwait&&pipw,!backblock);
diff --git a/mail/procmail/patches/patch-ag b/mail/procmail/patches/patch-ag
deleted file mode 100644
index acb4f66d180..00000000000
--- a/mail/procmail/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/01/08 13:43:26 joerg Exp $
-
---- src/includes.h.orig 2006-01-08 13:33:18.000000000 +0000
-+++ src/includes.h
-@@ -283,7 +283,6 @@ double pow();
- #endif
-
- extern /*const*/char**environ;
--extern int errno;
-
- #ifndef STDIN_FILENO
- #define STDIN 0
diff --git a/mail/proxsmtp/DESCR b/mail/proxsmtp/DESCR
deleted file mode 100644
index 34a1724c09e..00000000000
--- a/mail/proxsmtp/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-ProxSMTP is a flexible tool that allows you to reject, change or log
-email based on arbitrary critera. It accepts SMTP connections and
-forwards the SMTP commands and responses to another SMTP server. The
-'DATA' email body is intercepted and filtered before forwarding.
-ProxSMTP can be used as a transparent proxy to filter an entire
-network's SMTP traffic at the router.
diff --git a/mail/proxsmtp/Makefile b/mail/proxsmtp/Makefile
deleted file mode 100644
index c2218cb13ab..00000000000
--- a/mail/proxsmtp/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2006/03/14 16:00:41 jlam Exp $
-
-DISTNAME= proxsmtp-1.0
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= http://memberwebs.com/nielsen/software/proxsmtp/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://memberwebs.com/nielsen/software/proxsmtp/
-COMMENT= SMTP proxy content filter
-
-GNU_CONFIGURE= yes
-
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES= ${EGDIR}/proxsmtpd.conf ${PKG_SYSCONFDIR}/proxsmtpd.conf
-RCD_SCRIPTS= proxsmtpd
-
-.include "../../mk/pthread.buildlink3.mk"
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- for file in \
- doc/proxsmtpd.conf \
- scripts/add_header.sh \
- scripts/spamassassin.sh; \
- do \
- ${INSTALL_DATA} ${WRKSRC}/$$file ${EGDIR}; \
- done
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/proxsmtp/PLIST b/mail/proxsmtp/PLIST
deleted file mode 100644
index 7c72ad492f3..00000000000
--- a/mail/proxsmtp/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/02 20:34:01 reed Exp $
-man/man5/proxsmtpd.conf.5
-man/man8/proxsmtpd.8
-sbin/proxsmtpd
-share/examples/proxsmtp/add_header.sh
-share/examples/proxsmtp/proxsmtpd.conf
-share/examples/proxsmtp/spamassassin.sh
-share/examples/rc.d/proxsmtpd
-@dirrm share/examples/proxsmtp
diff --git a/mail/proxsmtp/distinfo b/mail/proxsmtp/distinfo
deleted file mode 100644
index 244219f50e6..00000000000
--- a/mail/proxsmtp/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:28 agc Exp $
-
-SHA1 (proxsmtp-1.0.tar.gz) = eb733956612c1655cfd2f0ac985c0a896e73e505
-RMD160 (proxsmtp-1.0.tar.gz) = 8cb6988c8a2cd54447b53e23ca113750423c925d
-Size (proxsmtp-1.0.tar.gz) = 154743 bytes
-SHA1 (patch-aa) = 09bba87bf89e0f3a54b68fc77922052f88563579
-SHA1 (patch-ab) = c7d79e8491d9c7571a18da8a7bcdb3a9b7a93f11
diff --git a/mail/proxsmtp/files/proxsmtpd.sh b/mail/proxsmtp/files/proxsmtpd.sh
deleted file mode 100644
index 7dc89bbff78..00000000000
--- a/mail/proxsmtp/files/proxsmtpd.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: proxsmtpd.sh,v 1.1.1.1 2004/12/02 04:08:18 jlam Exp $
-#
-# PROVIDE: proxsmtpd
-# REQUIRE: LOGIN
-# BEFORE: mail
-# KEYWORD: shutdown
-#
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="proxsmtpd"
-rcvar=$name
-command="@PREFIX@/sbin/${name}"
-
-start_precmd="proxsmtpd_prestart"
-stop_postcmd="proxsmtpd_poststop"
-
-user="nobody"
-tempdir="/tmp"
-pidfile=/var/run/${name}.pid
-conffile="@PKG_SYSCONFDIR@/${name}.conf"
-if [ -f "${conffile}" ]; then
- user=`@AWK@ 'BEGIN {r = "nobody"}; /^User:/ {r = $2}; END {print r}' ${conffile}`
- tempdir=`@AWK@ 'BEGIN {r = "/tmp"}; /^TempDirectory:/ {r = $2}; END {print r}' ${conffile}`
-
- case ${tempdir} in
- /tmp) ;;
- *) pidfile="${tempdir}/${name}.pid" ;;
- esac
-fi
-
-command_args="-p ${pidfile}"
-
-proxsmtpd_prestart()
-{
- case ${tempdir} in
- /tmp) ;;
- *) if [ ! -d "${tempdir}" ]; then
- @MKDIR@ -p ${tempdir}
- fi
- @CHOWN@ -R ${user} ${tempdir}
- @CHMOD@ -R 0700 ${tempdir}
- ;;
- esac
- @TOUCH@ ${pidfile}
- @CHOWN@ ${user} ${pidfile}
-}
-
-proxsmtpd_poststop()
-{
- @RM@ -f ${pidfile}
- case ${tempdir} in
- /tmp) ;;
- *) @RMDIR@ -p ${tempdir} 2>/dev/null || @TRUE@
- esac
-}
-
-if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- if [ -f /etc/rc.conf ]; then
- . /etc/rc.conf
- fi
- @ECHO@ -n " ${name}"
- eval ${start_precmd}
- ${command} ${proxsmtpd_flags} ${command_args}
-fi
diff --git a/mail/proxsmtp/patches/patch-aa b/mail/proxsmtp/patches/patch-aa
deleted file mode 100644
index 59a3381defa..00000000000
--- a/mail/proxsmtp/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/12/02 04:08:18 jlam Exp $
-
---- common/sock_any.h.orig 2004-09-03 20:34:42.000000000 -0400
-+++ common/sock_any.h
-@@ -57,7 +57,7 @@ struct sockaddr_any
- struct sockaddr_in6 in6;
- #endif
- } s;
-- size_t namelen;
-+ socklen_t namelen;
- };
-
- #define SANY_ADDR(any) ((any).s.a)
diff --git a/mail/proxsmtp/patches/patch-ab b/mail/proxsmtp/patches/patch-ab
deleted file mode 100644
index 58d01f60afb..00000000000
--- a/mail/proxsmtp/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/12/04 20:37:47 jlam Exp $
-
---- common/smtppass.c.orig 2004-12-01 14:09:52.000000000 -0500
-+++ common/smtppass.c
-@@ -591,7 +591,7 @@ static spctx_t* init_thread(int fd)
- g_unique_id++;
- sp_unlock();
-
-- sp_messagex(ctx, LOG_DEBUG, "processing %d on thread %x", fd, (int)pthread_self());
-+ sp_messagex(ctx, LOG_DEBUG, "processing %d on thread %p", fd, pthread_self());
-
- /* Connect to the outgoing server ... */
- if(make_connections(ctx, fd) == -1)
diff --git a/mail/pulsar/DESCR b/mail/pulsar/DESCR
deleted file mode 100644
index 6a4f27d82f8..00000000000
--- a/mail/pulsar/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Pulsar is a small, simple to install POP3 daemon.
-It features built in SSL support and virtual hosts.
diff --git a/mail/pulsar/Makefile b/mail/pulsar/Makefile
deleted file mode 100644
index 4a4ec49f496..00000000000
--- a/mail/pulsar/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2006/06/06 01:09:16 minskim Exp $
-#
-
-DISTNAME= pulsar-0.1.1
-PKGREVISION= 4
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pulsar/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= martin@NetBSD.org
-HOMEPAGE= http://pulsar.sourceforge.net/
-COMMENT= Small, secure POP3 daemon, featuring native SSL support
-
-GNU_CONFIGURE= yes
-USE_TOOLS+= autoconf gmake
-
-MANCOMPRESSED= yes
-
-pre-configure:
- cd ${WRKSRC}; autoconf
-
-.include "../../devel/sysexits/buildlink3.mk"
-.include "../../mk/pam.buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/pulsar/PLIST b/mail/pulsar/PLIST
deleted file mode 100644
index 6897ab59616..00000000000
--- a/mail/pulsar/PLIST
+++ /dev/null
@@ -1,28 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/07/07 19:19:54 schmonz Exp $
-man/man1/pulsar_crypt.1.gz
-man/man5/pulsar.conf.5.gz
-man/man8/pulsar.8.gz
-man/man8/pulsar_deliver.8.gz
-sbin/pulsar
-sbin/pulsar_crypt
-sbin/pulsar_deliver
-share/doc/${PKGNAME}/CHANGES
-share/doc/${PKGNAME}/COMPATIBILITY
-share/doc/${PKGNAME}/INSTALL
-share/doc/${PKGNAME}/LICENSE
-share/doc/${PKGNAME}/SUPPORT
-share/doc/${PKGNAME}/TODO
-share/doc/${PKGNAME}/pulsar.conf
-share/doc/${PKGNAME}/pulsar.init
-share/doc/${PKGNAME}/pulsar.pamd
-share/doc/${PKGNAME}/pulsar.xinetd
-share/doc/${PKGNAME}/rfc1082.txt
-share/doc/${PKGNAME}/rfc1734.txt
-share/doc/${PKGNAME}/rfc1939.txt
-share/doc/${PKGNAME}/rfc1957.txt
-share/doc/${PKGNAME}/rfc2033.txt
-share/doc/${PKGNAME}/rfc2195.txt
-share/doc/${PKGNAME}/rfc2384.txt
-share/doc/${PKGNAME}/rfc2595.txt
-share/doc/${PKGNAME}/rfc822.txt
-@dirrm share/doc/${PKGNAME}
diff --git a/mail/pulsar/distinfo b/mail/pulsar/distinfo
deleted file mode 100644
index 7c6d4d52965..00000000000
--- a/mail/pulsar/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/06/06 01:30:25 minskim Exp $
-
-SHA1 (pulsar-0.1.1.tar.bz2) = bc99f184809f42b312d23d76aa34f01db65ac823
-RMD160 (pulsar-0.1.1.tar.bz2) = bac068845f10a7c879c1fab9cff95791369bfa84
-Size (pulsar-0.1.1.tar.bz2) = 149675 bytes
-SHA1 (patch-aa) = 7b6ee91a55ec8c583df2bd0a407e9e43bd9e2c3f
-SHA1 (patch-ab) = 6a874d7b633c2914d3f4f46a3c63088458c4aa92
-SHA1 (patch-ac) = 56b8f1c48fbeb987e1635b268575609548e7c910
-SHA1 (patch-ad) = 3b7139d2dae9dfbc294778a8d1ead473c4294bfb
-SHA1 (patch-ae) = 899efb95a466a42b25255708e9b4e7930a164fa3
-SHA1 (patch-af) = 4fe6b687d71f27dd7755ba4cf4608a4883ce3aa5
-SHA1 (patch-ag) = 5b257bf3d96283a3676cb8ed108a981a5f295b1b
diff --git a/mail/pulsar/patches/patch-aa b/mail/pulsar/patches/patch-aa
deleted file mode 100644
index 627e3363061..00000000000
--- a/mail/pulsar/patches/patch-aa
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/03/28 21:02:15 martin Exp $
-
---- configure.in.orig 2003-09-07 17:23:12.000000000 +0200
-+++ configure.in 2004-03-14 11:23:23.000000000 +0100
-@@ -178,7 +178,7 @@
- old_LDFLAGS=$LDFLAGS
- LIBS="$LIBS $TCP_WRAPPERS_LIBS"
- LDFLAGS="$LDFLAGS $TCP_WRAPPERS_LDFLAGS"
-- AC_CHECK_LIB(wrap, request_init,
-+ AC_TRY_LINK([ int allow_severity; int deny_severity; ], [ request_init(); ],
- [
- AC_DEFINE(WITH_TCP_WRAPPERS)
- AC_CHECK_LIB(nsl, yp_get_default_domain,
-@@ -187,10 +187,17 @@
- ]
- )
- chk_tcp_wrappers=yes
-+ dnl ** we can't yet enable tcp wrappers, it would
-+ dnl ** spoil future tests due to the badly broken
-+ dnl ** api in that library
-+ LIBS=$old_LIBS
-+ LDFLAGS=$old_LDFLAGS
- ],
- [
- LIBS=$old_LIBS
- LDFLAGS=$old_LDFLAGS
-+ TCP_WRAPPERS_LIBS=""
-+ TCP_WRAPPERS_LIBS=""
- AC_MSG_RESULT([tcp wrappers library not found, support disabled])
- ]
- )
-@@ -253,7 +260,7 @@
- *)
- if test -d $with_ssl; then
- SSL_LDFLAGS="-L$with_ssl"
-- SSL_LIBS="-lssl"
-+ SSL_LIBS="-lcrypto -lssl"
- else
- SSL_LIBS="$with_ssl"
- fi
-@@ -267,7 +274,7 @@
- )
- if test "$with_ssl" = "yes"; then
- if test -z "$SSL_LIBS"; then
-- SSL_LIBS="-lssl"
-+ SSL_LIBS="-lcrypto -lssl"
- fi
- old_LIBS=$LIBS
- old_LDFLAGS=$LDFLAGS
-@@ -332,6 +339,11 @@
- ]
- )
- fi
-+
-+dnl ** now we are ready to enable tcp wrappers libs **
-+LIBS="$LIBS $TCP_WRAPPERS_LIBS"
-+LDFLAGS="$LDFLAGS $TCP_WRAPPERS_LDFLAGS"
-+
- dnl ********************************************************
- dnl ********************************************************
- dnl Output a list of included optional components
-@@ -375,7 +387,7 @@
- docdir=${prefix}/share/doc/pulsar-${VERSION}
- else
- mandir=${prefix}/man
-- docdir=${prefix}/doc/pulsar-${VERSION}
-+ docdir=${prefix}/share/doc/pulsar-${VERSION}
- fi
- sbindir=${prefix}/sbin
- AC_MSG_RESULT([Executables will go in: ] ${prefix}/sbin)
diff --git a/mail/pulsar/patches/patch-ab b/mail/pulsar/patches/patch-ab
deleted file mode 100644
index a4e25c1055d..00000000000
--- a/mail/pulsar/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/06/06 01:30:26 minskim Exp $
-
---- doc/Makefile.in.orig 2003-07-06 14:42:37.000000000 -0700
-+++ doc/Makefile.in
-@@ -50,5 +50,5 @@ clean:
- @find . -name "*~" -exec rm -f {} ";"
-
- install:
-- ${INSTALL} -m 0555 -g root -o root -d ${docdir}/
-- ${INSTALL} -m 0444 -g root -o root ${DOC_FILES} ${docdir}/
-+ ${BSD_INSTALL_DATA_DIR} ${docdir}/
-+ ${BSD_INSTALL_DATA} ${DOC_FILES} ${docdir}/
diff --git a/mail/pulsar/patches/patch-ac b/mail/pulsar/patches/patch-ac
deleted file mode 100644
index 3ab945ac06a..00000000000
--- a/mail/pulsar/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/06/06 01:30:26 minskim Exp $
-
---- man/Makefile.in.orig 2002-09-05 17:08:49.000000000 -0700
-+++ man/Makefile.in
-@@ -22,7 +22,7 @@
- .PHONY: all install clean distclean
- .SUFFIXES: .man .gz
-
--MAN_FILES = maildir.5.gz mbox.5.gz pulsar.8.gz pulsar.conf.5.gz \
-+MAN_FILES = pulsar.8.gz pulsar.conf.5.gz \
- pulsar_crypt.1.gz pulsar_deliver.8.gz
-
- srcdir = @srcdir@
-@@ -63,10 +63,10 @@ pulsar_deliver.8.gz: \
- pulsar_deliver.8.man
-
- install: ${MAN_FILES}
-- ${INSTALL} -m 0555 -g root -o root -d ${mandir}/man1/
-- ${INSTALL} -m 0555 -g root -o root -d ${mandir}/man5/
-- ${INSTALL} -m 0555 -g root -o root -d ${mandir}/man8/
-- ${INSTALL} -m 0444 -g root -o root *.1.gz ${mandir}/man1/
-- ${INSTALL} -m 0444 -g root -o root *.5.gz ${mandir}/man5/
-- ${INSTALL} -m 0444 -g root -o root *.8.gz ${mandir}/man8/
-+ ${BSD_INSTALL_MAN_DIR} ${mandir}/man1/
-+ ${BSD_INSTALL_MAN_DIR} ${mandir}/man5/
-+ ${BSD_INSTALL_MAN_DIR} ${mandir}/man8/
-+ ${BSD_INSTALL_MAN} *.1.gz ${mandir}/man1/
-+ ${BSD_INSTALL_MAN} *.5.gz ${mandir}/man5/
-+ ${BSD_INSTALL_MAN} *.8.gz ${mandir}/man8/
-
diff --git a/mail/pulsar/patches/patch-ad b/mail/pulsar/patches/patch-ad
deleted file mode 100644
index 1da46582099..00000000000
--- a/mail/pulsar/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/06/06 01:30:26 minskim Exp $
-
---- src/Makefile.in.orig 2003-09-04 11:15:21.000000000 -0700
-+++ src/Makefile.in
-@@ -25,7 +25,7 @@
- install-recursive clean-recursive distclean-recursive
-
- CC = @CC@
--CFLAGS = -Wall @CFLAGS@ @DEFS@ -I./mailstore -I./cfg -I./users -I./util -I./md5
-+CFLAGS = -Wall @CFLAGS@ @DEFS@ -I./mailstore -I./cfg -I./users -I./util -I./md5 -I.
- LDFLAGS = @LDFLAGS@
- LDLIBS = @LIBS@
-
-@@ -198,7 +198,7 @@ distclean-recursive:
- @set -e; for i in $(SUB_DIRS); do cd $$i; $(MAKE) distclean ; cd .. ; done
-
- install-files:
-- ${INSTALL} -m 0755 -g root -o root -d ${sbindir}
-- ${INSTALL} -m 0500 -g root -o root -s pulsar ${sbindir}
-- ${INSTALL} -m 0555 -g root -o root -s pulsar_crypt ${sbindir}
-- ${INSTALL} -m 0500 -g root -o root -s pulsar_deliver ${sbindir}
-+ ${BSD_INSTALL_PROGRAM_DIR} ${sbindir}
-+ ${INSTALL} -m 0500 -s pulsar ${sbindir}
-+ ${INSTALL} -m 0555 -s pulsar_crypt ${sbindir}
-+ ${INSTALL} -m 0500 -s pulsar_deliver ${sbindir}
diff --git a/mail/pulsar/patches/patch-ae b/mail/pulsar/patches/patch-ae
deleted file mode 100644
index d97bc6d3ae3..00000000000
--- a/mail/pulsar/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2006/06/06 01:30:26 minskim Exp $
-
---- support_files/Makefile.in.orig 2003-07-06 14:42:05.000000000 -0700
-+++ support_files/Makefile.in
-@@ -36,11 +36,11 @@ clean:
- @rm -f ../*.rpm
-
- install:
-- ${INSTALL} -m 0555 -g root -o root -d ${sup_dir}
-- ${INSTALL} -m 0644 -g root -o root pulsar.conf ${sup_dir}
-- ${INSTALL} -m 0555 -g root -o root pulsar.init ${sup_dir}
-- ${INSTALL} -m 0444 -g root -o root pulsar.pamd ${sup_dir}
-- ${INSTALL} -m 0444 -g root -o root pulsar.xinetd ${sup_dir}
-+ ${BSD_INSTALL_DATA_DIR} ${sup_dir}
-+ ${INSTALL} -m 0644 pulsar.conf ${sup_dir}
-+ ${INSTALL} -m 0555 pulsar.init ${sup_dir}
-+ ${INSTALL} -m 0444 pulsar.pamd ${sup_dir}
-+ ${INSTALL} -m 0444 pulsar.xinetd ${sup_dir}
-
- rpm:
- @echo -en "Building RPM package:\t"
diff --git a/mail/pulsar/patches/patch-af b/mail/pulsar/patches/patch-af
deleted file mode 100644
index 962b4b5a1b1..00000000000
--- a/mail/pulsar/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/03/28 21:02:15 martin Exp $
-
---- src/pulsar_crypt.c.orig 2003-09-06 13:15:07.000000000 +0200
-+++ src/pulsar_crypt.c 2004-03-14 12:02:37.000000000 +0100
-@@ -36,6 +36,11 @@
- #include <crypt.h>
- #endif /* HAVE_CRYPT_H */
-
-+#ifdef WITH_TCP_WRAPPERS
-+int allow_severity;
-+int deny_severity;
-+#endif /* WITH_TCP_WRAPPERS */
-+
- #include "md5.h"
-
- char table[] = "./0123456789abcdefghijklnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
diff --git a/mail/pulsar/patches/patch-ag b/mail/pulsar/patches/patch-ag
deleted file mode 100644
index 7470e1d5148..00000000000
--- a/mail/pulsar/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/03/28 21:02:15 martin Exp $
-
---- src/pulsar_deliver.c.orig 2003-09-07 17:29:23.000000000 +0200
-+++ src/pulsar_deliver.c 2004-03-14 12:03:48.000000000 +0100
-@@ -35,6 +35,11 @@
- #include "users.h"
- #include "error_facility.h"
-
-+#ifdef WITH_TCP_WRAPPERS
-+int allow_severity;
-+int deny_severity;
-+#endif /* WITH_TCP_WRAPPERS */
-+
- strStaticData g;
- //------------------------------------------------------------------------------------------------------------
- void help(const char *filename) {
-
diff --git a/mail/pymsgauth/DEINSTALL b/mail/pymsgauth/DEINSTALL
deleted file mode 100644
index 6d0e7a06e93..00000000000
--- a/mail/pymsgauth/DEINSTALL
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2005/04/18 15:59:38 schmonz Exp $
-
-case ${STAGE} in
-
-POST-DEINSTALL)
-
- ${RM} ${PREFIX}/bin/pymsgauth-*
- ;;
-
-esac
diff --git a/mail/pymsgauth/DESCR b/mail/pymsgauth/DESCR
deleted file mode 100644
index ffe6b84a9ea..00000000000
--- a/mail/pymsgauth/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-A toolkit for automatically and securely dealing with qsecretary
-confirmation notices.
diff --git a/mail/pymsgauth/INSTALL b/mail/pymsgauth/INSTALL
deleted file mode 100644
index 11924acaa5e..00000000000
--- a/mail/pymsgauth/INSTALL
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2005/04/18 15:59:38 schmonz Exp $
-
-SHAREDIR=@SHAREDIR@
-
-case ${STAGE} in
-
-POST-INSTALL)
- cd ${PREFIX}/bin
- ${LN} -s ../${SHAREDIR}/pymsgauth-* ./
- ;;
-
-esac
diff --git a/mail/pymsgauth/Makefile b/mail/pymsgauth/Makefile
deleted file mode 100644
index 92a0c18f9b8..00000000000
--- a/mail/pymsgauth/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2006/03/14 01:14:30 jlam Exp $
-#
-
-DISTNAME= pymsgauth-2.1.0
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ${HOMEPAGE}
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://pyropus.ca/software/pymsgauth/
-COMMENT= Automatically process qsecretary confirmation requests
-
-PYMSGAUTH_PROGRAMS= pymsgauth-*
-DOCS= BUGS CHANGELOG COPYING pymsgauth.txt
-HTMLDOCS= pymsgauth.html
-EXAMPLES= pymsgauthrc-example
-
-SHAREDIR= share/pymsgauth
-DOCDIR= share/doc/pymsgauth
-HTMLDOCDIR= share/doc/html/pymsgauth
-EGDIR= share/examples/pymsgauth
-
-NO_BUILD= yes
-PYTHON_PATCH_SCRIPTS= ${PYMSGAUTH_PROGRAMS} *.py
-
-FILES_SUBST+= SHAREDIR=${SHAREDIR:Q}
-
-INSTALLATION_DIRS= ${SHAREDIR} ${DOCDIR} ${HTMLDOCDIR} ${EGDIR} bin
-
-do-install:
- for f in ${PYTHON_PATCH_SCRIPTS}; do \
- ${INSTALL_SCRIPT} ${WRKSRC}/$${f} ${PREFIX}/${SHAREDIR}; \
- done
-
- for f in ${DOCS}; do \
- ${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/${DOCDIR}; \
- done
-
- for f in ${HTMLDOCS}; do \
- ${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/${HTMLDOCDIR}; \
- done
-
- for f in ${EXAMPLES}; do \
- ${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/${EGDIR}; \
- done
-
-.include "../../lang/python/application.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/pymsgauth/PLIST b/mail/pymsgauth/PLIST
deleted file mode 100644
index 6a9a71a1d49..00000000000
--- a/mail/pymsgauth/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/04/18 15:59:38 schmonz Exp $
-share/doc/html/pymsgauth/pymsgauth.html
-share/doc/pymsgauth/BUGS
-share/doc/pymsgauth/CHANGELOG
-share/doc/pymsgauth/COPYING
-share/doc/pymsgauth/pymsgauth.txt
-share/examples/pymsgauth/pymsgauthrc-example
-share/pymsgauth/ConfParser.py
-share/pymsgauth/pymsgauth-clean
-share/pymsgauth/pymsgauth-confirm
-share/pymsgauth/pymsgauth-mail
-share/pymsgauth/pymsgauth.py
-@dirrm share/pymsgauth
-@dirrm share/examples/pymsgauth
-@dirrm share/doc/pymsgauth
-@dirrm share/doc/html/pymsgauth
diff --git a/mail/pymsgauth/distinfo b/mail/pymsgauth/distinfo
deleted file mode 100644
index a4c353f8e17..00000000000
--- a/mail/pymsgauth/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/04/18 15:59:38 schmonz Exp $
-
-SHA1 (pymsgauth-2.1.0.tar.gz) = fe6c60022529ce2444db3423f84d44e457ae61bb
-RMD160 (pymsgauth-2.1.0.tar.gz) = 0a5d7d6be65d9623647a3dfe014cb89a2c213183
-Size (pymsgauth-2.1.0.tar.gz) = 17915 bytes
diff --git a/mail/qcheck/DESCR b/mail/qcheck/DESCR
deleted file mode 100644
index 96c7e5f0cac..00000000000
--- a/mail/qcheck/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a quick utility to check if there are new mails
-on any un*x system running qmail with Maildir. It won't work
-for someone running mailboxes in mbox format and I can't be
-bothered to add that. Do it yourself if you need to support
-this old format.
diff --git a/mail/qcheck/Makefile b/mail/qcheck/Makefile
deleted file mode 100644
index 96877ce3618..00000000000
--- a/mail/qcheck/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2007/03/15 04:41:39 schmonz Exp $
-#
-
-DISTNAME= qcheck
-PKGNAME= qcheck-1.0
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= http://zapek.com/software/qcheck/
-
-MAINTAINER= zuntum@NetBSD.org
-COMMENT= Text-only biff with Maildir support
-
-DIST_SUBDIR= ${PKGNAME_NOREV}
-
-NO_CONFIGURE= YES
-
-INSTALLATION_DIRS= bin share/doc/${PKGBASE}
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/qcheck ${PREFIX}/bin/qcheck
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PKGBASE}/README
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qcheck/PLIST b/mail/qcheck/PLIST
deleted file mode 100644
index 240d97a221f..00000000000
--- a/mail/qcheck/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2007/03/15 04:41:39 schmonz Exp $
-bin/qcheck
-share/doc/qcheck/README
-@dirrm share/doc/qcheck
diff --git a/mail/qcheck/distinfo b/mail/qcheck/distinfo
deleted file mode 100644
index 7723cd5d5df..00000000000
--- a/mail/qcheck/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2007/03/15 04:41:39 schmonz Exp $
-
-SHA1 (qcheck-1.0/qcheck.tar.gz) = 9808edb279a83c6a881b5feaf458b7ea40157708
-RMD160 (qcheck-1.0/qcheck.tar.gz) = 29c5f147d6dd80a03fd3a1a31ac0b0df510b93bc
-Size (qcheck-1.0/qcheck.tar.gz) = 898 bytes
-SHA1 (patch-aa) = c02c027d8855edf44c4d37924672cc0e96710146
diff --git a/mail/qcheck/patches/patch-aa b/mail/qcheck/patches/patch-aa
deleted file mode 100644
index b4298b745ec..00000000000
--- a/mail/qcheck/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/03/15 04:41:39 schmonz Exp $
-
---- qcheck.c.orig 2003-11-22 07:10:46.000000000 -0500
-+++ qcheck.c
-@@ -1,4 +1,6 @@
-+#include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <dirent.h>
-
- /*
diff --git a/mail/qgreylist/DESCR b/mail/qgreylist/DESCR
deleted file mode 100644
index 1166dfbe7c1..00000000000
--- a/mail/qgreylist/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-qgreylist is a 'lite' version of greylisting. It greylists only by
-source IP address, mainly because it's written as a wrapper for
-qmail-smtpd so has no other information available. For home and
-small office use this works nearly as well.
diff --git a/mail/qgreylist/MESSAGE b/mail/qgreylist/MESSAGE
deleted file mode 100644
index b9c7b6dbd02..00000000000
--- a/mail/qgreylist/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2004/08/29 15:32:12 schmonz Exp $
-
-To enable qgreylist, set qmailsmtpd_presmtpd="${PREFIX}/bin/qgreylist"
-in /etc/rc.conf, then restart qmail-smtpd.
-
-===========================================================================
diff --git a/mail/qgreylist/Makefile b/mail/qgreylist/Makefile
deleted file mode 100644
index 9e9218749f3..00000000000
--- a/mail/qgreylist/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2007/02/22 19:01:22 wiz Exp $
-#
-
-DISTNAME= qgreylist-0.3
-CATEGORIES= mail
-MASTER_SITES= ${HOMEPAGE}
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://www.jonatkins.com/page/software/qgreylist
-COMMENT= Simple greylisting for qmail
-
-DEPENDS_QMAIL= qmail>=1.03nb8:../../mail/qmail
-DEPENDS+= ${DEPENDS_QMAIL}
-
-WRKSRC= ${WRKDIR}/qgreylist
-
-USE_TOOLS+= perl:run
-OWN_DIRS_PERMS= ${PKG_SYSCONFDIR}/greylist qmaild wheel 0755
-OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/whitelist qmaild wheel 0755
-NO_BUILD= yes
-
-REPLACE_PERL= greylist
-
-.include "../../mk/bsd.prefs.mk"
-
-# Detect the PKG_SYSCONFDIR of the installed qmail, so we can create
-# config files there and refer to them from rc.d scripts.
-#
-.if !defined(PKG_SYSCONFDIR.qgreylist)
-PKG_SYSCONFDIR.qgreylist!= \
- ${PKG_INFO} -Q PKG_SYSCONFDIR \
- ${DEPENDS_QMAIL:C/:.*$//:Q} 2>/dev/null || \
- ${ECHO} "PKG_SYSCONFDIR.qgreylist_not_set"
-. if empty(PKG_SYSCONFDIR.qgreylist:M*not_set)
-MAKEVARS+= PKG_SYSCONFDIR.qgreylist
-. endif
-.endif
-
-SUBST_CLASSES+= qmaildirs
-SUBST_STAGE.qmaildirs= do-configure
-SUBST_FILES.qmaildirs= greylist
-SUBST_SED.qmaildirs= -e 's|/var/qmail/greylist|${PKG_SYSCONFDIR}/greylist|g'
-SUBST_SED.qmaildirs+= -e 's|/var/qmail/whitelist|${PKG_SYSCONFDIR}/whitelist|g'
-SUBST_SED.qmaildirs+= -e 's|/var/qmail|${QMAILDIR}|g'
-
-INSTALLATION_DIRS= bin share/doc/qgreylist
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/greylist ${PREFIX}/bin/qgreylist
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/qgreylist
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qgreylist/PLIST b/mail/qgreylist/PLIST
deleted file mode 100644
index a574f9001d3..00000000000
--- a/mail/qgreylist/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/10/13 17:01:46 schmonz Exp $
-bin/qgreylist
-share/doc/qgreylist/README
-@dirrm share/doc/qgreylist
diff --git a/mail/qgreylist/distinfo b/mail/qgreylist/distinfo
deleted file mode 100644
index 1807e27629c..00000000000
--- a/mail/qgreylist/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/10/13 17:01:46 schmonz Exp $
-
-SHA1 (qgreylist-0.3.tar.gz) = 9abaed7fd76f02a1090d1cf2eaad1e43dfa2f6d1
-RMD160 (qgreylist-0.3.tar.gz) = 8f85e1d19d7d9517f21c3b0f6fe0c38332e26fca
-Size (qgreylist-0.3.tar.gz) = 5822 bytes
-SHA1 (patch-aa) = afcee4cfd00481b71924ff2e0b96ad64522a8c3e
diff --git a/mail/qgreylist/patches/patch-aa b/mail/qgreylist/patches/patch-aa
deleted file mode 100644
index 5e42bd295a1..00000000000
--- a/mail/qgreylist/patches/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/10/13 17:01:47 schmonz Exp $
-
---- greylist.orig 2005-01-17 08:38:07.000000000 -0500
-+++ greylist
-@@ -27,8 +27,9 @@ my $version = "0.3";
-
- # TODO: alternative logging options, instead of syslog?
-
--use Sys::Syslog;
-+use Sys::Syslog qw(:DEFAULT setlogsock);
-
-+setlogsock('unix');
-
- openlog "greylist", "pid", "mail";
-
-@@ -338,14 +339,14 @@ cleanup_maybe;
- # TODO: change to an immediate error here..?
- unless ( defined $ENV{TCPREMOTEIP} )
- {
-- syslog "err", "ENV{TCPREMOEIP} not set!";
-+ syslog "err", "ENV{TCPREMOTEIP} not set!";
- smtp_temp_fail "Cannot find remote IP";
- }
-
- # now this should never happen...
- unless ( $ENV{TCPREMOTEIP} =~ m{^(\d+\.\d+\.\d+\.\d+)$} )
- {
-- syslog "err", "ENV{TCPREMOEIP} = $ENV{TCPREMOTEIP} - bad format!";
-+ syslog "err", "ENV{TCPREMOTEIP} = $ENV{TCPREMOTEIP} - bad format!";
- smtp_temp_fail "Bad format for remote IP";
- }
-
diff --git a/mail/qmHandle/DESCR b/mail/qmHandle/DESCR
deleted file mode 100644
index 63d0d8b9647..00000000000
--- a/mail/qmHandle/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-qmHandle is a simple perl script which allows you to view and manage the qmail
-message queue.
-
-The key features of qmHandle are:
-
-* Freeware and open source, under the GNU General Public License
-* You can read the qmail queue, like you do with the qmail-qread program.
- However, the output of this program is improved over qmail-qread,
- with the output of the message subjects and color capabilities
-* You can print queue statistics, like qmail-qstat with color capabilities
-* You can view a message in the queue
-* You can remove a message from the queue
diff --git a/mail/qmHandle/Makefile b/mail/qmHandle/Makefile
deleted file mode 100644
index 1d46217a9b6..00000000000
--- a/mail/qmHandle/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2005/07/16 01:19:13 jlam Exp $
-#
-
-DISTNAME= qmhandle-1.2.0
-PKGNAME= ${DISTNAME:S/h/H/}
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qmhandle/}
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://qmhandle.sourceforge.net/
-COMMENT= Tool to view and manage the qmail message queue
-
-WRKSRC= ${WRKDIR}
-USE_TOOLS+= perl:run
-REPLACE_PERL= qmHandle
-NO_BUILD= YES
-
-SUBST_CLASSES+= config
-SUBST_STAGE.config= do-configure
-SUBST_FILES.config= qmHandle
-SUBST_SED.config= -e 's|/var/qmail/queue/|${QMAIL_QUEUE_DIR}/|g'
-SUBST_SED.config+= -e 's|/etc/init.d/qmail|${RCD_SCRIPTS_DIR}/qmail|g'
-.if exists(/usr/bin/pgrep)
-SUBST_SED.config+= -e 's|pidof|/usr/bin/pgrep|g'
-.endif
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/qmHandle ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/qmHandle
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/qmHandle
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmHandle/PLIST b/mail/qmHandle/PLIST
deleted file mode 100644
index ab6591fd3ab..00000000000
--- a/mail/qmHandle/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/07/22 00:52:36 schmonz Exp $
-bin/qmHandle
-share/doc/qmHandle/README
-@dirrm share/doc/qmHandle
diff --git a/mail/qmHandle/distinfo b/mail/qmHandle/distinfo
deleted file mode 100644
index 03964193e5f..00000000000
--- a/mail/qmHandle/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 09:59:28 agc Exp $
-
-SHA1 (qmhandle-1.2.0.tar.gz) = 31a569904609253ba96f7714d954ed37cd7fdd73
-RMD160 (qmhandle-1.2.0.tar.gz) = c5cc22da809794d9a598dbeb7756edce672a419d
-Size (qmhandle-1.2.0.tar.gz) = 13134 bytes
diff --git a/mail/qmail-conf/DESCR b/mail/qmail-conf/DESCR
deleted file mode 100644
index 7c8a1478c96..00000000000
--- a/mail/qmail-conf/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
-qmail-conf is a collection of tools for setting up various qmail services.
-They are like *-conf programs in djbdns.
-
-With qmail-conf, for example, setting up a minimal SMTP service takes
-the following four steps:
-
-qmail-smtpd-conf qmaild qmaill /var/qmail/service/smtpd
-cd /var/qmail/service/smtpd
-make
-ln -s /var/qmail/service/smtpd /service
-
-qmail-conf assumes that (recent versions of) daemontools and
-ucspi-tcp have already been installed. It also assumes that svscan
-is already running.
-
-qmail-conf tries to provide reasonable defaults: it avoids DNS
-reverse lookups; it avoids IDENT lookups; it lets TCP connection
-attempts be logged with multilog; and for POP3 and QMQP, connection
-attempts are denied unless you explicitly authorize your clients.
diff --git a/mail/qmail-conf/Makefile b/mail/qmail-conf/Makefile
deleted file mode 100644
index a319b87e049..00000000000
--- a/mail/qmail-conf/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2006/07/27 18:48:02 jlam Exp $
-#
-
-DISTNAME= qmail-conf-0.60
-PKGREVISION= 3
-CATEGORIES= mail
-MASTER_SITES= http://www.din.or.jp/~ushijima/qmail-conf/
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} djbdns-1.05${EXTRACT_SUFX}
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://www.din.or.jp/~ushijima/qmail-conf.html
-COMMENT= Collection of tools for setting up qmail services
-
-DEPENDS+= checkpassword-[0-9]*:../../sysutils/checkpassword
-DEPENDS+= daemontools>=0.70:../../sysutils/daemontools
-DEPENDS+= qmail>=1.03nb7:../../mail/qmail
-DEPENDS+= ucspi-tcp>=0.86:../../net/ucspi-tcp
-
-SITES.djbdns-1.05.tar.gz= http://cr.yp.to/djbdns/ ftp://cr.yp.to/djbdns/
-
-DJB_RESTRICTED= NO
-DJB_CONFIG_CMDS= ${ECHO} ${LOCALBASE} > ${WRKSRC}/conf-ucspi-tcp
-
-SUBST_FILES.djbware+= ../djbdns-1.05/error.h
-
-pre-build:
- cd ${WRKSRC} && ${MAKE} -f Makefile.ini djbdns="../djbdns-1.05"
-
-.include "../../mk/djbware.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmail-conf/PLIST b/mail/qmail-conf/PLIST
deleted file mode 100644
index 6531ce27767..00000000000
--- a/mail/qmail-conf/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/07/21 23:54:47 schmonz Exp $
-bin/qmail-delivery-conf
-bin/qmail-pop3d-conf
-bin/qmail-qmqpd-conf
-bin/qmail-qmtpd-conf
-bin/qmail-smtpd-conf
diff --git a/mail/qmail-conf/distinfo b/mail/qmail-conf/distinfo
deleted file mode 100644
index 5009e6909ac..00000000000
--- a/mail/qmail-conf/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:28 agc Exp $
-
-SHA1 (qmail-conf-0.60.tar.gz) = d9a48e15394b0e7beaf5f7c64db4be101a71fb08
-RMD160 (qmail-conf-0.60.tar.gz) = 41bb36cb644c3669be96abccce3b69a91aa44cd8
-Size (qmail-conf-0.60.tar.gz) = 6332 bytes
-SHA1 (djbdns-1.05.tar.gz) = 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d
-RMD160 (djbdns-1.05.tar.gz) = a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed
-Size (djbdns-1.05.tar.gz) = 85648 bytes
diff --git a/mail/qmail-lint/DESCR b/mail/qmail-lint/DESCR
deleted file mode 100644
index 57d4513ae0d..00000000000
--- a/mail/qmail-lint/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-This tool examines the qmail configuration to see if any common errors exist.
-
-usage: qmail-lint [-v]
- -v -- print an explanation of the reports the first time one is printed.
diff --git a/mail/qmail-lint/Makefile b/mail/qmail-lint/Makefile
deleted file mode 100644
index e212f98c63d..00000000000
--- a/mail/qmail-lint/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/01/21 18:57:41 jlam Exp $
-#
-
-DISTNAME= qmail-lint-0.55
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ${HOMEPAGE}
-EXTRACT_SUFX= #
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://www.qmail.org/
-COMMENT= Examine the qmail configuration for common errors
-
-WRKSRC= ${WRKDIR}
-USE_TOOLS+= perl:run
-REPLACE_PERL= ${DISTNAME}
-NO_BUILD= yes
-
-SUBST_CLASSES+= qmaildir
-SUBST_STAGE.qmaildir= do-configure
-SUBST_FILES.qmaildir= ${DISTNAME}
-SUBST_SED.qmaildir= -e 's|/var/qmail|${QMAILDIR}|g'
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin/qmail-lint
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmail-lint/PLIST b/mail/qmail-lint/PLIST
deleted file mode 100644
index 3f9dc6cadbe..00000000000
--- a/mail/qmail-lint/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:01:12 zuntum Exp $
-bin/qmail-lint
diff --git a/mail/qmail-lint/distinfo b/mail/qmail-lint/distinfo
deleted file mode 100644
index 77f3fec60db..00000000000
--- a/mail/qmail-lint/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:28 agc Exp $
-
-SHA1 (qmail-lint-0.55) = bbe23a144a216cc85046e0aa9596806b81613c3e
-RMD160 (qmail-lint-0.55) = f2a412a88ffb696e84afa2d82c095c54c6492024
-Size (qmail-lint-0.55) = 13531 bytes
diff --git a/mail/qmail-qfilter/DESCR b/mail/qmail-qfilter/DESCR
deleted file mode 100644
index baceba6e86a..00000000000
--- a/mail/qmail-qfilter/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This program allows the body of a message to be filtered through a
-series of filters before being passed to the real qmail-queue program,
-and injected into the qmail queue.
diff --git a/mail/qmail-qfilter/Makefile b/mail/qmail-qfilter/Makefile
deleted file mode 100644
index 169d4f59517..00000000000
--- a/mail/qmail-qfilter/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2007/01/07 09:13:59 rillig Exp $
-#
-
-DISTNAME= qmail-qfilter-2.1
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ${HOMEPAGE}
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://untroubled.org/qmail-qfilter/
-COMMENT= Multi-filter front end for qmail-queue
-
-DEPENDS+= qmail>=1.03nb9:../../mail/qmail
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-OWN_DIRS_PERMS+= ${QMAIL_QFILTER_TMPDIR} qmaild ${ROOT_GROUP} 700
-
-REPLACE_PERL= samples/block-long-dates \
- samples/deny-filetypes \
- samples/rename-filetypes
-
-SUBST_CLASSES+= paths
-SUBST_STAGE.paths= do-configure
-SUBST_FILES.paths= qmail-qfilter.c
-SUBST_SED.paths= -e 's|/tmp|${QMAIL_QFILTER_TMPDIR}|g'
-SUBST_SED.paths+= -e 's|/var/qmail|${QMAILDIR}|g'
-SUBST_MESSAGE.paths= Fixing paths.
-
-INSTALLATION_DIRS= bin man ${PKGMANDIR}/man1 share/examples/qmail-qfilter
-
-DJB_RESTRICTED= NO
-DJB_MAKE_TARGETS= NO
-
-.include "../../mk/bsd.prefs.mk"
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qmail-qfilter
- for i in ${REPLACE_PERL}; do \
- ${INSTALL_SCRIPT} ${WRKSRC}/$${i} \
- ${PREFIX}/share/examples/qmail-qfilter; \
- done
-
-.include "../../devel/bglibs/buildlink3.mk"
-.include "../../mk/djbware.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmail-qfilter/PLIST b/mail/qmail-qfilter/PLIST
deleted file mode 100644
index 5d79f1d9fbe..00000000000
--- a/mail/qmail-qfilter/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/08/23 03:30:20 schmonz Exp $
-bin/qmail-qfilter
-man/man1/qmail-qfilter.1
-share/examples/qmail-qfilter/block-long-dates
-share/examples/qmail-qfilter/deny-filetypes
-share/examples/qmail-qfilter/rename-filetypes
-@dirrm share/examples/qmail-qfilter
diff --git a/mail/qmail-qfilter/distinfo b/mail/qmail-qfilter/distinfo
deleted file mode 100644
index 077a7dbd517..00000000000
--- a/mail/qmail-qfilter/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/08/02 02:36:17 schmonz Exp $
-
-SHA1 (qmail-qfilter-2.1.tar.gz) = 5ac595a9b6f7c14efa1bca3621fa16abfc382fc0
-RMD160 (qmail-qfilter-2.1.tar.gz) = 4336fef69e7f5216d11b4ee71110b7c9504d3970
-Size (qmail-qfilter-2.1.tar.gz) = 22242 bytes
-SHA1 (patch-aa) = c4c2a94d032f16c7d663d8813d18ae1f40aecd96
diff --git a/mail/qmail-qfilter/patches/patch-aa b/mail/qmail-qfilter/patches/patch-aa
deleted file mode 100644
index 27500e6156f..00000000000
--- a/mail/qmail-qfilter/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/08/02 02:36:17 schmonz Exp $
-
---- Makefile.orig 2005-08-12 19:40:51.000000000 -0400
-+++ Makefile
-@@ -37,7 +37,7 @@ load: conf-ld conf-bglibs
- ( bglibs=`head -n 1 conf-bglibs`; \
- echo '#!/bin/sh';\
- echo 'main="$$1"; shift';\
-- echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}' -lbg-sysdeps; \
-+ echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'" "-Wl,-R'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}' -lbg-sysdeps; \
- ) >load
- chmod 755 load
-
diff --git a/mail/qmail-run/DESCR b/mail/qmail-run/DESCR
deleted file mode 100644
index b9b4bf45872..00000000000
--- a/mail/qmail-run/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This package creates all the needed basic config files to run qmail,
-and provides NetBSD-style rc.d scripts and an example mailer.conf.
-It also includes wrapper scripts for procmail and qmail-qfilter.
diff --git a/mail/qmail-run/INSTALL b/mail/qmail-run/INSTALL
deleted file mode 100644
index 1ad1efd7be9..00000000000
--- a/mail/qmail-run/INSTALL
+++ /dev/null
@@ -1,50 +0,0 @@
-QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@
-
-psmsg='#
-# This file was auto-generated by pkgsrc.'
-
-case ${STAGE} in
-
-POST-INSTALL)
- cd ${LOCALBASE}/share/qmail/setup && ./config-fast `./hostname`
-
- cd ${PKG_SYSCONFDIR}/alias && ${TOUCH} .qmail-postmaster .qmail-mailer-daemon .qmail-root
-
- if ! [ -s ${PKG_SYSCONFDIR}/control/concurrencypop3 ]; then
- ${ECHO} 20 > ${PKG_SYSCONFDIR}/control/concurrencypop3
- ${ECHO} "$psmsg" >> ${PKG_SYSCONFDIR}/control/concurrencypop3
- ${CHMOD} 644 ${PKG_SYSCONFDIR}/control/concurrencypop3
- fi
-
- if ! [ -s ${PKG_SYSCONFDIR}/control/concurrencyincoming ]; then
- ${ECHO} 20 > ${PKG_SYSCONFDIR}/control/concurrencyincoming
- ${ECHO} "$psmsg" >> ${PKG_SYSCONFDIR}/control/concurrencyincoming
- ${CHMOD} 644 ${PKG_SYSCONFDIR}/control/concurrencyincoming
- fi
-
- if ! [ -s ${PKG_SYSCONFDIR}/control/defaultdelivery ]; then
- ${ECHO} ./Mailbox > ${PKG_SYSCONFDIR}/control/defaultdelivery
- ${ECHO} "$psmsg" >> ${PKG_SYSCONFDIR}/control/defaultdelivery
- ${CHMOD} 644 ${PKG_SYSCONFDIR}/control/defaultdelivery
- fi
-
- pop3rule=':allow'
- smtprule='127.:allow,RELAYCLIENT=""'
- for i in pop3 smtp; do
- if ! [ -s ${PKG_SYSCONFDIR}/tcp.${i} ]; then
- ${ECHO} "$psmsg" > ${PKG_SYSCONFDIR}/tcp.${i}
- eval ${ECHO} \"\$${i}rule\" > ${PKG_SYSCONFDIR}/tcp.${i}
- fi
- ${CHMOD} 644 ${PKG_SYSCONFDIR}/tcp.${i}
- ${LOCALBASE}/bin/tcprules ${PKG_SYSCONFDIR}/tcp.${i}.cdb ${PKG_SYSCONFDIR}/tcp.${i}.tmp < ${PKG_SYSCONFDIR}/tcp.${i}
- ${CHMOD} 644 ${PKG_SYSCONFDIR}/tcp.${i}.cdb
- done
-
- if ! [ -z ${QMAIL_QUEUE_EXTRA} ]; then
- ${ECHO} "$psmsg" >> ${PKG_SYSCONFDIR}/alias/.qmail-${QMAIL_QUEUE_EXTRA}
- ${CHMOD} 644 ${PKG_SYSCONFDIR}/alias/.qmail-${QMAIL_QUEUE_EXTRA}
- fi
-
- ;;
-
-esac
diff --git a/mail/qmail-run/MESSAGE b/mail/qmail-run/MESSAGE
deleted file mode 100644
index 5832d991f12..00000000000
--- a/mail/qmail-run/MESSAGE
+++ /dev/null
@@ -1,23 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2004/08/23 03:47:48 schmonz Exp $
-
-Please read ${PREFIX}/share/doc/qmail-run/README.pkgsrc.
-
-To enable qmail for...
-
-Local and outgoing deliveries:
-- Check the configuration files in ${PKG_SYSCONFDIR}.
-- Modify /etc/mailer.conf (see share/examples/qmail-run/mailer.conf).
-- Set qmailsend=YES in /etc/rc.conf.
-
-SMTP:
-- Set qmailsmtpd=YES in /etc/rc.conf.
-
-POP3 (only for Maildirs):
-- Set qmailpop3d=YES in /etc/rc.conf.
-
-To make the queue visible to local non-root users:
-- Set qmailqread=YES in /etc/rc.conf.
-- Change the mailq entry in /etc/mailer.conf to qmail-qread-client.
-
-===========================================================================
diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile
deleted file mode 100644
index ec7cd82e6d4..00000000000
--- a/mail/qmail-run/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2007/02/08 09:04:48 schmonz Exp $
-#
-
-DISTNAME= qmail-run-20060604
-CATEGORIES= mail
-MASTER_SITES= # empty
-DISTFILES= # empty
-
-MAINTAINER= schmonz@NetBSD.org
-COMMENT= Configures qmail to receive and deliver mail
-
-DEPENDS_QMAIL= qmail>=1.03nb8:../../mail/qmail
-DEPENDS+= ${DEPENDS_QMAIL}
-
-CONFLICTS+= qmail-qfilter-1.5nb1
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-WRKSRC= ${WRKDIR}
-NO_CHECKSUM= yes
-NO_BUILD= yes
-
-FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q}
-FILES_SUBST+= PKGNAME=${PKGNAME:Q}
-RCD_SCRIPTS= qmail qmailpop3d qmailqread qmailsend qmailsmtpd
-
-INSTALLATION_DIRS= bin share/doc/qmail-run share/examples/qmail-run
-
-.include "../../mk/bsd.prefs.mk"
-
-# Detect the PKG_SYSCONFDIR of the installed qmail, so we can create
-# config files there and refer to them from rc.d scripts.
-#
-.if !defined(PKG_SYSCONFDIR.qmail-run)
-PKG_SYSCONFDIR.qmail-run!= \
- ${PKG_INFO} -Q PKG_SYSCONFDIR \
- ${DEPENDS_QMAIL:C/:.*$//:Q} 2>/dev/null || \
- ${ECHO} "PKG_SYSCONFDIR.qmail-run_not_set"
-. if empty(PKG_SYSCONFDIR.qmail-run:M*not_set)
-MAKEVARS+= PKG_SYSCONFDIR.qmail-run
-. endif
-.endif
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= mailer.conf qmail-procmail qmail-qfilter-queue
-SUBST_FILES.paths+= qmail-qread-client
-SUBST_SED.paths+= -e 's,@LOCALBASE@,${LOCALBASE},g'
-SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+= -e 's,@ECHO@,${ECHO},g'
-SUBST_SED.paths+= -e 's,@SORT@,${SORT},g'
-SUBST_SED.paths+= -e 's,@CAT@,${CAT},g'
-SUBST_SED.paths+= -e 's,@SH@,${SH},g'
-SUBST_SED.paths+= -e 's,@SED@,${SED},g'
-SUBST_SED.paths+= -e 's,@PKGNAME@,${PKGNAME},g'
-SUBST_STAGE.paths= post-patch
-
-post-extract:
- for f in README.pkgsrc mailer.conf; do \
- ${CP} ${FILESDIR}/$$f ${WRKDIR}/$$f; \
- done
- for f in qmail-procmail qmail-qfilter-queue qmail-qread-client; do \
- ${CP} ${FILESDIR}/$$f.sh ${WRKDIR}/$$f; \
- done
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKDIR}/qmail-procmail ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKDIR}/qmail-qfilter-queue ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKDIR}/qmail-qread-client ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKDIR}/README.pkgsrc ${PREFIX}/share/doc/qmail-run
- ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${PREFIX}/share/examples/qmail-run
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmail-run/PLIST b/mail/qmail-run/PLIST
deleted file mode 100644
index 868226e8dfb..00000000000
--- a/mail/qmail-run/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2005/05/03 15:37:28 wiz Exp $
-bin/qmail-procmail
-bin/qmail-qfilter-queue
-bin/qmail-qread-client
-share/doc/qmail-run/README.pkgsrc
-share/examples/qmail-run/mailer.conf
-share/examples/rc.d/qmail
-share/examples/rc.d/qmailpop3d
-share/examples/rc.d/qmailqread
-share/examples/rc.d/qmailsend
-share/examples/rc.d/qmailsmtpd
-@dirrm share/examples/qmail-run
-@dirrm share/doc/qmail-run
diff --git a/mail/qmail-run/files/README.pkgsrc b/mail/qmail-run/files/README.pkgsrc
deleted file mode 100644
index efb160eb56b..00000000000
--- a/mail/qmail-run/files/README.pkgsrc
+++ /dev/null
@@ -1,46 +0,0 @@
- Getting help
- ============
-
-You've installed an automated and customized qmail-run package. If
-you're having trouble getting the qmail daemons to run, ask the
-package's maintainer:
-
-<URL:mailto:schmonz-pkgsrc-qmail@schmonz.com>
-
-Many members of the qmail mailing list recommend following the
-install instructions in Dave Sill's "Life with qmail" document:
-
-<URL:http://www.lifewithqmail.org/lwq.html>
-
-A "Life with qmail" installation is done by hand, so any qmail
-package necessarily deviates from LWQ in at least this respect.
-Therefore, if you need to ask for help on the qmail list, please
-mention that you're using the qmail-run package from pkgsrc.
-
-If you can first reproduce your problem on a manual LWQ-style
-installation, your request for help is likely to be better received.
-
-It is highly recommended that you read Charles Cazabon's "12 Steps
-to qmail List Bliss" before posting to the list:
-
-<URL:http://www.qcc.ca/~charlesc/writings/12-steps-to-qmail-list-bliss.html>
-
-
- Deviations from LWQ
- ===================
-
-LWQ suggests doing some things that the qmail-run package doesn't do:
-* Copying a script from /var/qmail/boot to /var/qmail/rc.
-* Configuring svscan(8) to run at boot.
-* Creating and/or populating /service.
-* Using supervise(8) and multilog(8).
-* Using the qmailctl script to control qmail.
-* Using the inst_check script to verify the installation.
-* Storing tcp.smtp{,cdb} in /etc.
-* Renaming the system sendmail(8) and marking it non-executable.
-
-Instead, the qmail-run package:
-* Provides NetBSD-style rc.d scripts, including one very similar to qmailctl.
-* Sends log messages to syslog(3) by default.
-* Stores tcp.smtp{,cdb} and tcp.pop3{,cdb} in ${PKG_SYSCONFDIR}.
-* Uses mailwrapper(8) and mailer.conf(5).
diff --git a/mail/qmail-run/files/mailer.conf b/mail/qmail-run/files/mailer.conf
deleted file mode 100644
index 81e41026c73..00000000000
--- a/mail/qmail-run/files/mailer.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: mailer.conf,v 1.3 2006/06/04 15:23:25 schmonz Exp $
-#
-# Use qmail as the system mailer.
-#
-sendmail @LOCALBASE@/bin/sendmail
-send-mail @LOCALBASE@/bin/sendmail
-mailq @LOCALBASE@/bin/qmail-qread
-newaliases @LOCALBASE@/bin/newaliases
-hoststat @LOCALBASE@/bin/qmail-tcpto
-purgestat @LOCALBASE@/bin/qmail-tcpok
diff --git a/mail/qmail-run/files/qmail-procmail.sh b/mail/qmail-run/files/qmail-procmail.sh
deleted file mode 100644
index 32f97c2d705..00000000000
--- a/mail/qmail-run/files/qmail-procmail.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!@SH@
-# Copyright (c) 1998-2001 Software in the Public Interest
-# <http://www.debian.org/>
-# Written by Philip Hands. Distributed under the GNU GPL.
-# Modified slightly by Dave Sill.
-
-@LOCALBASE@/bin/preline @LOCALBASE@/bin/procmail && exit 0
-
-# check if procmail returned EX_TEMPFAIL (75)
-[ $? = 75 ] && exit 111
-
-# otherwise return a permanent error
-exit 100
diff --git a/mail/qmail-run/files/qmail-qfilter-queue.sh b/mail/qmail-run/files/qmail-qfilter-queue.sh
deleted file mode 100644
index 9ea994b88da..00000000000
--- a/mail/qmail-run/files/qmail-qfilter-queue.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!@SH@
-#
-# Wrapper for qmail-queue that filters messages before injecting
-# into the queue.
-#
-# Using this wrapper, executable filters:
-# * Must be placed in @PKG_SYSCONFDIR@/filters
-# * Must have filenames matching "qfilter-*"
-# * Will be executed with no arguments
-# * Will be executed in sort(1) order
-#
-# To use this script to filter messages arriving via SMTP, set the
-# QMAILQUEUE environment variable in tcp.smtp like so:
-#
-# :allow,QMAILQUEUE="@PREFIX@/bin/qmail-qfilter-queue"
-#
-# Then rebuild the cdb.
-
-possible_qfilters=`@ECHO@ @PKG_SYSCONFDIR@/filters/qfilter-* | @SORT@`
-qfilters=""
-
-if [ "${possible_qfilters}" = "@PKG_SYSCONFDIR@/filters/qfilter-*" ]; then
- qfilters="@CAT@"
-else
- for qfilter in ${possible_qfilters}; do
- if [ -x "${qfilter}" ]; then
- qfilters="${qfilters} ${qfilter}"
- fi
- done
- [ -z "${qfilters}" ] && qfilters="@CAT@"
-fi
-
-qfilter_cmd="@LOCALBASE@/bin/qmail-qfilter `@ECHO@ ${qfilters} | @SED@ -e 's| | -- |g'`"
-
-exec ${qfilter_cmd}
diff --git a/mail/qmail-run/files/qmail-qread-client.sh b/mail/qmail-run/files/qmail-qread-client.sh
deleted file mode 100644
index 64fdcc88f41..00000000000
--- a/mail/qmail-run/files/qmail-qread-client.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!@SH@
-#
-# $NetBSD: qmail-qread-client.sh,v 1.2 2004/08/03 08:59:24 schmonz Exp $
-#
-# @PKGNAME@ client program to allow local non-root users to see
-# the queue. Requires that the corresponding server program be running.
-# From Steinar Haug.
-#
-
-exec @LOCALBASE@/bin/tcpclient -RHl0 -- 127.0.0.1 20025 @SH@ -c 'exec @CAT@ <&6'
diff --git a/mail/qmail-run/files/qmail.sh b/mail/qmail-run/files/qmail.sh
deleted file mode 100644
index a4599aa899e..00000000000
--- a/mail/qmail-run/files/qmail.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: qmail.sh,v 1.3 2004/08/23 03:47:48 schmonz Exp $
-#
-# @PKGNAME@ master script for administrators to control qmail
-# services. Usage resembles the qmailctl script from "Life with qmail".
-#
-# For Red Hat chkconfig
-# chkconfig: - 80 30
-# description: the qmail MTA
-#
-
-# 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
-}
-
-qmailrcd()
-{
- for service in $@; do
- $rcd_dir/qmail${service} $rc_arg
- done
-}
-
-qmail_help()
-{
- @CAT@ <<HELP
- stop -- stops mail service (smtp connections refused, nothing goes out)
- start -- starts mail service (smtp connection accepted, mail can go out)
- pause -- temporarily stops mail service (connections accepted, nothing leaves)
- cont -- continues paused mail service
- stat -- displays status of mail service
- cdb -- rebuild the tcpserver cdb file for smtp and/or pop3
-restart -- stops and restarts smtp, sends qmail-send a TERM & restarts it
-doqueue -- schedules queued messages for immediate delivery
- reload -- sends qmail-send HUP, rereading locals and virtualdomains
- queue -- shows status of queue
- alrm -- same as doqueue
- flush -- same as doqueue
- hup -- same as reload
-HELP
-}
-
-COMMAND_LIST="qmailsend qmailsmtpd qmailpop3d"
-
-name="qmail"
-start_cmd="forward_commands"
-stop_cmd="reverse_commands"
-doqueue_cmd="qmailrcd send"; alrm_cmd=${doqueue_cmd}; flush_cmd=${doqueue_cmd}
-reload_cmd="qmailrcd send"; hup_cmd=${reload_cmd}
-status_cmd="forward_commands"; stat_cmd=${status_cmd}
-pause_cmd="forward_commands"
-cont_cmd="forward_commands"
-cdb_cmd="qmailrcd smtpd pop3d"
-queue_cmd="qmailrcd send"
-help_cmd="qmail_help"
-extra_commands="pause cont stat status cdb doqueue reload queue alrm flush hup help"
-
-if [ -f /etc/rc.subr ]; then
- run_rc_command "$1"
-else
- _arg="$1"
- ${start_cmd}
-fi
diff --git a/mail/qmail-run/files/qmailpop3d.sh b/mail/qmail-run/files/qmailpop3d.sh
deleted file mode 100644
index a9ee670f8d9..00000000000
--- a/mail/qmail-run/files/qmailpop3d.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: qmailpop3d.sh,v 1.7 2005/07/19 21:06:39 schmonz Exp $
-#
-# @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs).
-#
-
-# PROVIDE: qmailpop3d mail
-
-name="qmailpop3d"
-
-# User-settable rc.conf variables and their default values:
-: ${qmailpop3d_postenv:=""}
-: ${qmailpop3d_tcpflags:="-vRHl0"}
-: ${qmailpop3d_tcphost:="0"}
-: ${qmailpop3d_tcpport:="110"}
-: ${qmailpop3d_datalimit:="2000000"}
-: ${qmailpop3d_pretcpserver:=""}
-: ${qmailpop3d_prepop3d:=""}
-: ${qmailpop3d_checkpassword:="@LOCALBASE@/bin/checkpassword"}
-: ${qmailpop3d_maildirname:="Maildir"}
-: ${qmailpop3d_log:="YES"}
-: ${qmailpop3d_logcmd:="logger -t nb${name} -p mail.info"}
-: ${qmailpop3d_nologcmd:="@LOCALBASE@/bin/multilog -*"}
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-rcvar=${name}
-required_files="@PKG_SYSCONFDIR@/control/me"
-required_files="${required_files} @PKG_SYSCONFDIR@/control/concurrencypop3"
-required_files="${required_files} @PKG_SYSCONFDIR@/tcp.pop3.cdb"
-command="@LOCALBASE@/bin/tcpserver"
-procname=${name}
-start_precmd="qmailpop3d_precmd"
-extra_commands="stat pause cont cdb"
-stat_cmd="qmailpop3d_stat"
-pause_cmd="qmailpop3d_pause"
-cont_cmd="qmailpop3d_cont"
-cdb_cmd="qmailpop3d_cdb"
-
-qmailpop3d_precmd()
-{
- # tcpserver(1) is akin to inetd(8), but runs one service per process.
- # We want to signal only the tcpserver process responsible for POP
- # service. Use argv0(1) to set procname to "qmailpop3d".
- if [ -f /etc/rc.subr ]; then
- checkyesno qmailpop3d_log || qmailpop3d_logcmd=${qmailpop3d_nologcmd}
- fi
- command="@SETENV@ - ${qmailpop3d_postenv} @LOCALBASE@/bin/softlimit -m ${qmailpop3d_datalimit} ${qmailpop3d_pretcpserver} @LOCALBASE@/bin/argv0 @LOCALBASE@/bin/tcpserver ${name} ${qmailpop3d_tcpflags} -x @PKG_SYSCONFDIR@/tcp.pop3.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencypop3` ${qmailpop3d_tcphost} ${qmailpop3d_tcpport} @LOCALBASE@/bin/qmail-popup `@HEAD@ -1 @PKG_SYSCONFDIR@/control/me` ${qmailpop3d_checkpassword} ${qmailpop3d_prepop3d} @LOCALBASE@/bin/qmail-pop3d ${qmailpop3d_maildirname} 2>&1 | @LOCALBASE@/bin/setuidgid qmaill ${qmailpop3d_logcmd}"
- command_args="&"
- rc_flags=""
-}
-
-qmailpop3d_stat()
-{
- run_rc_command status
-}
-
-qmailpop3d_pause()
-{
- if ! statusmsg=`run_rc_command status`; then
- @ECHO@ $statusmsg
- return 1
- fi
- @ECHO@ "Pausing ${name}."
- kill -STOP $rc_pid
-}
-
-qmailpop3d_cont()
-{
- if ! statusmsg=`run_rc_command status`; then
- @ECHO@ $statusmsg
- return 1
- fi
- @ECHO@ "Continuing ${name}."
- kill -CONT $rc_pid
-}
-
-qmailpop3d_cdb()
-{
- @ECHO@ "Reloading @PKG_SYSCONFDIR@/tcp.pop3."
- @LOCALBASE@/bin/tcprules @PKG_SYSCONFDIR@/tcp.pop3.cdb @PKG_SYSCONFDIR@/tcp.pop3.tmp < @PKG_SYSCONFDIR@/tcp.pop3
- @CHMOD@ 644 @PKG_SYSCONFDIR@/tcp.pop3.cdb
-}
-
-if [ -f /etc/rc.subr ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- @ECHO_N@ " ${name}"
- qmailpop3d_precmd
- eval ${command} ${qmailpop3d_flags} ${command_args}
-fi
diff --git a/mail/qmail-run/files/qmailqread.sh b/mail/qmail-run/files/qmailqread.sh
deleted file mode 100644
index cdcb050b2c8..00000000000
--- a/mail/qmail-run/files/qmailqread.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: qmailqread.sh,v 1.6 2005/04/15 05:17:02 schmonz Exp $
-#
-# @PKGNAME@ script to control a service providing local non-root
-# users access to see the queue. Adapted from a script by Steinar Haug.
-#
-
-# PROVIDE: qmailqread mail
-# REQUIRE: qmailsend
-
-name="qmailqread"
-
-# User-settable rc.conf variables and their default values:
-: ${qmailqread_log:="YES"}
-: ${qmailqread_logcmd:="logger -t nb${name} -p mail.info"}
-: ${qmailqread_nologcmd:="@LOCALBASE@/bin/multilog -*"}
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-rcvar=${name}
-command="@LOCALBASE@/bin/tcpserver"
-procname=${name}
-start_precmd="qmailqread_precmd"
-
-qmailqread_precmd()
-{
- if [ -f /etc/rc.subr ]; then
- checkyesno qmailqread_log || qmailqread_logcmd=${qmailqread_nologcmd}
- fi
- command="@SETENV@ - @LOCALBASE@/bin/argv0 @LOCALBASE@/bin/tcpserver ${name} -R -1 -u `@ID@ -u qmails` -g `@ID@ -g qmails` 127.0.0.1 20025 @LOCALBASE@/bin/qmail-qread 2>&1 | @LOCALBASE@/bin/setuidgid qmaill ${qmailqread_logcmd}"
- command_args="&"
- rc_flags=""
-}
-
-if [ -f /etc/rc.subr ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- @ECHO_N@ " ${name}"
- qmailqread_precmd
- eval ${command} ${qmailqread_flags} ${command_args}
-fi
diff --git a/mail/qmail-run/files/qmailsend.sh b/mail/qmail-run/files/qmailsend.sh
deleted file mode 100644
index d3d3656ba94..00000000000
--- a/mail/qmail-run/files/qmailsend.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: qmailsend.sh,v 1.6 2005/04/15 05:17:02 schmonz Exp $
-#
-# @PKGNAME@ script to control qmail-send (local and outgoing mail).
-#
-
-# PROVIDE: qmailsend mail
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-name="qmailsend"
-
-# User-settable rc.conf variables and their default values:
-: ${qmailsend_postenv:="PATH=@LOCALBASE@/bin:$PATH"}
-: ${qmailsend_defaultdelivery:="`@HEAD@ -1 @PKG_SYSCONFDIR@/control/defaultdelivery`"}
-: ${qmailsend_log:="YES"}
-: ${qmailsend_logcmd:="logger -t nb${name} -p mail.info"}
-: ${qmailsend_nologcmd:="@LOCALBASE@/bin/multilog -*"}
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-rcvar=${name}
-required_files="@PKG_SYSCONFDIR@/control/defaultdelivery"
-required_files="${required_files} @PKG_SYSCONFDIR@/control/me"
-command="@LOCALBASE@/bin/qmail-send"
-start_precmd="qmailsend_precmd"
-extra_commands="stat pause cont doqueue reload queue alrm flush hup"
-stat_cmd="qmailsend_stat"
-pause_cmd="qmailsend_pause"
-cont_cmd="qmailsend_cont"
-doqueue_cmd="qmailsend_doqueue"
-queue_cmd="qmailsend_queue"
-alrm_cmd="qmailsend_doqueue"
-flush_cmd="qmailsend_doqueue"
-hup_cmd="qmailsend_hup"
-
-qmailsend_precmd()
-{
- # qmail-start(8) starts the various qmail processes, then exits.
- # qmail-send(8) is the process we want to signal later.
- if [ -f /etc/rc.subr ]; then
- checkyesno qmailsend_log || qmailsend_logcmd=${qmailsend_nologcmd}
- fi
- command="@SETENV@ - ${qmailsend_postenv} qmail-start '$qmailsend_defaultdelivery' ${qmailsend_logcmd}"
- command_args="&"
- rc_flags=""
-}
-
-qmailsend_stat()
-{
- run_rc_command status
-}
-
-qmailsend_pause()
-{
- if ! statusmsg=`run_rc_command status`; then
- @ECHO@ $statusmsg
- return 1
- fi
- @ECHO@ "Pausing ${name}."
- kill -STOP $rc_pid
-}
-
-qmailsend_cont()
-{
- if ! statusmsg=`run_rc_command status`; then
- @ECHO@ $statusmsg
- return 1
- fi
- @ECHO@ "Continuing ${name}."
- kill -CONT $rc_pid
-}
-
-qmailsend_doqueue()
-{
- if ! statusmsg=`run_rc_command status`; then
- @ECHO@ $statusmsg
- return 1
- fi
- @ECHO@ "Flushing timeout table and sending ALRM signal to qmail-send."
- @LOCALBASE@/bin/qmail-tcpok
- kill -ALRM $rc_pid
-}
-
-qmailsend_queue()
-{
- @LOCALBASE@/bin/qmail-qstat
- @LOCALBASE@/bin/qmail-qread
-}
-
-qmailsend_hup()
-{
- run_rc_command reload
-}
-
-if [ -f /etc/rc.subr ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- @ECHO_N@ " ${name}"
- qmailsend_precmd
- eval ${command} ${qmailsend_flags} ${command_args}
-fi
diff --git a/mail/qmail-run/files/qmailsmtpd.sh b/mail/qmail-run/files/qmailsmtpd.sh
deleted file mode 100644
index 18b8a27dd4a..00000000000
--- a/mail/qmail-run/files/qmailsmtpd.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: qmailsmtpd.sh,v 1.7 2005/07/19 21:06:39 schmonz Exp $
-#
-# @PKGNAME@ script to control qmail-smtpd (SMTP service).
-#
-
-# PROVIDE: qmailsmtpd mail
-# REQUIRE: qmailsend
-
-name="qmailsmtpd"
-
-# User-settable rc.conf variables and their default values:
-: ${qmailsmtpd_postenv:="QMAILQUEUE=@LOCALBASE@/bin/qmail-queue"}
-: ${qmailsmtpd_tcpflags:="-vRl0"}
-: ${qmailsmtpd_tcphost:="0"}
-: ${qmailsmtpd_tcpport:="25"}
-: ${qmailsmtpd_datalimit:="2000000"}
-: ${qmailsmtpd_pretcpserver:=""}
-: ${qmailsmtpd_presmtpd:=""}
-: ${qmailsmtpd_postsmtpd:=""}
-: ${qmailsmtpd_log:="YES"}
-: ${qmailsmtpd_logcmd:="logger -t nb${name} -p mail.info"}
-: ${qmailsmtpd_nologcmd:="@LOCALBASE@/bin/multilog -*"}
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-rcvar=${name}
-required_files="@PKG_SYSCONFDIR@/control/concurrencyincoming"
-required_files="${required_files} @PKG_SYSCONFDIR@/tcp.smtp.cdb"
-required_files="${required_files} @PKG_SYSCONFDIR@/control/rcpthosts"
-command="@LOCALBASE@/bin/tcpserver"
-procname=${name}
-start_precmd="qmailsmtpd_precmd"
-extra_commands="stat pause cont cdb"
-stat_cmd="qmailsmtpd_stat"
-pause_cmd="qmailsmtpd_pause"
-cont_cmd="qmailsmtpd_cont"
-cdb_cmd="qmailsmtpd_cdb"
-
-qmailsmtpd_precmd()
-{
- # tcpserver(1) is akin to inetd(8), but runs one service per process.
- # We want to signal only the tcpserver process responsible for SMTP
- # service. Use argv0(1) to set procname to "qmailsmtpd".
- if [ -f /etc/rc.subr ]; then
- checkyesno qmailsmtpd_log || qmailsmtpd_logcmd=${qmailsmtpd_nologcmd}
- fi
- command="@SETENV@ - ${qmailsmtpd_postenv} @LOCALBASE@/bin/softlimit -m ${qmailsmtpd_datalimit} ${qmailsmtpd_pretcpserver} @LOCALBASE@/bin/argv0 @LOCALBASE@/bin/tcpserver ${name} ${qmailsmtpd_tcpflags} -x @PKG_SYSCONFDIR@/tcp.smtp.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencyincoming` -u `@ID@ -u qmaild` -g `@ID@ -g qmaild` ${qmailsmtpd_tcphost} ${qmailsmtpd_tcpport} ${qmailsmtpd_presmtpd} @LOCALBASE@/bin/qmail-smtpd ${qmailsmtpd_postsmtpd} 2>&1 | @LOCALBASE@/bin/setuidgid qmaill ${qmailsmtpd_logcmd}"
- command_args="&"
- rc_flags=""
-}
-
-qmailsmtpd_stat()
-{
- run_rc_command status
-}
-
-qmailsmtpd_pause()
-{
- if ! statusmsg=`run_rc_command status`; then
- @ECHO@ $statusmsg
- return 1
- fi
- @ECHO@ "Pausing ${name}."
- kill -STOP $rc_pid
-}
-
-qmailsmtpd_cont()
-{
- if ! statusmsg=`run_rc_command status`; then
- @ECHO@ $statusmsg
- return 1
- fi
- @ECHO@ "Continuing ${name}."
- kill -CONT $rc_pid
-}
-
-qmailsmtpd_cdb()
-{
- @ECHO@ "Reloading @PKG_SYSCONFDIR@/tcp.smtp."
- @LOCALBASE@/bin/tcprules @PKG_SYSCONFDIR@/tcp.smtp.cdb @PKG_SYSCONFDIR@/tcp.smtp.tmp < @PKG_SYSCONFDIR@/tcp.smtp
- @CHMOD@ 644 @PKG_SYSCONFDIR@/tcp.smtp.cdb
-}
-
-if [ -f /etc/rc.subr ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- @ECHO_N@ " ${name}"
- qmailsmtpd_precmd
- eval ${command} ${qmailsmtpd_flags} ${command_args}
-fi
diff --git a/mail/qmail/DEINSTALL b/mail/qmail/DEINSTALL
deleted file mode 100644
index a83d7e244cb..00000000000
--- a/mail/qmail/DEINSTALL
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.5 2006/04/29 04:53:17 schmonz Exp $
-
-QMAILDIR=@QMAILDIR@
-
-VAR_QMAIL_DIRS="alias bin boot control doc man queue users"
-
-case "${STAGE}" in
-
-POST-DEINSTALL)
-
- for dir in $VAR_QMAIL_DIRS; do
- if [ -h ${QMAILDIR}/$dir ]; then
- ${RM} -f ${QMAILDIR}/$dir
- fi
- done
- ;;
-esac
diff --git a/mail/qmail/DESCR b/mail/qmail/DESCR
deleted file mode 100644
index a162e50cdf7..00000000000
--- a/mail/qmail/DESCR
+++ /dev/null
@@ -1,20 +0,0 @@
-The qmail program is a secure, reliable, efficient simple message
-transfer agent. It is meant to be a replacement for the entire
-sendmail-binmail system that most UNIX hosts use.
-
-Although qmail holds security and reliability as its top two
-priorities, it is also fast. On a Pentium under BSD/OS, qmail can
-easily handle 200000 separate messages per day that are injected
-and must then be delivered to local mailboxes!
-
-Security and reliability are qmail's two strengths, however. The
-qmail package ensures a message, once accepted, will never be lost.
-An optional new mailbox format, maildir, even lets users safely
-read their mail over NFS, while still accepting new mail deliveries.
-
-The following features are supported: host and user masquerading,
-full host hiding, virtual domains, null clients, list-owner rewriting,
-relay control, double-bounce recording, arbitrary RFC 822 address
-lists, cross-host mailing-list loop detection, per-recipient
-checkpointing, downed host backoffs, independent message retry
-schedules, a drop-in sendmail replacement, and more!
diff --git a/mail/qmail/INSTALL b/mail/qmail/INSTALL
deleted file mode 100644
index 1180956a2a2..00000000000
--- a/mail/qmail/INSTALL
+++ /dev/null
@@ -1,77 +0,0 @@
-# $NetBSD: INSTALL,v 1.4 2004/12/21 05:32:56 schmonz Exp $
-
-DOCDIR=@DOCDIR@
-EGDIR=@EGDIR@
-QMAILDIR=@QMAILDIR@
-QMAIL_QUEUE_DIR=@QMAIL_QUEUE_DIR@
-QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@
-VIRUSCAN_SIGS_SRCFILE=@VIRUSCAN_SIGS_SRCFILE@
-
-VAR_QMAIL_DIRS="alias bin boot control doc man queue users"
-
-case ${STAGE} in
-
-PRE-INSTALL)
- for dir in $VAR_QMAIL_DIRS; do
- if [ -e ${QMAILDIR}/$dir ]; then
- ${CAT} <<EOF
-===========================================================================
-
-ERROR: ${QMAILDIR} exists and is non-empty.
-
-Please remove or rename it, then try again.
-
-===========================================================================
-EOF
- exit 1
- fi
- done
-
- if ${ECHO} ${QMAIL_QUEUE_DIR} | ${GREP} -q "^${QMAILDIR}/"; then
- ${CAT} <<EOF
-===========================================================================
-
-ERROR: QMAIL_QUEUE_DIR must not be under ${QMAILDIR}.
-
-Please adjust your definition of QMAIL_QUEUE_DIR, then try again.
-
-===========================================================================
-EOF
- exit 1
- fi
-
- ${LN} -s ${PKG_SYSCONFDIR}/alias ${QMAILDIR}/alias
- ${LN} -s ${PREFIX}/bin ${QMAILDIR}/bin
- ${LN} -s ${EGDIR}/boot ${QMAILDIR}/boot
- ${LN} -s ${PKG_SYSCONFDIR}/control ${QMAILDIR}/control
- ${LN} -s ${DOCDIR} ${QMAILDIR}/doc
- ${LN} -s ${PREFIX}/man ${QMAILDIR}/man
- ${LN} -s ${QMAIL_QUEUE_DIR} ${QMAILDIR}/queue
- ${LN} -s ${PKG_SYSCONFDIR}/users ${QMAILDIR}/users
-
- ;;
-
-POST-INSTALL)
- if ! [ -z ${QMAIL_QUEUE_EXTRA} ]; then
- ${CAT} <<EOF
-===========================================================================
-
-NOTE: Before using qmail, create a .qmail file corresponding with the local
-user or alias "${QMAIL_QUEUE_EXTRA}" that meets the requirements for
-QUEUE_EXTRA.
-
-===========================================================================
-EOF
- fi
- if ! [ -z ${VIRUSCAN_SIGS_SRCFILE} ] && \
- ! [ -s ${PKG_SYSCONFDIR}/control/signatures ]; then
- ${SED} -e '1,15d' -e '34,$d' \
- < ${VIRUSCAN_SIGS_SRCFILE} \
- > ${PKG_SYSCONFDIR}/control/signatures
- ${CHMOD} 644 ${PKG_SYSCONFDIR}/control/signatures
- fi
-
-
- ;;
-
-esac
diff --git a/mail/qmail/MESSAGE b/mail/qmail/MESSAGE
deleted file mode 100644
index f037e799913..00000000000
--- a/mail/qmail/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.13 2006/04/29 04:53:17 schmonz Exp $
-
-Please read ${DOCDIR}/README.pkgsrc.
-
-There are many ways to enable qmail. One popular, well-regarded
-choice is to follow the directions in Dave Sill's "Life with qmail":
-
- <URL:http://www.lifewithqmail.org/lwq.html>
-
-Alternatively, you can let pkgsrc do the work by installing the
-qmail-run package.
-
-===========================================================================
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
deleted file mode 100644
index bdcf0983eef..00000000000
--- a/mail/qmail/Makefile
+++ /dev/null
@@ -1,136 +0,0 @@
-# $NetBSD: Makefile,v 1.53 2007/03/09 12:34:21 schmonz Exp $
-#
-
-DISTNAME= netqmail-1.05
-PKGNAME= qmail-1.03
-PKGREVISION= 12
-CATEGORIES= mail
-MASTER_SITES= http://qmail.org/
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://cr.yp.to/qmail.html
-COMMENT= Secure, reliable, efficient, simple, and fast MTA
-
-DEPENDS+= checkpassword-[0-9]*:../../sysutils/checkpassword
-DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools
-DEPENDS+= ucspi-tcp-[0-9]*:../../net/ucspi-tcp
-
-CONFLICTS+= courier-maildirmake-[0-9]*
-CONFLICTS+= courier-mta-[0-9]*
-CONFLICTS+= mirrordir-[0-9]*
-CONFLICTS+= mutt<=1.4.2.1nb1
-CONFLICTS+= netqmail-[0-9]*
-CONFLICTS+= pulsar<=0.1.1
-
-NOT_FOR_UNPRIVILEGED= yes
-
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_TOOLS+= nroff
-
-DJB_BUILD_TARGETS= man
-
-DJB_RESTRICTED= YES
-
-MAKE_DIRS+= ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/alias
-MAKE_DIRS+= ${PKG_SYSCONFDIR}/control ${PKG_SYSCONFDIR}/users
-OWN_DIRS+= ${QMAILDIR} ${QMAIL_QUEUE_DIR}
-PKG_SYSCONFSUBDIR= qmail
-
-DOCDIR= ${PREFIX}/share/doc/qmail
-EGDIR= ${PREFIX}/share/examples/qmail
-SHAREDIR= ${PREFIX}/share/qmail
-MESSAGE_SUBST+= DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q}
-FILES_SUBST+= DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q} SHAREDIR=${SHAREDIR:Q}
-FILES_SUBST+= QMAILDIR=${QMAILDIR:Q} QMAIL_QUEUE_DIR=${QMAIL_QUEUE_DIR:Q}
-FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q}
-FILES_SUBST+= VIRUSCAN_SIGS_SRCFILE=${VIRUSCAN_SIGS_SRCFILE:Q}
-FILES_SUBST+= PKGNAME=${PKGNAME:Q}
-
-SETUP_PROGRAMS= dnsfq dnsip dnsptr hostname install ipmeprint
-SETUP_SCRIPTS= config config-fast
-
-MANDIRS= man
-.for i in cat man
-. for j in 1 5 7 8
-MANDIRS+= man/${i}${j}
-. endfor
-.endfor
-INSTALLATION_DIRS= bin ${MANDIRS}
-INSTALLATION_DIRS+= share/doc/qmail share/examples/qmail/boot share/qmail
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+= QMAILDIR QMAIL_QUEUE_DIR QMAIL_QUEUE_EXTRA
-
-.if !empty(QMAIL_QUEUE_DIR:M${QMAILDIR}/*)
-PKG_FAIL_REASON+= "QMAIL_QUEUE_DIR must not be under ${QMAILDIR}"
-.endif
-
-.if !empty(QMAIL_QUEUE_EXTRA)
-USE_TOOLS+= expr
-QUEUE_EXTRA= "T${QMAIL_QUEUE_EXTRA}\\0"
-QUEUE_EXTRALEN_cmd= ${EXPR} `${ECHO_N} ${QMAIL_QUEUE_EXTRA} | ${WC} -c` + 2
-SUBST_CLASSES+= logging
-SUBST_STAGE.logging= do-configure
-SUBST_FILES.logging= extra.h
-SUBST_SED.logging= -e 's|0|${QUEUE_EXTRALEN_cmd:sh}|g'
-SUBST_SED.logging+= -e 's|""|${QUEUE_EXTRA}|g'
-SUBST_MESSAGE.logging= Setting QUEUE_EXTRA.
-.endif
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= ${WRKDIR}/README.pkgsrc
-SUBST_SED.paths+= -e 's,@PKGNAME@,${PKGNAME:Q},g'
-SUBST_SED.paths+= -e 's,@PKG_INFO@,${PKG_INFO:Q},g'
-SUBST_SED.paths+= -e 's,@GREP@,${GREP:Q},g'
-SUBST_STAGE.paths= post-patch
-
-SUBST_FILES.djbware+= cdb_seek.c dns.c
-
-USERGROUP_PHASE= configure
-PKG_GROUPS= qmail nofiles
-PKG_USERS+= alias:nofiles
-PKG_USERS+= qmaill:nofiles qmaild:nofiles qmailp:nofiles
-PKG_USERS+= qmailq:qmail qmailr:qmail qmails:qmail
-.for user in ${PKG_USERS:C/\:.*//}
-PKG_HOME.${user}= ${QMAILDIR}
-.endfor
-PKG_HOME.alias= ${QMAILDIR}/alias
-
-SPECIAL_PERMS+= ${PREFIX}/bin/qmail-queue qmailq qmail 4711
-
-# extract the qmail tarball that was inside the netqmail distfile
-post-extract:
- ${_PKG_SILENT}${_PKG_DEBUG} \
- extract_file=${WRKDIR}/${DISTNAME}/${PKGNAME_NOREV}.tar.gz; \
- cd ${WRKDIR} && ${EXTRACT_CMD}
- ${CP} ${FILESDIR}/README.pkgsrc ${WRKDIR}/README.pkgsrc
-
-post-install:
- # qmail's installer sets strange permissions, set them back
-. if (${PKG_INSTALLATION_TYPE} == "overwrite")
-. for i in bin boot
- ${CHGRP} ${BINGRP} ${QMAILDIR}/${i}
-. endfor
-. for i in doc
- ${CHGRP} ${SHAREGRP} ${QMAILDIR}/${i}
-. endfor
-. for i in ${MANDIRS}
- ${CHGRP} ${MANGRP} ${QMAILDIR}/${i}
-. endfor
-. endif
-
- ${INSTALL_DATA} ${WRKDIR}/README.pkgsrc ${DOCDIR}
-
- ${INSTALL_PROGRAM_DIR} ${SHAREDIR}/setup
- for i in ${SETUP_PROGRAMS}; do \
- ${INSTALL_PROGRAM} ${WRKSRC}/$$i ${SHAREDIR}/setup; \
- done
- for i in ${SETUP_SCRIPTS}; do \
- ${INSTALL_SCRIPT} ${WRKSRC}/$$i ${SHAREDIR}/setup; \
- done
-
-.include "../../mk/djbware.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmail/PLIST b/mail/qmail/PLIST
deleted file mode 100644
index 59b100365e9..00000000000
--- a/mail/qmail/PLIST
+++ /dev/null
@@ -1,196 +0,0 @@
-@comment $NetBSD: PLIST,v 1.11 2007/03/09 12:34:22 schmonz Exp $
-bin/bouncesaying
-bin/condredirect
-bin/datemail
-bin/elq
-bin/except
-bin/forward
-bin/maildir2mbox
-bin/maildirmake
-bin/maildirwatch
-bin/mailsubj
-bin/pinq
-bin/predate
-bin/preline
-bin/qail
-bin/qbiff
-bin/qmail-clean
-bin/qmail-getpw
-bin/qmail-inject
-bin/qmail-local
-bin/qmail-lspawn
-bin/qmail-newmrh
-bin/qmail-newu
-bin/qmail-pop3d
-bin/qmail-popup
-bin/qmail-pw2u
-bin/qmail-qmqpc
-bin/qmail-qmqpd
-bin/qmail-qmtpd
-bin/qmail-qread
-bin/qmail-qstat
-bin/qmail-queue
-bin/qmail-remote
-bin/qmail-rspawn
-bin/qmail-send
-bin/qmail-showctl
-bin/qmail-smtpd
-bin/qmail-start
-bin/qmail-tcpok
-bin/qmail-tcpto
-bin/qreceipt
-bin/qsmhook
-bin/sendmail
-bin/splogger
-bin/tcp-env
-${QMAIL_TLS}bin/update_tmprsadh
-man/cat1/bouncesaying.0
-man/cat1/condredirect.0
-man/cat1/except.0
-man/cat1/forward.0
-man/cat1/maildir2mbox.0
-man/cat1/maildirmake.0
-man/cat1/maildirwatch.0
-man/cat1/mailsubj.0
-man/cat1/preline.0
-man/cat1/qbiff.0
-man/cat1/qreceipt.0
-man/cat1/tcp-env.0
-man/cat5/addresses.0
-man/cat5/dot-qmail.0
-man/cat5/envelopes.0
-man/cat5/maildir.0
-man/cat5/mbox.0
-man/cat5/qmail-control.0
-man/cat5/qmail-header.0
-man/cat5/qmail-log.0
-man/cat5/qmail-users.0
-man/cat5/tcp-environ.0
-man/cat7/forgeries.0
-man/cat7/qmail-limits.0
-man/cat7/qmail.0
-man/cat8/qmail-clean.0
-man/cat8/qmail-command.0
-man/cat8/qmail-getpw.0
-man/cat8/qmail-inject.0
-man/cat8/qmail-local.0
-man/cat8/qmail-lspawn.0
-man/cat8/qmail-newmrh.0
-man/cat8/qmail-newu.0
-man/cat8/qmail-pop3d.0
-man/cat8/qmail-popup.0
-man/cat8/qmail-pw2u.0
-man/cat8/qmail-qmqpc.0
-man/cat8/qmail-qmqpd.0
-man/cat8/qmail-qmtpd.0
-man/cat8/qmail-qread.0
-man/cat8/qmail-qstat.0
-man/cat8/qmail-queue.0
-man/cat8/qmail-remote.0
-man/cat8/qmail-rspawn.0
-man/cat8/qmail-send.0
-man/cat8/qmail-showctl.0
-man/cat8/qmail-smtpd.0
-man/cat8/qmail-start.0
-man/cat8/qmail-tcpok.0
-man/cat8/qmail-tcpto.0
-man/cat8/splogger.0
-man/man1/bouncesaying.1
-man/man1/condredirect.1
-man/man1/except.1
-man/man1/forward.1
-man/man1/maildir2mbox.1
-man/man1/maildirmake.1
-man/man1/maildirwatch.1
-man/man1/mailsubj.1
-man/man1/preline.1
-man/man1/qbiff.1
-man/man1/qreceipt.1
-man/man1/tcp-env.1
-man/man5/addresses.5
-man/man5/dot-qmail.5
-man/man5/envelopes.5
-man/man5/maildir.5
-man/man5/mbox.5
-man/man5/qmail-control.5
-man/man5/qmail-header.5
-man/man5/qmail-log.5
-man/man5/qmail-users.5
-man/man5/tcp-environ.5
-man/man7/forgeries.7
-man/man7/qmail-limits.7
-man/man7/qmail.7
-man/man8/qmail-clean.8
-man/man8/qmail-command.8
-man/man8/qmail-getpw.8
-man/man8/qmail-inject.8
-man/man8/qmail-local.8
-man/man8/qmail-lspawn.8
-man/man8/qmail-newmrh.8
-man/man8/qmail-newu.8
-man/man8/qmail-pop3d.8
-man/man8/qmail-popup.8
-man/man8/qmail-pw2u.8
-man/man8/qmail-qmqpc.8
-man/man8/qmail-qmqpd.8
-man/man8/qmail-qmtpd.8
-man/man8/qmail-qread.8
-man/man8/qmail-qstat.8
-man/man8/qmail-queue.8
-man/man8/qmail-remote.8
-man/man8/qmail-rspawn.8
-man/man8/qmail-send.8
-man/man8/qmail-showctl.8
-man/man8/qmail-smtpd.8
-man/man8/qmail-start.8
-man/man8/qmail-tcpok.8
-man/man8/qmail-tcpto.8
-man/man8/splogger.8
-share/doc/qmail/FAQ
-share/doc/qmail/INSTALL${DARWINSUFX}
-share/doc/qmail/INSTALL.alias
-share/doc/qmail/INSTALL.ctl
-share/doc/qmail/INSTALL.ids
-share/doc/qmail/INSTALL.maildir
-share/doc/qmail/INSTALL.mbox
-share/doc/qmail/INSTALL.vsm
-share/doc/qmail/PIC.local2alias
-share/doc/qmail/PIC.local2ext
-share/doc/qmail/PIC.local2local
-share/doc/qmail/PIC.local2rem
-share/doc/qmail/PIC.local2virt
-share/doc/qmail/PIC.nullclient
-share/doc/qmail/PIC.relaybad
-share/doc/qmail/PIC.relaygood
-share/doc/qmail/PIC.rem2local
-share/doc/qmail/README.pkgsrc
-${QMAIL_QREGEX}share/doc/qmail/README.qregex
-share/doc/qmail/REMOVE.binmail
-share/doc/qmail/REMOVE.sendmail
-share/doc/qmail/SENDMAIL${DARWINSUFX}
-share/doc/qmail/TEST.deliver
-share/doc/qmail/TEST.receive
-share/doc/qmail/UPGRADE
-share/examples/qmail/boot/binm1
-share/examples/qmail/boot/binm1+df
-share/examples/qmail/boot/binm2
-share/examples/qmail/boot/binm2+df
-share/examples/qmail/boot/binm3
-share/examples/qmail/boot/binm3+df
-share/examples/qmail/boot/home
-share/examples/qmail/boot/home+df
-share/examples/qmail/boot/proc
-share/examples/qmail/boot/proc+df
-share/qmail/setup/config
-share/qmail/setup/config-fast
-share/qmail/setup/dnsfq
-share/qmail/setup/dnsip
-share/qmail/setup/dnsptr
-share/qmail/setup/hostname
-share/qmail/setup/install
-share/qmail/setup/ipmeprint
-@dirrm share/qmail/setup
-@dirrm share/qmail
-@dirrm share/examples/qmail/boot
-@dirrm share/examples/qmail
-@dirrm share/doc/qmail
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
deleted file mode 100644
index ea7a9723046..00000000000
--- a/mail/qmail/distinfo
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: distinfo,v 1.16 2006/12/29 10:32:05 schmonz Exp $
-
-SHA1 (netqmail-1.05.tar.gz) = fe4cbe97bd2f18a5ca1b36e4fbbd6c524256a829
-RMD160 (netqmail-1.05.tar.gz) = e5bd8557c58a2686233449254b146e74389a7652
-Size (netqmail-1.05.tar.gz) = 252264 bytes
-SHA1 (badrcptto.patch) = 713875ab08239416b6d22ba0d846b14a6aa6912f
-RMD160 (badrcptto.patch) = 88e29eeb203f30ec9c9d01cc42f1b849ea08d509
-Size (badrcptto.patch) = 3033 bytes
-SHA1 (qmail-103.patch) = dfb9cdabe91449dad2117115177b0a6a356baa9f
-RMD160 (qmail-103.patch) = 437f8b3063438bbd82c59557333b3566214afa9c
-Size (qmail-103.patch) = 2104 bytes
-SHA1 (panther.patch) = 57c64d8fff7702b2196d7b06d3e95ee9b8ff0e77
-RMD160 (panther.patch) = d51d409b06202bdf87c7cc687eca5895d90a2f7c
-Size (panther.patch) = 2563 bytes
-SHA1 (outgoingip.patch) = c37b50facc72f82cad6505d2db88d5eccc5418b2
-RMD160 (outgoingip.patch) = 032c653d395e5f599c0998e92debb09d84f90f0f
-Size (outgoingip.patch) = 6839 bytes
-SHA1 (qregex-20060423.patch) = fe52992254e5d464ce0fa0b68cf15ee744266b83
-RMD160 (qregex-20060423.patch) = f28245fee8bcc38e84816fe379be886376740a0c
-Size (qregex-20060423.patch) = 26745 bytes
-SHA1 (qmail-1.03-realrcptto-2006.12.10.patch) = 89e06519df0f52f748afec583e3e2ce33fe5dfb2
-RMD160 (qmail-1.03-realrcptto-2006.12.10.patch) = 0f6ad12dd24accab324097350a90f7717747eb56
-Size (qmail-1.03-realrcptto-2006.12.10.patch) = 17718 bytes
-SHA1 (netqmail-1.05-tls-smtpauth-20060105.patch) = 1a0fb2367504a4c0f2196e13f753437f47d4b621
-RMD160 (netqmail-1.05-tls-smtpauth-20060105.patch) = 18a3edd3ea7e7a8e4d6cadbd3c0bd5e8cb041caa
-Size (netqmail-1.05-tls-smtpauth-20060105.patch) = 147837 bytes
-SHA1 (qmail-smtpd-viruscan-1.3.patch) = 3a8f4e38df1c3f483f72b1a24ebc36664d075dd9
-RMD160 (qmail-smtpd-viruscan-1.3.patch) = ad6c5ef7894177fd5a7f131765eff22d092ecf54
-Size (qmail-smtpd-viruscan-1.3.patch) = 8891 bytes
-SHA1 (qmail-smtpd-viruscan-logging.patch) = ca7105b5561cf280e9e3a465d2d68a16673ff56c
-RMD160 (qmail-smtpd-viruscan-logging.patch) = 79631cb7b5b120f98397011c4fb94726c48b83e4
-Size (qmail-smtpd-viruscan-logging.patch) = 2157 bytes
diff --git a/mail/qmail/files/README.pkgsrc b/mail/qmail/files/README.pkgsrc
deleted file mode 100644
index 91c8d4cac31..00000000000
--- a/mail/qmail/files/README.pkgsrc
+++ /dev/null
@@ -1,30 +0,0 @@
- Getting help
- ============
-
-You've installed an automated and customized qmail package. If
-you're having trouble with it, ask the package's maintainer:
-
-<URL:mailto:schmonz-pkgsrc-qmail@schmonz.com>
-
-Many members of the qmail mailing list recommend following the
-install instructions in Dave Sill's "Life with qmail" document:
-
-<URL:http://www.lifewithqmail.org/lwq.html>
-
-A "Life with qmail" installation is done by hand, so any qmail
-package necessarily deviates from LWQ in at least this respect.
-Therefore, if you need to ask for help on the qmail list, please
-mention:
-
-* that you installed @PKGNAME@ from pkgsrc,
-* the output of "@PKG_INFO@ -B @PKGNAME@ | @GREP@ ^QMAIL",
-* the output of "@PKG_INFO@ -Q PKG_OPTIONS @PKGNAME@", and
-* how you're running (or trying to run) the qmail daemons.
-
-If you can first reproduce your problem on a manual LWQ-style
-installation, your request for help is likely to be better received.
-
-It is highly recommended that you read Charles Cazabon's "12 Steps
-to qmail List Bliss" before posting to the list:
-
-<URL:http://pyropus.ca/personal/writings/12-steps-to-qmail-list-bliss.html>
diff --git a/mail/qmail/hacks.mk b/mail/qmail/hacks.mk
deleted file mode 100644
index 9d429571815..00000000000
--- a/mail/qmail/hacks.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2006/01/02 21:13:43 schmonz Exp $
-
-.include "../../mk/bsd.prefs.mk"
-
-# Fix build on OS X with BIND9 system resolver
-.if ${OPSYS} == "Darwin"
-PKG_HACKS+= macosx-bind9-bind8compat
-CFLAGS+= -DBIND_8_COMPAT=1
-.endif
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
deleted file mode 100644
index df41d9a3d60..00000000000
--- a/mail/qmail/options.mk
+++ /dev/null
@@ -1,111 +0,0 @@
-# $NetBSD: options.mk,v 1.26 2007/03/09 12:34:22 schmonz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.qmail
-PKG_SUPPORTED_OPTIONS+= darwin sasl syncdir tls qmail-badrcptto qmail-bigdns
-PKG_SUPPORTED_OPTIONS+= qmail-netqmail qmail-outgoingip qmail-qregex
-PKG_SUPPORTED_OPTIONS+= qmail-realrcptto qmail-viruscan
-
-.if ${OPSYS} == "Darwin"
-PKG_SUGGESTED_OPTIONS+= darwin
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mqmail-badrcptto)
-BADRCPTTO_PATCH= badrcptto.patch
-PATCHFILES+= ${BADRCPTTO_PATCH}
-SITES.${BADRCPTTO_PATCH}= http://patch.be/qmail/
-PATCH_DIST_STRIP.${BADRCPTTO_PATCH}= -p1
-.endif
-
-.if !empty(PKG_OPTIONS:Mqmail-bigdns)
-BIGDNS_PATCH= qmail-103.patch
-PATCHFILES+= ${BIGDNS_PATCH}
-SITES.${BIGDNS_PATCH}= http://www.ckdhr.com/ckd/
-PATCH_DIST_STRIP.${BIGDNS_PATCH}= -p1
-.endif
-
-PLIST_SUBST+= DARWINSUFX=""
-.if !empty(PKG_OPTIONS:Mdarwin)
-DARWIN_PATCH= panther.patch
-PATCHFILES+= ${DARWIN_PATCH}
-SITES.${DARWIN_PATCH}= http://http.netdevice.com:9080/qmail/patch/
-PATCH_DIST_STRIP.${DARWIN_PATCH}= -p1
-PLIST_SUBST+= DARWINSUFX=".doc"
-.endif
-
-.if !empty(PKG_OPTIONS:Mqmail-netqmail)
-NETQMAIL_PATCH= netqmail-1.05.tar.gz
-PATCHFILES+= ${NETQMAIL_PATCH}
-PATCH_DIST_CAT.${NETQMAIL_PATCH}= \
- ${CAT} ${WRKDIR}/${DISTNAME}/${DISTNAME}.patch
-PATCH_DIST_STRIP.${NETQMAIL_PATCH}= -p1
-.endif
-
-.if !empty(PKG_OPTIONS:Mqmail-outgoingip)
-OUTGOINGIP_PATCH= outgoingip.patch
-PATCHFILES+= ${OUTGOINGIP_PATCH}
-SITES.${OUTGOINGIP_PATCH}= http://www.qmail.org/
-.endif
-
-PLIST_SUBST+= QMAIL_QREGEX="@comment "
-.if !empty(PKG_OPTIONS:Mqmail-qregex)
-QREGEX_PATCH= qregex-20060423.patch
-PATCHFILES+= ${QREGEX_PATCH}
-SITES.${QREGEX_PATCH}= http://www.arda.homeunix.net/store/qmail/
-PATCH_DIST_STRIP.${QREGEX_PATCH}= -p3
-PLIST_SUBST+= QMAIL_QREGEX=""
-.endif
-
-.if !empty(PKG_OPTIONS:Mqmail-realrcptto)
-REALRCPTTO_PATCH= qmail-1.03-realrcptto-2006.12.10.patch
-PATCHFILES+= ${REALRCPTTO_PATCH}
-SITES.${REALRCPTTO_PATCH}= http://code.dogmap.org/qmail/
-PATCH_DIST_STRIP.${REALRCPTTO_PATCH}= -p1
-.endif
-
-PLIST_SUBST+= QMAIL_TLS="@comment "
-.if !empty(PKG_OPTIONS:Msasl) || !empty(PKG_OPTIONS:Mtls)
-. if empty(PKG_OPTIONS:Msasl)
-PKG_OPTIONS+= sasl
-. endif
-. include "../../security/openssl/buildlink3.mk"
-TLSSASL_PATCH= netqmail-1.05-tls-smtpauth-20060105.patch
-PATCHFILES+= ${TLSSASL_PATCH}
-SITES.${TLSSASL_PATCH}= http://shupp.org/patches/
-. if !empty(PKG_OPTIONS:Mtls)
-CFLAGS+= -DTLS=20060104 # NOTE: update according to the patch
-DJB_INSTALL_TARGETS= cert tmprsadh
-USE_TOOLS+= gmake
-PLIST_SUBST+= QMAIL_TLS=""
-. endif
-.endif
-
-.if !empty(PKG_OPTIONS:Msyncdir)
-. include "../../devel/syncdir/buildlink3.mk"
-SUBST_CLASSES+= load
-SUBST_STAGE.load= do-configure
-SUBST_FILES.load= make-load.sh
-SUBST_SED.load= -e '$$s|$$| ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.syncdir}/lib -L${BUILDLINK_PREFIX.syncdir}/lib \-lsyncdir|'
-. if ${OPSYS} == "Darwin"
-SUBST_SED.load+= -e '$$s|$$| -bind_at_load|'
-. endif
-SUBST_MESSAGE.load= Setting linker flags for syncdir.
-.endif
-
-.if !empty(PKG_OPTIONS:Mqmail-viruscan)
-VIRUSCAN_PATCH= qmail-smtpd-viruscan-1.3.patch
-VIRUSCAN_LOG_PATCH= qmail-smtpd-viruscan-logging.patch
-PATCHFILES+= ${VIRUSCAN_PATCH} ${VIRUSCAN_LOG_PATCH}
-SITES.${VIRUSCAN_PATCH}= http://www.qmail.org/
-SITES.${VIRUSCAN_LOG_PATCH}= http://scriptkitchen.com/qmail/
-PATCH_DIST_STRIP.${VIRUSCAN_PATCH}= -p1
-PATCH_DIST_STRIP.${VIRUSCAN_LOG_PATCH}= -p1
-SUBST_CLASSES+= viruscan
-SUBST_STAGE.viruscan= do-configure
-SUBST_FILES.viruscan= qmail-smtpd.c
-SUBST_SED.viruscan= -e 's|qmail-smtpd: ||g'
-VIRUSCAN_SIGS_SRCFILE= ${DISTDIR}/${VIRUSCAN_PATCH}
-.else
-VIRUSCAN_SIGS_SRCFILE= # undefined
-.endif
diff --git a/mail/qmailanalog/DESCR b/mail/qmailanalog/DESCR
deleted file mode 100644
index 38bf9c17c22..00000000000
--- a/mail/qmailanalog/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-qmailanalog is a collection of tools to help you analyze qmail's activity
-record. It supplies statistics to answer a wide variety of questions:
-
- overall: how many messages? recipients? attempts? etc.
- ddist: how soon were 50% of the messages delivered? 90%? 95%? 99%?
- rxdelay: what's the best order of recipients for mailing lists?
- recipients, rhosts: who's getting mail? bytes? messages? attempts?
- successes, failures, deferrals: why? how often? how much delay?
- senders, suids: messages? bytes? load? recipients? attempts? delay?
-
-qmailanalog also includes several tools to focus attention on particular
-senders, recipients, or messages.
diff --git a/mail/qmailanalog/MESSAGE b/mail/qmailanalog/MESSAGE
deleted file mode 100644
index cfde3847a9c..00000000000
--- a/mail/qmailanalog/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:13 wiz Exp $
-
- Don't forget to add ${LOCALBASE}/qmailanalog/man to MANPATH
- variable in your environment -- manpages are stored there.
-
-===========================================================================
diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile
deleted file mode 100644
index 273a57e5138..00000000000
--- a/mail/qmailanalog/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2005/11/01 19:40:13 tv Exp $
-#
-
-DISTNAME= qmailanalog-0.70
-CATEGORIES= mail
-MASTER_SITES= http://cr.yp.to/software/
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://cr.yp.to/qmailanalog.html
-COMMENT= Collection of tools to help analyze qmail's activity
-
-USE_TOOLS+= nroff
-
-DJB_RESTRICTED= YES
-DJB_CONFIG_PREFIX= ${PREFIX}/qmailanalog
-
-.include "../../mk/djbware.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmailanalog/PLIST b/mail/qmailanalog/PLIST
deleted file mode 100644
index cbced3c56f8..00000000000
--- a/mail/qmailanalog/PLIST
+++ /dev/null
@@ -1,44 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:01:13 zuntum Exp $
-qmailanalog/bin/matchup
-qmailanalog/bin/columnt
-qmailanalog/bin/zoverall
-qmailanalog/bin/zsendmail
-qmailanalog/bin/xqp
-qmailanalog/bin/xsender
-qmailanalog/bin/xrecipient
-qmailanalog/bin/ddist
-qmailanalog/bin/deferrals
-qmailanalog/bin/failures
-qmailanalog/bin/successes
-qmailanalog/bin/rhosts
-qmailanalog/bin/recipients
-qmailanalog/bin/rxdelay
-qmailanalog/bin/senders
-qmailanalog/bin/suids
-qmailanalog/bin/zddist
-qmailanalog/bin/zdeferrals
-qmailanalog/bin/zfailures
-qmailanalog/bin/zsuccesses
-qmailanalog/bin/zrhosts
-qmailanalog/bin/zrecipients
-qmailanalog/bin/zrxdelay
-qmailanalog/bin/zsenders
-qmailanalog/bin/zsuids
-qmailanalog/doc/MATCHUP
-qmailanalog/doc/ACCOUNTING
-qmailanalog/man/man1/matchup.1
-qmailanalog/man/man1/xqp.1
-qmailanalog/man/man1/xsender.1
-qmailanalog/man/man1/xrecipient.1
-qmailanalog/man/man1/columnt.1
-qmailanalog/man/cat1/matchup.0
-qmailanalog/man/cat1/xqp.0
-qmailanalog/man/cat1/xsender.0
-qmailanalog/man/cat1/xrecipient.0
-qmailanalog/man/cat1/columnt.0
-@dirrm qmailanalog/man/man1
-@dirrm qmailanalog/man/cat1
-@dirrm qmailanalog/man
-@dirrm qmailanalog/doc
-@dirrm qmailanalog/bin
-@dirrm qmailanalog
diff --git a/mail/qmailanalog/distinfo b/mail/qmailanalog/distinfo
deleted file mode 100644
index dbfc5b01ca5..00000000000
--- a/mail/qmailanalog/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:28 agc Exp $
-
-SHA1 (qmailanalog-0.70.tar.gz) = d9f47b6c5348759aeba3873b6b7653b823b2f92c
-RMD160 (qmailanalog-0.70.tar.gz) = 2f67793dc46930a4375dc481341d33b3406525d0
-Size (qmailanalog-0.70.tar.gz) = 28416 bytes
diff --git a/mail/qmqtool/DESCR b/mail/qmqtool/DESCR
deleted file mode 100644
index 32393f8b4cf..00000000000
--- a/mail/qmqtool/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-qmqtool is a qmail queue manipulation program geared towards the
-viewing and safe modification of the contents in a qmail queue.
-
-qmqtool was designed with Michele Beltrame's "qmHandle" in mind,
-however no source code from qmHandle was used within qmqtool.
-
-qmqtool is significantly faster than qmHandle 1.2.0 on the author's
-system, even though it has more work to do (such as examining the
-todo queue).
diff --git a/mail/qmqtool/Makefile b/mail/qmqtool/Makefile
deleted file mode 100644
index 947680d09e2..00000000000
--- a/mail/qmqtool/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/01/18 06:35:24 schmonz Exp $
-#
-
-DISTNAME= qmqtool-current
-PKGNAME= ${DISTNAME:S/-current/-1.13/}
-CATEGORIES= mail
-MASTER_SITES= ${HOMEPAGE}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://jeremy.kister.net/code/qmqtool/
-COMMENT= View and safely modify qmail queue
-
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_LANGUAGES= # none
-USE_TOOLS+= perl:run
-NO_BUILD= yes
-REPLACE_PERL= qmqtool
-SPECIAL_PERMS+= ${PREFIX}/sbin/qmqtool ${ROOT_USER} ${ROOT_GROUP} 0700
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= ${WRKSRC}/qmqtool
-SUBST_SED.paths+= -e 's,@QMAILDIR@,${QMAILDIR:Q},g'
-SUBST_SED.paths+= -e 's,@PS@,${PS},g'
-SUBST_SED.paths+= -e 's,@GREP@,${GREP},g'
-SUBST_SED.paths+= -e 's,@RCD_SCRIPTS_DIR@,${RCD_SCRIPTS_DIR},g'
-SUBST_STAGE.paths= do-configure
-
-INSTALLATION_DIRS= sbin share/doc/qmqtool share/examples/qmqtool
-
-do-install:
- cd ${WRKSRC}; \
- cp qmqtool ${PREFIX}/sbin; \
- cp Artistic ChangeLog FAQ README ${PREFIX}/share/doc/qmqtool; \
- cp -Rp contrib ${PREFIX}/share/examples/qmqtool
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmqtool/PLIST b/mail/qmqtool/PLIST
deleted file mode 100644
index e000215cc6d..00000000000
--- a/mail/qmqtool/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/18 06:35:24 schmonz Exp $
-sbin/qmqtool
-share/doc/qmqtool/Artistic
-share/doc/qmqtool/ChangeLog
-share/doc/qmqtool/FAQ
-share/doc/qmqtool/README
-share/examples/qmqtool/contrib/argus/README
-share/examples/qmqtool/contrib/argus/config
-share/examples/qmqtool/contrib/cricket/Defaults
-share/examples/qmqtool/contrib/cricket/README
-share/examples/qmqtool/contrib/cricket/Targets
-@dirrm share/examples/qmqtool/contrib/cricket
-@dirrm share/examples/qmqtool/contrib/argus
-@dirrm share/examples/qmqtool/contrib
-@dirrm share/examples/qmqtool
-@dirrm share/doc/qmqtool
diff --git a/mail/qmqtool/distinfo b/mail/qmqtool/distinfo
deleted file mode 100644
index 5728d5251d7..00000000000
--- a/mail/qmqtool/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/01/18 06:35:24 schmonz Exp $
-
-SHA1 (qmqtool-current.tgz) = c6fea8ef8324ae0ae241ff126b1da395d9b97e5c
-RMD160 (qmqtool-current.tgz) = d92dd6b9f03cea85f2e4cf69a1dd5b94afef42f2
-Size (qmqtool-current.tgz) = 19098 bytes
-SHA1 (patch-aa) = 4a15464d895afafa112d60af647d4f41f5596a24
diff --git a/mail/qmqtool/patches/patch-aa b/mail/qmqtool/patches/patch-aa
deleted file mode 100644
index bd0fb1c00b5..00000000000
--- a/mail/qmqtool/patches/patch-aa
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/01/18 06:35:24 schmonz Exp $
-
---- qmqtool.orig 2006-10-07 22:29:46.000000000 -0400
-+++ qmqtool
-@@ -10,14 +10,10 @@ use strict;
- use Getopt::Std;
- my (%tool,%opt);
-
--my $qmail = '/var/qmail';
--$tool{'ps'} = '/bin/ps'; # full path to ps, or just ps if $PATH is sufficient
-+my $qmail = '@QMAILDIR@';
-+$tool{'ps'} = '@PS@'; # full path to ps, or just ps if $PATH is sufficient
- $tool{'ps_arg'} = (`uname -s` =~ /SunOS/) ? '-ef' : 'aux'; # should statically code this
--if(-x '/usr/local/bin/grep'){
-- $tool{'grep'} = '/usr/local/bin/grep'; # GNU grep is 5 times faster than solaris grep
--}elsif(-x '/bin/grep'){
-- $tool{'grep'} = '/bin/grep';
--}
-+$tool{'grep'} = '@GREP@';
-
- # must play with @ARGV directly because Getopt doesnt have a xx: (-x with or without an arg)
- my $n = 0;
-@@ -152,6 +148,7 @@ if(defined($opt{h})){
- }
- unless($opt{Q}){
- print "you must now start qmail-send: for a LWQ installation, run: svc -u /service/qmail-send\n";
-+ print "for a pkgsrc installation, run: @RCD_SCRIPTS_DIR@/qmailsend start\n";
- }
- }else{
- syntax();
-@@ -409,6 +406,7 @@ sub check_qmailsend {
- if(/^\s*qmails\s.+\sqmail-send/){
- die "you must stop qmail-send before this program can continue\n",
- "for a LWQ installation, run: svc -d /service/qmail-send\n",
-+ "for a pkgsrc installation, run: @RCD_SCRIPTS_DIR@/qmailsend stop\n",
- "others may be able to run: kill -9 `$tool{'ps'} $tool{'ps_arg'} | awk '/qmails.*qmail-send/ { print \$2 }'`\n";
- }
- }
-@@ -586,6 +584,7 @@ sub checkqueue {
- print "no rogue files found\n";
- }
- print "you must now start qmail-send: for a LWQ installation, run: svc -u /service/qmail-send\n";
-+ print "for a pkgsrc installation, run: @RCD_SCRIPTS_DIR@/qmailsend start\n";
- }
-
- sub rm_files {
-@@ -624,6 +623,7 @@ sub rm_files {
- }
- if(defined($restart)){
- print "you must now restart qmail-send: for a LWQ installation, run: svc -du /service/qmail-send\n";
-+ print "for a pkgsrc installation, run: @RCD_SCRIPTS_DIR@/qmailsend restart\n";
- }
- }
-
diff --git a/mail/qpopper/DESCR b/mail/qpopper/DESCR
deleted file mode 100644
index 2c5134a0672..00000000000
--- a/mail/qpopper/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
------------
-what is it?
------------
-qpopper is Qualcomm's POP server for Eudora. It allows users to fetch
-their mail from a central mail server using the POP protocol.
diff --git a/mail/qpopper/MESSAGE b/mail/qpopper/MESSAGE
deleted file mode 100644
index aee65aff324..00000000000
--- a/mail/qpopper/MESSAGE
+++ /dev/null
@@ -1,17 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2006/05/02 08:39:37 joerg Exp $
-
-In order to enable APOP, you have to create the authentication database.
-It is no longer created as part of the installation, you should run
-the following command to create it:
- ${PREFIX}/sbin/qpopauth -init -safe
-
-In order to enable POP service, you should add the following lines
-to your /etc/inetd.conf:
-
- pop3 stream tcp nowait root ${PREFIX}/libexec/qpopper qpopper -s
- pop3 stream tcp6 nowait root ${PREFIX}/libexec/qpopper qpopper -s
-
-Or, you can start stand alone qpopper using ${RCD_SCRIPTS_DIR}/${RCD_SCRIPTS}.
-
-===========================================================================
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
deleted file mode 100644
index 7736a0b6e6d..00000000000
--- a/mail/qpopper/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# $NetBSD: Makefile,v 1.57 2006/10/23 08:14:02 rillig Exp $
-#
-
-DISTNAME= qpopper${VERSION}
-PKGNAME= qpopper-${VERSION}
-CATEGORIES= mail
-MASTER_SITES= ${QPOPPER_MASTER_SITES}
-
-PATCH_SITES= ${QPOPPER_PATCHSITES}
-PATCHFILES= ${QPOPPER_PATCHFILES}
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= mellon@fugue.com
-HOMEPAGE= ${QPOPPER_HOMEPAGE}
-COMMENT= Qualcomm's POP server for Eudora
-
-.include "Makefile.common"
-
-CONFIGURE_ARGS+= --enable-apop=${QPOPPER_APOP_AUTH:Q} \
- --enable-popuid=${QPOPPER_USER:Q} \
- --disable-update-abort --without-gdbm
-
-.include "options.mk"
-
-QPOPPER_USER?= pop
-QPOPPER_GROUP?= mail
-QPOPPER_APOP_AUTH?= ${PKG_SYSCONFDIR}/apop.auth
-
-BUILD_DEFS+= QPOPPER_USER QPOPPER_GROUP
-BUILD_DEFS+= QPOPPER_APOP_AUTH
-
-.if defined(QPOPPER_SPOOL_DIR)
-CONFIGURE_ARGS+= --enable-spool-dir=${QPOPPER_SPOOL_DIR:Q}
-.endif
-
-RCD_SCRIPTS= qpopper
-MESSAGE_SUBST+= RCD_SCRIPTS=${RCD_SCRIPTS} \
- RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR}
-
-PKG_USERS?= ${QPOPPER_USER}:${QPOPPER_GROUP}
-MAKE_ENV+= BINGRP=${BINGRP:Q}
-
-SUBST_CLASSES+= root
-SUBST_STAGE.root= pre-configure
-SUBST_FILES.root= Makefile.in */Makefile.in
-SUBST_SED.root= -e 's,-o root,-o ${ROOT_USER},g'
-
-SUBST_CLASSES+= libexec
-SUBST_STAGE.libexec= pre-configure
-SUBST_FILES.libexec= man/popper.8
-SUBST_SED.libexec= -e "s|/usr/local/lib|${PREFIX}/libexec|g"
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/License.txt \
- ${PREFIX}/share/doc/qpopper.License
- ${INSTALL_DATA} ${WRKSRC}/samples/qpopper.config \
- ${PREFIX}/share/examples
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qpopper/Makefile.common b/mail/qpopper/Makefile.common
deleted file mode 100644
index ae91cbbc7fe..00000000000
--- a/mail/qpopper/Makefile.common
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile.common,v 1.20 2006/10/23 08:14:02 rillig Exp $
-
-QPOPPER_MASTER_SITES+= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ \
- http://core.ring.gr.jp/archives/net/mail/qpopper/
-QPOPPER_HOMEPAGE= http://www.eudora.com/products/unsupported/qpopper/
-QPOPPER_PATCHSITES+= http://www.imasy.or.jp/~ume/ipv6/
-QPOPPER_PATCHFILES= qpopper4.0.8-ipv6-20050515.diff.gz
-
-VERSION= 4.0.9
-QPOPPER_FAC?= LOCAL1
-BUILD_DEFS+= QPOPPER_FAC
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \
- --enable-log-facility=LOG_${QPOPPER_FAC}
-LIBS+= ${LDFLAGS}
diff --git a/mail/qpopper/PLIST b/mail/qpopper/PLIST
deleted file mode 100644
index 33261bfb8e2..00000000000
--- a/mail/qpopper/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2005/05/28 02:55:43 taca Exp $
-libexec/qpopper
-man/man8/qpopauth.8
-man/man8/qpopper.8
-sbin/qpopauth
-sbin/qpopper
-share/doc/qpopper.License
-share/examples/qpopper.config
-share/examples/rc.d/qpopper
diff --git a/mail/qpopper/distinfo b/mail/qpopper/distinfo
deleted file mode 100644
index 21cda906e17..00000000000
--- a/mail/qpopper/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.15 2006/05/05 02:51:35 taca Exp $
-
-SHA1 (qpopper4.0.9.tar.gz) = 5629aa86d92fe10565021980882dffb733ce73d9
-RMD160 (qpopper4.0.9.tar.gz) = b48a68cd9e282bfb3d78c6b53f3dee7c97bdf77d
-Size (qpopper4.0.9.tar.gz) = 2767261 bytes
-SHA1 (qpopper4.0.8-ipv6-20050515.diff.gz) = 3ccd51fa8fb1633c34dee19e6d50351cb649a3c1
-RMD160 (qpopper4.0.8-ipv6-20050515.diff.gz) = 0ca9a8893e31933d8bf33a3cfa4d88fde511ed5e
-Size (qpopper4.0.8-ipv6-20050515.diff.gz) = 11479 bytes
-SHA1 (patch-aa) = d1f4e56dbb8eb4b7cc250ca261435ec609f14c23
-SHA1 (patch-ab) = 67d661adce74d0662cab5b644d2e57bfd1d5e3c7
-SHA1 (patch-ac) = 6df76adb260bee99eb4165f5ac8dff7a2e685a8a
-SHA1 (patch-ad) = 24fe673113eff34f896c05c0f3d71ca235219525
-SHA1 (patch-ae) = 1e06159f56c78e63a7960d4d9ca80535752099b2
-SHA1 (patch-af) = a2100b026a0bab0be8c99c211ec0bd14d4405f32
-SHA1 (patch-ag) = 4b187ab978ead4b751290fe483f6d6a6bf959089
-SHA1 (patch-al) = 63fdc28b9c1d292d55464cda13c529ffb2a47b34
-SHA1 (patch-am) = fba92571d9225f8c5cacb38a4621127a19151352
-SHA1 (patch-an) = 43e7c20b9c3cfd978255748236efbcbaf2f929ce
-SHA1 (patch-ap) = 14ad2349ba690bbdc679a24a8b96da5681af1f18
diff --git a/mail/qpopper/files/qpopper.sh b/mail/qpopper/files/qpopper.sh
deleted file mode 100644
index 75ebc759dbd..00000000000
--- a/mail/qpopper/files/qpopper.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: qpopper.sh,v 1.3 2004/12/19 01:33:36 grant Exp $
-#
-
-# PROVIDE: qpopper
-# REQUIRE: DAEMON LOGIN
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name=qpopper
-rcvar=$name
-command="@PREFIX@/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-extra_commands="reload"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/qpopper/options.mk b/mail/qpopper/options.mk
deleted file mode 100644
index e6fae09a9e5..00000000000
--- a/mail/qpopper/options.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# $NetBSD: options.mk,v 1.12 2007/02/22 19:26:43 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.qpopper
-PKG_SUPPORTED_OPTIONS= drac inet6 kerberos pam qpopper-servermode ssl
-PKG_SUGGESTED_OPTIONS= ssl
-PKG_OPTIONS_LEGACY_VARS+= QPOPPER_SERVERMODE:qpopper-servermode
-PKG_OPTIONS_LEGACY_VARS+= QPOPPER_USE_DRAC:drac
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mssl)
-. include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
-.else
-CONFIGURE_ARGS+= --without-ssl
-.endif
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ENV+= O_DEFS=${O_DEFS:Q} CFLAGS="-DINET6"
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
-# Please note this is currently experimental for platforms that support it
-.if !empty(PKG_OPTIONS:Mpam)
-. include "../../mk/pam.buildlink3.mk"
-CONFIGURE_ARGS+= --with-pam
-.else
-CONFIGURE_ARGS+= --without-pam
-.endif
-
-.if !empty(PKG_OPTIONS:Mkerberos)
-PKG_USE_KERBEROS= yes
-CONFIGURE_ARGS+= --enable-kerberos
-.endif
-
-.if !empty(PKG_OPTIONS:Mqpopper-servermode)
-CONFIGURE_ARGS+= --enable-servermode
-.endif
-
-.if !empty(PKG_OPTIONS:Mdrac)
-.include "../../mail/drac/buildlink3.mk"
-CONFIGURE_ARGS+= --with-drac=${BUILDLINK_PREFIX.drac}
-.endif
diff --git a/mail/qpopper/patches/patch-aa b/mail/qpopper/patches/patch-aa
deleted file mode 100644
index 606599b0d7a..00000000000
--- a/mail/qpopper/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2003/03/13 07:23:25 itojun Exp $
-
---- configure- Thu Mar 13 16:16:03 2003
-+++ configure Thu Mar 13 16:16:25 2003
-@@ -3022,13 +3022,6 @@
-
-
-
--if test -r /usr/local/include/gdbm.h -a "$GCC" = yes
--then
-- CFLAGS="$CFLAGS -idirafter /usr/local/include"
-- CPPFLAGS="$CPPFLAGS -idirafter /usr/local/include"
--fi
--
--
- if test "$GCC" = yes
- then
- echo "$as_me:$LINENO: checking for gcc version 2.7.2.3" >&5
diff --git a/mail/qpopper/patches/patch-ab b/mail/qpopper/patches/patch-ab
deleted file mode 100644
index 73ad47dd1cc..00000000000
--- a/mail/qpopper/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2001/06/10 15:08:41 taca Exp $
-
---- popper/popauth.c.orig Wed Apr 4 09:23:41 2001
-+++ popper/popauth.c
-@@ -168,7 +168,7 @@
- #define APOP_AUTH 1
- { "apopauth" },
- #define POP_AUTH 2
-- { "popauth" },
-+ { "qpopauth" },
- #define OTHER 3
- { NULL }
- };
diff --git a/mail/qpopper/patches/patch-ac b/mail/qpopper/patches/patch-ac
deleted file mode 100644
index bf4673a12e7..00000000000
--- a/mail/qpopper/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.11 2006/01/08 17:34:47 joerg Exp $
-
---- popper/popper.h.orig 2006-01-08 17:09:15.000000000 +0000
-+++ popper/popper.h
-@@ -287,8 +287,6 @@ typedef struct _pop_tls pop_
- # define WILDCARD_SHELL "/POPPER/ANY/SHELL/"
- #endif /* CHECK_SHELL */
-
--extern int errno;
--
- #if !( defined(BSD) && (BSD >= 199306) ) && !defined(__USE_BSD)
- extern int sys_nerr;
- # ifndef FREEBSD
diff --git a/mail/qpopper/patches/patch-ad b/mail/qpopper/patches/patch-ad
deleted file mode 100644
index c85842105f3..00000000000
--- a/mail/qpopper/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2006/01/08 17:34:47 joerg Exp $
-
---- popper/pop_init.c.orig 2006-01-08 17:27:18.000000000 +0000
-+++ popper/pop_init.c
-@@ -211,7 +211,6 @@
- #endif /* HAVE_HSTRERROR */
- #endif /* INET6 */
-
--extern int errno;
- int no_rev_lookup; /* Avoid reverse lookup? */
-
- /*
diff --git a/mail/qpopper/patches/patch-ae b/mail/qpopper/patches/patch-ae
deleted file mode 100644
index c787ff000de..00000000000
--- a/mail/qpopper/patches/patch-ae
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ae,v 1.11 2001/06/10 15:08:41 taca Exp $
-
---- man/popauth.8.orig Wed Apr 4 09:23:13 2001
-+++ man/popauth.8
-@@ -7,11 +7,11 @@
- .\" See License.txt file for terms and conditions for modification and
- .\" redistribution.
- .\"
--.TH POPAUTH 8
-+.TH QPOPAUTH 8
- .SH NAME
--popauth \-\- manipulate POP authorization DB
-+qpopauth \-\- manipulate POP authorization DB
- .SH SYNOPSIS
--.B popauth
-+.B qpopauth
- [
- .BI \-trace " tracefile"
- ] [
-@@ -46,18 +46,18 @@
- ]
-
- .SH DESCRIPTION
--The \fIpopauth\fR program allows POP subscribers to add or change the secret
-+The \fIqpopauth\fR program allows POP subscribers to add or change the secret
- values used to generate their authentication credentials, or to verify the
- existance of their records.
-
- In addition, the super\-user or master POP user can add, delete, or reset
- credential data for a user, or list which records exist. Only the
--super\-user may initialize the database. \fIpopauth\fR is useful only when
-+super\-user may initialize the database. \fIqpopauth\fR is useful only when
- the APOP (or SCRAM) configuration option is defined. See the INSTALL file
- in the Qpopper distribution for more information.
-
- Under normal usage,
--\fIpopauth\fR prompts for a new secret,
-+\fIqpopauth\fR prompts for a new secret,
- just like the \fIpasswd\fR program. It then updates the authorization DB.
-
- With the
-@@ -89,4 +89,4 @@
- .SH ACKNOWLEDGEMENTS
- This program was derived from MH 6.8.3
- .SH SEE ALSO
--popper(8), poppassd(8)
-+qpopper(8), poppassd(8)
diff --git a/mail/qpopper/patches/patch-af b/mail/qpopper/patches/patch-af
deleted file mode 100644
index dc329cc4fce..00000000000
--- a/mail/qpopper/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.7 2006/01/08 17:34:47 joerg Exp $
-
---- popper/pop_updt.c.orig 2006-01-08 17:29:18.000000000 +0000
-+++ popper/pop_updt.c
-@@ -125,8 +125,6 @@
-
- #include "misc.h"
-
--extern int errno;
--
- #define BUFSIZE 4096
-
- static char standard_error[] =
diff --git a/mail/qpopper/patches/patch-ag b/mail/qpopper/patches/patch-ag
deleted file mode 100644
index f1ec682ff93..00000000000
--- a/mail/qpopper/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.8 2001/06/10 15:08:41 taca Exp $
-
---- man/popper.8.orig Wed Apr 4 09:23:13 2001
-+++ man/popper.8
-@@ -19,7 +19,7 @@
- .SH NAME
- qpopper \-\- POP3 server (v4.0)
- .SH SYNOPSIS
--.B /usr/local/lib/popper
-+.B /usr/local/lib/qpopper
- [
- .I [ address ]
- .I [ ":" ]
-@@ -800,7 +803,7 @@
- .PP
- The server implements several extended commands.
- .PP
--XTND XMIT: Sends a mail message using /usr/lib/sendmail.
-+XTND XMIT: Sends a mail message using /usr/sbin/sendmail.
- .PP
- XTND XLIST header [num]: Extracts and returns the specified header line
- for the specified message number. If the "num" parameter is missing,
diff --git a/mail/qpopper/patches/patch-al b/mail/qpopper/patches/patch-al
deleted file mode 100644
index f9b04278756..00000000000
--- a/mail/qpopper/patches/patch-al
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-al,v 1.1 2001/06/10 15:08:41 taca Exp $
-
---- Makefile.in.orig Mon Apr 23 07:59:14 2001
-+++ Makefile.in
-@@ -58,10 +58,10 @@
- cd ${popper_dir} && ${MAKE} all
-
- install:
-- ${INSTALL} -m 0644 -o root ${top_srcdir}/man/popper.8 ${mandir}/man8/
-- echo "Installed man/popper.8 as ${mandir}/man8/popper.8"
-- ${INSTALL} -m 0644 -o root ${top_srcdir}/man/popauth.8 ${mandir}/man8/
-- echo "Installed man/popauth.8 as ${mandir}/man8/popauth.8"
-+ ${INSTALL} -m 0644 -o root ${top_srcdir}/man/popper.8 ${mandir}/man8/qpopper.8
-+ @echo "Installed man/popper.8 as ${mandir}/man8/qpopper.8"
-+ ${INSTALL} -m 0644 -o root ${top_srcdir}/man/popauth.8 ${mandir}/man8/qpopauth.8
-+ @echo "Installed man/popauth.8 as ${mandir}/man8/qpopauth.8"
- cd ${popper_dir} && ${MAKE} install
-
- clean:
diff --git a/mail/qpopper/patches/patch-am b/mail/qpopper/patches/patch-am
deleted file mode 100644
index 22312d98e30..00000000000
--- a/mail/qpopper/patches/patch-am
+++ /dev/null
@@ -1,124 +0,0 @@
-$NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $
-
---- popper/Makefile.in.orig 2005-05-13 19:20:11.000000000 +0000
-+++ popper/Makefile.in
-@@ -96,6 +96,8 @@ VPATH = @srcdir@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- installdir = @sbindir@
-+libexecdir = @libexecdir@
-+sbindir = @sbindir@
-
- popper_srcdir = ${top_srcdir}/popper
- qd_srcdir = ${top_srcdir}/qd
-@@ -114,17 +116,20 @@ password_dir = ${base_dir}/password
-
-
- OBJS = pop_dele.o pop_dropcopy.o \
-- pop_get_command.o pop_get_subcommand.o pop_init.o \
-+ pop_get_command.o pop_get_subcommand.o \
- pop_last.o pop_list.o pop_log.o pop_lower.o \
- pop_msg.o pop_parse.o pop_pass.o pop_quit.o \
- pop_rset.o pop_send.o pop_stat.o pop_updt.o \
- pop_user.o pop_xtnd.o pop_xmit.o popper.o \
-- pop_bull.o xtnd_xlst.o pop_uidl.o mktemp.o \
-+ pop_bull.o xtnd_xlst.o pop_uidl.o \
- pop_rpop.o pop_apop.o md5.o pop_auth.o pop_pope.o \
- pop_extend.o scram.o hmac.o base64.o pop_util.o \
- get_sub_opt.o msg_ptr.o drac.o pop_config.o pop_tls.o \
- pop_tls_openssl.o pop_tls_sslplus.o sslplus_utils.o \
-- main.o pop_cache.o genpath.o
-+ pop_cache.o genpath.o
-+
-+INETDOBJ = main.o pop_init.o
-+STANDOBJ = main-stand.o pop_init-stand.o
-
- SRCS = pop_dele.c pop_dropcopy.c \
- pop_get_command.c pop_get_subcommand.c pop_init.c \
-@@ -132,7 +137,7 @@ SRCS = pop_dele.c pop_dropc
- pop_msg.c pop_parse.c pop_pass.c pop_quit.c \
- pop_rset.c pop_send.c pop_stat.c pop_updt.c \
- pop_user.c pop_xtnd.c pop_xmit.c popper.c \
-- pop_bull.c xtnd_xlst.c pop_uidl.c mktemp.c \
-+ pop_bull.c xtnd_xlst.c pop_uidl.c \
- pop_rpop.c pop_apop.c md5.c pop_auth.c pop_pope.c \
- pop_extend.c scram.c hmac.c base64.c pop_util.c \
- get_sub_opt.c msg_ptr.c drac.c pop_config.c pop_tls.c \
-@@ -181,7 +186,7 @@ USE_PAM = @USE_PAM@
-
- .SUFFIXES: .c .o
-
--all: popper ${pop_auth} mangler_library common_library ${poppassd}
-+all: mangler_library common_library popper popper-standalone ${pop_auth} ${poppassd}
-
- mangler_library:
- cd ${mmangle_dir} && ${MAKE} all
-@@ -189,13 +194,18 @@ mangler_library:
- common_library:
- cd ${common_dir} && ${MAKE} all
-
--popper: ${OBJS} mangler_library common_library
-- ${CC} ${OBJS} -o popper ${mmangle_dir}/libmangle.a \
-+popper: ${INETDOBJ} ${OBJS} mangler_library common_library
-+ ${CC} ${INETDOBJ} ${OBJS} -o popper ${mmangle_dir}/libmangle.a \
- -I${common_srcdir} ${common_dir}/libcommon.a \
- ${LIBS} ${LDFLAGS}
-
-+popper-standalone: ${STANDOBJ} ${OBJS} mangler_library common_library
-+ ${CC} ${STANDOBJ} ${OBJS} -o popper-standalone \
-+ ${mmangle_dir}/libmangle.a -I${common_srcdir} \
-+ ${common_dir}/libcommon.a ${LIBS}
-+
- popauth: ${POPAUTHOBJS}
-- ${CC} -o popauth ${POPAUTHOBJS} ${NETWORK_LIBS} ${DBM_LIBS} \
-+ ${CC} -o popauth ${POPAUTHOBJS} ${LIBS} ${NETWORK_LIBS} ${DBM_LIBS} \
- ${common_dir}/libcommon.a
-
- poppassd: common_library
-@@ -206,22 +216,35 @@ poppassd: common_library
- -I${mmangle_srcdir} -I${common_srcdir} ${SSL_INC} \
- ${CFLAGS} ${DEFS} ${CDEFS} ${OS_DEFS} $< -o $@
-
-+main-stand.o: main.c
-+ ${CC} -c -I${base_dir} -I${top_srcdir} -I${srcdir} \
-+ -I${mmangle_srcdir} -I${common_srcdir} ${SSL_INC} \
-+ ${CFLAGS} ${DEFS} ${CDEFS} ${OS_DEFS} -DSTANDALONE \
-+ -o $@ main.c
-+
-+pop_init-stand.o: pop_init.c
-+ ${CC} -c -I${base_dir} -I${top_srcdir} -I${srcdir} \
-+ -I${mmangle_srcdir} -I${common_srcdir} ${SSL_INC} \
-+ ${CFLAGS} ${DEFS} ${CDEFS} ${OS_DEFS} -DSTANDALONE \
-+ -o $@ pop_init.c
-+
- ${SRCS}:
- ${POPAUTHSRCS}:
-
--install: popper ${pop_auth}
-- ${INSTALL} -s -m 0755 -o root popper ${installdir}/popper
-- echo "Installed popper as ${installdir}/popper"
-- if [ "x${poppassd}" != "x" ]; then \
-- cd ${password_dir} && ${MAKE} $@ ;\
-+install: popper popper-standalone ${pop_auth}
-+ ${INSTALL} -s -m 0755 -o root popper ${libexecdir}/qpopper
-+ echo "Installed popper as ${libexecdir}/qpopper"
-+ ${INSTALL} -s -m 0755 -o root popper-standalone ${sbindir}/qpopper
-+ @echo "Installed standalone popper as ${sbindir}/qpopper"
-+ @if [ "x${pop_auth}" != "x" ]; then \
-+ ${INSTALL} -s -m 4755 -o ${apop_uid} -g ${BINGRP} ${pop_auth} \
-+ ${sbindir}/q${pop_auth}; \
-+ echo "Installed popauth as ${sbindir}/q${pop_auth} " \
-+ "with uid ${apop_uid}"; \
- fi
-
-- if [ "x${pop_auth}" != "x" ]; then \
-- ${INSTALL} -s -m 4755 -o ${apop_uid} -g 0 ${pop_auth} \
-- ${installdir}/${pop_auth}; \
-- echo "Installed popauth as ${installdir}/${pop_auth} " \
-- "with uid ${apop_uid}"; \
-- ${installdir}/${pop_auth} -init -safe; \
-+ if [ "x${poppassd}" != "x" ]; then \
-+ cd ${password_dir} && ${MAKE} $@ ;\
- fi
-
- if [ "x${USE_PAM}" != "x" ]; then \
diff --git a/mail/qpopper/patches/patch-an b/mail/qpopper/patches/patch-an
deleted file mode 100644
index 7f83d64815f..00000000000
--- a/mail/qpopper/patches/patch-an
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-an,v 1.1 2002/05/04 05:59:05 taca Exp $
-
---- popper/pop_bull.c.orig Wed Feb 21 10:15:17 2001
-+++ popper/pop_bull.c
-@@ -702,7 +702,7 @@
- int msg_num;
- int msg_vis_num = 0;
- int msg_ends_in_nl = 0;
-- char bullName [ 256 ];
-+ char bullName [ MAXLINELEN ];
- MsgInfoList *mp; /* Pointer to message info list */
-
-
-@@ -716,7 +716,7 @@
- msg_num = p->msg_count;
- p->msg_count = ( ( ( p->msg_count - 1 ) / ALLOC_MSGS ) + 1 ) * ALLOC_MSGS;
-
-- sprintf ( bullName, "%s/%s", p->bulldir, name );
-+ Qsnprintf ( bullName, sizeof bullName, "%s/%s", p->bulldir, name );
- bull = fopen ( bullName, "r" );
- if ( bull == NULL ) {
- pop_log ( p, POP_PRIORITY, HERE,
diff --git a/mail/qpopper/patches/patch-ap b/mail/qpopper/patches/patch-ap
deleted file mode 100644
index 61ec0ccbc6d..00000000000
--- a/mail/qpopper/patches/patch-ap
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ap,v 1.3 2005/06/01 20:55:16 adrianp Exp $
-
---- popper/main.c.orig 2005-05-28 17:29:10.000000000 +0100
-+++ popper/main.c
-@@ -246,6 +246,7 @@ main ( int argc, char *argv[] )
- fd_set fdset_templ;
- fd_set fdset_read;
- int fd_flags = 0;
-+ FILE *fp;
-
-
- #ifdef USE_PAM
-@@ -625,7 +626,10 @@ main ( int argc, char *argv[] )
- "listening using socket fd %d",
- sockfd );
-
-- listen ( sockfd, 5 );
-+#ifndef SOMAXCONN
-+#define SOMAXCONN 5
-+#endif
-+ listen ( sockfd, SOMAXCONN );
-
- /*
- * Set file descriptor to be non-blocking in case there isn't really a
-@@ -655,6 +659,16 @@ main ( int argc, char *argv[] )
- signal ( SIGHUP, VOIDSTAR hupit );
- signal ( SIGTERM, VOIDSTAR cleanup );
-
-+#ifndef PIDFILE
-+#define PIDFILE "/var/run/qpopper.pid"
-+#endif
-+ fp = fopen(PIDFILE, "w");
-+ if (fp == NULL) {
-+ err_dump ( HERE, "Unable to open %s", PIDFILE);
-+ }
-+ fprintf(fp, "%d\n", getpid());
-+ fclose(fp);
-+
- while ( TRUE )
- {
- if ( bClean )
diff --git a/mail/qtools/DESCR b/mail/qtools/DESCR
deleted file mode 100644
index 8e5d983ccc5..00000000000
--- a/mail/qtools/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-qtools is a collection of commands, typically for use with qmail
-via dot-qmail(5). Among others, there are commands for header and
-body filtering as well as delivery to Maildirs.
diff --git a/mail/qtools/MESSAGE b/mail/qtools/MESSAGE
deleted file mode 100644
index e23a8204db3..00000000000
--- a/mail/qtools/MESSAGE
+++ /dev/null
@@ -1,6 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2004/12/22 18:36:51 schmonz Exp $
-
-For examples, see http://www.superscript.com/qtools/examples.html.
-
-===========================================================================
diff --git a/mail/qtools/Makefile b/mail/qtools/Makefile
deleted file mode 100644
index 0d31660b609..00000000000
--- a/mail/qtools/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2005/08/19 03:55:00 schmonz Exp $
-#
-
-DISTNAME= qtools-0.56
-CATEGORIES= mail
-MASTER_SITES= http://www.superscript.com/qtools/
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://www.superscript.com/qtools/intro.html
-COMMENT= Utilities for filtering via .qmail
-
-DEPENDS+= {ezmlm>=0.53,ezmlm-idx-[0-9]*}:../../mail/ezmlm
-DEPENDS+= qmail>=1.03:../../mail/qmail
-
-DJB_RESTRICTED= NO
-DJB_CONFIG_CMDS= ${ECHO} ${LOCALBASE} > ${WRKSRC}/conf-ezmlm
-
-.include "../../mk/djbware.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qtools/PLIST b/mail/qtools/PLIST
deleted file mode 100644
index aafe0391414..00000000000
--- a/mail/qtools/PLIST
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/11/29 19:11:04 zuntum Exp $
-bin/822addr
-bin/822body
-bin/822bodyfilter
-bin/822fields
-bin/822headerfilter
-bin/822headerok
-bin/822headers
-bin/checkaddr
-bin/checkdomain
-bin/condtomaildir
-bin/filterto
-bin/ifaddr
-bin/iftoccfrom
-bin/replier
-bin/replier-config
-bin/tomaildir
diff --git a/mail/qtools/distinfo b/mail/qtools/distinfo
deleted file mode 100644
index bc478151173..00000000000
--- a/mail/qtools/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:28 agc Exp $
-
-SHA1 (qtools-0.56.tar.gz) = 0c6daa8611ac38413e0e221bbc45ccf2b7396ebc
-RMD160 (qtools-0.56.tar.gz) = 0f040d18f02a9772291b1a1ddc55d4d899918684
-Size (qtools-0.56.tar.gz) = 37748 bytes
-SHA1 (patch-aa) = 0c95897bb6ff75584231e39c26e79cee3a794439
diff --git a/mail/qtools/patches/patch-aa b/mail/qtools/patches/patch-aa
deleted file mode 100644
index 3c10d49b361..00000000000
--- a/mail/qtools/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/12/22 18:36:51 schmonz Exp $
-
---- hier.c.orig 2001-06-30 16:44:50.000000000 -0400
-+++ hier.c
-@@ -2,9 +2,9 @@
-
- void hier()
- {
-- h(auto_home,-1,-1,02755);
-+ h(auto_home,-1,-1,0755);
-
-- d(auto_home,"bin",-1,-1,02755);
-+ d(auto_home,"bin",-1,-1,0755);
-
- c(auto_home,"bin","822addr",-1,-1,0755);
- c(auto_home,"bin","822body",-1,-1,0755);
diff --git a/mail/queue-fix/DESCR b/mail/queue-fix/DESCR
deleted file mode 100644
index 0178ee74596..00000000000
--- a/mail/queue-fix/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a small utility for checking and repairing the qmail queue
-structure. It will fix uid/gid settings and permissions. It will
-rename the message files to match their inodes. It will even create
-directories and files that don't exist that should be there (you can
-even create a queue from scratch). It will also print warnings for
-any files it finds that should not exist.
diff --git a/mail/queue-fix/Makefile b/mail/queue-fix/Makefile
deleted file mode 100644
index 7ec3345418e..00000000000
--- a/mail/queue-fix/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2005/10/12 09:53:55 wiz Exp $
-#
-
-DISTNAME= queue-fix-1.4
-CATEGORIES= mail
-MASTER_SITES= ${HOMEPAGE}
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://www.netmeridian.com/e-huss/
-COMMENT= Check and repair the qmail queue structure
-
-INSTALLATION_DIRS= bin
-
-DJB_RESTRICTED= NO
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/queue-fix ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/queue-fix
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/queue-fix
-
-.include "../../mk/djbware.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/queue-fix/PLIST b/mail/queue-fix/PLIST
deleted file mode 100644
index c2c88e92818..00000000000
--- a/mail/queue-fix/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/28 22:14:33 schmonz Exp $
-bin/queue-fix
-share/doc/queue-fix/README
-@dirrm share/doc/queue-fix
diff --git a/mail/queue-fix/distinfo b/mail/queue-fix/distinfo
deleted file mode 100644
index 4bc6a8361ee..00000000000
--- a/mail/queue-fix/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/10/12 09:53:55 wiz Exp $
-
-SHA1 (queue-fix-1.4.tar.gz) = ce42fcc4daf5076adcf8fea6a9a84f2e1716c67c
-RMD160 (queue-fix-1.4.tar.gz) = 7babeb21844214779dc58b96129ab0ee555393f8
-Size (queue-fix-1.4.tar.gz) = 18486 bytes
diff --git a/mail/queue-repair/DESCR b/mail/queue-repair/DESCR
deleted file mode 100644
index d26b29dd0eb..00000000000
--- a/mail/queue-repair/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-A toolkit for dealing with the qmail queue directory structure; it
-can create a new queue, move and properly rename a queue, dynamically
-change the conf-split value, convert big-todo queues to non-big-todo
-and vice versa, and repair a corrupted queue.
diff --git a/mail/queue-repair/MESSAGE b/mail/queue-repair/MESSAGE
deleted file mode 100644
index 1235fd7e10a..00000000000
--- a/mail/queue-repair/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2006/12/29 06:44:00 schmonz Exp $
-
-This package is incompatible with mail/qmail, as it does not follow
-symlinks properly. Use it only with non-pkgsrc qmail installations.
-Otherwise, try mail/queue-fix instead.
-
-===========================================================================
diff --git a/mail/queue-repair/Makefile b/mail/queue-repair/Makefile
deleted file mode 100644
index 3df46582276..00000000000
--- a/mail/queue-repair/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/12/29 06:44:00 schmonz Exp $
-#
-
-DISTNAME= queue-repair-0.9.0
-PKGREVISION= 2
-CATEGORIES= mail
-MASTER_SITES= ${HOMEPAGE}
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://pyropus.ca/software/queue-repair/
-COMMENT= Check or correct most corruptions of the queue in qmail
-
-NO_BUILD= YES
-
-PYTHON_PATCH_SCRIPTS= queue_repair.py
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/queue_repair.py ${PREFIX}/bin/queue_repair
-
-.include "../../lang/python/application.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/queue-repair/PLIST b/mail/queue-repair/PLIST
deleted file mode 100644
index 9258c1e02e0..00000000000
--- a/mail/queue-repair/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2005/07/14 04:23:14 schmonz Exp $
-bin/queue_repair
diff --git a/mail/queue-repair/distinfo b/mail/queue-repair/distinfo
deleted file mode 100644
index b7d373492eb..00000000000
--- a/mail/queue-repair/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1 2005/07/14 04:23:14 schmonz Exp $
-
-SHA1 (queue-repair-0.9.0.tar.gz) = 123a9034c2fbbda7ca7c193153d67c4837909e56
-RMD160 (queue-repair-0.9.0.tar.gz) = 7634105825299e5d2314c819d7eb3260a3bdb2b3
-Size (queue-repair-0.9.0.tar.gz) = 13913 bytes
diff --git a/mail/rblcheck/DESCR b/mail/rblcheck/DESCR
deleted file mode 100644
index f38b957cf3d..00000000000
--- a/mail/rblcheck/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-This program is a very basic interface to Paul Vixie's RBL filter. The
-basic idea of the filter is that when someone is blacklisted for an email
-abuse, a new domain name is resolved in the form of
-"a.b.c.d.rbl.maps.vix.com", where "a.b.c.d" is actually the IP address
-"d.c.b.a". For example, if the IP address 127.0.0.2 were listed as a
-blacklisted address, "2.0.0.127.rbl.maps.vix.com" would have a DNS entry
-(this is a real example; that address is in place as a verification
-mechanism).
-
-For more information about the RBL blacklist, please take a look at
-http://maps.vix.com/rbl/ . For more information about BIND, drop by
-http://www.isc.org/bind.html .
-
-Any ideas, bugfixes, or porting notes should be sent to me at
-"emarshal@logic.net". Don't bug the MAPS people about this; they didn't
-write it, and probably woudn't like getting a bunch of mail about it.
diff --git a/mail/rblcheck/Makefile b/mail/rblcheck/Makefile
deleted file mode 100644
index b47e9bbe27e..00000000000
--- a/mail/rblcheck/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2006/09/11 21:26:04 cube Exp $
-
-DISTNAME= rblcheck-1.5
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rblcheck/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://rblcheck.sourceforge.net/
-COMMENT= Command-line interface to Paul Vixie's RBL filter
-
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-
-DOCS= README NEWS docs/rblcheck.ps
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/rblcheck ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rblcheck
- cd ${WRKSRC} && \
- ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/rblcheck
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/rblcheck/PLIST b/mail/rblcheck/PLIST
deleted file mode 100644
index 514b5fac418..00000000000
--- a/mail/rblcheck/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/09/11 21:26:04 cube Exp $
-bin/rblcheck
-share/doc/rblcheck/NEWS
-share/doc/rblcheck/README
-share/doc/rblcheck/rblcheck.ps
-@dirrm share/doc/rblcheck
diff --git a/mail/rblcheck/distinfo b/mail/rblcheck/distinfo
deleted file mode 100644
index 41648afafa1..00000000000
--- a/mail/rblcheck/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/09/11 21:26:04 cube Exp $
-
-SHA1 (rblcheck-1.5.tar.gz) = 395e4bde8c2d3ec350e81a0af64cb63f82c4cdb3
-RMD160 (rblcheck-1.5.tar.gz) = 82dd687151175084d74958090877311d9d2e8f23
-Size (rblcheck-1.5.tar.gz) = 150395 bytes
-SHA1 (patch-aa) = 3c3ded88623fe118e020b36e68683a7cd2ab2f3d
diff --git a/mail/rblcheck/hacks.mk b/mail/rblcheck/hacks.mk
deleted file mode 100644
index 3048c9a2954..00000000000
--- a/mail/rblcheck/hacks.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2005/11/07 20:36:12 tv Exp $
-
-###
-### Need a real resolver on Interix.
-###
-.if ${OPSYS} == "Interix"
-BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/bind /usr/local/lib/bind
-CPPFLAGS+= -I/usr/local/include/bind
-LDFLAGS+= -L/usr/local/lib/bind
-LIBS+= -lbind -ldb
-.endif
diff --git a/mail/rblcheck/patches/patch-aa b/mail/rblcheck/patches/patch-aa
deleted file mode 100644
index c3daaf7b58e..00000000000
--- a/mail/rblcheck/patches/patch-aa
+++ /dev/null
@@ -1,124 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/09/11 21:26:04 cube Exp $
-
---- rblcheck.c.orig Thu Nov 8 14:05:27 2001
-+++ rblcheck.c Wed May 1 08:19:16 2002
-@@ -28,8 +28,10 @@
- #include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
-+#include <arpa/inet.h>
- #include <resolv.h>
- #include <netdb.h>
-+#include <unistd.h>
-
- /*-- PORTABILITY ------------------------------------------------------------*/
-
-@@ -184,7 +186,7 @@
- * domain. If "txt" is non-zero, we perform a TXT record lookup. We
- * return the text returned from a TXT match, or an empty string, on
- * a successful match, or NULL on an unsuccessful match. */
--char * rblcheck( int a, int b, int c, int d, char * rbldomain, int txt )
-+char * rblcheck( struct in_addr a, char * rbldomain, int txt )
- {
- char * domain;
- char * result = NULL;
-@@ -195,12 +197,15 @@
- const u_char * cend;
- const u_char * rend;
- int len;
-+ u_char *p;
-+ int i, j;
-
- /* 16 characters max in a dotted-quad address, plus 1 for null */
- domain = ( char * )malloc( 17 + strlen( rbldomain ) );
-
-+ p = (u_char *)&a;
- /* Create a domain name, in reverse. */
-- sprintf( domain, "%d.%d.%d.%d.%s", d, c, b, a, rbldomain );
-+ sprintf( domain, "%d.%d.%d.%d.%s", p[3], p[2], p[1], p[0], rbldomain );
-
- /* Make our DNS query. */
- res_init();
-@@ -242,8 +247,8 @@
- cp = answer + sizeof( HEADER );
- while( *cp != '\0' )
- {
-- a = *cp++;
-- while( a-- )
-+ i = *cp++;
-+ while( i-- )
- cp++;
- }
-
-@@ -258,8 +263,8 @@
- cp += ( NS_INT16SZ * 2 ) + NS_INT32SZ;
-
- /* Get the length and end of the buffer. */
-- NS_GET16( c, cp );
-- cend = cp + c;
-+ NS_GET16( i, cp );
-+ cend = cp + i;
-
- /* Iterate over any multiple answers we might have. In
- this context, it's unlikely, but anyway. */
-@@ -267,10 +272,10 @@
- rend = result + RESULT_SIZE - 1;
- while( cp < cend && rp < rend )
- {
-- a = *cp++;
-- if( a != 0 )
-- for( b = a; b > 0 && cp < cend && rp < rend;
-- b-- )
-+ i = *cp++;
-+ if( i != 0 )
-+ for( j = i; j > 0 && cp < cend && rp < rend;
-+ j-- )
- {
- if( *cp == '\n' || *cp == '"' ||
- *cp == '\\' )
-@@ -289,22 +294,39 @@
- * RBL listing, handling output of results if necessary. */
- int full_rblcheck( char * addr )
- {
-- int a, b, c, d;
-+ struct hostent *ent;
-+ struct in_addr a;
- int count = 0;
-+ int rblchecking = 0;
- char * response;
- struct rbl * ptr;
-+ int fail;
-+ int c;
-
- for( ptr = rblsites; ptr != NULL; ptr = ptr->next )
- {
-- if( sscanf( addr, "%d.%d.%d.%d", &a, &b, &c, &d ) != 4
-- || a < 0 || a > 255 || b < 0 || b > 255 || c < 0 || c > 255
-- || d < 0 || d > 255 )
-- {
-+ fail = 0;
-+ if ((ent = gethostbyname(addr)) != NULL) {
-+ memcpy(&a, ent->h_addr_list[0], sizeof(a));
-+ if (ent->h_addr_list[1]) {
-+ if (!quiet && rblchecking == 0)
-+ fprintf(stderr,
-+ "%s resolved to mutiple addresses: ",
-+ addr);
-+ }
-+ if (!quiet && rblchecking++ == 0)
-+ fprintf(stderr, "checking %s\n", inet_ntoa(a));
-+ } else {
-+ if (!inet_aton(addr, &a))
-+ fail++;
-+ }
-+
-+ if (fail) {
- fprintf( stderr, "%s: warning: invalid address `%s'\n",
- progname, addr );
- return 0;
- }
-- response = rblcheck( a, b, c, d, ptr->site, txt );
-+ response = rblcheck( a, ptr->site, txt );
- if( !quiet || response )
- printf( "%s %s%s%s%s%s%s", addr,
- ( !quiet && !response ? "not " : "" ),
diff --git a/mail/relay-ctrl/DESCR b/mail/relay-ctrl/DESCR
deleted file mode 100644
index c8d08b35376..00000000000
--- a/mail/relay-ctrl/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This set of programs controls access to relaying for users that
-authenticate using either POP3 using the qmail-popup/qmail-pop3d
-or pop3front servers, or IMAP using Courier IMAP or Dovecot.
diff --git a/mail/relay-ctrl/MESSAGE b/mail/relay-ctrl/MESSAGE
deleted file mode 100644
index c45e6b56ee1..00000000000
--- a/mail/relay-ctrl/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2007/02/28 14:12:40 schmonz Exp $
-
-relay-ctrl needs to be integrated into both your POP/IMAP and SMTP
-services. For SMTP, if you use mail/qmail-run, set the following
-in /etc/rc.conf:
-
-qmailsmtpd_postenv="RELAY_CTRL_DIR='${RELAY_CTRL_DIR}/allow'"
-qmailsmtpd_pretcpserver="${PREFIX}/bin/relay-ctrl-chdir"
-qmailsmtpd_presmtpd="${PREFIX}/bin/relay-ctrl-check"
-
-For other services, see ${PREFIX}/${DOCDIR}/README.
-
-===========================================================================
diff --git a/mail/relay-ctrl/Makefile b/mail/relay-ctrl/Makefile
deleted file mode 100644
index e4ebe7a9ec8..00000000000
--- a/mail/relay-ctrl/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/02/28 14:12:40 schmonz Exp $
-#
-
-DISTNAME= relay-ctrl-3.1.1
-CATEGORIES= mail
-MASTER_SITES= ${HOMEPAGE}
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://untroubled.org/relay-ctrl/
-COMMENT= Allows relaying via POP/IMAP-before-SMTP
-
-DJB_RESTRICTED= NO
-DJB_MAKE_TARGETS= NO
-
-DOCDIR= share/doc/${PKGBASE}
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 ${DOCDIR}
-OWN_DIRS_PERMS+= ${RELAY_CTRL_DIR} ${ROOT_USER} ${ROOT_GROUP} 700
-OWN_DIRS_PERMS+= ${RELAY_CTRL_DIR}/allow ${ROOT_USER} ${ROOT_GROUP} 777
-MESSAGE_SUBST+= RELAY_CTRL_DIR=${RELAY_CTRL_DIR:Q} DOCDIR=${DOCDIR:Q}
-BUILD_DEFS+= RELAY_CTRL_DIR
-
-ADDON_SCRIPTS= dovecot-settcpremoteip ifrelayclient
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= ${ADDON_SCRIPTS}
-SUBST_SED.paths= -e 's,@ECHO@,${ECHO},g'
-SUBST_SED.paths+= -e 's,@GREP@,${GREP},g'
-SUBST_SED.paths+= -e 's,@SED@,${SED},g'
-SUBST_SED.paths+= -e 's,@SETENV@,${SETENV},g'
-SUBST_SED.paths+= -e 's,@SH@,${SH},g'
-SUBST_STAGE.paths= do-configure
-
-post-extract:
- for f in ${ADDON_SCRIPTS}; do \
- ${CP} ${FILESDIR}/$$f.sh ${WRKSRC}/$$f; \
- done
-
-do-install:
- ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
- ./installer; \
- ./instcheck
- for f in ANNOUNCEMENT COPYING NEWS README TODO packet.html; do \
- ${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/${DOCDIR}; \
- done
- for f in ${ADDON_SCRIPTS}; do \
- ${INSTALL_SCRIPT} ${WRKSRC}/$${f} ${PREFIX}/bin; \
- done
-
-.include "../../mk/djbware.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/relay-ctrl/PLIST b/mail/relay-ctrl/PLIST
deleted file mode 100644
index 745ab9ec7de..00000000000
--- a/mail/relay-ctrl/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/02/28 14:12:40 schmonz Exp $
-bin/dovecot-settcpremoteip
-bin/ifrelayclient
-bin/relay-ctrl-age
-bin/relay-ctrl-allow
-bin/relay-ctrl-chdir
-bin/relay-ctrl-check
-bin/relay-ctrl-send
-bin/relay-ctrl-udp
-man/man8/relay-ctrl-age.8
-man/man8/relay-ctrl-allow.8
-man/man8/relay-ctrl-check.8
-man/man8/relay-ctrl-send.8
-man/man8/relay-ctrl-udp.8
-share/doc/relay-ctrl/ANNOUNCEMENT
-share/doc/relay-ctrl/COPYING
-share/doc/relay-ctrl/NEWS
-share/doc/relay-ctrl/README
-share/doc/relay-ctrl/TODO
-share/doc/relay-ctrl/packet.html
-@dirrm share/doc/relay-ctrl
diff --git a/mail/relay-ctrl/distinfo b/mail/relay-ctrl/distinfo
deleted file mode 100644
index eddf03c8e96..00000000000
--- a/mail/relay-ctrl/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/02/28 14:12:40 schmonz Exp $
-
-SHA1 (relay-ctrl-3.1.1.tar.gz) = 01ae6eba6fff3b93761ce0bdd5ca7059a999d2d1
-RMD160 (relay-ctrl-3.1.1.tar.gz) = 48fa830f08b1ea3b37ca07d62cde05dc35388287
-Size (relay-ctrl-3.1.1.tar.gz) = 35046 bytes
diff --git a/mail/relay-ctrl/files/dovecot-settcpremoteip.sh b/mail/relay-ctrl/files/dovecot-settcpremoteip.sh
deleted file mode 100644
index cb2f7b4281c..00000000000
--- a/mail/relay-ctrl/files/dovecot-settcpremoteip.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!@SH@
-#
-# Wrapper for relay-ctrl-allow that sets TCPREMOTEIP.
-
-TCPREMOTEIP="${IP}"; export TCPREMOTEIP
-exec "$@"
diff --git a/mail/relay-ctrl/files/ifrelayclient.sh b/mail/relay-ctrl/files/ifrelayclient.sh
deleted file mode 100644
index 30242e47c75..00000000000
--- a/mail/relay-ctrl/files/ifrelayclient.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!@SH@
-#
-# Wrapper for qmail-smtpd command chain that runs the first command
-# only if RELAYCLIENT is set, running the remaining commands
-# regardless. End the first command with "--".
-#
-# Useful for e.g. setting RBLSMTPD="" to avoid RBL-blocking an
-# authenticated user.
-
-relayclient_isset()
-{
- @SETENV@ | @GREP@ -q '^RELAYCLIENT=' >/dev/null 2>&1
-}
-
-main()
-{
- local cmd1 arg
- cmd1=""
- while [ $# -gt 0 ]; do
- arg="$1"; shift
- if [ "${arg}" = '--' ]; then
- break
- else
- cmd1="${cmd1} ${arg}"
- fi
- done
- if [ $# -eq 0 ]; then
- @ECHO@ >&2 "usage: $0 command args -- command args"
- exit 111
- fi
- if relayclient_isset; then
- exec ${cmd1} "$@"
- else
- exec "$@"
- fi
-}
-
-main "$@"
-exit $?
diff --git a/mail/ripmime/DESCR b/mail/ripmime/DESCR
deleted file mode 100644
index aae5ae32956..00000000000
--- a/mail/ripmime/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-RipMIME is designed to extract the attached files out of a MIME
-package (as say produced by programs such as AMaViS, Inflex and
-Xamime). It can decode BASE64, Apple-double, UUENCODED, TNEF,
-QuotedPrintable, nested and MS MHT attachments out of mailpacks.
diff --git a/mail/ripmime/Makefile b/mail/ripmime/Makefile
deleted file mode 100644
index 4dfca57944b..00000000000
--- a/mail/ripmime/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:44 wiz Exp $
-#
-
-DISTNAME= ripmime-1.4.0.2
-CATEGORIES= mail
-MASTER_SITES= http://www.pldaniels.com/ripmime/
-
-MAINTAINER= reed@reedmedia.net
-HOMEPAGE= http://www.pldaniels.com/ripmime/
-COMMENT= Extract the attached files out of a MIME encoded email package
-
-PKGMANDIR?= man
-MAKE_ENV+= PKGMANDIR=${PKGMANDIR:Q}
-INSTALLATION_DIRS= bin ${PKGMANDIR}
-
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/ripmime/PLIST b/mail/ripmime/PLIST
deleted file mode 100644
index fca3150c3d6..00000000000
--- a/mail/ripmime/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/11/27 07:41:06 reed Exp $
-bin/ripmime
-man/man1/ripmime.1
diff --git a/mail/ripmime/distinfo b/mail/ripmime/distinfo
deleted file mode 100644
index e5a10d3d09e..00000000000
--- a/mail/ripmime/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:28 agc Exp $
-
-SHA1 (ripmime-1.4.0.2.tar.gz) = c1d939b7cc311e538513a7eea10cb03f36d5969b
-RMD160 (ripmime-1.4.0.2.tar.gz) = 4d0b54d661f3690dd0da43f7a235f8995411b8c2
-Size (ripmime-1.4.0.2.tar.gz) = 157535 bytes
-SHA1 (patch-aa) = 2f3ca62a3a3921ee7407cc97c2f72efadd95dc08
diff --git a/mail/ripmime/patches/patch-aa b/mail/ripmime/patches/patch-aa
deleted file mode 100644
index 0c1514c0cce..00000000000
--- a/mail/ripmime/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/11/27 07:41:06 reed Exp $
-
---- Makefile.orig Fri Nov 26 17:14:55 2004
-+++ Makefile
-@@ -3,7 +3,7 @@
- #
- # 0.1.13: Added -I.
-
--LOCATION=/usr/local
-+LOCATION=$(PREFIX)
- VERSION=0.1.14
- # VERSION changes
- #---------------------
-@@ -15,7 +15,7 @@ VERSION=0.1.14
- # use our recommended settings.
- #CFLAGS ?= -Wall -g -O2 -Werror $(CPU_OPTS)
- #CFLAGS=-Wall -g -O2 -Wundef -Wshadow -Wsign-compare -I.
--CFLAGS=-Wall -g -O2 -I.
-+CFLAGS?=-Wall -g -O2 -I.
-
- # OLE decoding is still considered to be 'beta' mode - so it
- # disabled in the stable release of ripMIME for now
-@@ -74,7 +74,7 @@ riptest: ${OFILES}
- install: ${OBJ}
- strip ripmime
- cp ripmime ${LOCATION}/bin/
-- cp ripmime.1 ${LOCATION}/man/man1
-+ cp ripmime.1 ${LOCATION}/$(PKGMANDIR)/man1
-
- clean:
- rm -f *.o *core ${OBJ} buildcodes.h
diff --git a/mail/rmail-mime/DESCR b/mail/rmail-mime/DESCR
deleted file mode 100644
index e015055b838..00000000000
--- a/mail/rmail-mime/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-RMAIL-MIME is a module to provide MIME features to RMAIL. RMAIL is an Emacs
-subsystem for reading and disposing of mail that you receive.
diff --git a/mail/rmail-mime/Makefile b/mail/rmail-mime/Makefile
deleted file mode 100644
index 8441450d13b..00000000000
--- a/mail/rmail-mime/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:09:57 joerg Exp $
-#
-
-DISTNAME= rmail-mime-1.13.0
-PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.m17n.org/pub/mule/semi/rmail-mime/
-
-MAINTAINER= jschauma@NetBSD.org
-COMMENT= MIME-capabilities for RMAIL in Emacs
-
-DEPENDS+= ${EMACS_PKGNAME_PREFIX}semi>=1.14.4:../../devel/semi
-
-.include "../../mk/emacs.mk"
-
-SITE_LISP= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}
-PLIST_SUBST+= SITE_LISP=${SITE_LISP:Q}
-
-do-build:
- cd ${WRKSRC}; ${EMACS_BIN} --no-init-file --no-site-file -batch \
- -f batch-byte-compile rmail-mime.el
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/${SITE_LISP}
- ${INSTALL_DATA} ${WRKSRC}/rmail-mime.el ${EMACS_LISPPREFIX}
- ${INSTALL_DATA} ${WRKSRC}/rmail-mime.elc ${EMACS_LISPPREFIX}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/rmail-mime/PLIST b/mail/rmail-mime/PLIST
deleted file mode 100644
index d5bd9372683..00000000000
--- a/mail/rmail-mime/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/11/27 03:29:47 jschauma Exp $
-${SITE_LISP}/rmail-mime.el
-${SITE_LISP}/rmail-mime.elc
diff --git a/mail/rmail-mime/distinfo b/mail/rmail-mime/distinfo
deleted file mode 100644
index 170fbe1235c..00000000000
--- a/mail/rmail-mime/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:28 agc Exp $
-
-SHA1 (rmail-mime-1.13.0.tar.gz) = 46e1dedbffbd47558a1b0137712386c4a5483559
-RMD160 (rmail-mime-1.13.0.tar.gz) = d91690a0b3f6431b317c205b13c89a5f4787c98d
-Size (rmail-mime-1.13.0.tar.gz) = 8692 bytes
diff --git a/mail/rss2email/DESCR b/mail/rss2email/DESCR
deleted file mode 100644
index 003232a148e..00000000000
--- a/mail/rss2email/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-rss2email is a simple Python script that lets you subscribe to a
-list of XML newsfeeds and get new items sent to you by email.
diff --git a/mail/rss2email/Makefile b/mail/rss2email/Makefile
deleted file mode 100644
index 5ad29d418f8..00000000000
--- a/mail/rss2email/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2007/01/19 00:57:03 schmonz Exp $
-#
-
-DISTNAME= rss2email-2.60
-CATEGORIES= mail
-MASTER_SITES= ${HOMEPAGE}
-EXTRACT_SUFX= .py
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://rss2email.infogami.com/
-COMMENT= Get RSS feeds emailed to you
-
-DEPENDS+= ${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser
-DEPENDS+= ${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text
-
-WRKSRC= ${WRKDIR}
-NO_BUILD= yes
-PYTHON_PATCH_SCRIPTS= *.py
-PYTHON_VERSIONS_ACCEPTED?= 24 23 22
-
-SUBST_CLASSES+= bin
-SUBST_STAGE.bin= do-configure
-SUBST_FILES.bin= rss2email.py r2e
-SUBST_SED.bin= -e 's|@LOCALBASE@|${LOCALBASE}|g'
-SUBST_SED.bin+= -e 's|@PREFIX@|${PREFIX}|g'
-SUBST_SED.bin+= -e 's|@PYTHONBIN@|${PYTHONBIN}|g'
-
-SHAREDIR= ${PREFIX}/share/rss2email
-EGDIR= ${PREFIX}/share/examples/rss2email
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-extract:
- ${_PKG_SILENT}${_PKG_DEBUG} \
- ${CP} ${DISTDIR}/${DISTFILES:Q} ${WRKSRC}/rss2email.py; \
- cd ${FILESDIR} && cp config.py r2e r2e.1 ${WRKSRC}
-
-do-install:
- cd ${WRKSRC} && \
- ${INSTALL_SCRIPT_DIR} ${SHAREDIR}; \
- ${INSTALL_SCRIPT} rss2email.py ${SHAREDIR}; \
- ${INSTALL_DATA_DIR} ${EGDIR}; \
- ${INSTALL_DATA} config.py ${EGDIR}; \
- ${INSTALL_MAN} r2e.1 ${PREFIX}/${PKGMANDIR}/man1; \
- ${INSTALL_SCRIPT} r2e ${PREFIX}/bin
-
-.include "../../lang/python/application.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/rss2email/PLIST b/mail/rss2email/PLIST
deleted file mode 100644
index 2edf7f4e094..00000000000
--- a/mail/rss2email/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/12/03 00:49:36 schmonz Exp $
-bin/r2e
-man/man1/r2e.1
-share/examples/rss2email/config.py
-share/rss2email/rss2email.py
-@dirrm share/rss2email
-@dirrm share/examples/rss2email
diff --git a/mail/rss2email/distinfo b/mail/rss2email/distinfo
deleted file mode 100644
index 946e0e48f57..00000000000
--- a/mail/rss2email/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.14 2007/01/19 00:57:03 schmonz Exp $
-
-SHA1 (rss2email-2.60.py) = 1427043b2335574c57028a2692ca5fd18f461b6c
-RMD160 (rss2email-2.60.py) = ad7716ed62007bc13524057e060a529bdf924e18
-Size (rss2email-2.60.py) = 23956 bytes
-SHA1 (patch-ad) = 8932556b67aaa0e7d4df263ad9f3cf96deb74bfd
diff --git a/mail/rss2email/files/config.py b/mail/rss2email/files/config.py
deleted file mode 100644
index 3261584dcb5..00000000000
--- a/mail/rss2email/files/config.py
+++ /dev/null
@@ -1,76 +0,0 @@
-### Vaguely Customizable Options ###
-
-# The email address messages are from by default:
-DEFAULT_FROM = "bozo@dev.null.invalid"
-
-# 1: Send text/html messages when possible.
-# 0: Convert HTML to plain text.
-HTML_MAIL = 0
-
-# 1: Only use the DEFAULT_FROM address.
-# 0: Use the email address specified by the feed, when possible.
-FORCE_FROM = 0
-
-# 1: Receive one email per post
-# 0: Receive an email every time a post changes
-TRUST_GUID = 1
-
-# 1: Generate Date header based on item's date, when possible
-# 0: Generate Date header based on time sent
-DATE_HEADER = 0
-
-# A tuple consisting of some combination of
-# ('issued', 'created', 'modified', 'expired')
-# expressing ordered list of preference in dates
-# to use for the Date header of the email.
-DATE_HEADER_ORDER = ('modified', 'issued', 'created')
-
-# 1: Apply Q-P conversion (required for some MUAs).
-# 0: Send message in 8-bits.
-# http://cr.yp.to/smtp/8bitmime.html
-QP_REQUIRED = 0
-
-# 1: Name feeds as they're being processed.
-# 0: Keep quiet.
-VERBOSE = 0
-
-# 1: Use the publisher's email if you can't find the author's.
-# 0: Just use the DEFAULT_FROM email instead.
-USE_PUBLISHER_EMAIL = 0
-
-# 1: Use SMTP_SERVER to send mail.
-# 0: Call /usr/sbin/sendmail to send mail.
-SMTP_SEND = 0
-
-SMTP_SERVER = "smtp.yourisp.net:25"
-AUTHREQUIRED = 0 # if you need to use SMTP AUTH set to 1
-SMTP_USER = ' username' # for SMTP AUTH, set SMTP username here
-SMTP_PASS = 'password' # for SMTP AUTH, set SMTP password here
-
-# Set this to add a bonus header to all emails (start with '\n').
-BONUS_HEADER = ''
-# Example: BONUS_HEADER = '\nApproved: joe@bob.org'
-
-# Set this to override From addresses. Keys are feed URLs, values are new titles.
-OVERRIDE_FROM = {}
-
-# Set this to override the timeout (in seconds) for feed server response
-FEED_TIMEOUT = 60
-
-# Optional CSS styling
-USE_CSS_STYLING = 0
-STYLE_SHEET='h1 {font: 18pt Georgia, "Times New Roman";} body {font: 12pt Arial;} a:link {font: 12pt Arial; font-weight: bold; color: #0000cc} blockquote {font-family: monospace; } .header { background: #e0ecff; border-bottom: solid 4px #c3d9ff; padding: 5px; margin-top: 0px; color: red;} .header a { font-size: 20px; text-decoration: none; } .footer { background: #c3d9ff; border-top: solid 4px #c3d9ff; padding: 5px; margin-bottom: 0px; } #entry {border: solid 4px #c3d9ff; } #body { margin-left: 5px; margin-right: 5px; }'
-
-# If you have an HTTP Proxy set this in the format 'http://your.proxy.here:8080/'
-PROXY=""
-
-## html2text options ##
-
-# Use Unicode characters instead of their ascii psuedo-replacements
-UNICODE_SNOB = 0
-
-# Put the links after each paragraph instead of at the end.
-LINKS_EACH_PARAGRAPH = 0
-
-# Wrap long lines at position. 0 for no wrapping. (Requires Python 2.3.)
-BODY_WIDTH = 0
diff --git a/mail/rss2email/files/r2e b/mail/rss2email/files/r2e
deleted file mode 100644
index 112ced9c29e..00000000000
--- a/mail/rss2email/files/r2e
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-if [ ! -d ~/.rss2email ]; then
- mkdir ~/.rss2email
-fi
-cd ~/.rss2email
-exec @PYTHONBIN@ @PREFIX@/share/rss2email/rss2email.py feeds.dat $*
diff --git a/mail/rss2email/files/r2e.1 b/mail/rss2email/files/r2e.1
deleted file mode 100644
index 91fbf28f8cb..00000000000
--- a/mail/rss2email/files/r2e.1
+++ /dev/null
@@ -1,169 +0,0 @@
-.TH R2E 1a
-.SH NAME
-r2e \- receive RSS feeds by email
-.SH SYNOPSIS
-.B r2e action [options]
-.SH DESCRIPTION
-.BR r2e
-is a simple program which you can run in your crontab.
-It watches RSS feeds and sends you nicely formatted email message
-for each new item.
-.P
-The program is configured by ~/.rss2email/config.py
-.P
-For a quick start with r2e, try these steps:
-.P
-.RS
-.nf
-.BI "r2e new " your@address
-.BI "r2e add " http://feed.url/somewhere.rss
-.BI "r2e run "
-.RE
-.P
-The last command should eventually be put into your crontab, if you
-want things be sent you automatically.
-.SH ACTIONS
-.TP
-.B new [youremail]
-Create a new feedfile. If the second option is specified, it sets the
-default email address that mails are sent to.
-.TP
-.B add url [youremail]
-Subscribe to a feed. The first option is the URL of the feed.
-The optional second option is the email address to send new items to.
-Repeat for each feed you want to subscribe to.
-.TP
-.B run [--no-send] [num]
-Scan the feeds and send emails for new items. This can be run in a cron
-job.
-.P
-The --no-send option stops r2e from sending any email. This can be
-useful the first time you run it, as otherwise it would send every
-available story.
-.P
-If a number is specified, r2e will only download that feed. The list
-command lists the feed numbers.
-.TP
-.B email yournewemail
-Change the default email address.
-.TP
-.B list
-List all your currently subscribed feeds.
-.TP
-.B delete n
-Delete a feed, using its number from the list command.
-.SH "CONFIGURATION"
-The program's behavior can be controlled via the ~/.rss2email/config.py
-config file. The file is a python file, so variables are set using a syntax
-like this: VARIABLE = "value"
-.P
-If the value is a number, the quotes may be omitted. Most configuration
-variables in the file are boolean values, where a 1 indicates the option is
-set, and a 0 disables it.
-.P
-See the example config.py file for a full list of available configuration
-variables.
-.SH FILES
-.TP
-.B ~/.rss2email/feeds.dat
-The database of feeds. Use r2e to add, remove, or modify feeds, do not edit
-it directly.
-.TP
-.B ~/.rss2email/config.py
-If this file exists, it it read to configure the program.
-.SH AUTHOR
-Aaron Swartz <rss2email@aaronsw.com>
-.TH R2E 1a
-.SH NAME
-r2e \- receive RSS feeds by email
-.SH SYNOPSIS
-.B r2e action [options]
-.SH DESCRIPTION
-.BR r2e
-is a simple program which you can run in your crontab.
-It watches RSS feeds and sends you nicely formatted email message
-for each new item.
-.P
-The program is configured by ~/.rss2email/config.py
-.P
-For a quick start with r2e, try these steps:
-.P
-.RS
-.nf
-.BI "r2e new " your@address
-.BI "r2e add " http://feed.url/somewhere.rss
-.BI "r2e run "
-.RE
-.P
-The last command should eventually be put into your crontab, if you
-want things be sent you automatically.
-.SH ACTIONS
-.TP
-.B new [youremail]
-Create a new feedfile. If the second option is specified, it sets the
-default email address that mails are sent to.
-.TP
-.B add url [youremail]
-Subscribe to a feed. The first option is the URL of the feed.
-The optional second option is the email address to send new items to.
-Repeat for each feed you want to subscribe to.
-.TP
-.B run [--no-send]
-Scan the feeds and send emails for new items. This can be run in a cron
-job.
-The --no-send option stops r2e from sending any email. This can be
-useful the first time you run it, as otherwise it would send every
-available story.
-.TP
-.B email yournewemail
-Change the default email address.
-.TP
-.B list
-List all your currently subscribed feeds.
-.TP
-.B delete n
-Delete a feed, using its number from the list command.
-.SH "CONFIGURATION"
-The following configuration variables can be set in the ~/.rss2email/config.py
-config file. The file is a python file, so variables are set using a syntax
-like this: VARIABLE = "value"
-.P
-If the value is a number, the quotes may be omitted. Most configuration
-variables in the file are boolean values, where a 1 indicates the option is
-set, and a 0 disables it.
-.TP
-.B DEFAULT_FROM
-The email address messages are from by default, if the rss feed does not
-specify an email address. The default valus is "bozo@dev.null"
-.TP
-.B FORCE_FROM
-If set, the DEFAULT_FROM address will always be used, otherwise use
-the email address specified by the feed, when possible.
-.TP
-.B HTML_MAIL
-If set, HTML mail will be sent as such. Otherwise, entries will be
-converted to plain text before sending.
-.TP
-.B TRUST_GUID
-If set, receive one email per post. Otherwise, a new email will be sent
-each time a post changes.
-.TP
-.B DATE_HEADER
-If set, the mail's date will be set to the date the item was posted, if
-possible. Otherwise, the date will be based on the time the email is sent.
-.TP
-.B QP_REQUIRED
-If set, do a quoted printible conversion; otherwise send message in 8 bits.
-.TP
-.B VERBOSE
-If set, feeds are named as they're processed.
-.SH FILES
-.TP
-.B ~/.rss2email/feeds.dat
-The database of feeds. Use r2e to add, remove, or modify feeds, do not edit
-it directly.
-.TP
-.B ~/.rss2email/config.py
-If this file exists, it it read to configure the program.
-.SH AUTHOR
-Aaron Swartz <me@aaronsw.com>
diff --git a/mail/rss2email/patches/patch-ad b/mail/rss2email/patches/patch-ad
deleted file mode 100644
index 5bb777e7b6c..00000000000
--- a/mail/rss2email/patches/patch-ad
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2007/01/19 00:57:03 schmonz Exp $
-
---- rss2email.py.orig 2007-01-18 18:27:17.000000000 -0500
-+++ rss2email.py
-@@ -182,6 +182,11 @@ def send(sender, recipient, subject, bod
- i, o = os.popen2(["/usr/sbin/sendmail", recipient])
- i.write(msg_as_string)
- i.close(); o.close()
-+ pid, status = os.wait()
-+ if status != 0:
-+ print >>warn, ""
-+ print >>warn, ('Fatal error: sendmail exited with code %s' % status)
-+ sys.exit(1)
- del i, o
- return None
-
-@@ -212,8 +217,7 @@ import cPickle as pickle, md5, time, os,
- unix = 0
- try:
- import fcntl
-- if sys.version.find('sunos') != -1:
-- unix = 1
-+ unix = 1
- except:
- pass
-
-@@ -225,6 +229,7 @@ import mimify; from StringIO import Stri
- import feedparser
- feedparser.USER_AGENT = "rss2email/"+__version__+ " +http://www.aaronsw.com/2002/rss2email/"
-
-+sys.path.append("@LOCALBASE@/share/html2text")
- import html2text as h2t
-
- h2t.UNICODE_SNOB = UNICODE_SNOB
diff --git a/mail/ruby-actionmailer/DESCR b/mail/ruby-actionmailer/DESCR
deleted file mode 100644
index db2541c5ebb..00000000000
--- a/mail/ruby-actionmailer/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Action Mailer is framework for designing email-service layers. These
-layers are used to consolidate code for sending out forgotten
-passwords, welcoming wishes on signup, invoices for billing, and any
-other use case that requires a written notification to either a person
-or another system. Additionally, an Action Mailer class can be used
-to process incoming email, such as allowing a weblog to accept new
-posts from an email (which could even have been sent from a phone).
diff --git a/mail/ruby-actionmailer/Makefile b/mail/ruby-actionmailer/Makefile
deleted file mode 100644
index cf3a82d6630..00000000000
--- a/mail/ruby-actionmailer/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2007/03/17 11:14:29 minskim Exp $
-
-DISTNAME= actionmailer-1.3.3
-PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
-CATEGORIES= mail ruby
-MASTER_SITES= http://rubyforge.org/frs/download.php/18409/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= minskim@NetBSD.org
-HOMEPAGE= http://rubyforge.org/projects/actionmailer/
-COMMENT= Ruby framework for designing email-service layers
-
-DEPENDS+= ${RUBY_PKGPREFIX}-actionpack>=1.13.3:../../www/ruby-actionpack
-DEPENDS+= ${RUBY_PKGPREFIX}-tmail>=0.10.8:../../mail/ruby-tmail
-
-NO_BUILD= yes
-NO_CONFIGURE= yes
-USE_RUBY_INSTALL= yes
-
-.include "../../lang/ruby/modules.mk"
-
-pre-install:
- ${RM} -rf ${WRKSRC}/lib/action_mailer/vendor/tmail
- ${RM} -f ${WRKSRC}/lib/action_mailer/vendor/tmail.rb
-
-post-install:
- ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/actionmailer
- ${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${RUBY_DOCDIR}/actionmailer
- ${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/actionmailer
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/ruby-actionmailer/PLIST b/mail/ruby-actionmailer/PLIST
deleted file mode 100644
index 22167ee9441..00000000000
--- a/mail/ruby-actionmailer/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2007/03/17 11:14:29 minskim Exp $
-${RUBY_SITELIBDIR}/action_mailer.rb
-${RUBY_SITELIBDIR}/action_mailer/adv_attr_accessor.rb
-${RUBY_SITELIBDIR}/action_mailer/base.rb
-${RUBY_SITELIBDIR}/action_mailer/helpers.rb
-${RUBY_SITELIBDIR}/action_mailer/mail_helper.rb
-${RUBY_SITELIBDIR}/action_mailer/part.rb
-${RUBY_SITELIBDIR}/action_mailer/part_container.rb
-${RUBY_SITELIBDIR}/action_mailer/quoting.rb
-${RUBY_SITELIBDIR}/action_mailer/utils.rb
-${RUBY_SITELIBDIR}/action_mailer/vendor/text/format.rb
-${RUBY_SITELIBDIR}/action_mailer/version.rb
-${RUBY_DOCDIR}/actionmailer/CHANGELOG
-${RUBY_DOCDIR}/actionmailer/README
-@dirrm ${RUBY_DOCDIR}/actionmailer
-@dirrm ${RUBY_SITELIBDIR}/action_mailer/vendor/text
-@dirrm ${RUBY_SITELIBDIR}/action_mailer/vendor
-@dirrm ${RUBY_SITELIBDIR}/action_mailer
diff --git a/mail/ruby-actionmailer/distinfo b/mail/ruby-actionmailer/distinfo
deleted file mode 100644
index 8e38172ac28..00000000000
--- a/mail/ruby-actionmailer/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.9 2007/03/17 11:14:29 minskim Exp $
-
-SHA1 (actionmailer-1.3.3.tgz) = d03479074aa570b1ec23291e0ac13fec3e26736c
-RMD160 (actionmailer-1.3.3.tgz) = 7f4595eb7da82fcd1e82a330624d137bd0271abd
-Size (actionmailer-1.3.3.tgz) = 80773 bytes
diff --git a/mail/ruby-tmail/DESCR b/mail/ruby-tmail/DESCR
deleted file mode 100644
index 31847e6f182..00000000000
--- a/mail/ruby-tmail/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-TMail is a mail manipulating library for Ruby, with RFC822 and MIME
-multipart support.
diff --git a/mail/ruby-tmail/Makefile b/mail/ruby-tmail/Makefile
deleted file mode 100644
index 703eeea27b1..00000000000
--- a/mail/ruby-tmail/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2006/01/03 15:07:29 taca Exp $
-
-DISTNAME= tmail-0.10.8
-PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION= 4
-CATEGORIES= mail ruby
-MASTER_SITES= http://i.loveruby.net/archive/tmail/
-
-MAINTAINER= taca@NetBSD.org
-HOMEPAGE= http://i.loveruby.net/en/projects/tmail/
-COMMENT= Mail manipulating library for Ruby including MIME multipart support
-
-RUBY_HAS_ARCHLIB= yes
-USE_RUBY_SETUP= yes
-
-post-install:
- ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/tmail/en
- ${INSTALL_DATA} ${WRKSRC}/BUGS ${WRKSRC}/ChangeLog ${WRKSRC}/TODO \
- ${RUBY_DOCDIR}/tmail
- ${INSTALL_DATA} ${WRKSRC}/Incompatibilities ${WRKSRC}/README.en \
- ${RUBY_DOCDIR}/tmail/en
- ${INSTALL_DATA} ${WRKSRC}/doc.en/*.html ${RUBY_DOCDIR}/tmail/en
- ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/tmail/ja
- ${INSTALL_DATA} ${WRKSRC}/Incompatibilities.ja ${WRKSRC}/README.ja \
- ${RUBY_DOCDIR}/tmail/ja
- ${INSTALL_DATA} ${WRKSRC}/doc.ja/*.html ${RUBY_DOCDIR}/tmail/ja
- ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/tmail/data
- ${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_EXAMPLESDIR}/tmail
- ${INSTALL_DATA} ${WRKSRC}/sample/data/* ${RUBY_EXAMPLESDIR}/tmail/data
-
-.include "../../lang/ruby/modules.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/ruby-tmail/PLIST b/mail/ruby-tmail/PLIST
deleted file mode 100644
index c65bbcc1c03..00000000000
--- a/mail/ruby-tmail/PLIST
+++ /dev/null
@@ -1,70 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2006/09/07 15:54:25 taca Exp $
-${RUBY_SITEARCHLIBDIR}/tmail/base64.${RUBY_DLEXT}
-${RUBY_SITEARCHLIBDIR}/tmail/scanner_c.${RUBY_DLEXT}
-${RUBY_SITELIBDIR}/tmail.rb
-${RUBY_SITELIBDIR}/tmail/address.rb
-${RUBY_SITELIBDIR}/tmail/base64.rb
-${RUBY_SITELIBDIR}/tmail/config.rb
-${RUBY_SITELIBDIR}/tmail/compat.rb
-${RUBY_SITELIBDIR}/tmail/encode.rb
-${RUBY_SITELIBDIR}/tmail/header.rb
-${RUBY_SITELIBDIR}/tmail/info.rb
-${RUBY_SITELIBDIR}/tmail/loader.rb
-${RUBY_SITELIBDIR}/tmail/mail.rb
-${RUBY_SITELIBDIR}/tmail/mailbox.rb
-${RUBY_SITELIBDIR}/tmail/mbox.rb
-${RUBY_SITELIBDIR}/tmail/net.rb
-${RUBY_SITELIBDIR}/tmail/obsolete.rb
-${RUBY_SITELIBDIR}/tmail/parser.rb
-${RUBY_SITELIBDIR}/tmail/port.rb
-${RUBY_SITELIBDIR}/tmail/scanner.rb
-${RUBY_SITELIBDIR}/tmail/scanner_r.rb
-${RUBY_SITELIBDIR}/tmail/stringio.rb
-${RUBY_SITELIBDIR}/tmail/textutils.rb
-${RUBY_SITELIBDIR}/tmail/tmail.rb
-${RUBY_SITELIBDIR}/tmail/utils.rb
-${RUBY_DOCDIR}/tmail/BUGS
-${RUBY_DOCDIR}/tmail/ChangeLog
-${RUBY_DOCDIR}/tmail/TODO
-${RUBY_DOCDIR}/tmail/en/Incompatibilities
-${RUBY_DOCDIR}/tmail/en/README.en
-${RUBY_DOCDIR}/tmail/en/address.html
-${RUBY_DOCDIR}/tmail/en/basics.html
-${RUBY_DOCDIR}/tmail/en/config.html
-${RUBY_DOCDIR}/tmail/en/details.html
-${RUBY_DOCDIR}/tmail/en/index.html
-${RUBY_DOCDIR}/tmail/en/mail.html
-${RUBY_DOCDIR}/tmail/en/mailbox.html
-${RUBY_DOCDIR}/tmail/en/port.html
-${RUBY_DOCDIR}/tmail/en/tmail.html
-${RUBY_DOCDIR}/tmail/en/usage.html
-${RUBY_DOCDIR}/tmail/ja/Incompatibilities.ja
-${RUBY_DOCDIR}/tmail/ja/README.ja
-${RUBY_DOCDIR}/tmail/ja/address.html
-${RUBY_DOCDIR}/tmail/ja/basics.html
-${RUBY_DOCDIR}/tmail/ja/config.html
-${RUBY_DOCDIR}/tmail/ja/details.html
-${RUBY_DOCDIR}/tmail/ja/index.html
-${RUBY_DOCDIR}/tmail/ja/mail.html
-${RUBY_DOCDIR}/tmail/ja/mailbox.html
-${RUBY_DOCDIR}/tmail/ja/port.html
-${RUBY_DOCDIR}/tmail/ja/tmail.html
-${RUBY_DOCDIR}/tmail/ja/usage.html
-${RUBY_EXAMPLESDIR}/tmail/data/multipart
-${RUBY_EXAMPLESDIR}/tmail/data/normal
-${RUBY_EXAMPLESDIR}/tmail/data/sendtest
-${RUBY_EXAMPLESDIR}/tmail/data/simple
-${RUBY_EXAMPLESDIR}/tmail/data/test
-${RUBY_EXAMPLESDIR}/tmail/extract-attachements.rb
-${RUBY_EXAMPLESDIR}/tmail/from-check.rb
-${RUBY_EXAMPLESDIR}/tmail/multipart.rb
-${RUBY_EXAMPLESDIR}/tmail/parse-bench.rb
-${RUBY_EXAMPLESDIR}/tmail/parse-test.rb
-${RUBY_EXAMPLESDIR}/tmail/sendmail.rb
-@dirrm ${RUBY_SITEARCHLIBDIR}/tmail
-@dirrm ${RUBY_SITELIBDIR}/tmail
-@dirrm ${RUBY_DOCDIR}/tmail/en
-@dirrm ${RUBY_DOCDIR}/tmail/ja
-@dirrm ${RUBY_DOCDIR}/tmail
-@dirrm ${RUBY_EXAMPLESDIR}/tmail/data
-@dirrm ${RUBY_EXAMPLESDIR}/tmail
diff --git a/mail/ruby-tmail/distinfo b/mail/ruby-tmail/distinfo
deleted file mode 100644
index f0cb70dcfe3..00000000000
--- a/mail/ruby-tmail/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/01/03 14:25:50 taca Exp $
-
-SHA1 (tmail-0.10.8.tar.gz) = 179cad68020fb75de8bb34df489cb54a7cd14384
-RMD160 (tmail-0.10.8.tar.gz) = dadba826fdff0b67d17c4e5fb4e3cf36de5c4118
-Size (tmail-0.10.8.tar.gz) = 125752 bytes
diff --git a/mail/safecat/DESCR b/mail/safecat/DESCR
deleted file mode 100644
index 93a24fba218..00000000000
--- a/mail/safecat/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-safecat is an implementation of D. J. Bernstein's maildir algorithm.
-It can be used to write mail messages to a qmail-style maildir, or
-to write data to a "spool" directory reliably. There are no lockfiles
-with safecat, and nothing is left to chance. If safecat returns a
-successful exit status, then you can be (practically) 100% sure
-your data is safely committed to disk. Further, if data is written
-to a directory using safecat (or other implementations of the
-maildir algorithm), then every file in that directory is guaranteed
-to be complete. If safecat fails to write all of the data, there
-will be no file at all in the destination directory.
diff --git a/mail/safecat/Makefile b/mail/safecat/Makefile
deleted file mode 100644
index 0484dff7c98..00000000000
--- a/mail/safecat/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2007/01/15 11:01:24 schmonz Exp $
-#
-
-DISTNAME= safecat-1.13
-CATEGORIES= mail
-MASTER_SITES= http://jeenyus.net/~budney/linux/software/safecat/
-
-MAINTAINER= zuntum@NetBSD.org
-HOMEPAGE= http://jeenyus.net/~budney/linux/software/safecat.html
-COMMENT= Write data safely to a maildir
-
-USE_TOOLS+= nroff
-
-DJB_RESTRICTED= NO
-DJB_BUILD_TARGETS= install instcheck
-DJB_CONFIG_HOME= conf-root
-
-.include "../../mk/djbware.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/safecat/PLIST b/mail/safecat/PLIST
deleted file mode 100644
index dadb87d4a75..00000000000
--- a/mail/safecat/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/08/15 09:50:03 zuntum Exp $
-bin/maildir
-bin/safecat
-man/cat1/maildir.0
-man/cat1/safecat.0
-man/man1/maildir.1
-man/man1/safecat.1
diff --git a/mail/safecat/distinfo b/mail/safecat/distinfo
deleted file mode 100644
index 4a9c3fea3a6..00000000000
--- a/mail/safecat/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2007/01/15 11:01:24 schmonz Exp $
-
-SHA1 (safecat-1.13.tar.gz) = 07b42cb06490abeacefce9429a1dbf96caa1629b
-RMD160 (safecat-1.13.tar.gz) = 614df1d43d13a638ab30a2921b66d78f3fafc4c6
-Size (safecat-1.13.tar.gz) = 33953 bytes
-SHA1 (patch-aa) = 2e06a02df248b91e2b1fda9f783c53a10081b196
diff --git a/mail/safecat/patches/patch-aa b/mail/safecat/patches/patch-aa
deleted file mode 100644
index bdf67a83915..00000000000
--- a/mail/safecat/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/01/15 11:01:24 schmonz Exp $
---- tryulong32.c.orig 2000-02-28 23:10:12.000000000 -0500
-+++ tryulong32.c
-@@ -1,5 +1,8 @@
- void main()
- {
-+#ifdef __arm__
-+ _exit(0);
-+#else
- unsigned long u;
- u = 1;
- u += u; u += u; u += u; u += u; u += u; u += u; u += u; u += u;
-@@ -8,4 +11,5 @@ void main()
- u += u; u += u; u += u; u += u; u += u; u += u; u += u; u += u;
- if (!u) _exit(0);
- _exit(1);
-+#endif
- }
diff --git a/mail/sendmail/DESCR b/mail/sendmail/DESCR
deleted file mode 100644
index 3dd2e5933dd..00000000000
--- a/mail/sendmail/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Sendmail acts a unified "post office" to which all mail can be submitted.
-Address interpretation is controlled by a production system, which can
-parse both domain-based addressing and old-style "ad hoc" addresses.
-The production system is powerful enough to rewrite addresses in the message
-header to conform to the standards of a number of common target networks,
-including old (NCP/RFC733) Arpanet, new (TCP/RFC822) Arpanet, UUCP, and
-Phonenet. Sendmail also implements an SMTP server, message queueing, and
-aliasing.
diff --git a/mail/sendmail/MESSAGE b/mail/sendmail/MESSAGE
deleted file mode 100644
index bd628b24a7f..00000000000
--- a/mail/sendmail/MESSAGE
+++ /dev/null
@@ -1,21 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.5 2006/10/12 21:04:27 tv Exp $
-
-To use "${PKGNAME}" as the system's mail transport agent you have
-to install "${PREFIX}/share/examples/sendmail/mailer.conf" as global
-mailwrapper configuration file. The command below will do that for you:
-
-ln -fs ${PREFIX}/share/examples/sendmail/mailer.conf /etc/mailer.conf
-
-If you are changing the database format used by sendmail you must run
-"newaliases" and "makemap" in order to re-create the databases.
-
-You may also need to install (and/or customize) the configuration files
-for Sendmail before it will be operational. "cd" to the directory
-
- ${PREFIX}/share/sendmail/cf
-
-and read the file README for instructions on creating and installing
-configuration files.
-
-===========================================================================
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
deleted file mode 100644
index feade8e2d06..00000000000
--- a/mail/sendmail/Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
-# $NetBSD: Makefile,v 1.95 2007/01/20 20:08:31 tv Exp $
-
-.include "../../mail/sendmail/Makefile.common"
-
-PKGNAME= sendmail-${DIST_VERS}
-PKGREVISION= 4
-COMMENT= The well known Mail Transport Agent
-
-CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
-
-MESSAGE_SRC= ${WRKDIR}/.MESSAGE_SRC
-PLIST_SRC= ${WRKDIR}/.PLIST_SRC
-
-SMRSH_CMDDIR?= ${PREFIX}/libexec/sm.bin
-PLIST_SUBST+= SMRSH_CMDDIR=${SMRSH_CMDDIR:Q}
-RCD_SCRIPTS= sendmail smmsp
-
-# Not OWN_DIRS, so that the admin doesn't get a suggestion to delete the
-# queue dirs if they are nonempty at deinstall (probably undesirable).
-#
-MAKE_DIRS_PERMS+= /var/spool/clientmqueue smmsp smmsp 0770
-MAKE_DIRS_PERMS+= /var/spool/mqueue ${ROOT_USER} ${ROOT_GROUP} 0755
-
-PKG_GROUPS= smmsp
-PKG_USERS= smmsp:smmsp
-PKG_GECOS.smmsp= Sendmail Message Submission Program
-
-SUBST_CLASSES+= paths
-SUBST_STAGE.paths= pre-configure
-SUBST_FILES.paths= ../mailer.conf include/sm/conf.h smrsh/smrsh.8 cf/cf/Makefile
-SUBST_SED.paths+= -e "s|@@BINGRP@@|${BINGRP}|g"
-SUBST_SED.paths+= -e "s|@@BINOWN@@|${BINOWN}|g"
-SUBST_SED.paths+= -e "s|@@INSTALL@@|${INSTALL}|g"
-SUBST_SED.paths+= -e "s|@@PREFIX@@|${PREFIX}|g"
-SUBST_SED.paths+= -e "s|@@SMRSH_CMDDIR@@|${SMRSH_CMDDIR}|g"
-SUBST_MESSAGE.paths= Fixing paths.
-
-REPLACE_PERL= contrib/socketmapClient.pl contrib/socketmapServer.pl
-
-post-patch: make-sendmail-siteconfig
-.if !empty(PKG_OPTIONS:Mtcpwrappers)
- ${CAT} ${FILESDIR}/site.config.m4-tcpwrappers >>${SITECONFIG}
-.endif
-.if !empty(PKG_OPTIONS:Mldap)
- ${CAT} ${FILESDIR}/site.config.m4-ldap >>${SITECONFIG}
-.endif
-.if !empty(PKG_OPTIONS:Mdb2)
- ${CAT} ${FILESDIR}/site.config.m4-db2 >>${SITECONFIG}
-.endif
-.if !empty(PKG_OPTIONS:Mdb4)
- ${CAT} ${FILESDIR}/site.config.m4-db4 >>${SITECONFIG}
-.endif
-.if !empty(PKG_OPTIONS:Mtls)
- ${CAT} ${FILESDIR}/site.config.m4-starttls >>${SITECONFIG}
-.endif
-.if !empty(PKG_OPTIONS:Msasl)
- ${CAT} ${FILESDIR}/site.config.m4-sasl2 >>${SITECONFIG}
-.endif
-
-post-extract:
- ${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
-
-do-build:
- (cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./Build)
-
-post-build:
- ${CP} ${PKGDIR}/MESSAGE ${MESSAGE_SRC}
- ${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
-
-pre-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/libexec/sendmail
-
-post-install:
- ${INSTALL_DATA_DIR} ${SMRSH_CMDDIR}
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sendmail
- ${INSTALL_DATA_DIR} ${PREFIX}/share/sendmail
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sendmail
- ${INSTALL_DATA} ${WRKDIR}/mailer.conf \
- ${PREFIX}/share/examples/sendmail/
- cd ${WRKSRC}/cf && ${PAX} -rw -pp -pm -s',^.*\.orig$$,,' . ${PREFIX}/share/sendmail
- ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/sendmail
-
- ${INSTALL_DATA} ${WRKSRC}/obj.`${UNAME} -srm | ${TR} \ . | ${TR} \/ - | ${SED} s/sun4./sun4/`/libsm/libsm.a \
- ${PREFIX}/lib
-
- ${INSTALL_DATA} \
- ${WRKSRC}/obj.`${UNAME} -srm | ${TR} \ . | ${TR} \/ - | ${SED} s/sun4./sun4/`/libsmutil/libsmutil.a \
- ${PREFIX}/lib
- ${INSTALL_SCRIPT} ${WRKSRC}/contrib/socketmap*.pl \
- ${PREFIX}/share/examples/sendmail/
- ${INSTALL_DATA} ${WRKSRC}/RELEASE_NOTES ${PREFIX}/share/doc/sendmail
- ${INSTALL_DATA} ${WRKSRC}/cf/README ${PREFIX}/share/doc/sendmail
- ${INSTALL_DATA} ${WRKSRC}/sendmail/SECURITY ${PREFIX}/share/doc/sendmail
- ${INSTALL_DATA} ${WRKSRC}/doc/op/op.me ${PREFIX}/share/doc/sendmail
- ${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${PREFIX}/share/doc/sendmail
-
-.include "../../mk/bsd.pkg.mk"
-
-# has to be below include for bsd.pkg.mk, else substition fails
-OBJDIR!= ${ECHO} obj.`${UNAME} -srm | ${TR} \ . | ${TR} \/ -`
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
deleted file mode 100644
index 136c4960a2b..00000000000
--- a/mail/sendmail/Makefile.common
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile.common,v 1.40 2007/02/22 19:26:44 wiz Exp $
-#
-# Makefile fragment shared with libmilter
-#
-
-DISTNAME= sendmail.${DIST_VERS}
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ \
- ftp://ftp.sendmail.org/pub/sendmail/past-releases/ \
- ftp://ftp.fu-berlin.de/pub/unix/mail/sendmail/ \
- ftp://ftp.ayamura.org/pub/sendmail/
-
-MAINTAINER= tv@NetBSD.org
-HOMEPAGE= http://www.sendmail.org/
-
-LICENSE= sendmail-license
-
-DISTINFO_FILE?= ${.CURDIR}/../../mail/sendmail/distinfo
-FILESDIR?= ${.CURDIR}/../../mail/sendmail/files
-PATCHDIR?= ${.CURDIR}/../../mail/sendmail/patches
-
-DIST_VERS= 8.13.8
-
-MAKE_ENV+= BSD_BINOWN=${BINOWN:Q} BSD_BINGRP=${BINGRP:Q} \
- BSD_MANOWN=${MANOWN:Q} BSD_MANGRP=${MANGRP:Q} \
- BUILDLINK_DIR=${BUILDLINK_DIR:Q} \
- SMRSH_CMDDIR=${SMRSH_CMDDIR:Q}
-SITECONFIG= ${WRKSRC}/devtools/Site/site.config.m4
-
-BUILD_DEFS+= SMRSH_CMDDIR
-
-WRKSRC= ${WRKDIR}/sendmail-${DIST_VERS}
-USE_TOOLS+= gm4
-MAKE_ENV+= M4=${TOOLS_M4:Q}
-
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-
-make-sendmail-siteconfig:
- ${CP} ${FILESDIR}/site.config.m4 ${SITECONFIG}
- ${CHMOD} +w ${SITECONFIG}
-
-.if !empty(PKG_OPTIONS:Minet6)
- ${CAT} ${FILESDIR}/site.config.m4-v6 >>${SITECONFIG}
-.if ${OPSYS} != "SunOS" && ${OPSYS} != "BSDOS" && ${OPSYS} != "DragonFly"
- ${CAT} ${FILESDIR}/site.config.m4-v6-not-solaris >>${SITECONFIG}
-.endif
-.endif
- ${CAT} ${FILESDIR}/site.config.m4-milter >>${SITECONFIG}
diff --git a/mail/sendmail/PLIST b/mail/sendmail/PLIST
deleted file mode 100644
index c26b97b5668..00000000000
--- a/mail/sendmail/PLIST
+++ /dev/null
@@ -1,235 +0,0 @@
-@comment $NetBSD: PLIST,v 1.13 2007/01/20 20:08:32 tv Exp $
-bin/hoststat
-bin/mailq
-bin/newaliases
-bin/purgestat
-bin/vacation
-lib/libsm.a
-lib/libsmutil.a
-libexec/sendmail/sendmail
-libexec/sendmail/smrsh
-man/man1/mailq.1
-man/man1/newaliases.1
-man/man1/vacation.1
-man/man5/aliases.5
-man/man8/editmap.8
-man/man8/mailstats.8
-man/man8/makemap.8
-man/man8/praliases.8
-man/man8/sendmail.8
-man/man8/smrsh.8
-sbin/editmap
-sbin/mailstats
-sbin/makemap
-sbin/praliases
-share/doc/sendmail/README
-share/doc/sendmail/RELEASE_NOTES
-share/doc/sendmail/SECURITY
-share/doc/sendmail/op.me
-share/doc/sendmail/op.ps
-share/examples/rc.d/sendmail
-share/examples/rc.d/smmsp
-share/examples/sendmail/mailer.conf
-share/examples/sendmail/socketmapClient.pl
-share/examples/sendmail/socketmapServer.pl
-share/misc/helpfile
-share/sendmail/README
-share/sendmail/cf/Build
-share/sendmail/cf/Makefile
-share/sendmail/cf/README
-share/sendmail/cf/chez.cs.mc
-share/sendmail/cf/clientproto.mc
-share/sendmail/cf/cs-hpux10.mc
-share/sendmail/cf/cs-hpux9.mc
-share/sendmail/cf/cs-osf1.mc
-share/sendmail/cf/cs-solaris2.mc
-share/sendmail/cf/cs-sunos4.1.mc
-share/sendmail/cf/cs-ultrix4.mc
-share/sendmail/cf/cyrusproto.mc
-share/sendmail/cf/generic-bsd4.4.cf
-share/sendmail/cf/generic-bsd4.4.mc
-share/sendmail/cf/generic-hpux10.cf
-share/sendmail/cf/generic-hpux10.mc
-share/sendmail/cf/generic-hpux9.cf
-share/sendmail/cf/generic-hpux9.mc
-share/sendmail/cf/generic-linux.cf
-share/sendmail/cf/generic-linux.mc
-share/sendmail/cf/generic-mpeix.cf
-share/sendmail/cf/generic-mpeix.mc
-share/sendmail/cf/generic-nextstep3.3.cf
-share/sendmail/cf/generic-nextstep3.3.mc
-share/sendmail/cf/generic-osf1.cf
-share/sendmail/cf/generic-osf1.mc
-share/sendmail/cf/generic-solaris.cf
-share/sendmail/cf/generic-solaris.mc
-share/sendmail/cf/generic-sunos4.1.cf
-share/sendmail/cf/generic-sunos4.1.mc
-share/sendmail/cf/generic-ultrix4.cf
-share/sendmail/cf/generic-ultrix4.mc
-share/sendmail/cf/huginn.cs.mc
-share/sendmail/cf/knecht.mc
-share/sendmail/cf/mail.cs.mc
-share/sendmail/cf/mail.eecs.mc
-share/sendmail/cf/mailspool.cs.mc
-share/sendmail/cf/python.cs.mc
-share/sendmail/cf/s2k-osf1.mc
-share/sendmail/cf/s2k-ultrix4.mc
-share/sendmail/cf/submit.cf
-share/sendmail/cf/submit.mc
-share/sendmail/cf/tcpproto.mc
-share/sendmail/cf/ucbarpa.mc
-share/sendmail/cf/ucbvax.mc
-share/sendmail/cf/uucpproto.mc
-share/sendmail/cf/vangogh.cs.mc
-share/sendmail/domain/Berkeley.EDU.m4
-share/sendmail/domain/CS.Berkeley.EDU.m4
-share/sendmail/domain/EECS.Berkeley.EDU.m4
-share/sendmail/domain/S2K.Berkeley.EDU.m4
-share/sendmail/domain/berkeley-only.m4
-share/sendmail/domain/generic.m4
-share/sendmail/feature/accept_unqualified_senders.m4
-share/sendmail/feature/accept_unresolvable_domains.m4
-share/sendmail/feature/access_db.m4
-share/sendmail/feature/allmasquerade.m4
-share/sendmail/feature/always_add_domain.m4
-share/sendmail/feature/authinfo.m4
-share/sendmail/feature/bestmx_is_local.m4
-share/sendmail/feature/bitdomain.m4
-share/sendmail/feature/blacklist_recipients.m4
-share/sendmail/feature/compat_check.m4
-share/sendmail/feature/conncontrol.m4
-share/sendmail/feature/delay_checks.m4
-share/sendmail/feature/dnsbl.m4
-share/sendmail/feature/domaintable.m4
-share/sendmail/feature/enhdnsbl.m4
-share/sendmail/feature/generics_entire_domain.m4
-share/sendmail/feature/genericstable.m4
-share/sendmail/feature/greet_pause.m4
-share/sendmail/feature/ldap_routing.m4
-share/sendmail/feature/limited_masquerade.m4
-share/sendmail/feature/local_lmtp.m4
-share/sendmail/feature/local_no_masquerade.m4
-share/sendmail/feature/local_procmail.m4
-share/sendmail/feature/lookupdotdomain.m4
-share/sendmail/feature/loose_relay_check.m4
-share/sendmail/feature/mailertable.m4
-share/sendmail/feature/masquerade_entire_domain.m4
-share/sendmail/feature/masquerade_envelope.m4
-share/sendmail/feature/msp.m4
-share/sendmail/feature/mtamark.m4
-share/sendmail/feature/no_default_msa.m4
-share/sendmail/feature/nocanonify.m4
-share/sendmail/feature/notsticky.m4
-share/sendmail/feature/nouucp.m4
-share/sendmail/feature/nullclient.m4
-share/sendmail/feature/preserve_local_plus_detail.m4
-share/sendmail/feature/preserve_luser_host.m4
-share/sendmail/feature/promiscuous_relay.m4
-share/sendmail/feature/queuegroup.m4
-share/sendmail/feature/ratecontrol.m4
-share/sendmail/feature/redirect.m4
-share/sendmail/feature/relay_based_on_MX.m4
-share/sendmail/feature/relay_entire_domain.m4
-share/sendmail/feature/relay_hosts_only.m4
-share/sendmail/feature/relay_local_from.m4
-share/sendmail/feature/relay_mail_from.m4
-share/sendmail/feature/smrsh.m4
-share/sendmail/feature/stickyhost.m4
-share/sendmail/feature/use_client_ptr.m4
-share/sendmail/feature/use_ct_file.m4
-share/sendmail/feature/use_cw_file.m4
-share/sendmail/feature/uucpdomain.m4
-share/sendmail/feature/virtuser_entire_domain.m4
-share/sendmail/feature/virtusertable.m4
-share/sendmail/hack/cssubdomain.m4
-share/sendmail/m4/cf.m4
-share/sendmail/m4/cfhead.m4
-share/sendmail/m4/proto.m4
-share/sendmail/m4/version.m4
-share/sendmail/mailer/cyrus.m4
-share/sendmail/mailer/cyrusv2.m4
-share/sendmail/mailer/fax.m4
-share/sendmail/mailer/local.m4
-share/sendmail/mailer/mail11.m4
-share/sendmail/mailer/phquery.m4
-share/sendmail/mailer/pop.m4
-share/sendmail/mailer/procmail.m4
-share/sendmail/mailer/qpage.m4
-share/sendmail/mailer/smtp.m4
-share/sendmail/mailer/usenet.m4
-share/sendmail/mailer/uucp.m4
-share/sendmail/ostype/a-ux.m4
-share/sendmail/ostype/aix3.m4
-share/sendmail/ostype/aix4.m4
-share/sendmail/ostype/aix5.m4
-share/sendmail/ostype/altos.m4
-share/sendmail/ostype/amdahl-uts.m4
-share/sendmail/ostype/bsd4.3.m4
-share/sendmail/ostype/bsd4.4.m4
-share/sendmail/ostype/bsdi.m4
-share/sendmail/ostype/bsdi1.0.m4
-share/sendmail/ostype/bsdi2.0.m4
-share/sendmail/ostype/darwin.m4
-share/sendmail/ostype/dgux.m4
-share/sendmail/ostype/domainos.m4
-share/sendmail/ostype/dragonfly.m4
-share/sendmail/ostype/dynix3.2.m4
-share/sendmail/ostype/freebsd4.m4
-share/sendmail/ostype/freebsd5.m4
-share/sendmail/ostype/freebsd6.m4
-share/sendmail/ostype/gnu.m4
-share/sendmail/ostype/hpux10.m4
-share/sendmail/ostype/hpux11.m4
-share/sendmail/ostype/hpux9.m4
-share/sendmail/ostype/irix4.m4
-share/sendmail/ostype/irix5.m4
-share/sendmail/ostype/irix6.m4
-share/sendmail/ostype/isc4.1.m4
-share/sendmail/ostype/linux.m4
-share/sendmail/ostype/maxion.m4
-share/sendmail/ostype/mklinux.m4
-share/sendmail/ostype/mpeix.m4
-share/sendmail/ostype/nextstep.m4
-share/sendmail/ostype/openbsd.m4
-share/sendmail/ostype/osf1.m4
-share/sendmail/ostype/powerux.m4
-share/sendmail/ostype/ptx2.m4
-share/sendmail/ostype/qnx.m4
-share/sendmail/ostype/riscos4.5.m4
-share/sendmail/ostype/sco-uw-2.1.m4
-share/sendmail/ostype/sco3.2.m4
-share/sendmail/ostype/sinix.m4
-share/sendmail/ostype/solaris2.m4
-share/sendmail/ostype/solaris2.ml.m4
-share/sendmail/ostype/solaris2.pre5.m4
-share/sendmail/ostype/solaris8.m4
-share/sendmail/ostype/sunos3.5.m4
-share/sendmail/ostype/sunos4.1.m4
-share/sendmail/ostype/svr4.m4
-share/sendmail/ostype/ultrix4.m4
-share/sendmail/ostype/unicos.m4
-share/sendmail/ostype/unicosmk.m4
-share/sendmail/ostype/unicosmp.m4
-share/sendmail/ostype/unixware7.m4
-share/sendmail/ostype/unknown.m4
-share/sendmail/ostype/uxpds.m4
-share/sendmail/sendmail.schema
-share/sendmail/sh/makeinfo.sh
-share/sendmail/siteconfig/uucp.cogsci.m4
-share/sendmail/siteconfig/uucp.old.arpa.m4
-share/sendmail/siteconfig/uucp.ucbarpa.m4
-share/sendmail/siteconfig/uucp.ucbvax.m4
-@dirrm share/sendmail/siteconfig
-@dirrm share/sendmail/sh
-@dirrm share/sendmail/ostype
-@dirrm share/sendmail/mailer
-@dirrm share/sendmail/m4
-@dirrm share/sendmail/hack
-@dirrm share/sendmail/feature
-@dirrm share/sendmail/domain
-@dirrm share/sendmail/cf
-@dirrm share/sendmail
-@unexec ${RMDIR} %D/share/examples/sendmail 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} ${SMRSH_CMDDIR} 2>/dev/null || ${TRUE}
-@dirrm share/doc/sendmail
-@dirrm libexec/sendmail
diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo
deleted file mode 100644
index 3b18d2c3d85..00000000000
--- a/mail/sendmail/distinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: distinfo,v 1.34 2006/12/29 21:44:09 markd Exp $
-
-SHA1 (sendmail.8.13.8.tar.gz) = 8e97c10f52efe5204c08f6cb3f90c08e077ac505
-RMD160 (sendmail.8.13.8.tar.gz) = a5d333b073d681f056421e836df4067f331a8ac8
-Size (sendmail.8.13.8.tar.gz) = 2010975 bytes
-SHA1 (patch-aa) = b7ceece7760e3d637016da039f8429c1fb89f2cf
-SHA1 (patch-ab) = a2abf6e78772e257e2a1973e7730159ff24a91aa
-SHA1 (patch-ac) = 96c19300b4188dbcbd202768eea912f675dadc27
-SHA1 (patch-ad) = 7232cc7ceb46a2dbf631d61185e4c6ca4af18a13
-SHA1 (patch-ae) = ae06caa125fe4d4fc85123dc0a5d0016cd099ebd
-SHA1 (patch-af) = d26481845328adad6d46fdf797785ec2ad003e28
-SHA1 (patch-ag) = 672c3e8a0c897f2c721d45393d85d4ea819d55a6
-SHA1 (patch-ah) = e6be09008b9230ffdd1560aaacbdbb2ee4fb8028
-SHA1 (patch-ai) = 8ade5888074ad9a328f87d66836c04eacf7785d5
-SHA1 (patch-aj) = e65e6fe44380de2f9c397c1a97677eb4ad285433
-SHA1 (patch-ak) = 43b26ff1c78d4360909455124a382f65394377b3
-SHA1 (patch-al) = f5d8cef8c4abba5d5ae813b754c16037190a7ef1
-SHA1 (patch-am) = d84eedbff0f037c1db341255dc9e1877866f12c7
diff --git a/mail/sendmail/files/mailer.conf b/mail/sendmail/files/mailer.conf
deleted file mode 100644
index a263f9b2797..00000000000
--- a/mail/sendmail/files/mailer.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: mailer.conf,v 1.2 2000/07/24 04:22:32 itojun Exp $
-#
-# Execute the "real" sendmail program, named @@PREFIX@@/libexec/sendmail/sendmail
-#
-sendmail @@PREFIX@@/libexec/sendmail/sendmail
-send-mail @@PREFIX@@/libexec/sendmail/sendmail
-mailq @@PREFIX@@/libexec/sendmail/sendmail
-newaliases @@PREFIX@@/libexec/sendmail/sendmail
-hoststat @@PREFIX@@/libexec/sendmail/sendmail
-purgestat @@PREFIX@@/libexec/sendmail/sendmail
diff --git a/mail/sendmail/files/sendmail.sh b/mail/sendmail/files/sendmail.sh
deleted file mode 100755
index 68adf3b55fe..00000000000
--- a/mail/sendmail/files/sendmail.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: sendmail.sh,v 1.1 2006/06/06 22:03:36 adrianp Exp $
-#
-
-# PROVIDE: mail
-# REQUIRE: LOGIN
-# we make mail start late, so that things like .forward's are not
-# processed until the system is fully operational
-
-
-. /etc/rc.subr
-
-name="sendmail"
-rcvar=$name
-command="/usr/sbin/${name}"
-pidfile="@VARBASE@/run/${name}.pid"
-required_files="/etc/mail/sendmail.cf"
-start_precmd="sendmail_precmd"
-makemap="@PREFIX@/sbin/makemap"
-newaliases="@PREFIX@/bin/newaliases"
-smbin="@PREFIX@/libexec/sendmail/sendmail"
-check_files="aliases access genericstable virtusertable domaintable mailertable"
-sendmail_flags="-Lsm-mta -bd -q30m"
-
-sendmail_precmd()
-{
- # check modifications on /etc/mail/ databases
- for f in ${check_files}; do
- if [ -r "/etc/mail/$f.db" ] && [ -r "/etc/mail/$f" ]; then
- if [ ! "/etc/mail/$f" -ot "/etc/mail/$f.db" ]; then
- echo \
- "${name}: /etc/mail/$f newer than /etc/mail/$f.db, regenerating"
- if [ "x$f" = "xaliases" ]; then
- ${newaliases}
- else
- ${makemap} hash \
- /etc/mail/$f < /etc/mail/$f
- fi
- fi
- fi
- done
-
- # check existence on /etc/mail/ databases
- for f in ${check_files}; do
- if [ ! -r "/etc/mail/$f.db" ] && [ -r "/etc/mail/$f" ]; then
- echo "${name}: /etc/mail/$f.db not present, generating"
- if [ "x$f" = "xaliases" ]; then
- ${newaliases}
- else
- ${makemap} hash /etc/mail/$f < /etc/mail/$f
- fi
- fi
- done
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/sendmail/files/site.config.m4 b/mail/sendmail/files/site.config.m4
deleted file mode 100644
index 72aa9b20f5f..00000000000
--- a/mail/sendmail/files/site.config.m4
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: site.config.m4,v 1.8 2007/01/20 20:08:32 tv Exp $
-
-# pathnames specific to pkgsrc
-#
-define(`confEBINDIR', `${PREFIX}/libexec/sendmail')
-define(`confMBINDIR', `${PREFIX}/libexec/sendmail')
-define(`confSBINDIR', `${PREFIX}/sbin')
-define(`confUBINDIR', `${PREFIX}/bin')
-define(`confHFDIR', `${PREFIX}/share/misc')
-define(`confINSTALL_RAWMAN', 'yes')
-define(`confDONT_INSTALL_CATMAN', 'yes')
-define(`confMANROOT', `${PREFIX}/${PKGMANDIR}/man')
-define(`confMANROOTMAN', `${PREFIX}/${PKGMANDIR}/man')
-define(`confMAN1EXT', `1')
-define(`confMAN3EXT', `3')
-define(`confMAN4EXT', `4')
-define(`confMAN5EXT', `5')
-define(`confMAN8EXT', `8')
-APPENDDEF(`confENVDEF', `-I${PREFIX}/include -DSMRSH_CMDDIR=\"${SMRSH_CMDDIR}\"')
-APPENDDEF(`confLIBS', `-L${PREFIX}/lib')
-APPENDDEF(`confMAPDEF', `-DSOCKETMAP')
-
-# the following are handled by pkgsrc
-define(`confINST_DEP',`')
-define(`confNO_STATISTICS_INSTALL')
diff --git a/mail/sendmail/files/site.config.m4-db2 b/mail/sendmail/files/site.config.m4-db2
deleted file mode 100644
index e732aee1b7d..00000000000
--- a/mail/sendmail/files/site.config.m4-db2
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-db2,v 1.5 2004/08/30 20:16:28 adrianp Exp $
-
-# enable db2
-APPENDDEF(`confENVDEF', `-DNEWDB -I${BUILDLINK_DIR}/include/db2')
-APPENDDEF(`confLIBS', `-ldb2')
diff --git a/mail/sendmail/files/site.config.m4-db4 b/mail/sendmail/files/site.config.m4-db4
deleted file mode 100644
index b54caf89885..00000000000
--- a/mail/sendmail/files/site.config.m4-db4
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-db4,v 1.2 2004/08/30 20:16:28 adrianp Exp $
-
-# enable db4
-APPENDDEF(`confENVDEF', `-DNEWDB -I${BUILDLINK_DIR}/include/db4')
-APPENDDEF(`confLIBS', `-ldb4')
diff --git a/mail/sendmail/files/site.config.m4-ldap b/mail/sendmail/files/site.config.m4-ldap
deleted file mode 100644
index 0233f3f375b..00000000000
--- a/mail/sendmail/files/site.config.m4-ldap
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-ldap,v 1.5 2004/08/30 20:16:28 adrianp Exp $
-
-# enable ldap
-APPENDDEF(`confMAPDEF', `-DLDAPMAP')
-APPENDDEF(`confLIBS', `-lldap -llber')
diff --git a/mail/sendmail/files/site.config.m4-milter b/mail/sendmail/files/site.config.m4-milter
deleted file mode 100644
index 086af75d2bb..00000000000
--- a/mail/sendmail/files/site.config.m4-milter
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: site.config.m4-milter,v 1.2 2004/08/30 20:16:28 adrianp Exp $
-
-# enable milter
-APPENDDEF(`conf_sendmail_ENVDEF', `-DMILTER')
diff --git a/mail/sendmail/files/site.config.m4-sasl2 b/mail/sendmail/files/site.config.m4-sasl2
deleted file mode 100644
index 07b85db461a..00000000000
--- a/mail/sendmail/files/site.config.m4-sasl2
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-sasl2,v 1.2 2004/08/30 20:16:28 adrianp Exp $
-
-# enable SASL 2
-APPENDDEF(`confENVDEF', `-DSASL=2')
-APPENDDEF(`conf_sendmail_LIBS', `-lsasl2')
diff --git a/mail/sendmail/files/site.config.m4-starttls b/mail/sendmail/files/site.config.m4-starttls
deleted file mode 100644
index 8718173f6b4..00000000000
--- a/mail/sendmail/files/site.config.m4-starttls
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-starttls,v 1.6 2004/08/30 20:16:28 adrianp Exp $
-
-# enable STARTTLS
-APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS')
-APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto')
diff --git a/mail/sendmail/files/site.config.m4-tcpwrappers b/mail/sendmail/files/site.config.m4-tcpwrappers
deleted file mode 100644
index 5c3e175f67c..00000000000
--- a/mail/sendmail/files/site.config.m4-tcpwrappers
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-tcpwrappers,v 1.4 2004/08/30 20:21:51 adrianp Exp $
-
-# enable tcpwrappers
-APPENDDEF(`confENVDEF', `-DTCPWRAPPERS')
-APPENDDEF(`conf_sendmail_LIBS', `-lwrap')
diff --git a/mail/sendmail/files/site.config.m4-v6 b/mail/sendmail/files/site.config.m4-v6
deleted file mode 100644
index 6541cdbe64e..00000000000
--- a/mail/sendmail/files/site.config.m4-v6
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: site.config.m4-v6,v 1.3 2004/08/30 20:16:28 adrianp Exp $
-
-# enable IPv6
-APPENDDEF(`confENVDEF', `-DNETINET6')
diff --git a/mail/sendmail/files/site.config.m4-v6-not-solaris b/mail/sendmail/files/site.config.m4-v6-not-solaris
deleted file mode 100644
index 233493713d1..00000000000
--- a/mail/sendmail/files/site.config.m4-v6-not-solaris
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: site.config.m4-v6-not-solaris,v 1.2 2004/08/30 20:16:28 adrianp Exp $
-
-# enable IPv6 - not Solaris
-APPENDDEF(`confENVDEF', `-DNEEDSGETIPNODE')
diff --git a/mail/sendmail/files/smmsp.sh b/mail/sendmail/files/smmsp.sh
deleted file mode 100755
index d842f31dfc4..00000000000
--- a/mail/sendmail/files/smmsp.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: smmsp.sh,v 1.1 2006/06/06 22:03:36 adrianp Exp $
-#
-
-# REQUIRE: mail
-
-# The only function of the smmsp process is to push locally
-# collected mail (which got stuck in the local client queue)
-# to a more fully functional smtp relay. It is not a fully
-# functional smtp daemon.
-#
-# It can, however, be used as a completely unprivileged
-# replacement for hosts that were previously using a "null
-# client" configuration and a smart relay.
-
-. /etc/rc.subr
-
-name="smmsp"
-rcvar=$name
-command="/usr/sbin/sendmail"
-pidfile="@VARBASE@/spool/clientmqueue/sm-client.pid"
-required_files="/etc/mail/submit.cf"
-smbin="@PREFIX@/libexec/sendmail/sendmail"
-smmsp_flags="-Lsm-msp-queue -Ac -q30m"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/sendmail/options.mk b/mail/sendmail/options.mk
deleted file mode 100644
index 86b14a58aa8..00000000000
--- a/mail/sendmail/options.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# $NetBSD: options.mk,v 1.16 2007/01/20 20:08:32 tv Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.sendmail
-PKG_SUPPORTED_OPTIONS= inet6 db2 db4 ldap sasl tls tcpwrappers
-PKG_SUGGESTED_OPTIONS= tcpwrappers
-
-PKG_OPTIONS_LEGACY_OPTS+= starttls:tls
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Berkeley DB version 2/4 format for on disk databases e.g. aliases
-###
-.if !empty(PKG_OPTIONS:Mdb2)
-. include "../../databases/db/buildlink3.mk"
-. elif !empty(PKG_OPTIONS:Mdb4)
-. include "../../databases/db4/buildlink3.mk"
-.endif
-
-###
-### Use OpenLDAP for remote database access
-###
-.if !empty(PKG_OPTIONS:Mldap)
-. include "../../databases/openldap-client/buildlink3.mk"
-.endif
-
-###
-### Use SASL/v2 for SMTP AUTH
-###
-.if !empty(PKG_OPTIONS:Msasl)
-. include "../../security/cyrus-sasl/buildlink3.mk"
-.endif
-
-###
-### Use OpenSSL libraries for SMTP STARTTLS support
-###
-.if !empty(PKG_OPTIONS:Mtls)
-. include "../../security/openssl/buildlink3.mk"
-.endif
-
-###
-### Use tcpwrappers for network access control to sendmail
-###
-.if !empty(PKG_OPTIONS:Mtcpwrappers)
-. include "../../security/tcp_wrappers/buildlink3.mk"
-.endif
-
-###
-### IPv6 support.
-###
-.if !empty(PKG_OPTIONS:Minet6)
-.endif
diff --git a/mail/sendmail/patches/patch-aa b/mail/sendmail/patches/patch-aa
deleted file mode 100644
index 9dcaf05703e..00000000000
--- a/mail/sendmail/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.18 2004/08/30 20:16:28 adrianp Exp $
-
---- devtools/OS/NetBSD.orig Sun Jun 27 00:19:35 2004
-+++ devtools/OS/NetBSD Sun Jun 27 00:24:11 2004
-@@ -7,13 +7,14 @@
- define(`confLIBS', `-lutil')
- define(`confENVDEF', ` -DNETISO')
- define(`confDEPEND_TYPE', `CC-M')
--define(`confSBINGRP', `wheel')
--define(`confUBINOWN', `root')
--define(`confUBINGRP', `wheel')
--define(`confMANOWN', `root')
--define(`confMANGRP', `wheel')
-+define(`confSBINGRP', `${BSD_BINGRP}')
-+define(`confUBINOWN', `${BSD_BINOWN}')
-+define(`confUBINGRP', `${BSD_BINGRP}')
-+define(`confMANOWN', `${BSD_MANOWN}')
-+define(`confMANGRP', `${BSD_MANGRP}')
- define(`confMAN1EXT', `0')
- define(`confMAN3EXT', `0')
- define(`confMAN4EXT', `0')
- define(`confMAN5EXT', `0')
- define(`confMAN8EXT', `0')
-+define(`confLDOPTS', `${LDFLAGS}')
diff --git a/mail/sendmail/patches/patch-ab b/mail/sendmail/patches/patch-ab
deleted file mode 100644
index 0dda084aaad..00000000000
--- a/mail/sendmail/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.12 2002/09/23 12:57:00 markd Exp $
-
---- devtools/OS/SunOS.5.6.orig Fri Mar 22 11:59:26 2002
-+++ devtools/OS/SunOS.5.6 Mon Sep 16 15:05:30 2002
-@@ -11,6 +11,7 @@
- define(`confENVDEF', `-DSOLARIS=20600')
- define(`confSM_OS_HEADER', `sm_os_sunos')
- define(`confLIBS', `-lsocket -lnsl -lkstat')
-+define(`confLDOPTS', `${LDFLAGS}')
- define(`confMTCCOPTS', `-D_REENTRANT')
- define(`confMTLDOPTS', `-lpthread')
- define(`confMBINDIR', `/usr/lib')
diff --git a/mail/sendmail/patches/patch-ac b/mail/sendmail/patches/patch-ac
deleted file mode 100644
index 851b005737a..00000000000
--- a/mail/sendmail/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2002/09/23 12:57:00 markd Exp $
-
---- devtools/OS/SunOS.5.7.orig Fri Mar 22 11:59:26 2002
-+++ devtools/OS/SunOS.5.7 Mon Sep 16 15:07:08 2002
-@@ -11,6 +11,7 @@
- define(`confENVDEF', `-DSOLARIS=20700')
- define(`confSM_OS_HEADER', `sm_os_sunos')
- define(`confLIBS', `-lsocket -lnsl')
-+define(`confLDOPTS', `${LDFLAGS}')
- define(`confMTCCOPTS', `-D_REENTRANT')
- define(`confMTLDOPTS', `-lpthread')
- define(`confMBINDIR', `/usr/lib')
diff --git a/mail/sendmail/patches/patch-ad b/mail/sendmail/patches/patch-ad
deleted file mode 100644
index da81a3aab04..00000000000
--- a/mail/sendmail/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2002/09/23 12:57:01 markd Exp $
-
---- devtools/OS/SunOS.5.8.orig Fri Mar 22 11:59:26 2002
-+++ devtools/OS/SunOS.5.8 Mon Sep 16 15:09:28 2002
-@@ -10,6 +10,7 @@
- define(`confENVDEF', `-DSOLARIS=20800 -DNETINET6')
- define(`confSM_OS_HEADER', `sm_os_sunos')
- define(`confLIBS', `-lsocket -lnsl')
-+define(`confLDOPTS', `${LDFLAGS}')
- define(`confMTCCOPTS', `-D_REENTRANT')
- define(`confMTLDOPTS', `-lpthread')
- define(`confMBINDIR', `/usr/lib')
diff --git a/mail/sendmail/patches/patch-ae b/mail/sendmail/patches/patch-ae
deleted file mode 100644
index 7a607669353..00000000000
--- a/mail/sendmail/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2002/09/23 12:57:01 markd Exp $
-
---- devtools/OS/SunOS.5.9.orig Fri Mar 22 11:59:26 2002
-+++ devtools/OS/SunOS.5.9 Mon Sep 16 15:11:10 2002
-@@ -10,6 +10,7 @@
- define(`confENVDEF', `-DSOLARIS=20900 -DNETINET6')
- define(`confSM_OS_HEADER', `sm_os_sunos')
- define(`confLIBS', `-lsocket -lnsl')
-+define(`confLDOPTS', `${LDFLAGS}')
- define(`confMTCCOPTS', `-D_REENTRANT')
- define(`confMTLDOPTS', `-lpthread')
- define(`confMBINDIR', `/usr/lib')
diff --git a/mail/sendmail/patches/patch-af b/mail/sendmail/patches/patch-af
deleted file mode 100644
index ac36c279cc4..00000000000
--- a/mail/sendmail/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.10 2002/09/23 12:57:01 markd Exp $
-
---- sendmail/conf.c.orig Sat Aug 17 02:56:01 2002
-+++ sendmail/conf.c Mon Sep 16 15:13:22 2002
-@@ -4352,7 +4352,8 @@
-
- #if NETINET6
- if (type == AF_INET6 &&
-- IN6_IS_ADDR_UNSPECIFIED((struct in6_addr *) addr))
-+ (IN6_IS_ADDR_UNSPECIFIED((struct in6_addr *) addr) ||
-+ IN6_IS_ADDR_LINKLOCAL((struct in6_addr *) addr)))
- {
- /* Avoid reverse lookup for IPv6 unspecified address */
- SM_SET_H_ERRNO(HOST_NOT_FOUND);
diff --git a/mail/sendmail/patches/patch-ag b/mail/sendmail/patches/patch-ag
deleted file mode 100644
index 572f0a9c201..00000000000
--- a/mail/sendmail/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.12 2006/05/12 22:23:09 adrianp Exp $
-
---- include/sm/conf.h.orig 2006-01-27 18:43:44.000000000 +0000
-+++ include/sm/conf.h
-@@ -801,7 +801,11 @@ extern unsigned int sleepX __P((unsigned
- # ifndef LA_TYPE
- # define LA_TYPE LA_SUBR
- # endif /* ! LA_TYPE */
-+#if defined(__NetBSD__) && (__NetBSD_Version__ > 299000900)
-+# define SFS_TYPE SFS_STATVFS /* use <sys/statvfs.h> statfs() impl */
-+#else
- # define SFS_TYPE SFS_MOUNT /* use <sys/mount.h> statfs() impl */
-+#endif
- # define SPT_TYPE SPT_PSSTRINGS /* use PS_STRINGS pointer */
- # endif /* defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) && !defined(DARWIN)*/
-
diff --git a/mail/sendmail/patches/patch-ah b/mail/sendmail/patches/patch-ah
deleted file mode 100644
index e26eccd812b..00000000000
--- a/mail/sendmail/patches/patch-ah
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2005/02/10 22:17:24 adrianp Exp $
-
---- smrsh/smrsh.8.orig 2004-08-06 04:55:35.000000000 +0100
-+++ smrsh/smrsh.8
-@@ -39,7 +39,7 @@ Briefly,
- .I smrsh
- limits programs to be in a single directory,
- by default
--/usr/adm/sm.bin,
-+@@SMRSH_CMDDIR@@,
- allowing the system administrator to choose the set of acceptable commands,
- and to the shell builtin commands ``exec'', ``exit'', and ``echo''.
- It also rejects any commands with the characters
-@@ -56,7 +56,7 @@ so forwarding to ``/usr/ucb/vacation'',
- and
- ``vacation''
- all actually forward to
--``/usr/adm/sm.bin/vacation''.
-+``@@SMRSH_CMDDIR@@/vacation''.
- .PP
- System administrators should be conservative about populating
- the sm.bin directory.
-@@ -86,13 +86,9 @@ to adjust the default search path
- (defaults to ``/bin:/usr/bin:/usr/ucb'')
- and/or \-DSMRSH_CMDDIR=\e"\fIdir\fP\e"
- to change the default program directory
--(defaults to ``/usr/adm/sm.bin'').
-+(defaults to ``@@SMRSH_CMDDIR@@'').
- .SH FILES
--/usr/adm/sm.bin \- default directory for restricted programs on most OSs
--.PP
--/var/adm/sm.bin \- directory for restricted programs on HP UX and Solaris
--.PP
--/usr/libexec/sm.bin \- directory for restricted programs on FreeBSD (>= 3.3) and DragonFly BSD
-+@@SMRSH_CMDDIR@@ \- default directory for restricted programs
-
- .SH SEE ALSO
- sendmail(8)
diff --git a/mail/sendmail/patches/patch-ai b/mail/sendmail/patches/patch-ai
deleted file mode 100644
index ddb69d3a0a3..00000000000
--- a/mail/sendmail/patches/patch-ai
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ai,v 1.6 2006/06/07 14:48:28 joerg Exp $
-
---- sendmail/mci.c.orig 2005-07-12 22:27:44.000000000 +0000
-+++ sendmail/mci.c
-@@ -20,6 +20,7 @@ SM_RCSID("@(#)$Id: mci.c,v 8.216 2005/07
- #endif /* NETINET || NETINET6 */
-
- #include <dirent.h>
-+#include <limits.h>
-
- static int mci_generate_persistent_path __P((const char *, char *,
- int, bool));
-@@ -717,7 +718,11 @@ mci_lock_host_statfile(mci)
- {
- int save_errno = errno;
- int retVal = EX_OK;
-+#if defined(PATH_MAX)
-+ char fname[PATH_MAX];
-+#else
- char fname[MAXPATHLEN];
-+#endif
-
- if (HostStatDir == NULL || mci->mci_host == NULL)
- return EX_OK;
-@@ -1135,7 +1140,7 @@ mci_traverse_persistent(action, pathname
- pathname, sm_errstring(errno));
- return -1;
- }
-- len = sizeof(newpath) - MAXNAMLEN - 3;
-+ len = sizeof(newpath) - 2; /* enough space for '/' and NUL */
- if (sm_strlcpy(newpath, pathname, len) >= len)
- {
- if (tTd(56, 2))
-@@ -1145,6 +1150,7 @@ mci_traverse_persistent(action, pathname
- }
- newptr = newpath + strlen(newpath);
- *newptr++ = '/';
-+ len = sizeof(newpath) - (newptr - newpath);
-
- /*
- ** repeat until no file has been removed
-@@ -1161,9 +1167,8 @@ mci_traverse_persistent(action, pathname
- if (e->d_name[0] == '.')
- continue;
-
-- (void) sm_strlcpy(newptr, e->d_name,
-- sizeof newpath -
-- (newptr - newpath));
-+ if (sm_strlcpy(newptr, e->d_name, len) >= len)
-+ continue;
-
- if (StopRequest)
- stop_sendmail();
diff --git a/mail/sendmail/patches/patch-aj b/mail/sendmail/patches/patch-aj
deleted file mode 100644
index cda1a0591ac..00000000000
--- a/mail/sendmail/patches/patch-aj
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2006/07/07 18:06:28 tv Exp $
-
---- cf/cf/Makefile.orig 2005-06-13 22:16:34.000000000 -0400
-+++ cf/cf/Makefile
-@@ -25,10 +25,10 @@ CHMOD= chmod
- ROMODE= 444
- RM= rm -f
- # use our own install program; should be really confINSTALL
--INSTALL=../../devtools/bin/install.sh
-+INSTALL=@@INSTALL@@
- # CF file ownership/permissions
--CFOWN=root
--CFGRP=bin
-+CFOWN=@@BINOWN@@
-+CFGRP=@@BINGRP@@
- CFMODE=0444
-
-
diff --git a/mail/sendmail/patches/patch-ak b/mail/sendmail/patches/patch-ak
deleted file mode 100644
index 5a6e15b3976..00000000000
--- a/mail/sendmail/patches/patch-ak
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ak,v 1.5 2006/09/05 20:01:37 tv Exp $
-
-From: http://www.sendmail.org/patches/client_name.assert.p0
-(file path fixed to be relative to source top)
-
-Index: srvrsmtp.c
-===================================================================
-RCS file: /cvs/sendmail/srvrsmtp.c,v
-retrieving revision 8.948
-diff -u -r8.948 srvrsmtp.c
---- sendmail/srvrsmtp.c 15 Aug 2006 23:24:58 -0000 8.948
-+++ sendmail/srvrsmtp.c 24 Aug 2006 16:47:19 -0000
-@@ -945,7 +945,9 @@
- char *response;
-
- q = macvalue(macid("{client_name}"), e);
-- SM_ASSERT(q != NULL);
-+ SM_ASSERT(q != NULL || OpMode == MD_SMTP);
-+ if (q == NULL)
-+ q = "localhost";
- response = milter_connect(q, RealHostAddr, e, &state);
- switch (state)
- {
diff --git a/mail/sendmail/patches/patch-al b/mail/sendmail/patches/patch-al
deleted file mode 100644
index e84291b905b..00000000000
--- a/mail/sendmail/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.5 2006/12/29 21:44:09 markd Exp $
-
---- devtools/OS/SunOS.5.10.orig 2006-12-30 07:59:24.000000000 +1300
-+++ devtools/OS/SunOS.5.10
-@@ -10,6 +10,7 @@ define(`confMAPDEF', `-DNDBM -DNIS -DNIS
- define(`confENVDEF', `-DSOLARIS=21000 -DNETINET6')
- define(`confSM_OS_HEADER', `sm_os_sunos')
- define(`confLIBS', `-lsocket -lnsl')
-+define(`confLDOPTS', `${LDFLAGS}')
- define(`confMTCCOPTS', `-D_REENTRANT')
- define(`confMTLDOPTS', `-lpthread')
- define(`confMBINDIR', `/usr/lib')
diff --git a/mail/sendmail/patches/patch-am b/mail/sendmail/patches/patch-am
deleted file mode 100644
index 4afb4b3323b..00000000000
--- a/mail/sendmail/patches/patch-am
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-am,v 1.3 2006/12/29 21:44:09 markd Exp $
-
---- devtools/OS/SunOS.5.11.orig 2006-12-30 07:59:28.000000000 +1300
-+++ devtools/OS/SunOS.5.11
-@@ -10,6 +10,7 @@ define(`confMAPDEF', `-DNDBM -DNIS -DNIS
- define(`confENVDEF', `-DSOLARIS=21100 -DNETINET6')
- define(`confSM_OS_HEADER', `sm_os_sunos')
- define(`confLIBS', `-lsocket -lnsl')
-+define(`confLDOPTS', `${LDFLAGS}')
- define(`confMTCCOPTS', `-D_REENTRANT')
- define(`confMTLDOPTS', `-lpthread')
- define(`confMBINDIR', `/usr/lib')
diff --git a/mail/sendmail812/DESCR b/mail/sendmail812/DESCR
deleted file mode 100644
index 3dd2e5933dd..00000000000
--- a/mail/sendmail812/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Sendmail acts a unified "post office" to which all mail can be submitted.
-Address interpretation is controlled by a production system, which can
-parse both domain-based addressing and old-style "ad hoc" addresses.
-The production system is powerful enough to rewrite addresses in the message
-header to conform to the standards of a number of common target networks,
-including old (NCP/RFC733) Arpanet, new (TCP/RFC822) Arpanet, UUCP, and
-Phonenet. Sendmail also implements an SMTP server, message queueing, and
-aliasing.
diff --git a/mail/sendmail812/MESSAGE b/mail/sendmail812/MESSAGE
deleted file mode 100644
index 6e86a15da3b..00000000000
--- a/mail/sendmail812/MESSAGE
+++ /dev/null
@@ -1,21 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2006/10/12 21:05:25 tv Exp $
-
-To use "${PKGNAME}" as the system's mail transport agent you have
-to install "${PREFIX}/share/examples/sendmail/mailer.conf" as global
-mailwrapper configuration file. The command below will do that for you:
-
-ln -fs ${PREFIX}/share/examples/sendmail/mailer.conf /etc/mailer.conf
-
-If you are changing the database format used by sendmail you must run
-"newaliases" and "makemap" in order to re-create the databases.
-
-You may also need to install (and/or customize) the configuration files
-for Sendmail before it will be operational. "cd" to the directory
-
- ${PREFIX}/share/sendmail/cf
-
-and read the file README for instructions on creating and installing
-configuration files.
-
-===========================================================================
diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile
deleted file mode 100644
index 6b21c723b21..00000000000
--- a/mail/sendmail812/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2006/10/12 21:05:25 tv Exp $
-
-.include "options.mk"
-.include "../../mail/sendmail812/Makefile.common"
-
-PKGNAME= sendmail-${DIST_VERS}
-PKGREVISION= 5
-COMMENT= The well known Mail Transport Agent
-HAS_SIG= yes
-
-CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
-
-MESSAGE_SRC= ${WRKDIR}/.MESSAGE_SRC
-PLIST_SRC= ${WRKDIR}/.PLIST_SRC
-
-PKG_GROUPS= smmsp
-PKG_USERS= smmsp:smmsp
-PKG_GECOS.smmsp= Sendmail Message Submission Program
-
-# Not OWN_DIRS, so that the admin doesn't get a suggestion to delete the
-# queue dirs if they are nonempty at deinstall (probably undesirable).
-#
-MAKE_DIRS_PERMS+= /var/spool/clientmqueue smmsp smmsp 0770
-MAKE_DIRS_PERMS+= /var/spool/mqueue ${ROOT_USER} ${ROOT_GROUP} 0755
-
-post-patch: make-sendmail-siteconfig
-.if !empty(PKG_OPTIONS:Mtcpwrappers)
- ${CAT} ${FILESDIR}/site.config.m4-tcpwrappers >>${SITECONFIG}
- ${ECHO} -n ' TCPWRAPPERS' >>${DESCR_SRC}
-.endif
-.if !empty(PKG_OPTIONS:Mldap)
- ${CAT} ${FILESDIR}/site.config.m4-ldap >>${SITECONFIG}
- ${ECHO} -n ' LDAP' >>${DESCR_SRC}
-.endif
-.if !empty(PKG_OPTIONS:Mdb4)
- ${CAT} ${FILESDIR}/site.config.m4-db4 >>${SITECONFIG}
- ${ECHO} -n ' DB4' >>${DESCR_SRC}
-.elif !empty(PKG_OPTIONS:Mdb2)
- ${CAT} ${FILESDIR}/site.config.m4-db2 >>${SITECONFIG}
- ${ECHO} -n ' DB2' >>${DESCR_SRC}
-.endif
-.if !empty(PKG_OPTIONS:Mtls)
- ${CAT} ${FILESDIR}/site.config.m4-starttls >>${SITECONFIG}
- ${ECHO} -n ' STARTTLS' >>${DESCR_SRC}
-.endif
-.if !empty(PKG_OPTIONS:Msasl)
- ${CAT} ${FILESDIR}/site.config.m4-sasl2 >>${SITECONFIG}
- ${ECHO} -n ' SASL2' >>${DESCR_SRC}
-.endif
- ${ECHO} >>${DESCR_SRC}
-
-do-build:
- @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./Build)
-
-post-build:
- ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
- <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.sendmail
- ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
- ${CP} ${PKGDIR}/MESSAGE ${MESSAGE_SRC}
-.if !empty(PKG_OPTIONS:Mdb2)
- ${ECHO} "" >>${MESSAGE_SRC}
- ${ECHO} "If you are upgrading from \"sendmail\" 8.8.x don't forget to rebuild all" >>${MESSAGE_SRC}
- ${ECHO} "databases with \"${PREFIX}/bin/newaliases\" and \"${PREFIX}/sbin/makemap\"." >>${MESSAGE_SRC}
- ${ECHO} >>${PLIST_SRC} "@exec mv -f /usr/sbin/makemap /usr/sbin/makemap.8.8 || true"
- ${ECHO} >>${PLIST_SRC} "@unexec mv -f /usr/sbin/makemap.8.8 /usr/sbin/makemap || true"
-.endif
-
-pre-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/libexec/sendmail
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sendmail
- ${INSTALL_DATA_DIR} ${PREFIX}/share/sendmail
- ${INSTALL_DATA} ${WRKDIR}/mailer.conf.sendmail ${PREFIX}/share/examples/sendmail/mailer.conf
- cd ${WRKSRC}/cf && ${PAX} -rw -pp -pm . ${PREFIX}/share/sendmail
- ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/sendmail
-.if !empty(PKG_OPTIONS:Mdb2)
- ${MV} -f /usr/sbin/makemap /usr/sbin/makemap.8.8 || ${TRUE}
-.endif
- ${INSTALL_DATA} ${WRKSRC}/obj.`uname -srm | ${TR} \ . | ${TR} \/ - | ${SED} s/sun4./sun4/`/libsm/libsm.a \
- ${PREFIX}/lib
- ${INSTALL_DATA} \
- ${WRKSRC}/obj.`uname -srm | ${TR} \ . | ${TR} \/ - | ${SED} s/sun4./sun4/`/libsmutil/libsmutil.a \
- ${PREFIX}/lib
-
-.include "../../mk/bsd.pkg.mk"
-
-# has to be below include for bsd.pkg.mk, else substition fails
-OBJDIR!= ${ECHO} obj.`uname -srm | ${TR} \ . | ${TR} \/ -`
diff --git a/mail/sendmail812/Makefile.common b/mail/sendmail812/Makefile.common
deleted file mode 100644
index 4ee6ec7a356..00000000000
--- a/mail/sendmail812/Makefile.common
+++ /dev/null
@@ -1,57 +0,0 @@
-# $NetBSD: Makefile.common,v 1.13 2006/10/12 21:05:25 tv Exp $
-#
-# Makefile fragment [formerly] shared with libmilter
-#
-
-DISTNAME= sendmail.${DIST_VERS}
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ \
- ftp://ftp.sendmail.org/pub/sendmail/past-releases/ \
- ftp://ftp.fu-berlin.de/pub/unix/mail/sendmail/ \
- ftp://ftp.kyoto.wide.ad.jp/pub/mail/sendmail/
-
-PATCH_SITES= ${MASTER_SITES}
-PATCHFILES= 8.12.11.p0
-
-MAINTAINER= tv@NetBSD.org
-HOMEPAGE= http://www.sendmail.org/
-
-LICENSE= no-profit
-
-DISTINFO_FILE= ${.CURDIR}/../../mail/sendmail812/distinfo
-FILESDIR= ${.CURDIR}/../../mail/sendmail812/files
-PATCHDIR= ${.CURDIR}/../../mail/sendmail812/patches
-
-DIST_VERS= 8.12.11
-
-MAKE_ENV+= BSD_BINOWN=${BINOWN:Q} BSD_BINGRP=${BINGRP:Q} \
- BSD_MANOWN=${MANOWN:Q} BSD_MANGRP=${MANGRP:Q} \
- BUILDLINK_DIR=${BUILDLINK_DIR:Q}
-SITECONFIG= ${WRKSRC}/devtools/Site/site.config.m4
-
-DESCR_SRC= ${WRKDIR}/.DESCR_SRC
-
-WRKSRC= ${WRKDIR}/sendmail-${DIST_VERS}
-USE_TOOLS+= gm4
-MAKE_ENV+= M4=${TOOLS_M4:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-make-sendmail-siteconfig:
- ${CP} ${FILESDIR}/site.config.m4 ${SITECONFIG}
- ${CHMOD} +w ${SITECONFIG}
- ${CP} ${PKGDIR}/DESCR ${DESCR_SRC}
- ${ECHO} '---' >>${DESCR_SRC}
- ${ECHO} -n 'compiled features:' >>${DESCR_SRC}
-.if !empty(PKG_OPTIONS:Minet6)
- ${CAT} ${FILESDIR}/site.config.m4-v6 >>${SITECONFIG}
-.if ${OPSYS} != "SunOS" && ${OPSYS} != "BSDOS"
- ${CAT} ${FILESDIR}/site.config.m4-v6-not-solaris >>${SITECONFIG}
-.endif
- ${ECHO} -n ' INET6' >>${DESCR_SRC}
-.endif
-.if ${OPSYS} == "SunOS"
- ${CAT} ${FILESDIR}/site.config.m4-solaris >>${SITECONFIG}
-.endif
- ${CAT} ${FILESDIR}/site.config.m4-milter >>${SITECONFIG}
- ${ECHO} -n ' MILTER' >>${DESCR_SRC}
diff --git a/mail/sendmail812/PLIST b/mail/sendmail812/PLIST
deleted file mode 100644
index 70955766ba7..00000000000
--- a/mail/sendmail812/PLIST
+++ /dev/null
@@ -1,215 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/10/12 21:05:25 tv Exp $
-bin/hoststat
-bin/mailq
-bin/newaliases
-bin/purgestat
-bin/vacation
-lib/libsm.a
-lib/libsmutil.a
-libexec/sendmail/sendmail
-libexec/sendmail/smrsh
-man/man1/mailq.1
-man/man1/newaliases.1
-man/man1/vacation.1
-man/man5/aliases.5
-man/man8/editmap.8
-man/man8/mailstats.8
-man/man8/makemap.8
-man/man8/praliases.8
-man/man8/sendmail.8
-man/man8/smrsh.8
-sbin/editmap
-sbin/mailstats
-sbin/makemap
-sbin/praliases
-share/examples/sendmail/mailer.conf
-share/misc/helpfile
-share/sendmail/README
-share/sendmail/cf/Build
-share/sendmail/cf/Makefile
-share/sendmail/cf/README
-share/sendmail/cf/chez.cs.mc
-share/sendmail/cf/clientproto.mc
-share/sendmail/cf/cs-hpux10.mc
-share/sendmail/cf/cs-hpux9.mc
-share/sendmail/cf/cs-osf1.mc
-share/sendmail/cf/cs-solaris2.mc
-share/sendmail/cf/cs-sunos4.1.mc
-share/sendmail/cf/cs-ultrix4.mc
-share/sendmail/cf/cyrusproto.mc
-share/sendmail/cf/generic-bsd4.4.cf
-share/sendmail/cf/generic-bsd4.4.mc
-share/sendmail/cf/generic-hpux10.cf
-share/sendmail/cf/generic-hpux10.mc
-share/sendmail/cf/generic-hpux9.cf
-share/sendmail/cf/generic-hpux9.mc
-share/sendmail/cf/generic-linux.cf
-share/sendmail/cf/generic-linux.mc
-share/sendmail/cf/generic-mpeix.cf
-share/sendmail/cf/generic-mpeix.mc
-share/sendmail/cf/generic-nextstep3.3.cf
-share/sendmail/cf/generic-nextstep3.3.mc
-share/sendmail/cf/generic-osf1.cf
-share/sendmail/cf/generic-osf1.mc
-share/sendmail/cf/generic-solaris.cf
-share/sendmail/cf/generic-solaris.mc
-share/sendmail/cf/generic-sunos4.1.cf
-share/sendmail/cf/generic-sunos4.1.mc
-share/sendmail/cf/generic-ultrix4.cf
-share/sendmail/cf/generic-ultrix4.mc
-share/sendmail/cf/huginn.cs.mc
-share/sendmail/cf/knecht.mc
-share/sendmail/cf/mail.cs.mc
-share/sendmail/cf/mail.eecs.mc
-share/sendmail/cf/mailspool.cs.mc
-share/sendmail/cf/python.cs.mc
-share/sendmail/cf/s2k-osf1.mc
-share/sendmail/cf/s2k-ultrix4.mc
-share/sendmail/cf/submit.cf
-share/sendmail/cf/submit.mc
-share/sendmail/cf/tcpproto.mc
-share/sendmail/cf/ucbarpa.mc
-share/sendmail/cf/ucbvax.mc
-share/sendmail/cf/uucpproto.mc
-share/sendmail/cf/vangogh.cs.mc
-share/sendmail/domain/Berkeley.EDU.m4
-share/sendmail/domain/CS.Berkeley.EDU.m4
-share/sendmail/domain/EECS.Berkeley.EDU.m4
-share/sendmail/domain/S2K.Berkeley.EDU.m4
-share/sendmail/domain/berkeley-only.m4
-share/sendmail/domain/generic.m4
-share/sendmail/feature/accept_unqualified_senders.m4
-share/sendmail/feature/accept_unresolvable_domains.m4
-share/sendmail/feature/access_db.m4
-share/sendmail/feature/allmasquerade.m4
-share/sendmail/feature/always_add_domain.m4
-share/sendmail/feature/authinfo.m4
-share/sendmail/feature/bestmx_is_local.m4
-share/sendmail/feature/bitdomain.m4
-share/sendmail/feature/blacklist_recipients.m4
-share/sendmail/feature/compat_check.m4
-share/sendmail/feature/delay_checks.m4
-share/sendmail/feature/dnsbl.m4
-share/sendmail/feature/domaintable.m4
-share/sendmail/feature/enhdnsbl.m4
-share/sendmail/feature/generics_entire_domain.m4
-share/sendmail/feature/genericstable.m4
-share/sendmail/feature/ldap_routing.m4
-share/sendmail/feature/limited_masquerade.m4
-share/sendmail/feature/local_lmtp.m4
-share/sendmail/feature/local_no_masquerade.m4
-share/sendmail/feature/local_procmail.m4
-share/sendmail/feature/lookupdotdomain.m4
-share/sendmail/feature/loose_relay_check.m4
-share/sendmail/feature/mailertable.m4
-share/sendmail/feature/masquerade_entire_domain.m4
-share/sendmail/feature/masquerade_envelope.m4
-share/sendmail/feature/msp.m4
-share/sendmail/feature/no_default_msa.m4
-share/sendmail/feature/nocanonify.m4
-share/sendmail/feature/nodns.m4
-share/sendmail/feature/notsticky.m4
-share/sendmail/feature/nouucp.m4
-share/sendmail/feature/nullclient.m4
-share/sendmail/feature/preserve_local_plus_detail.m4
-share/sendmail/feature/preserve_luser_host.m4
-share/sendmail/feature/promiscuous_relay.m4
-share/sendmail/feature/queuegroup.m4
-share/sendmail/feature/redirect.m4
-share/sendmail/feature/relay_based_on_MX.m4
-share/sendmail/feature/relay_entire_domain.m4
-share/sendmail/feature/relay_hosts_only.m4
-share/sendmail/feature/relay_local_from.m4
-share/sendmail/feature/relay_mail_from.m4
-share/sendmail/feature/smrsh.m4
-share/sendmail/feature/stickyhost.m4
-share/sendmail/feature/use_ct_file.m4
-share/sendmail/feature/use_cw_file.m4
-share/sendmail/feature/uucpdomain.m4
-share/sendmail/feature/virtuser_entire_domain.m4
-share/sendmail/feature/virtusertable.m4
-share/sendmail/hack/cssubdomain.m4
-share/sendmail/m4/cf.m4
-share/sendmail/m4/cfhead.m4
-share/sendmail/m4/proto.m4
-share/sendmail/m4/version.m4
-share/sendmail/mailer/cyrus.m4
-share/sendmail/mailer/cyrusv2.m4
-share/sendmail/mailer/fax.m4
-share/sendmail/mailer/local.m4
-share/sendmail/mailer/mail11.m4
-share/sendmail/mailer/phquery.m4
-share/sendmail/mailer/pop.m4
-share/sendmail/mailer/procmail.m4
-share/sendmail/mailer/qpage.m4
-share/sendmail/mailer/smtp.m4
-share/sendmail/mailer/usenet.m4
-share/sendmail/mailer/uucp.m4
-share/sendmail/ostype/a-ux.m4
-share/sendmail/ostype/aix3.m4
-share/sendmail/ostype/aix4.m4
-share/sendmail/ostype/aix5.m4
-share/sendmail/ostype/altos.m4
-share/sendmail/ostype/amdahl-uts.m4
-share/sendmail/ostype/bsd4.3.m4
-share/sendmail/ostype/bsd4.4.m4
-share/sendmail/ostype/bsdi.m4
-share/sendmail/ostype/bsdi1.0.m4
-share/sendmail/ostype/bsdi2.0.m4
-share/sendmail/ostype/darwin.m4
-share/sendmail/ostype/dgux.m4
-share/sendmail/ostype/domainos.m4
-share/sendmail/ostype/dynix3.2.m4
-share/sendmail/ostype/freebsd4.m4
-share/sendmail/ostype/freebsd5.m4
-share/sendmail/ostype/gnu.m4
-share/sendmail/ostype/hpux10.m4
-share/sendmail/ostype/hpux11.m4
-share/sendmail/ostype/hpux9.m4
-share/sendmail/ostype/irix4.m4
-share/sendmail/ostype/irix5.m4
-share/sendmail/ostype/irix6.m4
-share/sendmail/ostype/isc4.1.m4
-share/sendmail/ostype/linux.m4
-share/sendmail/ostype/maxion.m4
-share/sendmail/ostype/mklinux.m4
-share/sendmail/ostype/mpeix.m4
-share/sendmail/ostype/nextstep.m4
-share/sendmail/ostype/openbsd.m4
-share/sendmail/ostype/osf1.m4
-share/sendmail/ostype/powerux.m4
-share/sendmail/ostype/ptx2.m4
-share/sendmail/ostype/qnx.m4
-share/sendmail/ostype/riscos4.5.m4
-share/sendmail/ostype/sco-uw-2.1.m4
-share/sendmail/ostype/sco3.2.m4
-share/sendmail/ostype/sinix.m4
-share/sendmail/ostype/solaris2.m4
-share/sendmail/ostype/solaris2.ml.m4
-share/sendmail/ostype/solaris2.pre5.m4
-share/sendmail/ostype/solaris8.m4
-share/sendmail/ostype/sunos3.5.m4
-share/sendmail/ostype/sunos4.1.m4
-share/sendmail/ostype/svr4.m4
-share/sendmail/ostype/ultrix4.m4
-share/sendmail/ostype/unixware7.m4
-share/sendmail/ostype/unknown.m4
-share/sendmail/ostype/uxpds.m4
-share/sendmail/sendmail.schema
-share/sendmail/sh/makeinfo.sh
-share/sendmail/siteconfig/uucp.cogsci.m4
-share/sendmail/siteconfig/uucp.old.arpa.m4
-share/sendmail/siteconfig/uucp.ucbarpa.m4
-share/sendmail/siteconfig/uucp.ucbvax.m4
-@dirrm libexec/sendmail
-@dirrm share/sendmail/siteconfig
-@dirrm share/sendmail/sh
-@dirrm share/sendmail/ostype
-@dirrm share/sendmail/mailer
-@dirrm share/sendmail/m4
-@dirrm share/sendmail/hack
-@dirrm share/sendmail/feature
-@dirrm share/sendmail/domain
-@dirrm share/sendmail/cf
-@dirrm share/sendmail
-@dirrm share/examples/sendmail
diff --git a/mail/sendmail812/distinfo b/mail/sendmail812/distinfo
deleted file mode 100644
index 031107cf05f..00000000000
--- a/mail/sendmail812/distinfo
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: distinfo,v 1.7 2006/09/11 17:18:09 tv Exp $
-
-SHA1 (8.12.11.p0) = aeef47bf434c13d91ba1c1e777cf81a2ba283290
-RMD160 (8.12.11.p0) = 267afdf9abc4636d0750bddf3b7bd16fe9b2fd5b
-Size (8.12.11.p0) = 71804 bytes
-SHA1 (sendmail.8.12.11.tar.gz) = ce1ba0e50740c548f8555f1a905d8514e6637f95
-RMD160 (sendmail.8.12.11.tar.gz) = a80ceccbe3425ea01ce6cb89f2226f83b3562b64
-Size (sendmail.8.12.11.tar.gz) = 1899112 bytes
-SHA1 (patch-aa) = cf9a68f5e6d6fd6e13a806a7d1e6ebab18fc9c6f
-SHA1 (patch-ab) = a2abf6e78772e257e2a1973e7730159ff24a91aa
-SHA1 (patch-ac) = 96c19300b4188dbcbd202768eea912f675dadc27
-SHA1 (patch-ad) = 7232cc7ceb46a2dbf631d61185e4c6ca4af18a13
-SHA1 (patch-ae) = ae06caa125fe4d4fc85123dc0a5d0016cd099ebd
-SHA1 (patch-af) = d26481845328adad6d46fdf797785ec2ad003e28
-SHA1 (patch-ag) = 4e84e709338eecc0dc14a6df42d8071fee1938a3
-SHA1 (patch-ah) = b876e92147bce47fee5f77106c2a1b281fac743f
-SHA1 (patch-ai) = d17bc0a551fa5efd59f4822ca59049e166e59d86
-SHA1 (patch-aj) = 6901b3efacf02ba5f71fbfb6056b1eced9d4c037
-SHA1 (patch-ak) = 2668680ec507ce4b59acae1a985e3af105c51816
-SHA1 (patch-al) = 95b7de0a68015256e372a7151b49c2a27e10f463
diff --git a/mail/sendmail812/files/mailer.conf b/mail/sendmail812/files/mailer.conf
deleted file mode 100644
index a6a1933a6d6..00000000000
--- a/mail/sendmail812/files/mailer.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: mailer.conf,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-#
-# Execute the "real" sendmail program, named @@PREFIX@@/libexec/sendmail/sendmail
-#
-sendmail @@PREFIX@@/libexec/sendmail/sendmail
-send-mail @@PREFIX@@/libexec/sendmail/sendmail
-mailq @@PREFIX@@/libexec/sendmail/sendmail
-newaliases @@PREFIX@@/libexec/sendmail/sendmail
-hoststat @@PREFIX@@/libexec/sendmail/sendmail
-purgestat @@PREFIX@@/libexec/sendmail/sendmail
diff --git a/mail/sendmail812/files/site.config.m4 b/mail/sendmail812/files/site.config.m4
deleted file mode 100644
index b2fd5331d7c..00000000000
--- a/mail/sendmail812/files/site.config.m4
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: site.config.m4,v 1.2 2006/10/12 21:05:25 tv Exp $
-
-# pathnames specific to pkgsrc
-#
-define(`confEBINDIR', `${PREFIX}/libexec/sendmail')
-define(`confMBINDIR', `${PREFIX}/libexec/sendmail')
-define(`confSBINDIR', `${PREFIX}/sbin')
-define(`confUBINDIR', `${PREFIX}/bin')
-define(`confHFDIR', `${PREFIX}/share/misc')
-define(`confINSTALL_RAWMAN', 'yes')
-define(`confDONT_INSTALL_CATMAN', 'yes')
-define(`confMANROOT', `${PREFIX}/${PKGMANDIR}/man')
-define(`confMANROOTMAN', `${PREFIX}/${PKGMANDIR}/man')
-define(`confMAN1EXT', `1')
-define(`confMAN3EXT', `3')
-define(`confMAN4EXT', `4')
-define(`confMAN5EXT', `5')
-define(`confMAN8EXT', `8')
-APPENDDEF(`confENVDEF', `-I${PREFIX}/include')
-APPENDDEF(`confLIBS', `-L${PREFIX}/lib')
-
-# the following are handled by pkgsrc
-define(`confINST_DEP',`')
-define(`confNO_STATISTICS_INSTALL')
diff --git a/mail/sendmail812/files/site.config.m4-db2 b/mail/sendmail812/files/site.config.m4-db2
deleted file mode 100644
index b5c360b8ed8..00000000000
--- a/mail/sendmail812/files/site.config.m4-db2
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-db2,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# enable db2
-APPENDDEF(`confENVDEF', `-DNEWDB -I${BUILDLINK_DIR}/include/db2')
-APPENDDEF(`confLIBS', `-ldb2')
diff --git a/mail/sendmail812/files/site.config.m4-db4 b/mail/sendmail812/files/site.config.m4-db4
deleted file mode 100644
index 620da5dd2a5..00000000000
--- a/mail/sendmail812/files/site.config.m4-db4
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-db4,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# enable db4
-APPENDDEF(`confENVDEF', `-DNEWDB -I${BUILDLINK_DIR}/include/db4')
-APPENDDEF(`confLIBS', `-ldb4')
diff --git a/mail/sendmail812/files/site.config.m4-ldap b/mail/sendmail812/files/site.config.m4-ldap
deleted file mode 100644
index a64017fe043..00000000000
--- a/mail/sendmail812/files/site.config.m4-ldap
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-ldap,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# enable ldap
-APPENDDEF(`confMAPDEF', `-DLDAPMAP')
-APPENDDEF(`confLIBS', `-lldap -llber')
diff --git a/mail/sendmail812/files/site.config.m4-milter b/mail/sendmail812/files/site.config.m4-milter
deleted file mode 100644
index 5bb55578fd2..00000000000
--- a/mail/sendmail812/files/site.config.m4-milter
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: site.config.m4-milter,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# enable milter
-APPENDDEF(`conf_sendmail_ENVDEF', `-DMILTER')
diff --git a/mail/sendmail812/files/site.config.m4-sasl2 b/mail/sendmail812/files/site.config.m4-sasl2
deleted file mode 100644
index 70199afe7de..00000000000
--- a/mail/sendmail812/files/site.config.m4-sasl2
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-sasl2,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# enable SASL 2
-APPENDDEF(`confENVDEF', `-DSASL=2')
-APPENDDEF(`conf_sendmail_LIBS', `-lsasl2')
diff --git a/mail/sendmail812/files/site.config.m4-solaris b/mail/sendmail812/files/site.config.m4-solaris
deleted file mode 100644
index 0ab7a6d18e2..00000000000
--- a/mail/sendmail812/files/site.config.m4-solaris
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: site.config.m4-solaris,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# man pathnames specific for Solaris
-#
-define(`confMAN1EXT', `0')
-define(`confMAN3EXT', `0')
-define(`confMAN4EXT', `0')
-define(`confMAN5EXT', `0')
-define(`confMAN8EXT', `0')
diff --git a/mail/sendmail812/files/site.config.m4-starttls b/mail/sendmail812/files/site.config.m4-starttls
deleted file mode 100644
index 6be6f7ea7fa..00000000000
--- a/mail/sendmail812/files/site.config.m4-starttls
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-starttls,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# enable STARTTLS
-APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS')
-APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto')
diff --git a/mail/sendmail812/files/site.config.m4-tcpwrappers b/mail/sendmail812/files/site.config.m4-tcpwrappers
deleted file mode 100644
index 4c2fd8b8698..00000000000
--- a/mail/sendmail812/files/site.config.m4-tcpwrappers
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-tcpwrappers,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# enable tcpwrappers
-APPENDDEF(`confENVDEF', `-DTCPWRAPPERS')
-APPENDDEF(`conf_sendmail_LIBS', `-lwrap')
diff --git a/mail/sendmail812/files/site.config.m4-v6 b/mail/sendmail812/files/site.config.m4-v6
deleted file mode 100644
index 5b5971e614c..00000000000
--- a/mail/sendmail812/files/site.config.m4-v6
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: site.config.m4-v6,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# enable IPv6
-APPENDDEF(`confENVDEF', `-DNETINET6')
diff --git a/mail/sendmail812/files/site.config.m4-v6-not-solaris b/mail/sendmail812/files/site.config.m4-v6-not-solaris
deleted file mode 100644
index 9f8203bb232..00000000000
--- a/mail/sendmail812/files/site.config.m4-v6-not-solaris
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: site.config.m4-v6-not-solaris,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-APPENDDEF(`confENVDEF', `-DNEEDSGETIPNODE')
diff --git a/mail/sendmail812/options.mk b/mail/sendmail812/options.mk
deleted file mode 100644
index f2aa404b878..00000000000
--- a/mail/sendmail812/options.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-# $NetBSD: options.mk,v 1.6 2006/05/31 18:22:24 ghen Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.sendmail
-PKG_OPTIONS_OPTIONAL_GROUPS= database
-PKG_OPTIONS_GROUP.database= db2 db4
-PKG_SUPPORTED_OPTIONS= inet6 ldap sasl tls tcpwrappers sendmail-socketmap
-PKG_SUGGESTED_OPTIONS= tcpwrappers
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-PKG_SUGGESTED_OPTIONS+= db2
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Berkeley DB version 2/4 format for on disk databases e.g. aliases
-###
-.if !empty(PKG_OPTIONS:Mdb2)
-. include "../../databases/db/buildlink3.mk"
-.elif !empty(PKG_OPTIONS:Mdb4)
-. include "../../databases/db4/buildlink3.mk"
-.endif
-
-###
-### Use OpenLDAP for remote database access
-###
-.if !empty(PKG_OPTIONS:Mldap)
-. include "../../databases/openldap-client/buildlink3.mk"
-.endif
-
-###
-### Use SASL/v2 for SMTP AUTH
-###
-.if !empty(PKG_OPTIONS:Msasl)
-. include "../../security/cyrus-sasl/buildlink3.mk"
-.endif
-
-###
-### Use OpenSSL libraries for SMTP STARTTLS support
-###
-.if !empty(PKG_OPTIONS:Mtls)
-. include "../../security/openssl/buildlink3.mk"
-.endif
-
-###
-### Use tcpwrappers for network access control to sendmail
-###
-.if !empty(PKG_OPTIONS:Mtcpwrappers)
-. include "../../security/tcp_wrappers/buildlink3.mk"
-.endif
-
-###
-### Enable Sendmail SOCKETMAP support
-###
-.if !empty(PKG_OPTIONS:Msendmail-socketmap)
-USE_TOOLS+= perl:run
-REPLACE_PERL= contrib/socketmapClient.pl contrib/socketmapServer.pl
-.endif
-
-###
-### IPv6 support.
-###
-.if !empty(PKG_OPTIONS:Minet6)
-.endif
diff --git a/mail/sendmail812/patches/patch-aa b/mail/sendmail812/patches/patch-aa
deleted file mode 100644
index eba618135db..00000000000
--- a/mail/sendmail812/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/08/30 19:56:45 adrianp Exp $
-
---- devtools/OS/NetBSD.orig 2002-03-21 15:59:25.000000000 -0800
-+++ devtools/OS/NetBSD
-@@ -6,13 +6,15 @@ dnl Place personal settings in devtools/
- define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
- define(`confENVDEF', ` -DNETISO')
- define(`confDEPEND_TYPE', `CC-M')
--define(`confSBINGRP', `wheel')
--define(`confUBINOWN', `root')
--define(`confUBINGRP', `wheel')
--define(`confMANOWN', `root')
--define(`confMANGRP', `wheel')
-+define(`confSBINGRP', `${BSD_BINOWN}')
-+define(`confSBINGRP', `${BSD_BINGRP}')
-+define(`confUBINOWN', `${BSD_BINOWN}')
-+define(`confUBINGRP', `${BSD_BINGRP}')
-+define(`confMANOWN', `${BSD_MANOWN}')
-+define(`confMANGRP', `${BSD_MANGRP}')
- define(`confMAN1EXT', `0')
- define(`confMAN3EXT', `0')
- define(`confMAN4EXT', `0')
- define(`confMAN5EXT', `0')
- define(`confMAN8EXT', `0')
-+define(`confLDOPTS', `${LDFLAGS}')
diff --git a/mail/sendmail812/patches/patch-ab b/mail/sendmail812/patches/patch-ab
deleted file mode 100644
index 42f5ad729ae..00000000000
--- a/mail/sendmail812/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/08/30 19:56:45 adrianp Exp $
-
---- devtools/OS/SunOS.5.6.orig Fri Mar 22 11:59:26 2002
-+++ devtools/OS/SunOS.5.6 Mon Sep 16 15:05:30 2002
-@@ -11,6 +11,7 @@
- define(`confENVDEF', `-DSOLARIS=20600')
- define(`confSM_OS_HEADER', `sm_os_sunos')
- define(`confLIBS', `-lsocket -lnsl -lkstat')
-+define(`confLDOPTS', `${LDFLAGS}')
- define(`confMTCCOPTS', `-D_REENTRANT')
- define(`confMTLDOPTS', `-lpthread')
- define(`confMBINDIR', `/usr/lib')
diff --git a/mail/sendmail812/patches/patch-ac b/mail/sendmail812/patches/patch-ac
deleted file mode 100644
index 2e2a0a6ad74..00000000000
--- a/mail/sendmail812/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/08/30 19:56:45 adrianp Exp $
-
---- devtools/OS/SunOS.5.7.orig Fri Mar 22 11:59:26 2002
-+++ devtools/OS/SunOS.5.7 Mon Sep 16 15:07:08 2002
-@@ -11,6 +11,7 @@
- define(`confENVDEF', `-DSOLARIS=20700')
- define(`confSM_OS_HEADER', `sm_os_sunos')
- define(`confLIBS', `-lsocket -lnsl')
-+define(`confLDOPTS', `${LDFLAGS}')
- define(`confMTCCOPTS', `-D_REENTRANT')
- define(`confMTLDOPTS', `-lpthread')
- define(`confMBINDIR', `/usr/lib')
diff --git a/mail/sendmail812/patches/patch-ad b/mail/sendmail812/patches/patch-ad
deleted file mode 100644
index 5b855e84750..00000000000
--- a/mail/sendmail812/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/08/30 19:56:45 adrianp Exp $
-
---- devtools/OS/SunOS.5.8.orig Fri Mar 22 11:59:26 2002
-+++ devtools/OS/SunOS.5.8 Mon Sep 16 15:09:28 2002
-@@ -10,6 +10,7 @@
- define(`confENVDEF', `-DSOLARIS=20800 -DNETINET6')
- define(`confSM_OS_HEADER', `sm_os_sunos')
- define(`confLIBS', `-lsocket -lnsl')
-+define(`confLDOPTS', `${LDFLAGS}')
- define(`confMTCCOPTS', `-D_REENTRANT')
- define(`confMTLDOPTS', `-lpthread')
- define(`confMBINDIR', `/usr/lib')
diff --git a/mail/sendmail812/patches/patch-ae b/mail/sendmail812/patches/patch-ae
deleted file mode 100644
index bd417e49c6e..00000000000
--- a/mail/sendmail812/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/08/30 19:56:45 adrianp Exp $
-
---- devtools/OS/SunOS.5.9.orig Fri Mar 22 11:59:26 2002
-+++ devtools/OS/SunOS.5.9 Mon Sep 16 15:11:10 2002
-@@ -10,6 +10,7 @@
- define(`confENVDEF', `-DSOLARIS=20900 -DNETINET6')
- define(`confSM_OS_HEADER', `sm_os_sunos')
- define(`confLIBS', `-lsocket -lnsl')
-+define(`confLDOPTS', `${LDFLAGS}')
- define(`confMTCCOPTS', `-D_REENTRANT')
- define(`confMTLDOPTS', `-lpthread')
- define(`confMBINDIR', `/usr/lib')
diff --git a/mail/sendmail812/patches/patch-af b/mail/sendmail812/patches/patch-af
deleted file mode 100644
index 73a1eba9ca6..00000000000
--- a/mail/sendmail812/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/08/30 19:56:45 adrianp Exp $
-
---- sendmail/conf.c.orig Sat Aug 17 02:56:01 2002
-+++ sendmail/conf.c Mon Sep 16 15:13:22 2002
-@@ -4352,7 +4352,8 @@
-
- #if NETINET6
- if (type == AF_INET6 &&
-- IN6_IS_ADDR_UNSPECIFIED((struct in6_addr *) addr))
-+ (IN6_IS_ADDR_UNSPECIFIED((struct in6_addr *) addr) ||
-+ IN6_IS_ADDR_LINKLOCAL((struct in6_addr *) addr)))
- {
- /* Avoid reverse lookup for IPv6 unspecified address */
- SM_SET_H_ERRNO(HOST_NOT_FOUND);
diff --git a/mail/sendmail812/patches/patch-ag b/mail/sendmail812/patches/patch-ag
deleted file mode 100644
index 909580fc09b..00000000000
--- a/mail/sendmail812/patches/patch-ag
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2005/09/08 22:32:39 abs Exp $
-
---- include/sm/conf.h.orig 2004-01-07 13:52:16.000000000 +1300
-+++ include/sm/conf.h
-@@ -780,7 +780,11 @@ extern unsigned int sleepX __P((unsigned
- # ifndef LA_TYPE
- # define LA_TYPE LA_SUBR
- # endif /* ! LA_TYPE */
-+#if defined(__NetBSD__) && (__NetBSD_Version__ > 299000900)
-+# define SFS_TYPE SFS_STATVFS /* use <sys/statvfs.h> statfs() impl */
-+#else
- # define SFS_TYPE SFS_MOUNT /* use <sys/mount.h> statfs() impl */
-+#endif
- # define SPT_TYPE SPT_PSSTRINGS /* use PS_STRINGS pointer */
- # endif /* defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) */
-
-@@ -894,7 +898,11 @@ extern unsigned int sleepX __P((unsigned
- # ifndef LA_TYPE
- # define LA_TYPE LA_SUBR
- # endif /* ! LA_TYPE */
-+#if defined(__NetBSD__) && (__NetBSD_Version__ > 299000900)
-+# define SFS_TYPE SFS_STATVFS /* use <sys/statvfs.h> statfs() impl */
-+#else
- # define SFS_TYPE SFS_MOUNT /* use <sys/mount.h> statfs() impl */
-+#endif
- # if defined(__NetBSD__) && (NetBSD > 199307 || NetBSD0_9 > 1)
- # undef SPT_TYPE
- # define SPT_TYPE SPT_BUILTIN /* setproctitle is in libc */
-@@ -902,6 +910,9 @@ extern unsigned int sleepX __P((unsigned
- # if defined(__NetBSD__) && ((__NetBSD_Version__ > 102070000) || (NetBSD1_2 > 8) || defined(NetBSD1_4) || defined(NetBSD1_3))
- # define HASURANDOMDEV 1 /* has /dev/urandom(4) */
- # endif /* defined(__NetBSD__) && ((__NetBSD_Version__ > 102070000) || (NetBSD1_2 > 8) || defined(NetBSD1_4) || defined(NetBSD1_3)) */
-+# if defined(__NetBSD__)
-+# define SMRSH_CMDDIR "/usr/libexec/sm.bin"
-+# endif /* defined(__NetBSD__) */
- # if defined(__FreeBSD__)
- # define HASSETLOGIN 1 /* has setlogin(2) */
- # if __FreeBSD_version >= 227001
diff --git a/mail/sendmail812/patches/patch-ah b/mail/sendmail812/patches/patch-ah
deleted file mode 100644
index b10b3f3cf40..00000000000
--- a/mail/sendmail812/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/06/14 18:57:34 adrianp Exp $
-
---- sendmail/deliver.c.orig 2006-06-13 21:35:58.000000000 +0100
-+++ sendmail/deliver.c
-@@ -4566,7 +4566,7 @@ putbody(mci, e, separator)
- /* now do the hard work */
- boundaries[0] = NULL;
- mci->mci_flags |= MCIF_INHEADER;
-- if (mime8to7(mci, e->e_header, e, boundaries, M87F_OUTER) ==
-+ if (mime8to7(mci, e->e_header, e, boundaries, M87F_OUTER, 0) ==
- SM_IO_EOF)
- goto writeerr;
- }
-@@ -4597,7 +4597,7 @@ putbody(mci, e, separator)
- SuprErrs = true;
-
- if (mime8to7(mci, e->e_header, e, boundaries,
-- M87F_OUTER|M87F_NO8TO7) == SM_IO_EOF)
-+ M87F_OUTER|M87F_NO8TO7, 0) == SM_IO_EOF)
- goto writeerr;
-
- /* restore SuprErrs */
diff --git a/mail/sendmail812/patches/patch-ai b/mail/sendmail812/patches/patch-ai
deleted file mode 100644
index 2e2ced50ad9..00000000000
--- a/mail/sendmail812/patches/patch-ai
+++ /dev/null
@@ -1,103 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/06/14 18:57:34 adrianp Exp $
-
---- sendmail/mime.c.orig 2006-06-13 21:35:58.000000000 +0100
-+++ sendmail/mime.c
-@@ -80,6 +80,7 @@ static bool MapNLtoCRLF;
- ** boundaries -- the currently pending message boundaries.
- ** NULL if we are processing the outer portion.
- ** flags -- to tweak processing.
-+** level -- recursion level.
- **
- ** Returns:
- ** An indicator of what terminated the message part:
-@@ -96,12 +97,13 @@ struct args
- };
-
- int
--mime8to7(mci, header, e, boundaries, flags)
-+mime8to7(mci, header, e, boundaries, flags, level)
- register MCI *mci;
- HDR *header;
- register ENVELOPE *e;
- char **boundaries;
- int flags;
-+ int level;
- {
- register char *p;
- int linelen;
-@@ -122,6 +124,18 @@ mime8to7(mci, header, e, boundaries, fla
- char pvpbuf[MAXLINE];
- extern unsigned char MimeTokenTab[256];
-
-+ if (level > MAXMIMENESTING)
-+ {
-+ if (!bitset(EF_TOODEEP, e->e_flags))
-+ {
-+ if (tTd(43, 4))
-+ sm_dprintf("mime8to7: too deep, level=%d\n",
-+ level);
-+ usrerr("mime8to7: recursion level %d exceeded",
-+ level);
-+ e->e_flags |= EF_DONT_MIME|EF_TOODEEP;
-+ }
-+ }
- if (tTd(43, 1))
- {
- sm_dprintf("mime8to7: flags = %x, boundaries =", flags);
-@@ -242,7 +256,9 @@ mime8to7(mci, header, e, boundaries, fla
- */
-
- if (sm_strcasecmp(type, "multipart") == 0 &&
-- (!bitset(M87F_NO8BIT, flags) || bitset(M87F_NO8TO7, flags)))
-+ (!bitset(M87F_NO8BIT, flags) || bitset(M87F_NO8TO7, flags)) &&
-+ !bitset(EF_TOODEEP, e->e_flags)
-+ )
- {
-
- if (sm_strcasecmp(subtype, "digest") == 0)
-@@ -286,10 +302,13 @@ mime8to7(mci, header, e, boundaries, fla
- }
- if (i >= MAXMIMENESTING)
- {
-- usrerr("mime8to7: multipart nesting boundary too deep");
-+ if (tTd(43, 4))
-+ sm_dprintf("mime8to7: too deep, i=%d\n", i);
-+ if (!bitset(EF_TOODEEP, e->e_flags))
-+ usrerr("mime8to7: multipart nesting boundary too deep");
-
- /* avoid bounce loops */
-- e->e_flags |= EF_DONT_MIME;
-+ e->e_flags |= EF_DONT_MIME|EF_TOODEEP;
- }
- else
- {
-@@ -333,7 +352,8 @@ mime8to7(mci, header, e, boundaries, fla
- goto writeerr;
- if (tTd(43, 101))
- putline("+++after putheader", mci);
-- bt = mime8to7(mci, hdr, e, boundaries, flags);
-+ bt = mime8to7(mci, hdr, e, boundaries, flags,
-+ level + 1);
- if (bt == SM_IO_EOF)
- goto writeerr;
- }
-@@ -374,7 +394,8 @@ mime8to7(mci, header, e, boundaries, fla
-
- if (sm_strcasecmp(type, "message") == 0)
- {
-- if (!wordinclass(subtype, 's'))
-+ if (!wordinclass(subtype, 's') ||
-+ bitset(EF_TOODEEP, e->e_flags))
- {
- flags |= M87F_NO8BIT;
- }
-@@ -397,7 +418,8 @@ mime8to7(mci, header, e, boundaries, fla
- !bitset(M87F_NO8TO7, flags) &&
- !putline("MIME-Version: 1.0", mci))
- goto writeerr;
-- bt = mime8to7(mci, hdr, e, boundaries, flags);
-+ bt = mime8to7(mci, hdr, e, boundaries, flags,
-+ level + 1);
- mci->mci_flags &= ~MCIF_INMIME;
- return bt;
- }
diff --git a/mail/sendmail812/patches/patch-aj b/mail/sendmail812/patches/patch-aj
deleted file mode 100644
index 014e8225b9c..00000000000
--- a/mail/sendmail812/patches/patch-aj
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/06/14 18:57:34 adrianp Exp $
-
---- sendmail/sendmail.h.orig 2006-06-13 21:35:58.000000000 +0100
-+++ sendmail/sendmail.h
-@@ -942,6 +942,7 @@ struct envelope
- #define EF_TOOBIG 0x02000000L /* message is too big */
- #define EF_SPLIT 0x04000000L /* envelope has been split */
- #define EF_UNSAFE 0x08000000L /* unsafe: read from untrusted source */
-+#define EF_TOODEEP 0x10000000L /* message is nested too deep */
-
- #define DLVR_NOTIFY 0x01
- #define DLVR_RETURN 0x02
-@@ -1592,7 +1593,7 @@ EXTERN unsigned long PrivacyFlags; /* pr
-
- /* functions */
- extern bool mime7to8 __P((MCI *, HDR *, ENVELOPE *));
--extern int mime8to7 __P((MCI *, HDR *, ENVELOPE *, char **, int));
-+extern int mime8to7 __P((MCI *, HDR *, ENVELOPE *, char **, int, int));
-
- /*
- ** Flags passed to returntosender.
diff --git a/mail/sendmail812/patches/patch-ak b/mail/sendmail812/patches/patch-ak
deleted file mode 100644
index f65d21e1b07..00000000000
--- a/mail/sendmail812/patches/patch-ak
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/06/14 18:57:34 adrianp Exp $
-
---- sendmail/version.c.orig 2006-06-14 19:54:25.000000000 +0100
-+++ sendmail/version.c
-@@ -17,2 +17,2 @@ SM_RCSID("@(#)$Id: version.c,v 8.104.2.2
-
--char Version[] = "8.12.11.20060308";
-+char Version[] = "8.12.11.20060614";
diff --git a/mail/sendmail812/patches/patch-al b/mail/sendmail812/patches/patch-al
deleted file mode 100644
index 0fe011daa25..00000000000
--- a/mail/sendmail812/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/09/05 20:06:06 tv Exp $
-
---- sendmail/main.c.orig 2003-11-06 19:09:31.000000000 -0500
-+++ sendmail/main.c
-@@ -2910,6 +2910,7 @@ finis(drop, cleanup, exitstat)
- dropenvelope(CurEnv, true, false);
- sm_rpool_free(CurEnv->e_rpool);
- CurEnv->e_rpool = NULL;
-+ CurEnv->e_to = NULL;
- }
- else
- poststats(StatFile);
diff --git a/mail/sendymail/DESCR b/mail/sendymail/DESCR
deleted file mode 100644
index 858ccc0c8c7..00000000000
--- a/mail/sendymail/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-sendymail allows you to send e-mails through Yahoo! Mail, using your
-favorite email client. sendymail works as a gateway between Yahoo!
-Mail web interface and your e-mail program, and can be used in
-conjunction with fetchyahoo or YoSucker to emulate a POP3/SMTP-like
-interface.
diff --git a/mail/sendymail/MESSAGE b/mail/sendymail/MESSAGE
deleted file mode 100644
index cecab717ded..00000000000
--- a/mail/sendymail/MESSAGE
+++ /dev/null
@@ -1,22 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2007/01/14 14:05:34 obache Exp $
-
- To use sendymail,
-
- 1) Create a ~/.sendymailrc file by copying
- ${PREFIX}/share/examples/sendymail/sendymailrc.sample
- to ~/.sendymailrc and edit the file.
-
- 2) Give the proper permissions to the configuration file:
-
- $ chmod 600 ~/.sendymailrc
-
- 3) Configure your MUA (mail client). sendymail has a
- Sendmail-like interface, so you have to create a "sendmail"
- account to outgoing messages and set the path of the sendmail
- command to the sendymail script location. Eg: For Mutt,
- edit ~/.muttrc and change "sendmail" variable:
-
- set sendmail="${PREFIX}/bin/sendymail"
-
-===========================================================================
diff --git a/mail/sendymail/Makefile b/mail/sendymail/Makefile
deleted file mode 100644
index 4f063e7ac1d..00000000000
--- a/mail/sendymail/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/01/14 14:05:34 obache Exp $
-#
-
-DISTNAME= sendymail-0.5.8
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sendymail/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://sendymail.sourceforge.net/
-COMMENT= Send emails through Yahoo using your favorite email client
-
-DEPENDS+= p5-Crypt-SSLeay-[0-9]*:../../security/p5-Crypt-SSLeay
-DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
-DEPENDS+= p5-Getopt-Long-[0-9]*:../../devel/p5-Getopt-Long
-DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
-DEPENDS+= p5-MailTools-[0-9]*:../../mail/p5-MailTools
-DEPENDS+= p5-MIME-tools-[0-9]*:../../mail/p5-MIME-tools
-
-USE_TOOLS+= perl:run
-REPLACE_PERL= sendymail.pl
-
-NO_BUILD= yes
-
-EGDIR= ${PREFIX}/share/examples/sendymail
-DOCDIR= ${PREFIX}/share/doc/sendymail
-
-SUBST_CLASSES+= sa2
-SUBST_STAGE.sa2= pre-configure
-SUBST_FILES.sa2= ChangeLog INSTALL
-SUBST_SED.sa2= -e s!sendymail.pl!sendymail!g
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/sendymail.pl ${PREFIX}/bin/sendymail
- ${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA_DIR} ${EGDIR}
-.for i in BUGS COPYING ChangeLog INSTALL README TODO
- ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/sendymail
-.endfor
- ${INSTALL_DATA} ${WRKSRC}/sendymailrc.sample ${EGDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/sendymail/PLIST b/mail/sendymail/PLIST
deleted file mode 100644
index 5218da894b1..00000000000
--- a/mail/sendymail/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/14 14:05:34 obache Exp $
-bin/sendymail
-share/doc/sendymail/BUGS
-share/doc/sendymail/COPYING
-share/doc/sendymail/ChangeLog
-share/doc/sendymail/INSTALL
-share/doc/sendymail/README
-share/doc/sendymail/TODO
-share/examples/sendymail/sendymailrc.sample
-@dirrm share/examples/sendymail
-@dirrm share/doc/sendymail
diff --git a/mail/sendymail/distinfo b/mail/sendymail/distinfo
deleted file mode 100644
index b48bcae68bf..00000000000
--- a/mail/sendymail/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/01/14 14:05:34 obache Exp $
-
-SHA1 (sendymail-0.5.8.tar.gz) = 900e7fb7f252c3933e5b58c3659bc58ff565339f
-RMD160 (sendymail-0.5.8.tar.gz) = 2ff4c5c269c4459e0456c01e2703480394ec71c7
-Size (sendymail-0.5.8.tar.gz) = 16327 bytes
diff --git a/mail/serialmail/DESCR b/mail/serialmail/DESCR
deleted file mode 100644
index ac02f00607b..00000000000
--- a/mail/serialmail/DESCR
+++ /dev/null
@@ -1,21 +0,0 @@
-serialmail is a collection of tools for passing mail across serial
-links. It works with qmail: you use qmail to deliver messages to
-a maildir, and then serialmail to deliver messages out of the
-maildir.
-
-serialmail is designed to handle three common types of mail delivery
-between a dialup computer and an ISP:
-
-* Delivery to the ISP. The dialup computer sends all outgoing mail
- to the ISP.
-
-* AutoTURN delivery from the ISP. After the dialup computer makes
- an SMTP connection to the ISP, it automatically receives an
- SMTP connection back from the ISP if there is any new mail for
- it. This provides the same power as ETRN but does not require
- a special client.
-
-* User-controlled delivery from the ISP. A user with a shell account
- can switch from qmail-pop3d to serialmail without pestering the
- sysadmin. The user can also decide whether undeliverable messages
- should be left for POP retrieval or bounced back to the sender.
diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile
deleted file mode 100644
index ef68bc4147b..00000000000
--- a/mail/serialmail/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/01/23 16:24:09 joerg Exp $
-#
-
-DISTNAME= serialmail-0.75
-CATEGORIES= mail
-MASTER_SITES= http://cr.yp.to/software/
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://cr.yp.to/serialmail.html
-COMMENT= Tools for passing mail across serial links
-
-DEPENDS+= qmail>=1.03nb7:../../mail/qmail
-
-USE_TOOLS+= nroff
-
-# We change conf-home from the default "/usr/local" and don't
-# provide compatibility symlinks. We also patch to install docs
-# following hier(7), to set reasonable permissions on standard
-# pkgsrc directories, and to avoid overwriting the "setlock" binary
-# provided by sysutils/daemontools.
-DJB_RESTRICTED= YES
-
-SUBST_FILES.djbware+= leapsecs_read.c
-
-.include "../../mk/djbware.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/serialmail/PLIST b/mail/serialmail/PLIST
deleted file mode 100644
index c09897ee633..00000000000
--- a/mail/serialmail/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/04/21 01:00:29 schmonz Exp $
-bin/maildirqmtp
-bin/maildirserial
-bin/maildirsmtp
-bin/serialqmtp
-bin/serialsmtp
-man/cat1/maildirqmtp.0
-man/cat1/maildirserial.0
-man/cat1/maildirsmtp.0
-man/cat1/serialqmtp.0
-man/cat1/serialsmtp.0
-man/man1/maildirqmtp.1
-man/man1/maildirserial.1
-man/man1/maildirsmtp.1
-man/man1/serialqmtp.1
-man/man1/serialsmtp.1
-share/doc/serialmail/AUTOTURN
-share/doc/serialmail/FROMISP
-share/doc/serialmail/TOISP
-@dirrm share/doc/serialmail
diff --git a/mail/serialmail/distinfo b/mail/serialmail/distinfo
deleted file mode 100644
index 22b1154265c..00000000000
--- a/mail/serialmail/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/04/21 01:00:29 schmonz Exp $
-
-SHA1 (serialmail-0.75.tar.gz) = 76f8d5ae698cff25b3227e51cc99fff1f4a8b137
-RMD160 (serialmail-0.75.tar.gz) = 2d12152b9c7d007f76b4d129c2795cd192ba9f83
-Size (serialmail-0.75.tar.gz) = 55079 bytes
-SHA1 (patch-aa) = 0ccbe27149addddcd839ed71cc07b68d7473100b
diff --git a/mail/serialmail/patches/patch-aa b/mail/serialmail/patches/patch-aa
deleted file mode 100644
index 95a2a6916b4..00000000000
--- a/mail/serialmail/patches/patch-aa
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/04/21 01:00:29 schmonz Exp $
-
---- hier.c.orig 1998-11-14 21:28:23.000000000 -0500
-+++ hier.c
-@@ -2,21 +2,20 @@
-
- void hier()
- {
-- h(auto_home,-1,-1,02755);
-+ h(auto_home,-1,-1,0755);
-
-- d(auto_home,"bin",-1,-1,02755);
-- d(auto_home,"doc",-1,-1,02755);
-- d(auto_home,"doc/serialmail",-1,-1,02755);
-- d(auto_home,"man",-1,-1,02755);
-- d(auto_home,"man/man1",-1,-1,02755);
-- d(auto_home,"man/cat1",-1,-1,02755);
-+ d(auto_home,"bin",-1,-1,0755);
-+ d(auto_home,"share/doc",-1,-1,0755);
-+ d(auto_home,"share/doc/serialmail",-1,-1,0755);
-+ d(auto_home,"man",-1,-1,0755);
-+ d(auto_home,"man/man1",-1,-1,0755);
-+ d(auto_home,"man/cat1",-1,-1,0755);
-
- c(auto_home,"bin","serialqmtp",-1,-1,0755);
- c(auto_home,"bin","serialsmtp",-1,-1,0755);
- c(auto_home,"bin","maildirqmtp",-1,-1,0755);
- c(auto_home,"bin","maildirsmtp",-1,-1,0755);
- c(auto_home,"bin","maildirserial",-1,-1,0755);
-- c(auto_home,"bin","setlock",-1,-1,0755);
-
- c(auto_home,"man/man1","serialqmtp.1",-1,-1,0644);
- c(auto_home,"man/cat1","serialqmtp.0",-1,-1,0644);
-@@ -28,10 +27,8 @@ void hier()
- c(auto_home,"man/cat1","maildirsmtp.0",-1,-1,0644);
- c(auto_home,"man/man1","maildirserial.1",-1,-1,0644);
- c(auto_home,"man/cat1","maildirserial.0",-1,-1,0644);
-- c(auto_home,"man/man1","setlock.1",-1,-1,0644);
-- c(auto_home,"man/cat1","setlock.0",-1,-1,0644);
-
-- c(auto_home,"doc/serialmail","FROMISP",-1,-1,0644);
-- c(auto_home,"doc/serialmail","TOISP",-1,-1,0644);
-- c(auto_home,"doc/serialmail","AUTOTURN",-1,-1,0644);
-+ c(auto_home,"share/doc/serialmail","FROMISP",-1,-1,0644);
-+ c(auto_home,"share/doc/serialmail","TOISP",-1,-1,0644);
-+ c(auto_home,"share/doc/serialmail","AUTOTURN",-1,-1,0644);
- }
diff --git a/mail/sigrot/DESCR b/mail/sigrot/DESCR
deleted file mode 100644
index d1be8ed6692..00000000000
--- a/mail/sigrot/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Sigrot rotates your .signature file every time it is run. It includes an
-option for a non-rotating header and/or footer with a rotating middle.
diff --git a/mail/sigrot/Makefile b/mail/sigrot/Makefile
deleted file mode 100644
index 6c49d7adcad..00000000000
--- a/mail/sigrot/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:59 rillig Exp $
-
-DISTNAME= sigrot_1.2-1
-PKGNAME= sigrot-1.2
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/s/sigrot/}
-
-MAINTAINER= drue@users.sourceforge.net
-HOMEPAGE= http://packages.debian.org/oldstable/mail/sigrot
-COMMENT= Signature file rotation program
-
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_TOOLS+= gmake
-
-DOCDIR= ${PREFIX}/share/doc/sigrot
-EGDIR= ${PREFIX}/share/examples/sigrot
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-build:
- cd ${WRKSRC} && ${CC} sigrot.c -o sigrot
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/sigrot ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/sigrot.1 ${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/copyright ${DOCDIR}/COPYRIGHT
- ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR}/INSTALL
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/examples/prefix ${EGDIR}/prefix
- ${INSTALL_DATA} ${WRKSRC}/examples/sig_archive ${EGDIR}/sig_archive
- ${INSTALL_DATA} ${WRKSRC}/examples/suffix ${EGDIR}/suffix
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/sigrot/PLIST b/mail/sigrot/PLIST
deleted file mode 100644
index 9273330f9eb..00000000000
--- a/mail/sigrot/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/05/02 08:03:38 jmmv Exp $
-bin/sigrot
-man/man1/sigrot.1
-share/doc/sigrot/COPYRIGHT
-share/doc/sigrot/INSTALL
-share/examples/sigrot/prefix
-share/examples/sigrot/sig_archive
-share/examples/sigrot/suffix
-@dirrm share/examples/sigrot
-@dirrm share/doc/sigrot
diff --git a/mail/sigrot/distinfo b/mail/sigrot/distinfo
deleted file mode 100644
index 6a66a45d835..00000000000
--- a/mail/sigrot/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:29 agc Exp $
-
-SHA1 (sigrot_1.2-1.tar.gz) = 7cec808e44b00831d196f2e6677e852596baafab
-RMD160 (sigrot_1.2-1.tar.gz) = f861a7757840e0431eac9a533286395751329559
-Size (sigrot_1.2-1.tar.gz) = 7908 bytes
diff --git a/mail/sma/DESCR b/mail/sma/DESCR
deleted file mode 100644
index d89a1a48c9a..00000000000
--- a/mail/sma/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-sma - Sendmail log analyser
-
-sma is a very fast sendmail log analyzer and outputs
-standard ascii or html report files.
-Requires access to mail logs in /var/logs.
diff --git a/mail/sma/MESSAGE b/mail/sma/MESSAGE
deleted file mode 100644
index 1110a5435a4..00000000000
--- a/mail/sma/MESSAGE
+++ /dev/null
@@ -1,6 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2003/09/24 13:21:10 tron Exp $
-
-
-Sample configration file has been copied to ${PREFIX}/share/examples/sma
-===========================================================================
diff --git a/mail/sma/Makefile b/mail/sma/Makefile
deleted file mode 100644
index 293c62ccb53..00000000000
--- a/mail/sma/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:44 wiz Exp $
-
-DISTNAME= sma-1.4
-CATEGORIES= mail
-MASTER_SITES= http://www.klake.org/sma/dl/
-
-MAINTAINER= markus@core.de
-HOMEPAGE= http://www.klake.org/sma/
-COMMENT= Sendmail log analyser
-
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-NO_CONFIGURE= yes
-
-MAKE_FILE= Makefile
-BUILD_TARGET= sma
-
-.include "../../mk/bsd.prefs.mk"
-
-.if empty(LOWER_OPSYS:Mirix5*)
-CFLAGS+= -DUSE_REGEXP
-.endif
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man8
-
-do-install:
- cd ${WRKSRC}; \
- ${INSTALL_PROGRAM} sma ${PREFIX}/bin; \
- ${INSTALL_MAN} docs/sma.8 ${PREFIX}/${PKGMANDIR}/man8; \
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sma; \
- ${INSTALL_DATA} README ${PREFIX}/share/doc/sma; \
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sma; \
- ${INSTALL_DATA} sma.conf ${PREFIX}/share/examples/sma
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/sma/PLIST b/mail/sma/PLIST
deleted file mode 100644
index aa27338732c..00000000000
--- a/mail/sma/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/11/14 12:31:30 obache Exp $
-bin/sma
-man/man8/sma.8
-share/doc/sma/README
-share/examples/sma/sma.conf
-@dirrm share/examples/sma
-@dirrm share/doc/sma
diff --git a/mail/sma/distinfo b/mail/sma/distinfo
deleted file mode 100644
index 3200f2f529d..00000000000
--- a/mail/sma/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/11/14 12:31:30 obache Exp $
-
-SHA1 (sma-1.4.tar.gz) = ee4acb57ed7cde85e732e689756d900ed398a2ba
-RMD160 (sma-1.4.tar.gz) = ce643df84f054216c3a6de5e6cea57b30b0b8f0a
-Size (sma-1.4.tar.gz) = 121365 bytes
-SHA1 (patch-aa) = c1f7a646e7b0ebe9b22c8bd91e41d80487703040
diff --git a/mail/sma/patches/patch-aa b/mail/sma/patches/patch-aa
deleted file mode 100644
index 875e69099a8..00000000000
--- a/mail/sma/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/01/04 15:34:23 wiz Exp $
-
---- Makefile.orig 2002-11-14 18:09:54.000000000 +0100
-+++ Makefile
-@@ -7,7 +7,7 @@ MANDIR = /usr/local/man/man8
-
- CC = gcc
- # XPG3 regular expressions (GNU/BSD/SVR4)
--CFLAGS = -Wall -O -DUSE_REGEXP
-+#CFLAGS = -Wall -O -DUSE_REGEXP
- # Others
- #CFLAGS = -Wall -O
-
diff --git a/mail/smtpfeed/DESCR b/mail/smtpfeed/DESCR
deleted file mode 100644
index d2e0af3c32e..00000000000
--- a/mail/smtpfeed/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-SMTP feed -- SMTP Fast Exploding External Deliverer for Sendmail
-
-Smtpfeed is a SMTP delivery agent which is called by sendmail, and it
-improves required time to complete delivery of copies of a message to
-recipients of huge number.
-
-This delay of delivery by sendmail causes by the fact that implementation
-of SMTP delivery routine in sendmail processes all delivery in a series.
-By this reason, when it takes long time for delivery to one recipient
-which is in a huge list, delivery to following recipients is greatly
-influenced.
-
-To avoid such a problem, delivery agents should be implemented so that
-a delivery is not influenced by preceding delivery: DNS query and
-SMTP delivery par destination should be processed in parallel.
-Smtpfeed is the SMTP delivery agent for sendmail implemented with this
-idea.
diff --git a/mail/smtpfeed/MESSAGE b/mail/smtpfeed/MESSAGE
deleted file mode 100644
index 0914319de86..00000000000
--- a/mail/smtpfeed/MESSAGE
+++ /dev/null
@@ -1,11 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:14 wiz Exp $
-
-The executable for ${PKGNAME} is installed into
-${PREFIX}/libexec/smtpfeed.
-
-You'll need to prepare (1) sendmail with WIDE patch applied,
-and (2) properly configured sendmail.cf.
-(1) is done in the mail/sendmail package.
-
-===========================================================================
diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
deleted file mode 100644
index 2150b87cbd8..00000000000
--- a/mail/smtpfeed/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# $NetBSD: Makefile,v 1.29 2007/02/22 19:26:44 wiz Exp $
-
-DISTNAME= smtpfeed-1.18
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/ \
- ftp://ftp.kyoto.wide.ad.jp/pub/mail/sendmail/ \
- ftp://ftp.sendmail.org/ucb/src/sendmail/ \
- http://freefall.freebsd.org/~itojun/distfiles/
-
-MAINTAINER= itojun@itojun.org
-HOMEPAGE= http://www.kyoto.wide.ad.jp/mta/sendmail.html#smtpfeed
-COMMENT= SMTP Fast Exploding External Deliverer for Sendmail
-
-# sendmail 8.x with WIDE patch works better with it, than stock 8.x.
-# require sendmail from pkgsrc.
-#DEPENDS+= sendmail>=8.9.3:../../mail/sendmail
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --libexecdir=${PREFIX:Q}/libexec
-# configure tries to be clever, so force our setting
-CONFIGURE_ENV+= my_cv_path_lib_exec=${PREFIX:Q}/libexec
-# use bind8?
-#CONFIGURE_ARGS+= --with-bind8
-
-DOCS= COPYRIGHT FEATURES FEATURES.j FYI FYI.j INSTALL INSTALL.j \
- ML-ADMIN ML-ADMIN.j OPTIONS OPTIONS.j README README.j \
- RELEASE.NOTE SIGNAL SIGNAL.j TODO
-
-BUILD_DEFS+= USE_INET6
-
-INSTALLATION_DIRS= libexec ${PKGMANDIR}/man8 share/doc/smtpfeed
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(USE_INET6) && ${USE_INET6} == YES
-CONFIGURE_ARGS+=--enable-ipv6
-.endif
-
-post-install:
- ${INSTALL_MAN} ${WRKSRC}/smtpfeed.8 ${PREFIX}/${PKGMANDIR}/man8
- for i in ${DOCS}; do \
- ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/smtpfeed; \
- done
-
-.include "../../devel/sysexits/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/smtpfeed/PLIST b/mail/smtpfeed/PLIST
deleted file mode 100644
index c01d5343d42..00000000000
--- a/mail/smtpfeed/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2005/03/14 19:52:16 tv Exp $
-libexec/smtpfeed
-man/man8/smtpfeed.8
-share/doc/smtpfeed/COPYRIGHT
-share/doc/smtpfeed/FEATURES
-share/doc/smtpfeed/FEATURES.j
-share/doc/smtpfeed/FYI
-share/doc/smtpfeed/FYI.j
-share/doc/smtpfeed/INSTALL
-share/doc/smtpfeed/INSTALL.j
-share/doc/smtpfeed/ML-ADMIN
-share/doc/smtpfeed/ML-ADMIN.j
-share/doc/smtpfeed/OPTIONS
-share/doc/smtpfeed/OPTIONS.j
-share/doc/smtpfeed/README
-share/doc/smtpfeed/README.j
-share/doc/smtpfeed/RELEASE.NOTE
-share/doc/smtpfeed/SIGNAL
-share/doc/smtpfeed/SIGNAL.j
-share/doc/smtpfeed/TODO
-@dirrm share/doc/smtpfeed
diff --git a/mail/smtpfeed/distinfo b/mail/smtpfeed/distinfo
deleted file mode 100644
index 62a588ab732..00000000000
--- a/mail/smtpfeed/distinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: distinfo,v 1.7 2006/07/23 15:00:41 taca Exp $
-
-SHA1 (smtpfeed-1.18.tar.gz) = c5875be954a12035658c57dfca0d032609e4e057
-RMD160 (smtpfeed-1.18.tar.gz) = cb477e5e3de9cb422aa2a3b612486ad819c8f8bf
-Size (smtpfeed-1.18.tar.gz) = 140293 bytes
-SHA1 (patch-aa) = e0ba34dd816d349ecedbc2a76cef9e70b396c655
-SHA1 (patch-ac) = d5b33823fa1ad9910ec97719f47c4265acf1dccc
-SHA1 (patch-ad) = 4ecd4ae9ba72997ed617158862e8801a9977472a
-SHA1 (patch-ae) = 33f2fc505db76c9fcb5e0b62b34797256c95db6b
-SHA1 (patch-af) = 2fd2dfa124a0ab842b739e85998e4b4a32e5eb71
-SHA1 (patch-ag) = a0956209ee563f73f3398d0fc0ee69cb57240cd5
-SHA1 (patch-ah) = d53b829ff765b7d555a6dda743a9496497679aa7
-SHA1 (patch-ai) = 2e29b595c1a946ea68186886a80bd5371b697e4e
-SHA1 (patch-aj) = f26af3988350e0df29fa7e97ea7c308ac6699125
-SHA1 (patch-ak) = 206286eb6872876fc4b67a6ad413229124b8bb80
-SHA1 (patch-al) = 6b8fbaf7a4882e6f179627b4e42ee5bf2e3964c3
-SHA1 (patch-am) = 63c35492d1cd9f01e9de901b7816e6f5d3e28c91
diff --git a/mail/smtpfeed/hacks.mk b/mail/smtpfeed/hacks.mk
deleted file mode 100644
index e967ea912da..00000000000
--- a/mail/smtpfeed/hacks.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2005/11/07 20:35:20 tv Exp $
-
-###
-### Need a real resolver on Interix.
-###
-.if ${OPSYS} == "Interix"
-BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/bind /usr/local/lib/bind
-CPPFLAGS+= -I/usr/local/include/bind
-LDFLAGS+= -L/usr/local/lib/bind
-LIBS+= -lbind -ldb
-.endif
diff --git a/mail/smtpfeed/patches/patch-aa b/mail/smtpfeed/patches/patch-aa
deleted file mode 100644
index 9c4ef532244..00000000000
--- a/mail/smtpfeed/patches/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2000/02/22 01:31:26 dmcmahill Exp $
-
---- Makefile.in.orig Mon Feb 21 20:24:39 2000
-+++ Makefile.in Mon Feb 21 20:29:43 2000
-@@ -68,5 +68,4 @@
-
- install:
-- -mv -f ${DEST}/${TARGET} ${DEST}/${TARGET}.old
- ${INSTALL} ${TARGET} ${DEST}
-
diff --git a/mail/smtpfeed/patches/patch-ac b/mail/smtpfeed/patches/patch-ac
deleted file mode 100644
index fc0cd543ceb..00000000000
--- a/mail/smtpfeed/patches/patch-ac
+++ /dev/null
@@ -1,143 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/07/23 15:00:41 taca Exp $
-
---- address.c.orig 2002-01-20 23:19:42.000000000 +0900
-+++ address.c
-@@ -42,6 +42,8 @@
- # include "extern.h"
- # include "smtp.h"
-
-+static void dnsstatus P((struct recipient *, int, char *));
-+
- int
- addmyalias(name)
- char *name;
-@@ -58,12 +60,12 @@
- ha = (struct hostalias *)MALLOC(sizeof(struct hostalias));
- if (ha == NULL)
- {
-- log(LOG_NOTICE, "out of memory (addmyalias)");
-+ mylog(LOG_NOTICE, "out of memory (addmyalias)");
- return -1;
- }
- /* bzero(ha, sizeof(struct hostalias)); */
- if (cnf.debug & DEBUG_ADDRESS)
-- log(LOG_DEBUG, "adding alias: %s", name);
-+ mylog(LOG_DEBUG, "adding alias: %s", name);
- len = strlen(name);
- /* strip trailing dot */
- while (len > 0 && name[len-1] == '.')
-@@ -114,7 +116,7 @@
- hostp = (struct host *)MALLOC(sizeof(struct host));
- if (hostp == NULL)
- {
-- log(LOG_NOTICE,
-+ mylog(LOG_NOTICE,
- "out of memory (addinetaddress)");
- return -1;
- }
-@@ -153,7 +155,7 @@
- if (addr == NULL) /* just link from mxp */
- {
- if (cnf.debug & DEBUG_ADDRESS)
-- log(LOG_DEBUG, "address info for %s linked", mxp->name);
-+ mylog(LOG_DEBUG, "address info for %s linked", mxp->name);
- return 0;
- }
-
-@@ -170,13 +172,13 @@
- {
- case AF_INET:
- bcopy(addr, &sin, sizeof(sin));
-- log(LOG_INFO, "got new address %s for %s, state reset",
-+ mylog(LOG_INFO, "got new address %s for %s, state reset",
- inet_ntoa(sin), mxp->name);
- break;
- #if INET6
- case AF_INET6:
- inet_ntop(AF_INET6, addr, buf, sizeof(buf));
-- log(LOG_INFO, "got new address %s for %s, state reset",
-+ mylog(LOG_INFO, "got new address %s for %s, state reset",
- buf, mxp->name);
-
- break;
-@@ -193,19 +195,19 @@
- {
- case AF_INET:
- bcopy(addr, &sin, sizeof(sin));
-- log(LOG_DEBUG, "DNS: registering %s=%s",
-+ mylog(LOG_DEBUG, "DNS: registering %s=%s",
- mxp->name, inet_ntoa(sin));
- break;
- #if INET6
- case AF_INET6:
- inet_ntop(AF_INET6, addr, buf, sizeof(buf));
-- log(LOG_DEBUG, "DNS: registering %s=%s",
-+ mylog(LOG_DEBUG, "DNS: registering %s=%s",
- mxp->name, buf);
-
- break;
- #endif
- default:
-- log(LOG_NOTICE,
-+ mylog(LOG_NOTICE,
- "DNS: invalid inet_domain %d at addinetaddress",
- inet_domain);
- }
-@@ -226,7 +228,7 @@
- iap = (struct inetaddr *)MALLOC(sizeof(struct inetaddr));
- if (iap == NULL)
- {
-- log(LOG_NOTICE, "out of memory (addinetaddress)");
-+ mylog(LOG_NOTICE, "out of memory (addinetaddress)");
- return -1;
- }
- bzero(iap, sizeof(struct inetaddr));
-@@ -235,7 +237,7 @@
- iap->address = (char *)MALLOC(len);
- if (iap->address == NULL)
- {
-- log(LOG_NOTICE, "out of memory (addinetaddress)");
-+ mylog(LOG_NOTICE, "out of memory (addinetaddress)");
- return -1;
- }
- bcopy(addr, iap->address, len);
-@@ -462,12 +464,12 @@
- struct domain *d, **hashp;
-
- if (cnf.debug & DEBUG_LMTP)
-- log(LOG_DEBUG, "RCPT TO: %s notify=%s orcpt=%s", addr,
-+ mylog(LOG_DEBUG, "RCPT TO: %s notify=%s orcpt=%s", addr,
- (notify == NULL)?"":notify, (orcpt == NULL)?"":orcpt);
- rcpt = (struct recipient *)MALLOC(sizeof(struct recipient));
- if (rcpt == NULL)
- {
-- log(LOG_NOTICE, "out of memory (addrecipient)");
-+ mylog(LOG_NOTICE, "out of memory (addrecipient)");
- return -1;
- }
- bzero(rcpt, sizeof(struct recipient));
-@@ -493,7 +495,7 @@
- if (d == NULL)
- {
- if (cnf.debug & DEBUG_LMTP)
-- log(LOG_DEBUG, "new domain: %s", domain);
-+ mylog(LOG_DEBUG, "new domain: %s", domain);
- rcpt->domain = (struct domain *)MALLOC(sizeof(struct domain));
- bzero(rcpt->domain, sizeof(struct domain));
- rcpt->domain->name = newstr(domain);
-@@ -540,13 +542,13 @@
- return 0;
- }
-
--void
-+static void
- dnsstatus(rcpt, rcode, response)
- struct recipient *rcpt;
- int rcode;
- char *response;
- {
-- log(LOG_INFO, "(%d+%d+%d+%d/%d) relay=%s to=%s proto=%s delay=%d code=%d (%s)",
-+ mylog(LOG_INFO, "(%d+%d+%d+%d/%d) relay=%s to=%s proto=%s delay=%d code=%d (%s)",
- sti.nsent, sti.ndeferred, sti.nnsfailed,
- sti.nsmtpfailed, sti.nrcpt, "unknown",
- rcpt->address, "unknown", 0, rcode,
diff --git a/mail/smtpfeed/patches/patch-ad b/mail/smtpfeed/patches/patch-ad
deleted file mode 100644
index 427b655f0a2..00000000000
--- a/mail/smtpfeed/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/07/23 15:00:41 taca Exp $
-
---- common.h.orig 2002-01-20 23:20:44.000000000 +0900
-+++ common.h
-@@ -425,3 +425,9 @@
- #endif
- };
- typedef union SockAddrUnion SockAddr;
-+
-+#ifdef __STDC__
-+#define P(c) c
-+#else
-+#define P(c)
-+#endif
diff --git a/mail/smtpfeed/patches/patch-ae b/mail/smtpfeed/patches/patch-ae
deleted file mode 100644
index fb213eaed67..00000000000
--- a/mail/smtpfeed/patches/patch-ae
+++ /dev/null
@@ -1,1089 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/07/23 15:00:41 taca Exp $
-
---- dns.c.orig 2002-03-15 11:03:39.000000000 +0900
-+++ dns.c
-@@ -79,6 +79,19 @@
- # define RES_INSECURE1 0x00000400 /* type 1 security disabled */
- #endif
-
-+static int query_domain P((char *, int));
-+static int process_query P((int));
-+static int make_query P((struct dns_stat *, int));
-+#if INET6
-+static int whichserver P((const SockAddr *));
-+#else
-+static int whichserver P((const struct sockaddr_in *));
-+#endif
-+static void got_answer P((struct query_chain *, u_char *, int));
-+static void remove_query P((struct query_chain *));
-+static struct mx* newmx P((char *, int, int, struct domain *, long));
-+static void show_query P((u_char *, u_char *, u_char *));
-+
- int
- pregetmx(dl)
- struct domain *dl;
-@@ -87,7 +100,6 @@
- char **map_arg;
- long stime, etime;
- int n;
-- static int query_domain(), process_query();
- #ifdef INET6
- SockAddr dsin; /* dummy */
- #endif
-@@ -109,7 +121,7 @@
- }
- }
-
-- log(LOG_DEBUG, "start getting MXRRs with caching");
-+ mylog(LOG_DEBUG, "start getting MXRRs with caching");
- n = 0;
- stime = time(NULL);
- if (env.queueid != NULL)
-@@ -120,7 +132,7 @@
- if (cnf.pgateway != NULL)
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "pregetting A of protocol gateway: %s",
-+ mylog(LOG_DEBUG, "pregetting A of protocol gateway: %s",
- cnf.pgateway);
- #ifdef INET6
- if (cnf.inetdom & SMTP_V4)
-@@ -144,7 +156,7 @@
- if (cnf.fallbackmx != NULL)
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "pregetting A of fallbackmx: %s",
-+ mylog(LOG_DEBUG, "pregetting A of fallbackmx: %s",
- cnf.fallbackmx);
- #ifdef INET6
- if (cnf.inetdom & SMTP_V4)
-@@ -185,7 +197,7 @@
- #endif
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG,
-+ mylog(LOG_DEBUG,
- "pregetting A of sourceIP: %s", p);
- #ifdef INET6
- if (cnf.inetdom & SMTP_V4)
-@@ -243,7 +255,7 @@
- || (strcasecmp(*map_arg, "MX?") == 0))
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "pregetting MX: %s", dp->name);
-+ mylog(LOG_DEBUG, "pregetting MX: %s", dp->name);
- if (query_domain(dp->name, T_MX) < 0)
- return -1;
- n++;
-@@ -251,7 +263,7 @@
- else if (strcasecmp(*map_arg, "A") == 0)
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "pregetting A: %s", dp->name);
-+ mylog(LOG_DEBUG, "pregetting A: %s", dp->name);
- #ifdef INET6
- if (cnf.inetdom & SMTP_V4)
- {
-@@ -272,7 +284,7 @@
- else if (**map_arg != '[')
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "pregetting MX: %s", *map_arg);
-+ mylog(LOG_DEBUG, "pregetting MX: %s", *map_arg);
- if (query_domain(*map_arg, T_MX) < 0)
- return -1;
- n++;
-@@ -291,7 +303,7 @@
- goto skip_preget_a;
-
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG,
-+ mylog(LOG_DEBUG,
- "pregetting A of sourceIP: %s",
- (*map_arg) + 1);
- #ifdef INET6
-@@ -333,16 +345,16 @@
- else
- setproctitle("syncing MX: %d", n);
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "syncing responses of MXRRs");
-+ mylog(LOG_DEBUG, "syncing responses of MXRRs");
- if (process_query(1) < 0) /* sync */
- return -1;
- etime = time(NULL);
-- log(LOG_DEBUG, "got MXRRs: %d MXs in %d seconds",
-+ mylog(LOG_DEBUG, "got MXRRs: %d MXs in %d seconds",
- n, etime - stime);
- }
- else
- {
-- log(LOG_DEBUG, "no MXRRs to sync");
-+ mylog(LOG_DEBUG, "no MXRRs to sync");
- }
- return 0;
- }
-@@ -353,7 +365,6 @@
- int type;
- {
- struct dns_stat *qrp, **hashp;
-- static int make_query();
-
- qrp = hash_query_lookup(name, &hashp);
- if (qrp == NULL) {
-@@ -361,7 +372,7 @@
- bzero(qrp, sizeof(struct dns_stat));
- if (qrp == NULL)
- {
-- log(LOG_NOTICE, "out of memory (dns_query)");
-+ mylog(LOG_NOTICE, "out of memory (dns_query)");
- return -1;
- }
- qrp->name = newstr(name);
-@@ -375,7 +386,7 @@
- case T_AAAA:
- break;
- default:
-- log(LOG_NOTICE, "query_domain: unknown query type: %d", type);
-+ mylog(LOG_NOTICE, "query_domain: unknown query type: %d", type);
- return 0;
- }
-
-@@ -396,7 +407,6 @@
- u_char buf[MAXPACKET];
- int n;
- struct query_chain *qchain;
-- static int process_query();
-
- switch (type) {
- case T_MX:
-@@ -419,7 +429,7 @@
- {
- /* already got */
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "ignore request n=%s t=%d",
-+ mylog(LOG_DEBUG, "ignore request n=%s t=%d",
- qrp->name, type);
- return 0;
- }
-@@ -439,18 +449,18 @@
- {
- /* already in processing */
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "skip request n=%s t=%d", qrp->name, type);
-+ mylog(LOG_DEBUG, "skip request n=%s t=%d", qrp->name, type);
- return 0;
- }
-
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "res_mkquery n=%s t=%d", qrp->name, type);
-+ mylog(LOG_DEBUG, "res_mkquery n=%s t=%d", qrp->name, type);
- n = res_mkquery(QUERY, qrp->name, C_IN, type, NULL, 0, NULL,
- buf, sizeof(buf));
- if (n <= 0)
- {
- /* error */
-- log(LOG_NOTICE, "res_mkquery failed for %s type %d",
-+ mylog(LOG_NOTICE, "res_mkquery failed for %s type %d",
- qrp->name, type);
- return -1;
- }
-@@ -459,7 +469,7 @@
- if (qchain == NULL)
- {
- /* error */
-- log(LOG_NOTICE, "out of memory (make_query)");
-+ mylog(LOG_NOTICE, "out of memory (make_query)");
- return -1;
- }
- bzero(qchain, sizeof(struct query_chain));
-@@ -469,7 +479,7 @@
- if (qchain->request == NULL)
- {
- /* error */
-- log(LOG_NOTICE, "out of memory (make_query)");
-+ mylog(LOG_NOTICE, "out of memory (make_query)");
- return -1;
- }
- bcopy(buf, qchain->request, n);
-@@ -492,7 +502,7 @@
- qchain->prev = NULL;
- query_chain_count++;
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: query concurrency = %d", query_chain_count);
-+ mylog(LOG_DEBUG, "DNS: query concurrency = %d", query_chain_count);
- if (sti.maxcquery < query_chain_count)
- sti.maxcquery = query_chain_count;
-
-@@ -501,10 +511,10 @@
- {
- struct query_chain *qcp;
-
-- log(LOG_DEBUG, "Chain after linked:");
-+ mylog(LOG_DEBUG, "Chain after linked:");
- for (qcp = QueryChain; qcp != NULL; qcp = qcp->next)
- {
-- log(LOG_DEBUG, " %s", qcp->stat->name);
-+ mylog(LOG_DEBUG, " %s", qcp->stat->name);
- }
- }
- #endif
-@@ -514,7 +524,7 @@
- return 0;
- }
-
--int
-+static int
- whichserver(inp)
- #if INET6
- const SockAddr *inp;
-@@ -591,14 +601,12 @@
- char nbuf[MAXDNAME+1];
- struct dns_stat *qrp;
- int pending;
-- static void got_answer();
-- static void remove_query();
-
- if (sync == 0 && cnf.cquery_max != 0
- && query_chain_count >= cnf.cquery_max)
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "reached to max concurrency (%d)....syncing",
-+ mylog(LOG_DEBUG, "reached to max concurrency (%d)....syncing",
- query_chain_count);
- sync = -1;
- }
-@@ -612,7 +620,7 @@
- s = socket(AF_INET, SOCK_DGRAM, PF_UNSPEC);
- if (s < 0) {
- /* error */
-- log(LOG_NOTICE,
-+ mylog(LOG_NOTICE,
- "socket failed (process_query)");
- return -1;
- }
-@@ -622,7 +630,7 @@
- s6 = socket(AF_INET6, SOCK_DGRAM, PF_UNSPEC);
- if (s6 < 0) {
- /* error */
-- log(LOG_NOTICE,
-+ mylog(LOG_NOTICE,
- "socket(INET6) failed (process_query)");
- return -1;
- }
-@@ -633,7 +641,7 @@
- s = socket(AF_INET, SOCK_DGRAM, PF_UNSPEC);
- if (s < 0) {
- /* error */
-- log(LOG_NOTICE, "socket failed (process_query)");
-+ mylog(LOG_NOTICE, "socket failed (process_query)");
- return -1;
- }
- }
-@@ -663,14 +671,14 @@
- nextqcp = qcp->next;
- remove_query(qcp);
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: no valid ns, removing %s type %d",
-+ mylog(LOG_DEBUG, "DNS: no valid ns, removing %s type %d",
- qcp->stat->name, qcp->type);
- qcp = nextqcp;
- continue;
- }
- qcp->try++;
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: retry count=%d", qcp->try);
-+ mylog(LOG_DEBUG, "DNS: retry count=%d", qcp->try);
- }
- }
- if (qcp->try >= (u_char)_res.retry)
-@@ -680,7 +688,7 @@
- nextqcp = qcp->next;
- remove_query(qcp);
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: no valid ns, removing %s type %d",
-+ mylog(LOG_DEBUG, "DNS: no valid ns, removing %s type %d",
- qcp->stat->name, qcp->type);
- qcp = nextqcp;
- continue;
-@@ -689,7 +697,7 @@
- {
- itvl = _res.retrans << qcp->try;
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: waiting %d sec.", itvl);
-+ mylog(LOG_DEBUG, "DNS: waiting %d sec.", itvl);
- if (qcp->try > 0)
- itvl /= _res.nscount;
- if (itvl <= 0)
-@@ -700,7 +708,7 @@
- if (nsap->in.sin_family == AF_INET)
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "send query n=%s t=%d (s=%s)",
-+ mylog(LOG_DEBUG, "send query n=%s t=%d (s=%s)",
- qcp->stat->name, qcp->type,
- inet_ntoa(nsap->in.sin_addr));
-
-@@ -711,7 +719,7 @@
- {
- qcp->badns |= 1<<qcp->ns;
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "sendto failed: invalid ns (%s)", strerror(errno));
-+ mylog(LOG_DEBUG, "sendto failed: invalid ns (%s)", strerror(errno));
- }
- }
- if (nsap->in6.sin6_family == AF_INET6)
-@@ -722,7 +730,7 @@
- {
- inet_ntop(AF_INET6, &nsap->in6.sin6_addr,
- buf, sizeof(buf));
-- log(LOG_DEBUG, "send query n=%s t=%d (s=%s)",
-+ mylog(LOG_DEBUG, "send query n=%s t=%d (s=%s)",
- qcp->stat->name, qcp->type, buf);
- }
-
-@@ -733,13 +741,13 @@
- {
- qcp->badns |= 1<<qcp->ns;
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "sendto failed: invalid ns (%s)", strerror(errno));
-+ mylog(LOG_DEBUG, "sendto failed: invalid ns (%s)", strerror(errno));
- }
- }
- #else
- nsap = &NSADDR_LIST(qcp->ns);
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "send query n=%s t=%d (s=%s)",
-+ mylog(LOG_DEBUG, "send query n=%s t=%d (s=%s)",
- qcp->stat->name, qcp->type,
- inet_ntoa(nsap->sin_addr));
-
-@@ -749,7 +757,7 @@
- {
- qcp->badns |= 1<<qcp->ns;
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "sendto failed: invalid ns");
-+ mylog(LOG_DEBUG, "sendto failed: invalid ns");
- }
- #endif
- sti.nqueries++;
-@@ -793,7 +801,7 @@
- timeout.tv_usec = 0;
- }
- if ((cnf.debug & DEBUG_DNS) && (timeout.tv_sec > 0))
-- log(LOG_DEBUG, "DNS: waiting %d sec in %s mode",
-+ mylog(LOG_DEBUG, "DNS: waiting %d sec in %s mode",
- timeout.tv_sec, sync?"sync":"nosync");
- FD_ZERO(&dsmask);
- #if INET6
-@@ -825,7 +833,7 @@
- resplen = recvfrom(s, &answer, anssiz, 0,
- (struct sockaddr *)&from, &fromlen);
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: got answer from %s",
-+ mylog(LOG_DEBUG, "DNS: got answer from %s",
- inet_ntoa(from.in.sin_addr));
- }
- else if (s6 >= 0 && FD_ISSET(s6, &dsmask))
-@@ -838,7 +846,7 @@
- {
- inet_ntop(AF_INET6, &from.in6.sin6_addr,
- buf, sizeof(buf));
-- log(LOG_DEBUG,
-+ mylog(LOG_DEBUG,
- "DNS: got answer from %s", buf);
- }
- }
-@@ -846,19 +854,20 @@
- resplen = recvfrom(s, &answer, anssiz, 0,
- (struct sockaddr *)&from, &fromlen);
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: got answer from %s",
-+ mylog(LOG_DEBUG, "DNS: got answer from %s",
- inet_ntoa(from.sin_addr));
- #endif
-
- if (0) {
- show_query("DNS: answer received",
-- &answer, &answer+resplen);
-+ (u_char *)&answer,
-+ (u_char *)&answer+resplen);
- }
- now = time(NULL);
-
- if (resplen <= 0) {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: bad anssiz %d",
-+ mylog(LOG_DEBUG, "DNS: bad anssiz %d",
- resplen);
- continue; /* error */
- }
-@@ -870,7 +879,7 @@
- if (!(_res.options & RES_INSECURE1))
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG,
-+ mylog(LOG_DEBUG,
- "DNS: not from our server");
- continue;
- }
-@@ -888,14 +897,15 @@
- GETSHORT(class, ap);
-
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: got answer for %s type %d",
-+ mylog(LOG_DEBUG, "DNS: got answer for %s type %d",
- nbuf, type);
-
- qrp = hash_query_lookup(nbuf, NULL);
- if (qrp == NULL)
- {
- show_query("DNS: no associated query sent",
-- &answer, &answer+resplen);
-+ (u_char *)&answer,
-+ (u_char *)&answer+resplen);
- continue; /* no associated request */
- }
- qcp = qrp->requests;
-@@ -904,7 +914,8 @@
- if (qcp == NULL)
- {
- show_query("DNS: no associated query",
-- &answer, &answer+resplen);
-+ (u_char *)&answer,
-+ (u_char *)&answer+resplen);
- continue; /* no associated request */
- }
-
-@@ -915,7 +926,7 @@
- {
- qcp->badns |= (1<<ns);
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: badnsF rcode=%d %x/%x",
-+ mylog(LOG_DEBUG, "DNS: badnsF rcode=%d %x/%x",
- hp->rcode,
- qcp->badns, (1<<_res.nscount)-1);
- if (qcp->badns != (1<<_res.nscount)-1)
-@@ -924,7 +935,7 @@
- qrp->rr_timeout |= qcp->need;
- remove_query(qcp);
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: TCP requested, removing %s type %d",
-+ mylog(LOG_DEBUG, "DNS: TCP requested, removing %s type %d",
- qcp->stat->name, qcp->type);
- continue;
- }
-@@ -933,7 +944,7 @@
- qrp->rr_timeout |= qcp->need;
- remove_query(qcp);
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: TCP requested, removing %s type %d",
-+ mylog(LOG_DEBUG, "DNS: TCP requested, removing %s type %d",
- qcp->stat->name, qcp->type);
- continue;
- }
-@@ -952,7 +963,7 @@
- if (sync != 0) {
- pending = 0;
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: sync: get nearest timeout from %d", now);
-+ mylog(LOG_DEBUG, "DNS: sync: get nearest timeout from %d", now);
- for (qcp = QueryChain; qcp != NULL;)
- {
- if (qcp->try >= (u_char)_res.retry)
-@@ -962,7 +973,7 @@
- nextqcp = qcp->next;
- remove_query(qcp);
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: sync timeout (n=%s, t=%d)",
-+ mylog(LOG_DEBUG, "DNS: sync timeout (n=%s, t=%d)",
- qcp->stat->name, qcp->type);
- qcp = nextqcp;
- continue;
-@@ -970,7 +981,7 @@
-
- pending++;
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: event timeout=%d", qcp->time);
-+ mylog(LOG_DEBUG, "DNS: event timeout=%d", qcp->time);
- qcp = qcp->next;
- }
- if (sync < 0)
-@@ -978,7 +989,7 @@
- if (pending)
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: retry in sync mode");
-+ mylog(LOG_DEBUG, "DNS: retry in sync mode");
- /* sleep(1); * XXX */
- goto again;
- }
-@@ -989,12 +1000,12 @@
- nextqcp = qcp->next;
- remove_query(qcp);
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: final timeout (n=%s, t=%d)",
-+ mylog(LOG_DEBUG, "DNS: final timeout (n=%s, t=%d)",
- qcp->stat->name, qcp->type);
- qcp = nextqcp;
- }
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: closing socket");
-+ mylog(LOG_DEBUG, "DNS: closing socket");
- #if INET6
- if (s >= 0)
- {
-@@ -1038,10 +1049,10 @@
- #if 0
- if (cnf.debug & DEBUG_DNS)
- {
-- log(LOG_DEBUG, "Chain after removed:");
-+ mylog(LOG_DEBUG, "Chain after removed:");
- for (qcp = QueryChain; qcp != NULL; qcp = qcp->next)
- {
-- log(LOG_DEBUG, " %s", qcp->stat->name);
-+ mylog(LOG_DEBUG, " %s", qcp->stat->name);
- }
- }
- #endif
-@@ -1070,7 +1081,7 @@
-
- remove_query(qcp);
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: got answer, removing %s type %d",
-+ mylog(LOG_DEBUG, "DNS: got answer, removing %s type %d",
- qcp->stat->name, qcp->type);
-
- b = (u_char *) answer;
-@@ -1087,7 +1098,7 @@
- if (hp->aa == 0 && hp->ra == 0) {
- /* this nameserver does not support recursion */
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "non recursive ns=%d", qcp->ns);
-+ mylog(LOG_DEBUG, "non recursive ns=%d", qcp->ns);
- qcp->badns |= 1<<qcp->ns;
- return;
- }
-@@ -1097,7 +1108,7 @@
- {
- /* host not found */
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: host (any other data) not found");
-+ mylog(LOG_DEBUG, "DNS: host (any other data) not found");
-
- qcp->stat->rr_noex = RR_ALL;
- return;
-@@ -1108,7 +1119,7 @@
- {
- /* no data, other data exist */
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: no data for %d", qcp->type);
-+ mylog(LOG_DEBUG, "DNS: no data for %d", qcp->type);
-
- if (qcp->type == T_ANY)
- {
-@@ -1152,7 +1163,7 @@
- }
-
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: valid data");
-+ mylog(LOG_DEBUG, "DNS: valid data");
-
- while (qdcount--)
- {
-@@ -1160,7 +1171,7 @@
- ap += n;
- if (ap + INT16SZ*2 > eom)
- {
-- /* log(LOG_NOTICE, "corrupt DNS answer"); */
-+ /* mylog(LOG_NOTICE, "corrupt DNS answer"); */
- return;
- }
- GETSHORT(type, ap);
-@@ -1180,7 +1191,7 @@
- ap += n;
- if (ap + INT16SZ*3 + INT32SZ > eom)
- {
-- /* log(LOG_NOTICE, "corrupt DNS answer"); */
-+ /* mylog(LOG_NOTICE, "corrupt DNS answer"); */
- return;
- }
- GETSHORT(type, ap);
-@@ -1189,13 +1200,13 @@
- GETSHORT(n, ap);
- if (ap + n > eom)
- {
-- /* log(LOG_NOTICE, "corrupt DNS answer"); */
-+ /* mylog(LOG_NOTICE, "corrupt DNS answer"); */
- return;
- }
- if (class != C_IN)
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: unexpected class %d in an", class);
-+ mylog(LOG_DEBUG, "DNS: unexpected class %d in an", class);
- ap += n;
- continue;
- }
-@@ -1229,7 +1240,7 @@
- return;
-
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: got MX for %s, %s p=%d",
-+ mylog(LOG_DEBUG, "DNS: got MX for %s, %s p=%d",
- nbuf, nbuf2, pref);
-
- qrp->rr_got |= RR_MX;
-@@ -1268,7 +1279,7 @@
- {
- addr_found = 1;
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: got AAAA for %s",
-+ mylog(LOG_DEBUG, "DNS: got AAAA for %s",
- qcp->stat->name);
-
- qcp->stat->rr_got |= RR_AAAA;
-@@ -1278,7 +1289,7 @@
- /* may be address for an alias */
- cname_found = 0;
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: got aliased (%s) AAAA for %s",
-+ mylog(LOG_DEBUG, "DNS: got aliased (%s) AAAA for %s",
- nbuf, qcp->stat->name);
- qrp = hash_query_lookup(nbuf, NULL);
- if (qrp == NULL)
-@@ -1309,7 +1320,7 @@
- {
- addr_found = 1;
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: got A for %s",
-+ mylog(LOG_DEBUG, "DNS: got A for %s",
- qcp->stat->name);
-
- qcp->stat->rr_got |= RR_A;
-@@ -1319,7 +1330,7 @@
- cname_found = 0;
- /* may be address for an alias */
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: got aliased (%s) A for %s",
-+ mylog(LOG_DEBUG, "DNS: got aliased (%s) A for %s",
- nbuf, qcp->stat->name);
- qrp = hash_query_lookup(nbuf, NULL);
- if (qrp == NULL)
-@@ -1342,13 +1353,13 @@
- return;
-
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: got CNAME %s for %s",
-+ mylog(LOG_DEBUG, "DNS: got CNAME %s for %s",
- nbuf2, nbuf);
-
- if (strcasecmp(nbuf, nbuf2) == 0)
- {
- /* CNAME points back itself, ignore it */
-- log(LOG_INFO,
-+ mylog(LOG_INFO,
- "CNAME %s points back itself (q=%d)",
- nbuf, qcp->type);
- return;
-@@ -1376,7 +1387,7 @@
- bzero(qrp2, sizeof(struct dns_stat));
- if (qrp2 == NULL)
- {
-- log(LOG_NOTICE,
-+ mylog(LOG_NOTICE,
- "out of memory (dns_query)");
- return;
- }
-@@ -1441,13 +1452,13 @@
- ap += INT16SZ + INT16SZ + INT32SZ;
- if (ap + INT16SZ > eom)
- {
-- /* log(LOG_NOTICE, "corrupt DNS answer"); */
-+ /* mylog(LOG_NOTICE, "corrupt DNS answer"); */
- return;
- }
- GETSHORT(n, ap);
- if (ap + n > eom)
- {
-- /* log(LOG_NOTICE, "corrupt DNS answer"); */
-+ /* mylog(LOG_NOTICE, "corrupt DNS answer"); */
- return;
- }
- ap += n;
-@@ -1460,13 +1471,13 @@
- ap += INT16SZ + INT16SZ + INT32SZ;
- if (ap + INT16SZ > eom)
- {
-- /* log(LOG_NOTICE, "corrupt DNS answer"); */
-+ /* mylog(LOG_NOTICE, "corrupt DNS answer"); */
- return;
- }
- GETSHORT(n, ap);
- if (ap + n > eom)
- {
-- /* log(LOG_NOTICE, "corrupt DNS answer"); */
-+ /* mylog(LOG_NOTICE, "corrupt DNS answer"); */
- return;
- }
- ap += n;
-@@ -1481,7 +1492,7 @@
- ap += n;
- if (ap + INT16SZ*3 + INT32SZ > eom)
- {
-- /* log(LOG_NOTICE, "corrupt DNS answer"); */
-+ /* mylog(LOG_NOTICE, "corrupt DNS answer"); */
- return;
- }
- GETSHORT(type, ap);
-@@ -1490,13 +1501,13 @@
- GETSHORT(addrsize, ap);
- if (ap + addrsize > eom)
- {
-- /* log(LOG_NOTICE, "corrupt DNS answer"); */
-+ /* mylog(LOG_NOTICE, "corrupt DNS answer"); */
- return;
- }
- if (class != C_IN)
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: unexpected class %d in ar", class);
-+ mylog(LOG_DEBUG, "DNS: unexpected class %d in ar", class);
- ap += addrsize;
- continue;
- }
-@@ -1529,7 +1540,7 @@
- }
-
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: got additional Address RR for %s type=%d",
-+ mylog(LOG_DEBUG, "DNS: got additional Address RR for %s type=%d",
- nbuf, type);
-
- #if FAKE_AR_CHECK
-@@ -1545,7 +1556,7 @@
- if (!found)
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: ignoring additional Address RR");
-+ mylog(LOG_DEBUG, "DNS: ignoring additional Address RR");
- ap += addrsize;
- continue;
- }
-@@ -1558,7 +1569,7 @@
- bzero(qrp, sizeof(struct dns_stat));
- if (qrp == NULL)
- {
-- log(LOG_NOTICE, "out of memory (dns_query)");
-+ mylog(LOG_NOTICE, "out of memory (dns_query)");
- return;
- }
- qrp->name = newstr(nbuf);
-@@ -1592,7 +1603,7 @@
- bzero(qrp, sizeof(struct dns_stat));
- if (qrp == NULL)
- {
-- log(LOG_NOTICE,
-+ mylog(LOG_NOTICE,
- "out of memory (dns_query)");
- return;
- }
-@@ -1605,20 +1616,20 @@
- if (cnf.inetdom & SMTP_V6 || cnf.v4v6fallback)
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: getting AAAA RR for %s",
-+ mylog(LOG_DEBUG, "DNS: getting AAAA RR for %s",
- mxp->name);
- make_query(qrp, T_AAAA);
- }
- if (cnf.inetdom & SMTP_V4 || cnf.v4v6fallback)
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: getting A RR for %s",
-+ mylog(LOG_DEBUG, "DNS: getting A RR for %s",
- mxp->name);
- make_query(qrp, T_A);
- }
- #else
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: getting A RR for %s",
-+ mylog(LOG_DEBUG, "DNS: getting A RR for %s",
- mxp->name);
- make_query(qrp, T_A);
- if (cnf.v4v6fallback)
-@@ -1653,7 +1664,7 @@
- continue;
-
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "getting MX for %s", dp->name);
-+ mylog(LOG_DEBUG, "getting MX for %s", dp->name);
-
- offset = 0;
- needfindaddr = 0;
-@@ -1701,15 +1712,15 @@
- {
- struct mx *mxp;
-
-- log(LOG_DEBUG, "final MX list for %s", dp->name);
-+ mylog(LOG_DEBUG, "final MX list for %s", dp->name);
- mxp = dp->firstmx;
- if (mxp == NULL)
- {
-- log(LOG_DEBUG, " NO MX!");
-+ mylog(LOG_DEBUG, " NO MX!");
- }
- while (mxp != NULL)
- {
-- log(LOG_DEBUG, " %s(%d, %d)", mxp->name,
-+ mylog(LOG_DEBUG, " %s(%d, %d)", mxp->name,
- mxp->pref, mxp->weight);
- mxp = mxp->next;
- }
-@@ -1733,12 +1744,12 @@
- int found = 0;
-
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "protocol gateway checking for %s",
-+ mylog(LOG_DEBUG, "protocol gateway checking for %s",
- dp->name);
- for (mxp = dp->firstmx; mxp != NULL; mxp = mxp->next)
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "checking MX: %s", mxp->name);
-+ mylog(LOG_DEBUG, "checking MX: %s", mxp->name);
- if (mxp->host == NULL)
- {
- /* no hosts, try next MX */
-@@ -1750,7 +1761,7 @@
- {
- /*
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "proto: %d",
-+ mylog(LOG_DEBUG, "proto: %d",
- addrp->domain);
- */
- #ifdef INET6
-@@ -1763,10 +1774,9 @@
- #endif
- {
- struct mx *gwmxp;
-- static struct mx* newmx();
-
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "setting protocol gateway as first MX");
-+ mylog(LOG_DEBUG, "setting protocol gateway as first MX");
- if ((gwmxp = newmx(cnf.pgateway,
- -2, 0, dp, 0))
- == NULL)
-@@ -1817,7 +1827,7 @@
- if (mxpp == NULL)
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "linking MX %s(%d) at the top",
-+ mylog(LOG_DEBUG, "linking MX %s(%d) at the top",
- newmxp->name, newmxp->pref);
-
- domp->firstmx = newmxp;
-@@ -1825,7 +1835,7 @@
- else
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "linking MX %s(%d) after MX %s(%d)",
-+ mylog(LOG_DEBUG, "linking MX %s(%d) after MX %s(%d)",
- newmxp->name, newmxp->pref,
- mxpp->name, mxpp->pref);
-
-@@ -1856,14 +1866,14 @@
- {
- /* already registered, drop lower one */
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "duplicated MX %s(%d) found",
-+ mylog(LOG_DEBUG, "duplicated MX %s(%d) found",
- mxp->name, mxp->pref);
-
- if (mxp->pref > pref
- || (mxp->pref == pref && mxp->weight > weight))
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "remove it and reuse");
-+ mylog(LOG_DEBUG, "remove it and reuse");
-
- if (mxp == dp->firstmx)
- dp->firstmx = mxp->next;
-@@ -1873,7 +1883,7 @@
- else
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "leave it and ignore newer");
-+ mylog(LOG_DEBUG, "leave it and ignore newer");
-
- return mxp; /* do nothing */
- }
-@@ -1885,7 +1895,7 @@
- mxp = (struct mx*)MALLOC(sizeof(struct mx));
- if (mxp == NULL)
- {
-- log(LOG_NOTICE, "out of memory (newmx)");
-+ mylog(LOG_NOTICE, "out of memory (newmx)");
- return NULL;
- }
- bzero(mxp, sizeof(struct mx));
-@@ -1922,7 +1932,7 @@
- char msgbuf[MAXLINE], *mxname;
-
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "getmxrr(%s, %s) offset=%d opt=%x",
-+ mylog(LOG_DEBUG, "getmxrr(%s, %s) offset=%d opt=%x",
- name, dp->name, offset, opt);
-
- if (!query_mx)
-@@ -1961,7 +1971,7 @@
- if (mxp == NULL)
- return -1;
- addinetaddress(mxp, AF_INET, sizeof(nsin.in.sin_addr),
-- &nsin.in.sin_addr);
-+ (u_char *)&nsin.in.sin_addr);
- }
- #ifdef INET6
- else if (inet_pton(INET6, name + 1, &nsin.in6.sin6_addr) > 0)
-@@ -1973,7 +1983,7 @@
- return -1;
- addinetaddress(mxp, AF_INET6,
- sizeof(nsin.in6.sin6_addr),
-- &nsin.in6.sin6_addr);
-+ (u_char *)&nsin.in6.sin6_addr);
- }
- #endif
- else
-@@ -1999,7 +2009,7 @@
- qrp = qrp->cname;
-
- if (cnf.debug & DEBUG_DNS && cnamechain > 0)
-- log(LOG_DEBUG, "CNAME traced: %s", qrp->name);
-+ mylog(LOG_DEBUG, "CNAME traced: %s", qrp->name);
-
- if (cnamechain >= CNAMELOOPMAX)
- {
-@@ -2009,7 +2019,7 @@
- }
-
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "%s: timeout=%x noex=%x got=%x",
-+ mylog(LOG_DEBUG, "%s: timeout=%x noex=%x got=%x",
- qrp->name, qrp->rr_timeout, qrp->rr_noex, qrp->rr_got);
-
- if (qrp == NULL || qrp->rr_timeout & RR_MX) {
-@@ -2044,7 +2054,7 @@
- return -1;
- }
- else
-- log(LOG_INFO, "No MX/A on %s for %s; ignored",
-+ mylog(LOG_INFO, "No MX/A on %s for %s; ignored",
- name, dp->name);
- return 0;
- }
-@@ -2089,12 +2099,12 @@
- mxname = cmxp->name;
- #if 0
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "mx=%s pref=%d", mxname, cmxp->pref);
-+ mylog(LOG_DEBUG, "mx=%s pref=%d", mxname, cmxp->pref);
- #endif
- if (isamyalias(mxname))
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "found localhost (%s) in MX list",
-+ mylog(LOG_DEBUG, "found localhost (%s) in MX list",
- mxname);
- if (!seenlocal || cmxp->pref < localpref)
- localpref = cmxp->pref;
-@@ -2136,13 +2146,13 @@
- /* already registered, drop lower one */
-
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "duplicated MX %s(%d) found",
-+ mylog(LOG_DEBUG, "duplicated MX %s(%d) found",
- mxp->name, mxp->pref);
-
- if (mxp->pref > offset + cmxp->pref)
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "remove it for re-link");
-+ mylog(LOG_DEBUG, "remove it for re-link");
- mxp->pref = offset + cmxp->pref;
- if (mxp == dp->firstmx)
- dp->firstmx = mxp->next;
-@@ -2220,6 +2230,7 @@
- return 0;
- }
-
-+static void
- show_query(t, b, e)
- u_char *t, *b, *e;
- {
-@@ -2246,13 +2257,13 @@
- ap += n;
- if (ap + INT16SZ*2 > eom)
- {
-- /* log(LOG_NOTICE, "corrupt DNS answer"); */
-+ /* mylog(LOG_NOTICE, "corrupt DNS answer"); */
- return;
- }
- GETSHORT(class, ap);
- GETSHORT(type, ap);
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "%s: %s(%d,%d), rcode=%d",
-+ mylog(LOG_DEBUG, "%s: %s(%d,%d), rcode=%d",
- t, nbuf, class, type, ntohs(hp->rcode));
- }
-
-@@ -2267,7 +2278,7 @@
- ap += n;
- if (ap + INT16SZ*3 + INT32SZ > eom)
- {
-- /* log(LOG_NOTICE, "corrupt DNS answer"); */
-+ /* mylog(LOG_NOTICE, "corrupt DNS answer"); */
- return;
- }
- GETSHORT(class, ap);
-@@ -2276,13 +2287,13 @@
- GETSHORT(n, ap);
- if (ap + n > eom)
- {
-- /* log(LOG_NOTICE, "corrupt DNS answer"); */
-+ /* mylog(LOG_NOTICE, "corrupt DNS answer"); */
- return;
- }
- if (class != C_IN)
- {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "DNS: unexpected class %d in an", class);
-+ mylog(LOG_DEBUG, "DNS: unexpected class %d in an", class);
- ap += n;
- continue;
- }
-@@ -2293,20 +2304,20 @@
- break;
- ap += n;
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "got MX pref=%d,host=(%s)", pref, nbuf);
-+ mylog(LOG_DEBUG, "got MX pref=%d,host=(%s)", pref, nbuf);
- #if 0 /* for debug */
- hep = gethostbyname(nbuf);
- if (hep == NULL) {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "get A -- h_errno=%d", h_errno);
-+ mylog(LOG_DEBUG, "get A -- h_errno=%d", h_errno);
- } else {
- if (cnf.debug & DEBUG_DNS)
-- log(LOG_DEBUG, "get A -- OK");
-+ mylog(LOG_DEBUG, "get A -- OK");
- }
- #endif
- } else {
- ap += n;
-- /* log(LOG_DEBUG, "unexpected answer type: %d", type); */
-+ /* mylog(LOG_DEBUG, "unexpected answer type: %d", type); */
- }
- }
- }
diff --git a/mail/smtpfeed/patches/patch-af b/mail/smtpfeed/patches/patch-af
deleted file mode 100644
index 03f4394a1f9..00000000000
--- a/mail/smtpfeed/patches/patch-af
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/07/23 15:00:41 taca Exp $
-
---- extern.h.orig 2002-01-20 23:20:46.000000000 +0900
-+++ extern.h 2006-07-18 13:14:05.000000000 +0900
-@@ -37,52 +37,55 @@
- */
-
--char *newstr();
--void strlower();
--char *parse_address();
--void setsender();
--int addrecipient();
--void addalias();
--int getmxrr();
--void init_log();
--int addmyalias();
--int isamyalias();
--void lmtp();
--void lmtp_data_response();
--void deliver();
--int pregetmx();
--int getmxlist();
--void finalstatus();
--int addinetaddress();
--void set_timeout();
--void resource_usage();
-+#ifdef __STDC__
-+#define P(c) c
-+#else
-+#define P(c)
-+#endif
-+
-+char *newstr P((char *));
-+void strlower P((char *));
-+char *parse_address P((char *, char **, char **, char **));
-+int addrecipient P((char *, char *, char *, char *));
-+int getmxrr P((char *, struct domain *, int, int, int, long));
-+void init_log P((void));
-+int addmyalias P((char *));
-+int isamyalias P((char *));
-+void lmtp P((void));
-+void lmtp_data_response P((int));
-+void deliver P((void));
-+int pregetmx P((struct domain *));
-+int getmxlist P((struct domain *));
-+void finalstatus P((void));
-+int addinetaddress P((struct mx *, int, int, u_char *));
-+void set_timeout P((char *));
-+void resource_usage P((char *));
- struct dns_stat *hash_query_lookup();
--struct domain *hash_domain_lookup();
--struct host *hash_host_lookup();
--struct host_map *hash_map_lookup();
--int host_map_load();
--char **host_map_lookup();
--int mxrand();
--int hash_domain_rcpts_lookup();
--void hash_domain_rcpts_enter();
--int isnumeric();
--int rcpts_def_load();
-+struct domain *hash_domain_lookup P((char *, struct domain ***));
-+struct host *hash_host_lookup P((char *, struct host ***));
-+struct host_map *hash_map_lookup P((char *, struct host_map ***));
-+int host_map_load P((void));
-+char **host_map_lookup P((char *));
-+int mxrand P((char *, char *));
-+int hash_domain_rcpts_lookup P((char *));
-+void hash_domain_rcpts_enter P((char *, struct domain_rcpts *));
-+int isnumeric P((char *));
-+int rcpts_def_load P((void));
-+
-+#if SPT_TYPE != SPT_BUILTIN
-+void initsetproctitle P((int, char **, char **));
-+void setproctitle P((const char *, ...));
-+#endif
-
--void initsetproctitle();
- #ifdef JAZ_HACK2
- void show_cache();
- #endif
--# ifdef __STDC__
--void log(int, const char *, ...);
--void setproctitle(const char *, ...);
--# else
--void log();
--void setproctitle();
--# endif
-+
-+void mylog P((int, const char *, ...));
-
- # if !HAVE_STRERROR
--char *strerror();
-+char *strerror P((int));
- # endif
- # if !HAVE_SNPRINTF
--int snprintf();
-+int snprintf P((char *, size_t, const char *, ...));
- # endif
-
diff --git a/mail/smtpfeed/patches/patch-ag b/mail/smtpfeed/patches/patch-ag
deleted file mode 100644
index 0d5364abf3e..00000000000
--- a/mail/smtpfeed/patches/patch-ag
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/07/23 15:00:41 taca Exp $
-
---- lmtp.c.orig 2002-01-20 23:19:42.000000000 +0900
-+++ lmtp.c
-@@ -67,8 +67,22 @@
- static int state;
- static int save_rcpts_trans;
-
-+static void sig_quit P((int));
-+static void lmtp_greeting P((void));
-+static int lmtp_lhlo P((char *));
-+static int lmtp_mail P((char *));
-+static int lmtp_rcpt P((char *));
-+static int lmtp_data P((char *));
-+static int lmtp_quit P((void));
-+static int lmtp_rset P((void));
-+static int lmtp_noop P((void));
-+static int lmtp_help P((char *));
-+static int lmtp_nocmd P((void));
-+static int read_message P((void));
-+
- static void
--sig_quit()
-+sig_quit(dummy)
-+ int dummy;
- {
- exit(EX_TEMPFAIL);
- }
-@@ -116,7 +130,7 @@
- if (strcasecmp(lmtpbuf, cmdp->cmd) == 0) {
-
- if (cnf.debug & DEBUG_LMTP)
-- log(LOG_DEBUG, "LMTP input: %s %s", lmtpbuf,
-+ mylog(LOG_DEBUG, "LMTP input: %s %s", lmtpbuf,
- (p == NULL)?"":p);
- ret = (*cmdp->func)(p);
- fflush (LmtpOut);
-@@ -242,7 +256,7 @@
- return 0;
- }
- if (cnf.debug & DEBUG_LMTP)
-- log(LOG_DEBUG, "MAIL FROM: %s size=%s body=%s envid=%s ret=%s", addr,
-+ mylog(LOG_DEBUG, "MAIL FROM: %s size=%s body=%s envid=%s ret=%s", addr,
- (env.size == NULL)?"":env.size, (env.body == NULL)?"":env.body,
- (env.envid == NULL)?"":env.envid, (env.ret == NULL)?"":env.ret);
- fprintf (LmtpOut, "250 %s Sender ok\n", addr);
-@@ -358,7 +372,7 @@
- deliver(); /* delivery with SMTP */
- lmtp_data_response(1);
-
-- log(LOG_INFO, "nquery=%d/%d nconnect=%d/%d ntimeout=%d ntrans=%d/%d nsent=%d/%d ndeferred=%d nerror=%d+%d dnsmaxcq=%d maxsock=%d tmx=%d tdelivery=%d/%d maxdelay=%d tdelay=%d tsendmail=%d dns_i/o=%d/%d smtp_i/o=%d/%d mem=%d",
-+ mylog(LOG_INFO, "nquery=%d/%d nconnect=%d/%d ntimeout=%d ntrans=%d/%d nsent=%d/%d ndeferred=%d nerror=%d+%d dnsmaxcq=%d maxsock=%d tmx=%d tdelivery=%d/%d maxdelay=%d tdelay=%d tsendmail=%d dns_i/o=%d/%d smtp_i/o=%d/%d mem=%d",
- sti.nanswers, sti.nqueries, sti.nquitok, sti.nconnect,
- sti.ntimeout, sti.noktrans, sti.ntrans, sti.nsent, sti.nrcpt,
- sti.ndeferred, sti.nnsfailed, sti.nsmtpfailed,
-@@ -521,7 +535,7 @@
- if (strstr(rcptp->response, rcptp->address) == NULL)
- {
- if (cnf.debug & DEBUG_LMTP)
-- log(LOG_DEBUG, "%d %s... %s",
-+ mylog(LOG_DEBUG, "%d %s... %s",
- rcptp->result, rcptp->address,
- rcptp->response);
- fprintf (LmtpOut, "%d %s... %s\n",
-@@ -529,7 +543,7 @@
- rcptp->response);
- } else {
- if (cnf.debug & DEBUG_LMTP)
-- log(LOG_DEBUG, "%d %s",
-+ mylog(LOG_DEBUG, "%d %s",
- rcptp->result, rcptp->response);
- fprintf (LmtpOut, "%d %s\n",
- rcptp->result, rcptp->response);
-@@ -542,7 +556,7 @@
-
- sti.ndeferred++;
- if (cnf.debug & DEBUG_LMTP)
-- log(LOG_DEBUG, "%d %s... %s",
-+ mylog(LOG_DEBUG, "%d %s... %s",
- SMTP_TEMPFAIL(51), rcptp->address, msg);
- fprintf (LmtpOut, "%d %s... %s\n",
- SMTP_TEMPFAIL(51), rcptp->address, msg);
-@@ -709,7 +723,7 @@
- {
- msgp->data = (char *)MALLOC(CHUNKSIZE);
- if (cnf.debug & DEBUG_LMTP)
-- log(LOG_DEBUG, "new chunk %d", ++chunk_num);
-+ mylog(LOG_DEBUG, "new chunk %d", ++chunk_num);
- if (msgp->data == NULL)
- {
- outofmemory = 1;
-@@ -725,7 +739,7 @@
-
- if (outofmemory)
- {
-- log(LOG_NOTICE, "out of memory (LMTP data buffer allocation)");
-+ mylog(LOG_NOTICE, "out of memory (LMTP data buffer allocation)");
- return -1;
- }
- return 0;
diff --git a/mail/smtpfeed/patches/patch-ah b/mail/smtpfeed/patches/patch-ah
deleted file mode 100644
index 750725a6f5f..00000000000
--- a/mail/smtpfeed/patches/patch-ah
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/07/23 15:00:41 taca Exp $
-
---- log.c.orig 2002-01-20 23:19:43.000000000 +0900
-+++ log.c
-@@ -73,7 +73,7 @@
- {
- syslog_fd = fd_before;
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "file descriptor for syslog: %d", syslog_fd);
-+ mylog(LOG_DEBUG, "file descriptor for syslog: %d", syslog_fd);
- }
- #endif
- }
-@@ -85,9 +85,9 @@
-
- void
- # ifdef __STDC__
--log(int level, const char *fmt, ...)
-+mylog(int level, const char *fmt, ...)
- # else
--log(level, fmt, va_alist)
-+mylog(level, fmt, va_alist)
- int level;
- char *fmt;
- va_dcl
diff --git a/mail/smtpfeed/patches/patch-ai b/mail/smtpfeed/patches/patch-ai
deleted file mode 100644
index 768f8b55c25..00000000000
--- a/mail/smtpfeed/patches/patch-ai
+++ /dev/null
@@ -1,136 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/07/23 15:00:41 taca Exp $
-
---- main.c.orig 2002-03-15 11:12:59.000000000 +0900
-+++ main.c
-@@ -46,7 +46,10 @@
- # define MAIN 1
- # include "extern.h"
-
--void
-+static void usage P((char *));
-+static void sig_quit P((int));
-+
-+static void
- usage(progname)
- char *progname;
- {
-@@ -96,7 +99,8 @@
- }
-
- static void
--sig_quit()
-+sig_quit(dummy)
-+ int dummy;
- {
- exit(EX_TEMPFAIL);
- }
-@@ -155,7 +159,9 @@
- else
- cnf.dst_port = 25;
-
-+#if SPT_TYPE != SPT_BUILTIN
- initsetproctitle(argc, argv, envp);
-+#endif
-
- opterr = 0;
- #ifdef INET6
-@@ -455,14 +461,14 @@
- switch (peername.in.sin_family)
- {
- case AF_INET:
-- log(LOG_INFO, "connected from %s",
-+ mylog(LOG_INFO, "connected from %s",
- inet_ntoa(peername.in.sin_addr));
- break;
- #ifdef INET6
- case AF_INET6:
- inet_ntop(AF_INET6, &peername.in6.sin6_addr,
- buf, sizeof(buf));
-- log(LOG_INFO, "connected from %s", buf);
-+ mylog(LOG_INFO, "connected from %s", buf);
- break;
- #endif
- }
-@@ -470,7 +476,7 @@
-
- if (cnf.sd_max > MAX_SOCK)
- {
-- log(LOG_INFO, "cnf.sd_max should not be greater than %d, recompile smtpfeed with greater FD_SETSIZE", MAX_SOCK);
-+ mylog(LOG_INFO, "cnf.sd_max should not be greater than %d, recompile smtpfeed with greater FD_SETSIZE", MAX_SOCK);
- cnf.sd_max = MAX_SOCK;
- }
- #ifdef RLIMIT_NOFILE
-@@ -478,14 +484,14 @@
- {
- if (limit.rlim_max - 1 < cnf.sd_max)
- {
-- log(LOG_INFO, "cnf.sd_max should be %d",
-+ mylog(LOG_INFO, "cnf.sd_max should be %d",
- limit.rlim_max - 1);
- cnf.sd_max = limit.rlim_max - 1;
- }
- limit.rlim_cur = limit.rlim_max; /* make soft limit the max */
- if (setrlimit(RLIMIT_NOFILE, &limit) == -1)
- {
-- log(LOG_NOTICE, "can't set max sd to %d",
-+ mylog(LOG_NOTICE, "can't set max sd to %d",
- limit.rlim_cur);
- }
- }
-@@ -494,18 +500,18 @@
- #if SHOW_UID
- uid = geteuid();
- #ifdef INET6
-- log(LOG_DEBUG, "%s (with IPv6) started (uid %d with %d descriptors)",
-+ mylog(LOG_DEBUG, "%s (with IPv6) started (uid %d with %d descriptors)",
- version, uid, cnf.sd_max);
- #else
-- log(LOG_DEBUG, "%s started (uid %d with %d descriptors)",
-+ mylog(LOG_DEBUG, "%s started (uid %d with %d descriptors)",
- version, uid, cnf.sd_max);
- #endif
- #else
- #ifdef INET6
-- log(LOG_DEBUG, "%s (with IPv6) started (with %d descriptors)",
-+ mylog(LOG_DEBUG, "%s (with IPv6) started (with %d descriptors)",
- version, cnf.sd_max);
- #else
-- log(LOG_DEBUG, "%s started (with %d descriptors)",
-+ mylog(LOG_DEBUG, "%s started (with %d descriptors)",
- version, cnf.sd_max);
- #endif
- #endif
-@@ -551,7 +557,7 @@
- }
- }
- if (strchr(myname, '.') == NULL)
-- log(LOG_INFO, "hostname (%s) is not a FQDN", myname);
-+ mylog(LOG_INFO, "hostname (%s) is not a FQDN", myname);
- }
- if (addmyalias(myname) < 0)
- {
-@@ -559,13 +565,13 @@
- }
- if (cnf.fallbackmx != NULL && isamyalias(cnf.fallbackmx))
- {
-- log(LOG_INFO, "ignoring fallbackmx (%s)", cnf.fallbackmx);
-+ mylog(LOG_INFO, "ignoring fallbackmx (%s)", cnf.fallbackmx);
- free(cnf.fallbackmx);
- cnf.fallbackmx = NULL;
- }
- if (cnf.pgateway != NULL && isamyalias(cnf.pgateway))
- {
-- log(LOG_INFO, "ignoring protocol gateway (%s)", cnf.pgateway);
-+ mylog(LOG_INFO, "ignoring protocol gateway (%s)", cnf.pgateway);
- free(cnf.pgateway);
- cnf.pgateway = NULL;
- }
-@@ -574,7 +580,7 @@
- {
- if(rcpts_def_load() < 0)
- {
-- log(LOG_INFO, "ignoring R option (%s)", cnf.rcpts_def);
-+ mylog(LOG_INFO, "ignoring R option (%s)", cnf.rcpts_def);
- free(cnf.rcpts_def);
- cnf.rcpts_def = NULL;
- }
diff --git a/mail/smtpfeed/patches/patch-aj b/mail/smtpfeed/patches/patch-aj
deleted file mode 100644
index 11156f48047..00000000000
--- a/mail/smtpfeed/patches/patch-aj
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/07/23 15:00:41 taca Exp $
-
---- mxrand.c.orig 2002-01-20 23:19:43.000000000 +0900
-+++ mxrand.c
-@@ -75,6 +75,8 @@
-
- # include "common.h"
-
-+static time_t curtime P((void));
-+
- /*
- ** CURTIME -- return current time.
- **
-@@ -88,7 +90,7 @@
- ** none.
- */
-
--time_t
-+static time_t
- curtime()
- {
- auto time_t t;
-@@ -117,7 +119,7 @@
-
- int
- mxrand(host1, host2)
-- register char *host1, *host2;
-+ char *host1, *host2;
- {
- int hfunc;
- static unsigned int seed;
diff --git a/mail/smtpfeed/patches/patch-ak b/mail/smtpfeed/patches/patch-ak
deleted file mode 100644
index 50e169a51e6..00000000000
--- a/mail/smtpfeed/patches/patch-ak
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/07/23 15:00:41 taca Exp $
-
---- proctitle.c.orig 2002-01-20 23:19:43.000000000 +0900
-+++ proctitle.c
-@@ -156,6 +156,8 @@
-
- #endif /* SPT_TYPE != SPT_NONE && SPT_TYPE != SPT_BUILTIN */
-
-+#if SPT_TYPE != SPT_BUILTIN
-+
- /*
- ** Pointers for setproctitle.
- ** This allows "ps" listings to give more useful information.
-@@ -211,9 +213,6 @@
- LastArgv = argv[argc - 1] + strlen(argv[argc - 1]);
- }
-
--#if SPT_TYPE != SPT_BUILTIN
--
--
- /*VARARGS1*/
- void
- # ifdef __STDC__
diff --git a/mail/smtpfeed/patches/patch-al b/mail/smtpfeed/patches/patch-al
deleted file mode 100644
index 83bcbc50c5d..00000000000
--- a/mail/smtpfeed/patches/patch-al
+++ /dev/null
@@ -1,967 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/07/23 15:00:41 taca Exp $
-
---- smtp.c.orig 2002-02-23 19:20:05.000000000 +0900
-+++ smtp.c
-@@ -49,32 +49,42 @@
- static int FirstRead, FirstWrite;
- static int Terminate, NewTransCheck, NeedTrimDomain, MoreFreeSlot;
-
-+static void sig_alarm P((int));
-+static void sig_int P((int));
-+static void sig_hup P((int));
-+static void sig_term P((int));
-+static void smtp P((void));
-+
- static void
--sig_alarm()
-+sig_alarm(dummy)
-+ int dummy;
- {
- errno = ETIMEDOUT;
- if (cnf.debug & DEBUG_EVENT)
-- log(LOG_DEBUG, "alarm clock");
-+ mylog(LOG_DEBUG, "alarm clock");
- }
-
- static void
--sig_int()
-+sig_int(dummy)
-+ int dummy;
- {
-- log(LOG_INFO, "SIGINT received: internal states dumped");
-+ mylog(LOG_INFO, "SIGINT received: internal states dumped");
- dump_internal();
- }
-
- static void
--sig_hup()
-+sig_hup(dummy)
-+ int dummy;
- {
-- log(LOG_INFO, "SIGHUP received: graceful termination");
-+ mylog(LOG_INFO, "SIGHUP received: graceful termination");
- forced_terminate();
- }
-
- static void
--sig_term()
-+sig_term(dummy)
-+ int dummy;
- {
-- log(LOG_INFO, "SIGTERM received: semi graceful termination");
-+ mylog(LOG_INFO, "SIGTERM received: semi graceful termination");
- markstatus(env.rcpt_list, SMTP_TEMPFAIL(51),
- "Aborted by INT signal", 1);
- longjmp(jmp_env, 1);
-@@ -87,10 +97,10 @@
- int s;
-
- while((s = dup(0)) < 253);
-- log(LOG_DEBUG, "descriptor reserved till %d", s);
-+ mylog(LOG_DEBUG, "descriptor reserved till %d", s);
- #endif
-
-- log(LOG_INFO, "from=%s size=%d nrcpt=%d msgid=%s",
-+ mylog(LOG_INFO, "from=%s size=%d nrcpt=%d msgid=%s",
- env.sender, env.realsize, sti.nrcpt,
- (env.mid == NULL)?"none":env.mid);
-
-@@ -99,7 +109,7 @@
- FILE *fp;
-
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "searching sender address %s in %s",
-+ mylog(LOG_DEBUG, "searching sender address %s in %s",
- env.sender, cnf.src_mod_path);
- if ((fp = fopen(cnf.src_mod_path, "r")) == NULL)
- {
-@@ -127,7 +137,7 @@
- fclose(fp);
- if (found)
- {
-- log(LOG_INFO,
-+ mylog(LOG_INFO,
- "recipients/transaction changed to 1");
- cnf.rcpts_trans == 1;
- }
-@@ -207,15 +217,53 @@
- resource_usage("finalstatus done");
- }
-
--static int smtp_connected(), smtp_greeted(), smtp_flush();
--static int smtp_helo_r(), smtp_helo_r();
--static int smtp_mail_r(), smtp_rcpt_r(), smtp_rcpt_s();
--static int smtp_data_r(), smtp_data_body(), smtp_data_t();
--static int smtp_rset_r(), smtp_quit_r();
-+static int smtp_connected P((struct connection *));
-+static int smtp_flush P((struct connection *));
-+static int smtp_greeted P((struct connection *));
-+static int smtp_helo_r P((struct connection *));
-+static int smtp_mail_r P((struct connection *));
-+static int smtp_rcpt_r P((struct connection *));
-+static int smtp_data_r P((struct connection *));
-+static int smtp_data_body P((struct connection *));
-+static int smtp_data_t P((struct connection *));
-+static int smtp_rset_r P((struct connection *));
-+static int smtp_quit_r P((struct connection *));
-+
-+static int smtp_helo_s P((struct connection *));
-+static int smtp_mail_s P((struct connection *));
-+static int smtp_rcpt_s P((struct connection *));
-+static int smtp_data_s P((struct connection *));
-+static int smtp_rset_s P((struct connection *));
-+static int smtp_quit_s P((struct connection *));
-+
-+static int new_transaction P((void));
-+static void process_connection P((fd_set *, fd_set *, int, int));
-+static void markstatus P((struct recipient *, int, char *, int));
-+static struct connection *open_transaction P((struct recipient *));
-+static void close_transaction P((struct connection *, int));
-+static void trim_rcpts P((struct domain *));
-+static int trim_domain P((void));
-+static void forced_terminate P((void));
-+
-+static int smtp_connect P((struct connection *));
-+void smtp_close P((int));
-+static int smtp_read P((struct connection *, char *, int, int *));
-+static int smtp_write P((struct connection *, char *, int, int));
-+static int smtp_get_reply P((struct connection *,
-+ void (*) P((struct connection *, char *)),
-+ char *, int, int *));
-+static int smtp_send_command P((struct connection *, char *, int, int));
-+static void esmtp_check P((struct connection *, char *));
-+static void ehlo_opt P((struct connection *, char *));
-+static char *skipaddr P((char *, char *addr));
-+static int may_be_reused P((struct connection *));
-+static int smtp_timeout P((struct connection *));
-+static void dump_internal P((void));
-+static char *smtpstrerror P((int));
-
- static struct {
-- int (*recv)();
-- int (*send)();
-+ int (*recv) P((struct connection *));
-+ int (*send) P((struct connection *));
- time_t tout;
- char *name;
- } state_tbl[] = {
-@@ -356,13 +404,13 @@
- if (rcptp->domain == NULL)
- {
- rcptp->stat = RCPT_DONE;
-- log(LOG_NOTICE, "no domain for %s", rcptp->address);
-+ mylog(LOG_NOTICE, "no domain for %s", rcptp->address);
- continue;
- }
- if (rcptp->domain->firstmx == NULL)
- {
- rcptp->stat = RCPT_DONE;
-- log(LOG_NOTICE, "no MX for %s", rcptp->address);
-+ mylog(LOG_NOTICE, "no MX for %s", rcptp->address);
- continue;
- }
- }
-@@ -375,7 +423,7 @@
- if (domp->rcpt_top == NULL)
- continue;
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "pick up domain: %s", domp->name);
-+ mylog(LOG_DEBUG, "pick up domain: %s", domp->name);
- if (wdomp == NULL)
- env.work_domain = domp;
- else
-@@ -395,7 +443,7 @@
- {
- /* all recipients had been processed */
- if (cnf.debug & DEBUG_CONNECT)
-- log(LOG_DEBUG, "closing all sockets");
-+ mylog(LOG_DEBUG, "closing all sockets");
- all_done = 1;
- for (i = 0; i < cnf.sd_max; i++)
- {
-@@ -424,7 +472,7 @@
- }
-
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "in_use=%d, max_sock=%d, min_sock=%d",
-+ mylog(LOG_DEBUG, "in_use=%d, max_sock=%d, min_sock=%d",
- in_use, max_sock, sti.minsock);
-
- if (in_use > (max_sock - sti.minsock))
-@@ -439,7 +487,7 @@
- if (connwork[i].host->state != STAT_SENT)
- continue;
- if (cnf.debug & DEBUG_CONNECT)
-- log(LOG_DEBUG, "%d/%d: closing idle socket",
-+ mylog(LOG_DEBUG, "%d/%d: closing idle socket",
- connwork[i].seq,
- connwork[i].socket);
- smtp_quit_s(&connwork[i]);
-@@ -458,7 +506,7 @@
- if (!connwork[i].reuse)
- break;
- if (cnf.debug & DEBUG_CONNECT)
-- log(LOG_DEBUG, "%d/%d: closing idle socket",
-+ mylog(LOG_DEBUG, "%d/%d: closing idle socket",
- connwork[i].seq,
- connwork[i].socket);
- smtp_quit_s(&connwork[i]);
-@@ -479,7 +527,7 @@
- }
- #if 1
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "new transaction: trans=%d, sock=%d",
-+ mylog(LOG_DEBUG, "new transaction: trans=%d, sock=%d",
- num_trans, num_sock);
- #endif
- if (new_transaction() < 0)
-@@ -514,7 +562,7 @@
- if (all_done && fds < 0)
- {
- if (cnf.debug & DEBUG_CONNECT)
-- log(LOG_DEBUG, "all sockets are closed");
-+ mylog(LOG_DEBUG, "all sockets are closed");
- #if 0
- dump_internal();
- #endif
-@@ -523,7 +571,7 @@
-
- if (fds < 0) /* XXX */
- {
-- log(LOG_INFO, "No active sockets");
-+ mylog(LOG_INFO, "No active sockets");
- if (bad_state++ > 5)
- {
- markstatus(env.rcpt_list, SMTP_TEMPFAIL(51),
-@@ -561,12 +609,12 @@
- {
- /* time up */
- forced_terminate();
-- log(LOG_INFO, "total processing timed out (%d sec)",
-+ mylog(LOG_INFO, "total processing timed out (%d sec)",
- cnf.t_timeout);
- }
- if (rc < 0)
- {
-- log(LOG_INFO, "select returns %d (fds=%d, errno=%d)",
-+ mylog(LOG_INFO, "select returns %d (fds=%d, errno=%d)",
- rc, fds, errno);
- sleep(1);
- }
-@@ -594,7 +642,7 @@
- {
- #if 1
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "checking domain: %s", domp->name);
-+ mylog(LOG_DEBUG, "checking domain: %s", domp->name);
- #endif
- /* first time for the domain? */
- #if 1
-@@ -615,7 +663,7 @@
- || domp->curmx->host->addr == NULL))))
- {
- if (domp->curmx->host == NULL)
-- log(LOG_INFO, "skipping bad MX: %s for %s",
-+ mylog(LOG_INFO, "skipping bad MX: %s for %s",
- domp->curmx->name, domp->name);
- else
- {
-@@ -697,7 +745,7 @@
- }
- #if 1
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "no new transaction");
-+ mylog(LOG_DEBUG, "no new transaction");
- #endif
- NewTransCheck = 0;
- return -1; /* no new transaction */
-@@ -721,7 +769,7 @@
-
- snprintf(msgbuf, sizeof(msgbuf),
- "No address known for %s", conn->host->name);
-- log(LOG_INFO, msgbuf, conn->host->name);
-+ mylog(LOG_INFO, msgbuf, conn->host->name);
-
- rcode = SMTP_TEMPFAIL(52);
- if (cnf.absentAok)
-@@ -798,7 +846,7 @@
- /* timeout! */
- sti.ntimeout++;
- if (cnf.debug & DEBUG_CONNECT)
-- log(LOG_DEBUG, "%d/%d: timeout (%s)", conn->seq,
-+ mylog(LOG_DEBUG, "%d/%d: timeout (%s)", conn->seq,
- conn->socket, STATE(st));
- if (st == STAT_DTERMSENT)
- {
-@@ -814,7 +862,7 @@
- if (FD_ISSET(conn->socket, w_fds))
- {
- if (cnf.debug & DEBUG_EVENT)
-- log(LOG_DEBUG, "%d/%d: writable (%s)",
-+ mylog(LOG_DEBUG, "%d/%d: writable (%s)",
- conn->seq, conn->socket, STATE(st));
- if (state_tbl[st].send != NULL)
- {
-@@ -825,14 +873,14 @@
- if (conn->host == NULL)
- {
- if (cnf.debug & DEBUG_EVENT)
-- log(LOG_DEBUG, "%d/%d: state %s -> NULL",
-+ mylog(LOG_DEBUG, "%d/%d: state %s -> NULL",
- conn->seq, conn->socket, STATE(st));
- }
- else if (st != conn->host->state)
- {
- conn->host->time = Now;
- if (cnf.debug & DEBUG_EVENT)
-- log(LOG_DEBUG, "%d/%d: state %s -> %s",
-+ mylog(LOG_DEBUG, "%d/%d: state %s -> %s",
- conn->seq, conn->socket, STATE(st),
- STATE(conn->host->state));
- }
-@@ -841,7 +889,7 @@
- if (FD_ISSET(conn->socket, r_fds))
- {
- if (cnf.debug & DEBUG_EVENT)
-- log(LOG_DEBUG, "%d/%d: readable (%s)",
-+ mylog(LOG_DEBUG, "%d/%d: readable (%s)",
- conn->seq, conn->socket, STATE(st));
- if (state_tbl[st].recv != NULL)
- {
-@@ -852,14 +900,14 @@
- if (conn->host == NULL)
- {
- if (cnf.debug & DEBUG_EVENT)
-- log(LOG_DEBUG, "%d/%d: state %s -> NULL",
-+ mylog(LOG_DEBUG, "%d/%d: state %s -> NULL",
- conn->seq, conn->socket, STATE(st));
- }
- else if (st != conn->host->state)
- {
- conn->host->time = Now;
- if (cnf.debug & DEBUG_EVENT)
-- log(LOG_DEBUG, "%d/%d: state %s -> %s",
-+ mylog(LOG_DEBUG, "%d/%d: state %s -> %s",
- conn->seq, conn->socket, STATE(st),
- STATE(conn->host->state));
- }
-@@ -1041,7 +1089,7 @@
- {
- /* buffer may be full */
- strcat(addrbuf+addrlen, ",(more...)");
-- log(LOG_INFO, "(%d+%d+%d+%d/%d) relay=%s to=%s proto=%s delay=%d code=%d (%s)",
-+ mylog(LOG_INFO, "(%d+%d+%d+%d/%d) relay=%s to=%s proto=%s delay=%d code=%d (%s)",
- sti.nsent, sti.ndeferred, sti.nnsfailed,
- sti.nsmtpfailed, sti.nrcpt, hostname,
- addrbuf, proto, delay, rcode,
-@@ -1066,7 +1114,7 @@
- {
- rcptp->stat = RCPT_RETRY;
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "tempfail; next avail: %s",
-+ mylog(LOG_DEBUG, "tempfail; next avail: %s",
- rcptp->address);
- }
- else
-@@ -1074,7 +1122,7 @@
- sti.ndeferred++;
- rcptp->stat = RCPT_DONE;
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "tempfail; done: %s",
-+ mylog(LOG_DEBUG, "tempfail; done: %s",
- rcptp->address);
- }
- }
-@@ -1103,7 +1151,7 @@
- }
- if (addrlen > 0)
- {
-- log(LOG_INFO, "(%d+%d+%d+%d/%d) relay=%s to=%s proto=%s delay=%d code=%d (%s)",
-+ mylog(LOG_INFO, "(%d+%d+%d+%d/%d) relay=%s to=%s proto=%s delay=%d code=%d (%s)",
- sti.nsent, sti.ndeferred, sti.nnsfailed,
- sti.nsmtpfailed, sti.nrcpt, hostname,
- addrbuf, proto, delay, rcode,
-@@ -1143,7 +1191,7 @@
-
- #if 1
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "num_trans=%d, num_sock=%d, max_sock=%d, min_sock=%d",
-+ mylog(LOG_DEBUG, "num_trans=%d, num_sock=%d, max_sock=%d, min_sock=%d",
- num_trans, num_sock, max_sock, sti.minsock);
- #endif
- if (num_trans > (max_sock - sti.minsock))
-@@ -1158,7 +1206,7 @@
-
- #if 1
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "open transaction for %s", rcptp->address);
-+ mylog(LOG_DEBUG, "open transaction for %s", rcptp->address);
- #endif
-
- if (rcptp->domain->curmx->host->state == STAT_SENT)
-@@ -1170,7 +1218,7 @@
- break;
- }
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "reusing: slot=%d", i);
-+ mylog(LOG_DEBUG, "reusing: slot=%d", i);
- }
- else
- {
-@@ -1190,7 +1238,7 @@
- {
- #if 0
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "no free slot");
-+ mylog(LOG_DEBUG, "no free slot");
- #endif
- /* sleep (1); */
- return NULL; /* XXX socket slot is full */
-@@ -1199,7 +1247,7 @@
- sti.ntrans++;
-
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "%d/-: open transaction for %s, slot=%d",
-+ mylog(LOG_DEBUG, "%d/-: open transaction for %s, slot=%d",
- sti.ntrans, rcptp->address, i);
-
- /* initialize transaction */
-@@ -1230,7 +1278,7 @@
- domp = mxp->domain;
- if (domp == NULL)
- {
-- log(LOG_NOTICE, "Oops, mxp->domain for %s is NULL",
-+ mylog(LOG_NOTICE, "Oops, mxp->domain for %s is NULL",
- mxp->name);
- goto next_domain;
- }
-@@ -1253,7 +1301,7 @@
- if (rcpts + 1 > cnf.rcpts_trans)
- #else
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "check count of rcpts (domain:%s, max rcpts:%d, count:%d)",
-+ mylog(LOG_DEBUG, "check count of rcpts (domain:%s, max rcpts:%d, count:%d)",
- rcptp2->domain->name,
- rcptp2->domain->rcpts,
- rcpts);
-@@ -1266,7 +1314,7 @@
- }
- rcpts++;
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "%d/-: with %s",
-+ mylog(LOG_DEBUG, "%d/-: with %s",
- sti.ntrans, rcptp2->address);
- rcptp2->stat = RCPT_WORK;
- rcptp2->chain = NULL;
-@@ -1306,7 +1354,7 @@
- #endif
-
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "%d/%d: close transaction", conn->seq, conn->socket);
-+ mylog(LOG_DEBUG, "%d/%d: close transaction", conn->seq, conn->socket);
-
- NewTransCheck = 1; /* do not skip new_transaction() */
- env.work_dom_ptr = NULL; /* retry from the top of list */
-@@ -1369,7 +1417,7 @@
- if (domp->curmx != NULL)
- {
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "%d/-: switching to next MX: %s",
-+ mylog(LOG_DEBUG, "%d/-: switching to next MX: %s",
- conn->seq, domp->curmx->name);
- }
- }
-@@ -1410,7 +1458,7 @@
- num_trans--;
- }
-
--void
-+static void
- trim_rcpts(domp)
- struct domain *domp;
- {
-@@ -1427,7 +1475,7 @@
- {
- /* remove recipient from working chain */
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "removing recipient: %s",
-+ mylog(LOG_DEBUG, "removing recipient: %s",
- rcptp->address);
- if (rcptp == domp->rcpt_top)
- {
-@@ -1449,7 +1497,7 @@
- NeedTrimDomain = 1;
- }
-
--int
-+static int
- trim_domain()
- {
- struct domain *domp, *domtmp;
-@@ -1463,7 +1511,7 @@
- {
- /* remove from working domain chain */
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "removing domain: %s",
-+ mylog(LOG_DEBUG, "removing domain: %s",
- domp->name);
- if (domp == env.work_domain)
- {
-@@ -1490,7 +1538,7 @@
- return 0;
- }
-
--void
-+static void
- forced_terminate()
- {
- struct recipient *rcptp;
-@@ -1518,7 +1566,7 @@
-
- if (conn->host == NULL)
- {
-- log(LOG_NOTICE, "smtp_connect called with NULL host");
-+ mylog(LOG_NOTICE, "smtp_connect called with NULL host");
- return -1;
- }
-
-@@ -1532,7 +1580,7 @@
- }
-
- if (cnf.debug & DEBUG_CONNECT)
-- log(LOG_DEBUG, "%d/-: connecting to %s",
-+ mylog(LOG_DEBUG, "%d/-: connecting to %s",
- conn->seq, conn->host->name);
-
- bzero((char *)&rsin, sizeof(rsin));
-@@ -1569,7 +1617,7 @@
- socksize = sizeof(struct sockaddr_in);
-
- if (cnf.debug & DEBUG_CONNECT)
-- log(LOG_DEBUG, "%d/-: destination=%s/%d", conn->seq,
-+ mylog(LOG_DEBUG, "%d/-: destination=%s/%d", conn->seq,
- inet_ntoa(rsin.in.sin_addr), cnf.dst_port);
- found = 1;
- break;
-@@ -1599,7 +1647,7 @@
-
- inet_ntop(AF_INET6, &rsin.in6.sin6_addr,
- buf, sizeof(buf));
-- log(LOG_DEBUG, "%d/-: destination=%s/%d",
-+ mylog(LOG_DEBUG, "%d/-: destination=%s/%d",
- conn->seq, buf, cnf.dst_port);
- }
- found = 1;
-@@ -1637,7 +1685,7 @@
-
- if (sd > MAX_SOCK)
- {
-- log(LOG_NOTICE, "%d/%d: can not manage such a big file descriptor number with select()",
-+ mylog(LOG_NOTICE, "%d/%d: can not manage such a big file descriptor number with select()",
- conn->seq, sd);
- close(sd);
- if (max_sock > MAX_SOCK)
-@@ -1650,7 +1698,7 @@
-
- if (sd < 0){
- /* no more socket resource */
-- log(LOG_NOTICE, "socket allocation failed for %s: %s (may be max=%d, current=%d/%d/%d)",
-+ mylog(LOG_NOTICE, "socket allocation failed for %s: %s (may be max=%d, current=%d/%d/%d)",
- conn->host->name, smtpstrerror(errno), sti.maxsock,
- max_sock, num_sock, sti.minsock);
- if (max_sock > NOFILE)
-@@ -1669,14 +1717,14 @@
- }
-
- if (cnf.debug & DEBUG_CONNECT)
-- log(LOG_DEBUG, "%d/%d: socket allocated", conn->seq, sd);
-+ mylog(LOG_DEBUG, "%d/%d: socket allocated", conn->seq, sd);
-
- #ifdef SO_SNDBUF
- if (cnf.sendbufsize > 0)
- {
- if (setsockopt(sd, SOL_SOCKET, SO_SNDBUF,
- (char *)&cnf.sendbufsize, sizeof(cnf.sendbufsize)) < 0)
-- log(LOG_NOTICE, "%d/%d: setsockopt(SO_SNDBUF) failed for %s: %s",
-+ mylog(LOG_NOTICE, "%d/%d: setsockopt(SO_SNDBUF) failed for %s: %s",
- conn->seq, sd, conn->host->name,
- smtpstrerror(errno));
- /* ignore error */
-@@ -1741,7 +1789,7 @@
- case AF_INET:
- bcopy(addrp->address,
- &lsin.in.sin_addr, addrp->len);
-- log(LOG_INFO,
-+ mylog(LOG_INFO,
- "using %s as source IP address",
- inet_ntoa(lsin.in.sin_addr));
- break;
-@@ -1753,7 +1801,7 @@
-
- inet_ntop(AF_INET6, &lsin.in6.sin6_addr,
- buf, sizeof(buf));
-- log(LOG_INFO, "using %s as source IP address", buf);
-+ mylog(LOG_INFO, "using %s as source IP address", buf);
- break;
- #endif
- }
-@@ -1771,7 +1819,7 @@
- p = NULL;
- }
- if (!found)
-- log(LOG_INFO, "sourceIP (%s) ignored", cnf.sourceIP);
-+ mylog(LOG_INFO, "sourceIP (%s) ignored", cnf.sourceIP);
- }
- if (!found)
- {
-@@ -1820,7 +1868,7 @@
- {
- if (bind(sd, (struct sockaddr *)&lsin, socksize) < 0)
- {
-- log(LOG_NOTICE, "%d/%d: bind failed for %s: %s",
-+ mylog(LOG_NOTICE, "%d/%d: bind failed for %s: %s",
- conn->seq, sd, conn->host->name,
- smtpstrerror(errno));
- conn->host->state = STAT_FAIL;
-@@ -1837,7 +1885,7 @@
-
- if (ioctl (sd, FIONBIO, &res) < 0)
- {
-- log(LOG_NOTICE, "%d/%d: FIONBIO failed for %s: %s",
-+ mylog(LOG_NOTICE, "%d/%d: FIONBIO failed for %s: %s",
- conn->seq, sd, conn->host->name, smtpstrerror(errno));
- conn->host->state = STAT_FAIL;
- close (sd);
-@@ -1848,7 +1896,7 @@
- #else
- if ((res = fcntl(sd, F_GETFL, 0)) == -1)
- {
-- log(LOG_NOTICE, "%d/%d: F_GETFL failed for %s: %s",
-+ mylog(LOG_NOTICE, "%d/%d: F_GETFL failed for %s: %s",
- conn->seq, sd, conn->host->name, smtpstrerror(errno));
- conn->host->state = STAT_FAIL;
- close (sd);
-@@ -1863,7 +1911,7 @@
- # endif
- if (fcntl(sd, F_SETFL, res) == -1)
- {
-- log(LOG_NOTICE, "%d/%d: F_SETFL failed for %s: %s",
-+ mylog(LOG_NOTICE, "%d/%d: F_SETFL failed for %s: %s",
- conn->seq, sd, conn->host->name, smtpstrerror(errno));
- conn->host->state = STAT_FAIL;
- close (sd);
-@@ -1879,7 +1927,7 @@
- && errno != EINPROGRESS && errno != EINTR) /* XXX */
- {
- alarm(0);
-- log(LOG_DEBUG, "%d/%d: connect failed for %s: %s",
-+ mylog(LOG_DEBUG, "%d/%d: connect failed for %s: %s",
- conn->seq, sd, conn->host->name, smtpstrerror(errno));
- conn->host->current->stat = EX_TEMPFAIL;
- close (sd);
-@@ -1911,7 +1959,7 @@
- }
- sti.minsock = sd;
- if (cnf.debug & DEBUG_CONNECT)
-- log(LOG_DEBUG, "minsock=%d", sti.minsock);
-+ mylog(LOG_DEBUG, "minsock=%d", sti.minsock);
- }
- num_sock++;
- return 0;
-@@ -1931,11 +1979,11 @@
- {
- SockAddr cin;
- int len = sizeof(SockAddr);
-- const char *errmsg;
-+ char *errmsg;
-
- if (getpeername(conn->socket, (struct sockaddr *)&cin, &len) < 0)
- {
-- log(LOG_INFO, "%d/%d: getpeername failed for %s: %s",
-+ mylog(LOG_INFO, "%d/%d: getpeername failed for %s: %s",
- conn->seq, conn->socket, conn->host->name,
- smtpstrerror(errno));
- if (conn->host->current != NULL) /* XXX for safe access */
-@@ -1984,7 +2032,7 @@
- conn->outlen = 0;
- if (conn->inbuf == NULL || conn->outbuf == NULL)
- {
-- log(LOG_NOTICE, "out of memory (SMTP buffer allocation)");
-+ mylog(LOG_NOTICE, "out of memory (SMTP buffer allocation)");
- if (conn->host->current != NULL) /* XXX for safe access */
- {
- conn->host->current->stat = EX_TEMPFAIL;
-@@ -2028,7 +2076,7 @@
- if (n == 0)
- {
- if (cnf.debug & DEBUG_CONNECT)
-- log(LOG_DEBUG, "%d/%d: closed by foreign host",
-+ mylog(LOG_DEBUG, "%d/%d: closed by foreign host",
- conn->seq, conn->socket);
- errno = E_SF_IO;
- return -1;
-@@ -2046,7 +2094,7 @@
- #endif
- return 0;
- default:
-- log(LOG_DEBUG, "%d/%d: read failed for %s: ret=%d, errno=%d",
-+ mylog(LOG_DEBUG, "%d/%d: read failed for %s: ret=%d, errno=%d",
- conn->seq, conn->socket,
- conn->host->name, n, errno);
- return n;
-@@ -2112,7 +2160,7 @@
- if (n == 0)
- {
- if (cnf.debug & DEBUG_CONNECT)
-- log(LOG_DEBUG,
-+ mylog(LOG_DEBUG,
- "%d/%d: closed by foreign host (%s)",
- conn->seq, conn->socket,
- conn->host->name);
-@@ -2132,7 +2180,7 @@
- #endif
- return 0;
- default:
-- log(LOG_DEBUG,
-+ mylog(LOG_DEBUG,
- "%d/%d: write failed for %s: ret=%d, errno=%d",
- conn->seq, conn->socket,
- conn->host->name, n, errno);
-@@ -2167,7 +2215,7 @@
- if (n == 0)
- {
- if (cnf.debug & DEBUG_CONNECT)
-- log(LOG_DEBUG,
-+ mylog(LOG_DEBUG,
- "%d/%d: closed by foreign host (%s)",
- conn->seq, conn->socket,
- conn->host->name);
-@@ -2185,7 +2233,7 @@
- #endif
- return size;
- default:
-- log(LOG_DEBUG,
-+ mylog(LOG_DEBUG,
- "%d/%d: write failed for %s: ret=%d, errno=%d",
- conn->seq, conn->socket,
- conn->host->name, n, errno);
-@@ -2236,7 +2284,7 @@
- static int
- smtp_get_reply(conn, func, firstline, size, rest)
- struct connection *conn;
--void (*func)();
-+void (*func) P((struct connection *, char *));
- char firstline[];
- int size;
- int *rest;
-@@ -2281,7 +2329,7 @@
- cbuf[--len] = '\0';
- }
- if (cnf.debug & DEBUG_SMTP)
-- log(LOG_DEBUG, "%d/%d: >>> %s", conn->seq, conn->socket, cbuf);
-+ mylog(LOG_DEBUG, "%d/%d: >>> %s", conn->seq, conn->socket, cbuf);
- if (func != NULL)
- (*func)(conn, cbuf);
- if (!isdigit(cbuf[0]) || !isdigit(cbuf[1]) || !isdigit(cbuf[2])
-@@ -2338,7 +2386,7 @@
- int len = strlen(buf);
-
- if (cnf.debug & DEBUG_SMTP)
-- log(LOG_DEBUG, "%d/%d: <<< %s", conn->seq, conn->socket, buf);
-+ mylog(LOG_DEBUG, "%d/%d: <<< %s", conn->seq, conn->socket, buf);
- if (len + 2 < size)
- {
- strcat(buf, CRLF);
-@@ -2412,7 +2460,7 @@
- {
- char buf[MAXLINE];
- int rcode, savestate;
-- const char *errmsg;
-+ char *errmsg;
-
- errno = 0;
- savestate = conn->host->state;
-@@ -2453,7 +2501,7 @@
- errmsg = "Unexpected Error";
- break;
- }
-- log(LOG_INFO, "%d/%d: failed for %s: %s (%s)",
-+ mylog(LOG_INFO, "%d/%d: failed for %s: %s (%s)",
- conn->seq, conn->socket, conn->host->name,
- smtpstrerror(errno), STATE(savestate));
- if (conn->host->current != NULL) /* XXX for safe access */
-@@ -2600,7 +2648,7 @@
- {
- if (errno > 0)
- {
-- log(LOG_INFO, "%d/%d: failed for %s: %s (%s)",
-+ mylog(LOG_INFO, "%d/%d: failed for %s: %s (%s)",
- conn->seq, conn->socket, smtpstrerror(errno),
- conn->host->name, STATE(savestate));
- }
-@@ -2854,7 +2902,7 @@
- {
- if (errno > 0)
- {
-- log(LOG_INFO, "%d/%d: failed for %s: %s (%s)",
-+ mylog(LOG_INFO, "%d/%d: failed for %s: %s (%s)",
- conn->seq, conn->socket, conn->host->name,
- smtpstrerror(errno), STATE(savestate));
- }
-@@ -3032,7 +3080,7 @@
- {
- if (errno > 0)
- {
-- log(LOG_INFO, "%d/%d: failed for %s: %s (%s)",
-+ mylog(LOG_INFO, "%d/%d: failed for %s: %s (%s)",
- conn->seq, conn->socket, conn->host->name,
- smtpstrerror(errno), STATE(savestate));
- }
-@@ -3149,7 +3197,7 @@
- {
- if (errno > 0)
- {
-- log(LOG_INFO, "%d/%d: failed for %s: %s (%s)",
-+ mylog(LOG_INFO, "%d/%d: failed for %s: %s (%s)",
- conn->seq, conn->socket, conn->host->name,
- smtpstrerror(errno), STATE(savestate));
- }
-@@ -3229,7 +3277,7 @@
- len = strlen(altbuf);
- rcode = smtp_write(conn, altbuf, len, 0);
- if (rcode != len) /* XXX */
-- log(LOG_NOTICE,
-+ mylog(LOG_NOTICE,
- "Header of sent message will be corrupted: %s",
- altbuf);
- }
-@@ -3301,7 +3349,7 @@
- return 0;
-
- if (cnf.debug & DEBUG_CONNECT)
-- log(LOG_DEBUG, "reusability check: %s", conn->host->name);
-+ mylog(LOG_DEBUG, "reusability check: %s", conn->host->name);
-
- /* check possibility of reuse connection */
- for (rmxp = conn->host->mx_ref; rmxp != NULL; rmxp = rmxp->mx_ref)
-@@ -3323,7 +3371,7 @@
- }
- }
- if (cnf.debug & DEBUG_CONNECT)
-- log(LOG_DEBUG, "on domain: %s = %d", domp->name, reused);
-+ mylog(LOG_DEBUG, "on domain: %s = %d", domp->name, reused);
-
- if (reused == 0)
- continue;
-@@ -3335,7 +3383,7 @@
- if (mxp == rmxp)
- {
- if (cnf.debug & DEBUG_CONNECT)
-- log(LOG_DEBUG, "%d/%d: may be reused: %s",
-+ mylog(LOG_DEBUG, "%d/%d: may be reused: %s",
- conn->seq, conn->socket,
- conn->host->name);
- return 1;
-@@ -3361,7 +3409,7 @@
- {
- if (errno > 0)
- {
-- log(LOG_INFO, "%d/%d: failed for %s: %s (%s)",
-+ mylog(LOG_INFO, "%d/%d: failed for %s: %s (%s)",
- conn->seq, conn->socket, conn->host->name,
- smtpstrerror(errno), STATE(savestate));
- }
-@@ -3453,7 +3501,7 @@
- {
- if (errno > 0)
- {
-- log(LOG_INFO, "%d/%d: failed for %s: %s (%s)",
-+ mylog(LOG_INFO, "%d/%d: failed for %s: %s (%s)",
- conn->seq, conn->socket, conn->host->name,
- smtpstrerror(errno), STATE(savestate));
- }
-@@ -3528,7 +3576,7 @@
- {
- if (errno > 0)
- {
-- log(LOG_INFO, "%d/%d: failed for %s: %s (%s)",
-+ mylog(LOG_INFO, "%d/%d: failed for %s: %s (%s)",
- conn->seq, conn->socket, conn->host->name,
- smtpstrerror(errno), STATE(savestate));
- }
-@@ -3588,7 +3636,7 @@
- markstatus(conn->rcpt, SMTP_TEMPFAIL(52),
- newstr(buf), 1);
- else
-- log(LOG_INFO, "Trying next address of %s",
-+ mylog(LOG_INFO, "Trying next address of %s",
- conn->host->name);
- if (conn->host->current != NULL) /* XXX for safe access */
- conn->host->current = conn->host->current->next;
-@@ -3614,7 +3662,7 @@
- {
- conn->host->state = STAT_CLOSED;
- conn->host->current->stat = EX_TEMPFAIL;
-- log(LOG_INFO, "Trying next address of %s",
-+ mylog(LOG_INFO, "Trying next address of %s",
- conn->host->name);
- }
- else
-@@ -3641,17 +3689,17 @@
- struct recipient *rcptp;
- int i;
-
-- log(LOG_INFO, "=== dumping internal information ===");
-+ mylog(LOG_INFO, "=== dumping internal information ===");
-
- for (rcptp = env.rcpt_list; rcptp != NULL; rcptp = rcptp->next)
- {
- switch (rcptp->stat)
- {
- case RCPT_NOOP:
-- log(LOG_INFO, "rcpt=%s stat=noop", rcptp->address);
-+ mylog(LOG_INFO, "rcpt=%s stat=noop", rcptp->address);
- break;
- case RCPT_WORK:
-- log(LOG_INFO, "rcpt=%s stat=working mx=%s st=%s",
-+ mylog(LOG_INFO, "rcpt=%s stat=working mx=%s st=%s",
- rcptp->address,
- (rcptp->domain->curmx == NULL)?"none":
- rcptp->domain->curmx->name,
-@@ -3660,18 +3708,18 @@
- break;
- case RCPT_RETRY:
- if (rcptp->domain->curmx != NULL)
-- log(LOG_INFO,
-+ mylog(LOG_INFO,
- "rcpt=%s stat=retry code=%d mx=%s st=%s",
- rcptp->address, rcptp->result,
- rcptp->domain->curmx->name,
- STATE(rcptp->domain->curmx->host->state));
- else
-- log(LOG_INFO,
-+ mylog(LOG_INFO,
- "rcpt=%s stat=retry code=%d mx=none",
- rcptp->address, rcptp->result);
- break;
- case RCPT_DONE:
-- log(LOG_INFO, "rcpt=%s stat=done code=%d",
-+ mylog(LOG_INFO, "rcpt=%s stat=done code=%d",
- rcptp->address, rcptp->result);
- break;
- }
-@@ -3681,12 +3729,12 @@
- {
- if (connwork[i].host == NULL)
- continue;
-- log(LOG_INFO, "slot=%d host=%s stat=%s", i,
-+ mylog(LOG_INFO, "slot=%d host=%s stat=%s", i,
- connwork[i].host->name,
- STATE(connwork[i].host->state));
- }
-
-- log(LOG_INFO, "=== end of internal information ===");
-+ mylog(LOG_INFO, "=== end of internal information ===");
- }
-
- static char *
diff --git a/mail/smtpfeed/patches/patch-am b/mail/smtpfeed/patches/patch-am
deleted file mode 100644
index 83ac6de037b..00000000000
--- a/mail/smtpfeed/patches/patch-am
+++ /dev/null
@@ -1,212 +0,0 @@
-$NetBSD: patch-am,v 1.1 2006/07/23 15:00:41 taca Exp $
-
---- util.c.orig 2002-01-20 23:19:44.000000000 +0900
-+++ util.c
-@@ -41,6 +41,11 @@
- # include "common.h"
- # include "extern.h"
-
-+static void tv_sub P((struct timeval *, struct timeval *, struct timeval *));
-+static int hash_func P((char *));
-+struct dns_stat *hash_query_lookup P((char *, struct dns_stat ***));
-+static void hash_map_enter P((char *, struct host_map *));
-+
- char *
- newstr(str)
- char *str;
-@@ -49,7 +54,7 @@
-
- ptr = (char *)MALLOC(strlen(str) + 1);
- if (ptr == NULL) {
-- log(LOG_NOTICE, "out of memory (newstr)");
-+ mylog(LOG_NOTICE, "out of memory (newstr)");
- return NULL;
- }
- strcpy(ptr, str);
-@@ -109,7 +114,7 @@
- tv_sub(&ct, &pt, &dt);
- d.ru_maxrss = c.ru_maxrss - p.ru_maxrss;
- d.ru_nivcsw = c.ru_nivcsw - p.ru_nivcsw;
-- log(LOG_INFO, "time=%d.%03d+%d.%03d/%d.%03d rss=%ld nivcsw=%ld (%s)",
-+ mylog(LOG_INFO, "time=%d.%03d+%d.%03d/%d.%03d rss=%ld nivcsw=%ld (%s)",
- d.ru_utime.tv_sec, d.ru_utime.tv_usec/1000,
- d.ru_stime.tv_sec, d.ru_stime.tv_usec/1000,
- dt.tv_sec, dt.tv_usec/1000,
-@@ -139,7 +144,7 @@
- }
-
- if (cnf.debug & DEBUG_HASH)
-- log(LOG_DEBUG, "hash_func(%s) = %d", name, val);
-+ mylog(LOG_DEBUG, "hash_func(%s) = %d", name, val);
-
- return val;
- }
-@@ -165,7 +170,7 @@
- if (strcasecmp(qp->name, name) == 0)
- {
- if (cnf.debug & DEBUG_HASH)
-- log(LOG_DEBUG, "query %s found in hash table", name);
-+ mylog(LOG_DEBUG, "query %s found in hash table", name);
- return qp;
- }
- qp = qp->next;
-@@ -194,7 +199,7 @@
- if (strcasecmp(domp->name, name) == 0)
- {
- if (cnf.debug & DEBUG_HASH)
-- log(LOG_DEBUG, "domain %s found in hash table", name);
-+ mylog(LOG_DEBUG, "domain %s found in hash table", name);
- return domp;
- }
- domp = domp->hash;
-@@ -211,7 +216,7 @@
- int idx = hash_func(name);
-
- if (cnf.debug & DEBUG_HASH)
-- log(LOG_DEBUG, "enter domain %s into hash table", name);
-+ mylog(LOG_DEBUG, "enter domain %s into hash table", name);
-
- newdomp->hash = hash_domain[idx];
- hash_domain[idx] = newdomp;
-@@ -228,21 +233,21 @@
- int idx = hash_func(name);
-
- if (cnf.debug & DEBUG_HASH)
-- log(LOG_DEBUG, "look up domain(%s) index(%d)", name, idx);
-+ mylog(LOG_DEBUG, "look up domain(%s) index(%d)", name, idx);
- dom_r_p = hash_domain_rcpts[idx];
- while (dom_r_p != NULL)
- {
- if (strcasecmp(dom_r_p->name, name) == 0)
- {
- if (cnf.debug & DEBUG_HASH)
-- log(LOG_DEBUG, "hit domain(%s) rcpts(%d) in hash table",
-+ mylog(LOG_DEBUG, "hit domain(%s) rcpts(%d) in hash table",
- name, dom_r_p->rcpts);
- return dom_r_p->rcpts;
- }
- dom_r_p = dom_r_p->hash;
- }
- if (cnf.debug & DEBUG_HASH)
-- log(LOG_DEBUG, "domain(%s) not found in hash table, return %d",
-+ mylog(LOG_DEBUG, "domain(%s) not found in hash table, return %d",
- name, cnf.rcpts_trans);
- return cnf.rcpts_trans;
- }
-@@ -255,7 +260,7 @@
- int idx = hash_func(name);
-
- if (cnf.debug & DEBUG_HASH)
-- log(LOG_DEBUG, "enter domain(%s) index(%d) rcpts(%d) into hash table",
-+ mylog(LOG_DEBUG, "enter domain(%s) index(%d) rcpts(%d) into hash table",
- name, idx, newdom_r_p->rcpts);
-
- newdom_r_p->hash = hash_domain_rcpts[idx];
-@@ -290,7 +295,7 @@
- fp = fopen(cnf.rcpts_def, "r");
- if (fp == NULL)
- {
-- log(LOG_NOTICE, "file %s not found", cnf.rcpts_def);
-+ mylog(LOG_NOTICE, "file %s not found", cnf.rcpts_def);
- return -1;
- }
- /* read cnf.rcpts_def */
-@@ -337,7 +342,7 @@
- dom_r_p = (struct domain_rcpts*) MALLOC(sizeof(struct domain_rcpts));
- if (dom_r_p == NULL)
- {
-- log(LOG_NOTICE, "out of memory (domain_rcpts)");
-+ mylog(LOG_NOTICE, "out of memory (domain_rcpts)");
- fclose(fp);
- return -1;
- }
-@@ -345,7 +350,7 @@
- dom_r_p->name = newstr(strp);
- if(dom_r_p->name == NULL)
- {
-- log(LOG_NOTICE, "out of memory (dom_r_p->name)");
-+ mylog(LOG_NOTICE, "out of memory (dom_r_p->name)");
- fclose(fp);
- return -1;
- }
-@@ -356,7 +361,7 @@
- fclose(fp);
- cnf.rcpts_trans = hash_domain_rcpts_lookup(DEFAULTRCPTS);
- if (cnf.debug & DEBUG_TRANS)
-- log(LOG_DEBUG, "set cnf.rcpts_trans = %d", cnf.rcpts_trans);
-+ mylog(LOG_DEBUG, "set cnf.rcpts_trans = %d", cnf.rcpts_trans);
- return 0;
- }
-
-@@ -381,7 +386,7 @@
- if (strcasecmp(hostp->name, name) == 0)
- {
- if (cnf.debug & DEBUG_HASH)
-- log(LOG_DEBUG, "host %s found in hash table", name);
-+ mylog(LOG_DEBUG, "host %s found in hash table", name);
- return hostp;
- }
- hostp = hostp->hash;
-@@ -398,7 +403,7 @@
- int idx = hash_func(name);
-
- if (cnf.debug & DEBUG_HASH)
-- log(LOG_DEBUG, "enter host %s into hash table", name);
-+ mylog(LOG_DEBUG, "enter host %s into hash table", name);
-
- newhostp->hash = hash_host[idx];
- hash_host[idx] = newhostp;
-@@ -426,7 +431,7 @@
- if (strcasecmp(mapp->name, name) == 0)
- {
- if (cnf.debug & DEBUG_HASH)
-- log(LOG_DEBUG, "map %s found in hash table", name);
-+ mylog(LOG_DEBUG, "map %s found in hash table", name);
- return mapp;
- }
- mapp = mapp->hash;
-@@ -434,7 +439,7 @@
- return NULL;
- }
-
--void
-+static void
- hash_map_enter(name, newmapp)
- char *name;
- struct host_map *newmapp;
-@@ -442,7 +447,7 @@
- int idx = hash_func(name);
-
- if (cnf.debug & DEBUG_HASH)
-- log(LOG_DEBUG, "enter map %s into hash table", name);
-+ mylog(LOG_DEBUG, "enter map %s into hash table", name);
-
- newmapp->hash = hash_map[idx];
- hash_map[idx] = newmapp;
-@@ -462,7 +467,7 @@
- fp = fopen(cnf.map, "r");
- if (fp == NULL)
- {
-- log(LOG_NOTICE, "map %s not found", cnf.map);
-+ mylog(LOG_NOTICE, "map %s not found", cnf.map);
- return -1; /* should be TEMPFAIL */
- }
- while (fgets(buf, sizeof(buf), fp) != NULL)
-@@ -580,7 +585,7 @@
- }
- argp++;
- }
-- log(LOG_DEBUG, "reading map: domain = %s, map = %s",
-+ mylog(LOG_DEBUG, "reading map: domain = %s, map = %s",
- mapp->name, tmpbuf);
- }
- }
-@@ -604,7 +609,7 @@
- while (p != NULL)
- {
- if (cnf.debug & DEBUG_MAP)
-- log(LOG_DEBUG, "searching host map for %s: %s", domain, p);
-+ mylog(LOG_DEBUG, "searching host map for %s: %s", domain, p);
-
- if ((mapp = hash_map_lookup(p, NULL)) != NULL)
- {
diff --git a/mail/solid-pop3d/DESCR b/mail/solid-pop3d/DESCR
deleted file mode 100644
index 534de28dd95..00000000000
--- a/mail/solid-pop3d/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-The Solid POP3 Server is an implementation of a Post Office Protocol
-version 3 server that has flexibility as its main goal. The server is
-easily configurable and has support for few features such as APOP
-authentication scheme, virtual hosting, maildir and mailbox handling,
-bulletins and expiration of messages. Each user can specify position and
-type of his maildrop.
diff --git a/mail/solid-pop3d/MESSAGE b/mail/solid-pop3d/MESSAGE
deleted file mode 100644
index 33874fe214f..00000000000
--- a/mail/solid-pop3d/MESSAGE
+++ /dev/null
@@ -1,16 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2002/05/12 16:54:45 hubertf Exp $
-
-The config file for ${PKGNAME} must be located at ${PKG_SYSCONFDIR}
-Example files are located at ${EGDIR}
-
-To use ${PKGNAME} you must add 'spop3d' user:
-
- spop3d:*:68:32766::0:0:spop3d:/sbin/nonexistent:/sbin/nologin
-
-To run ${PKGNAME} from inetd, make sure you didn't enable standalone
-option and add the following line to /etc/inetd.conf:
-
- pop3 stream tcp nowait root ${PREFIX}/sbin/spop3d spop3d
-
-===========================================================================
diff --git a/mail/solid-pop3d/Makefile b/mail/solid-pop3d/Makefile
deleted file mode 100644
index f241d043369..00000000000
--- a/mail/solid-pop3d/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2006/03/04 21:30:02 jlam Exp $
-
-DISTNAME= solid-pop3d-0.15
-CATEGORIES= mail
-MASTER_SITES= http://solidpop3d.pld.org.pl/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://solidpop3d.pld.org.pl/
-COMMENT= Flexible POP3 server
-
-EGDIR= ${PREFIX}/share/examples/spop3d
-MESSAGE_SUBST+= EGDIR=${EGDIR}
-
-PLIST_SRC=
-EXAMPLES=
-
-GNU_CONFIGURE= yes
-
-CONFIGURE_ARGS+= --enable-logextend \
- --enable-statistics
-
-BUILD_DEFS+= USE_INET6
-
-.if defined(SPOP3D_ENABLE_APOP)
-CONFIGURE_ARGS+= --enable-apop
-PLIST_SRC+= ${.CURDIR}/PLIST.apop
-.endif
-
-.if defined(SPOP3D_ENABLE_STANDALONE)
-CONFIGURE_ARGS+= --enable-standalone
-CONFIGURE_ARGS+= --enable-connect
-.endif
-
-.if defined(SPOP3D_ENABLE_ALIASES)
-CONFIGURE_ARGS+= --enable-mapping
-CONFIGURE_ARGS+= --enable-nonip
-.endif
-
-.if defined(USE_INET6)
-CONFIGURE_ARGS+= --enable-ipv6
-.endif
-
-EXAMPLES+= config.example
-
-PLIST_SRC+= ${.CURDIR}/PLIST
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- cd ${WRKSRC}/doc; for i in ${EXAMPLES}; do \
- ${INSTALL_DATA} $${i} ${EGDIR}/$${i}; \
- done
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/solid-pop3d
-.for i in AUTHORS CONFIGFILE COPYING ChangeLog INSTALL README THANKS VIRTUALS
- ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/solid-pop3d
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/solid-pop3d/PLIST b/mail/solid-pop3d/PLIST
deleted file mode 100644
index ccdccce19f5..00000000000
--- a/mail/solid-pop3d/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/12 16:54:45 hubertf Exp $
-man/man5/spop3d.conf.5
-man/man5/dot-spop3d.5
-man/man8/spop3d.8
-sbin/spop3d
-share/examples/spop3d/config.example
-share/doc/solid-pop3d/AUTHORS
-share/doc/solid-pop3d/CONFIGFILE
-share/doc/solid-pop3d/COPYING
-share/doc/solid-pop3d/ChangeLog
-share/doc/solid-pop3d/INSTALL
-share/doc/solid-pop3d/README
-share/doc/solid-pop3d/THANKS
-share/doc/solid-pop3d/VIRTUALS
-@dirrm share/examples/spop3d
-@dirrm share/doc/solid-pop3d
diff --git a/mail/solid-pop3d/PLIST.apop b/mail/solid-pop3d/PLIST.apop
deleted file mode 100644
index 873da03dc2b..00000000000
--- a/mail/solid-pop3d/PLIST.apop
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.apop,v 1.1.1.1 2002/05/12 16:54:45 hubertf Exp $
-man/man1/pop_auth.1
diff --git a/mail/solid-pop3d/distinfo b/mail/solid-pop3d/distinfo
deleted file mode 100644
index 22ea68246d1..00000000000
--- a/mail/solid-pop3d/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:29 agc Exp $
-
-SHA1 (solid-pop3d-0.15.tar.gz) = 77534072dc352700acf23d29c781659833e53a04
-RMD160 (solid-pop3d-0.15.tar.gz) = c01c120bb835c0e7b139ff091e3f80aecada1b05
-Size (solid-pop3d-0.15.tar.gz) = 102927 bytes
-SHA1 (patch-aa) = ce2a1959bfd917f99281c6b0f3e5ed9fd47511d8
diff --git a/mail/solid-pop3d/patches/patch-aa b/mail/solid-pop3d/patches/patch-aa
deleted file mode 100644
index b37a16dfce3..00000000000
--- a/mail/solid-pop3d/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/12 16:54:45 hubertf Exp $
-
---- configure Mon May 6 01:06:20 2002
-+++ configure Mon May 6 01:06:28 2002
-@@ -82,7 +82,7 @@
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
- infodir='${prefix}/share/info'
--mandir='${prefix}/share/man'
-+mandir='${prefix}/man'
-
- # Initialize some other variables.
- subdirs=
diff --git a/mail/spamass-milter/DESCR b/mail/spamass-milter/DESCR
deleted file mode 100644
index 55e32b26faf..00000000000
--- a/mail/spamass-milter/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-A little plugin for the Sendmail Milter (Mail Filter) library that pipes
-all incoming mail (including things received by rmail/UUCP) through the
-SpamAssassin, a highly customizable SpamFilter.
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
deleted file mode 100644
index 09022bc5170..00000000000
--- a/mail/spamass-milter/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2006/10/12 12:19:09 obache Exp $
-#
-
-DISTNAME= spamass-milter-0.3.1
-CATEGORIES= mail
-MASTER_SITES= http://savannah.nongnu.org/download/spamass-milt/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://savannah.nongnu.org/projects/spamass-milt/
-COMMENT= Milter interface to Spamassassin
-
-DEPENDS+= spamassassin>=2.44:../../mail/spamassassin
-
-GNU_CONFIGURE= YES
-USE_LANGUAGES= c c++
-
-RCD_SCRIPTS= spamass-milter
-
-.include "../../mail/libmilter/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/spamass-milter/PLIST b/mail/spamass-milter/PLIST
deleted file mode 100644
index e7f77471f04..00000000000
--- a/mail/spamass-milter/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2005/05/02 20:34:01 reed Exp $
-man/man1/spamass-milter.1
-sbin/spamass-milter
-share/examples/rc.d/spamass-milter
diff --git a/mail/spamass-milter/distinfo b/mail/spamass-milter/distinfo
deleted file mode 100644
index 0243666fb66..00000000000
--- a/mail/spamass-milter/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.6 2006/10/12 12:19:09 obache Exp $
-
-SHA1 (spamass-milter-0.3.1.tar.gz) = dd488eb9ab1f230440fba8a729bee80550f2fbff
-RMD160 (spamass-milter-0.3.1.tar.gz) = 5db6af6b31de1bf83eafbd9713d81cdc957b5033
-Size (spamass-milter-0.3.1.tar.gz) = 141144 bytes
-SHA1 (patch-aa) = a1eaf9d3d2dad72f7fa08628293f80cc15374800
diff --git a/mail/spamass-milter/files/spamass-milter.sh b/mail/spamass-milter/files/spamass-milter.sh
deleted file mode 100644
index 69fb06e0a9b..00000000000
--- a/mail/spamass-milter/files/spamass-milter.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: spamass-milter.sh,v 1.4 2005/08/24 16:08:13 tv Exp $
-#
-
-# PROVIDE: spamass-milter
-# REQUIRE: spamd
-# KEYWORD: shutdown
-# BEFORE: mail
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="spamass_milter"
-rcvar=${name}
-command="@PREFIX@/sbin/spamass-milter"
-command_args="-u nobody -p /var/run/spamass.sock -f"
-
-if [ -f /etc/rc.subr ]; then
- load_rc_config $name
-
- # hack: put ${spamass_milter_flags} last in args,
- # so that "-- ..." spamc flags can be added to the end
- #
- command_args="${command_args} ${spamass_milter_flags}"
- spamass_milter_flags=
-
- run_rc_command "$1"
-else
- @ECHO@ -n " ${name}"
- ${command} ${command_args} ${spamass_milter_flags}
-fi
diff --git a/mail/spamass-milter/patches/patch-aa b/mail/spamass-milter/patches/patch-aa
deleted file mode 100644
index 9aaf029f303..00000000000
--- a/mail/spamass-milter/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/10/12 12:19:09 obache Exp $
-
---- spamass-milter.cpp.orig 2006-03-23 21:41:36.000000000 +0000
-+++ spamass-milter.cpp
-@@ -2033,7 +2033,7 @@ cmp_nocase_partial(const string& s, cons
- string::const_iterator p=s.begin();
- string::const_iterator p2=s2.begin();
-
-- while ( p != s.end() && p2 <= s2.end() ) {
-+ while ( p != s.end() ) {
- if (toupper(*p) != toupper(*p2))
- {
- debug(D_STR, "c_nc_p: <%s><%s> : miss", s.c_str(), s2.c_str());
diff --git a/mail/spamassassin/DESCR b/mail/spamassassin/DESCR
deleted file mode 100644
index a4e468c546f..00000000000
--- a/mail/spamassassin/DESCR
+++ /dev/null
@@ -1,24 +0,0 @@
-SpamAssassin is a mail filter to identify spam. It will examine
-each message presented to it, and assign a score indicating the
-likelihood that the mail is spam.
-
-It applies a wide range of heuristic tests on mail headers and body text
-to identify "spam", also known as unsolicited commercial email. The mail
-can then be optionally tagged as spam for later filtering.
-
-The spam-identification tactics used include header analysis, text analysis,
-a Bayesian-style form of probability-analysis classification and DNS
-blacklists. It also includes plugins to support reporting spam messages to
-collaborative filtering databases such as Pyzor, DCC, and Vipul's Razor.
-
-The distribution provides a command line tool to perform filtering, along
-with a set of perl modules which allows SpamAssassin to be used in a
-variety of different spam-blocking scenarios.
-
-In addition, "spamd", a daemonized version of SpamAssassin which runs
-persistently, is available. Using its counterpart, "spamc", a lightweight
-client written in C, an MTA can process large volumes of mail through
-SpamAssassin without having to fork/exec a perl interpreter for each message.
-
-SpamAssassin does not deliver mail to the users mailbox. You need a
-different program (procmail is recommended) for local mail delivery.
diff --git a/mail/spamassassin/MESSAGE b/mail/spamassassin/MESSAGE
deleted file mode 100644
index 487a16d72ae..00000000000
--- a/mail/spamassassin/MESSAGE
+++ /dev/null
@@ -1,15 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.10 2005/11/13 22:48:32 heinz Exp $
-
-If you upgrade from an earlier version *PLEASE* take a look at the file
-UPGRADE in
-
- ${PREFIX}/share/doc/spamassassin/
-
-Some configuration options were changed and some features are now provided
-by plugins (they may not be enabled after installation).
-
-For more information see 'perldoc Mail::SpamAssassin::Conf' and the man
-pages for 'spamassassin', 'spamd'/'spamc', 'sa-learn' and 'sa-update'.
-Please check that your existing mail configuration still works.
-===========================================================================
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
deleted file mode 100644
index 09b99276ea1..00000000000
--- a/mail/spamassassin/Makefile
+++ /dev/null
@@ -1,204 +0,0 @@
-# $NetBSD: Makefile,v 1.79 2007/02/15 21:43:43 heinz Exp $
-
-DISTNAME= Mail-SpamAssassin-3.1.8
-PKGNAME= spamassassin-3.1.8
-SVR4_PKGNAME= sa
-CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/}
-
-MAINTAINER= heinz@NetBSD.org
-HOMEPAGE= http://spamassassin.apache.org/
-COMMENT= Mail filter to identify spam
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
-
-.include "../../mk/bsd.prefs.mk"
-
-DEPENDS+= p5-Net-DNS>=0.34:../../net/p5-Net-DNS
-DEPENDS+= p5-HTML-Parser>=3.31:../../www/p5-HTML-Parser
-DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
-DEPENDS+= {p5-MIME-Base64>=2.11,perl>=5.8.0}:../../converters/p5-MIME-Base64
-DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
-DEPENDS+= p5-Archive-Tar>=1.23:../../archivers/p5-Archive-Tar
-DEPENDS+= p5-IO-Zlib>=1.04:../../devel/p5-IO-Zlib
-
-USE_TOOLS+= perl
-
-.if (${OPSYS} != "NetBSD") && (${OPSYS} != "DragonFly")
-DEPENDS+= p5-DB_File-[0-9]*:../../databases/p5-DB_File
-.endif
-
-CONFLICTS= p5-Mail-SpamAssassin-[1-9]*
-
-WRKSRC= ${WRKDIR}/${DISTNAME}
-
-PKG_SYSCONFSUBDIR= spamassassin
-
-# Set contact address (e-mail, URL, ...) for use in spam report messages
-# See "perldoc Mail::SpamAssassin::Conf" for option "report_contact"
-SPAMASSASSIN_CONTACT_ADDRESS?= postmaster
-
-.include "options.mk"
-
-BUILD_DEFS+= SPAMASSASSIN_CONTACT_ADDRESS
-
-PLIST_ADD= ${WRKSRC}/.PLIST_ADD
-PLIST_SRC= ${PKGDIR}/PLIST ${PLIST_ADD}
-PERL5_PACKLIST= auto/Mail/SpamAssassin/.packlist
-
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_DIRS= ${WRKSRC}/spamc
-BUILD_DIRS= ${WRKSRC}
-PERL5_CONFIGURE= NO # we need the default "do-configure" target
-PERL5_CONFIGURE_DIRS= ${WRKSRC}
-
-# test t/meta needs this
-REPLACE_PERL+= masses/parse-rules-for-masses
-
-MAKE_PARAMS+= CONTACT_ADDRESS=${SPAMASSASSIN_CONTACT_ADDRESS:Q}
-MAKE_PARAMS+= DEFRULESDIR="${RULESDIR}"
-MAKE_PARAMS+= LOCALRULESDIR="${PKG_SYSCONFDIR}"
-MAKE_PARAMS+= LOCALSTATEDIR="${VARBASE}/spamassassin"
-MAKE_PARAMS+= PERL_BIN="${PERL5}"
-MAKE_PARAMS+= SYSCONFDIR="${PKG_SYSCONFDIR}"
-
-RCD_SCRIPTS= spamd
-RCD_SCRIPT_SRC.spamd= ${WRKSRC}/spamd/netbsd-rc-script.sh
-
-EG_SUBDIR= share/examples/spamassassin
-EGDIR= ${PREFIX}/${EG_SUBDIR}
-DOC_SUBDIR= share/doc/spamassassin
-DOCDIR= ${PREFIX}/${DOC_SUBDIR}
-RULE_SUBDIR= share/spamassassin
-RULESDIR= ${PREFIX}/${RULE_SUBDIR}
-
-PRE_FILES= init.pre v310.pre v312.pre
-.for p in ${PRE_FILES}
-CONF_FILES+= ${EGDIR}/${p} ${PKG_SYSCONFDIR}/${p}
-.endfor
-CONF_FILES+= ${EGDIR}/local.cf ${PKG_SYSCONFDIR}/local.cf \
- ${RULESDIR}/user_prefs.template \
- ${PKG_SYSCONFDIR}/user_prefs.template
-
-INSTALLATION_DIRS+= ${EG_SUBDIR} ${DOC_SUBDIR} ${DOC_SUBDIR}/spamc\
- ${DOC_SUBDIR}/spamd ${RULE_SUBDIR}
-
-OWN_DIRS+= ${VARBASE}/spamassassin
-OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/sa-update-keys ${SHAREOWN} ${SHAREGRP} 0700
-
-SUBST_CLASSES+= sa2
-SUBST_STAGE.sa2= pre-configure
-SUBST_FILES.sa2= README spamd/spamd.raw
-SUBST_SED.sa2= -e s!@@PREFIX@@!${PREFIX}!g
-SUBST_SED.sa2+= -e s!@PKG_SYSCONFDIR@!${PKG_SYSCONFDIR}!g
-
-SUBST_CLASSES+= sa3
-SUBST_STAGE.sa3= pre-configure
-SUBST_FILES.sa3= INSTALL UPGRADE USAGE ldap/README \
- spamc/README.qmail \
- lib/Mail/SpamAssassin/Conf.pm \
- lib/Mail/SpamAssassin/Plugin/Test.pm \
- spamd/README spamd/README.vpopmail sql/README \
- sql/README.awl sa-update.raw
-SUBST_SED.sa3= -e s!/usr/share!${PREFIX}/share!g
-SUBST_SED.sa3+= -e s!/usr/bin!${PREFIX}/bin!g
-SUBST_SED.sa3+= -e s!/usr/local/bin!${PREFIX}/bin!g
-SUBST_SED.sa3+= -e s!/usr/lib!${PREFIX}/lib!g
-SUBST_SED.sa3+= -e s!/etc/mail/spamassassin!${PKG_SYSCONFDIR}!g
-
-.if (${OPSYS} == "NetBSD") || (${OPSYS} == "DragonFly")
-# the 'spamd' RCD_SCRIPT behaves differently if we run NetBSD 1.6 or later
-. if (${OPSYS} == "NetBSD") && !empty(OS_VERSION:M1.[0-5]*)
-INTERPRETER_SUPPORT= NO
-. else
-INTERPRETER_SUPPORT= YES
-. endif
-.endif
-
-# These variables are substituted in netbsd-rc-script.sh.
-FILES_SUBST+= INTERPRETER_SUPPORT=${INTERPRETER_SUPPORT:Q}
-FILES_SUBST+= OPSYS=${OPSYS:Q}
-
-post-extract:
- @# correct bad SA permissions
- @${CHMOD} a+x ${WRKSRC}/tools/convert_awl_dbm_to_sql
-
-pre-configure: perl5-configure
- @# GNU configure needs version.h -> create it
- @cd ${WRKSRC}/spamc && ${PERL5} ./version.h.pl
- @# values will be set via the SUBST framework in options.mk
- @${CP} ${WRKSRC}/t/config.dist ${WRKSRC}/t/config
-
-post-install:
- @${TEST} -r ${PLIST_ADD} && ${RM} ${PLIST_ADD} ; :
-.for f in INSTALL LICENSE README TRADEMARK UPGRADE USAGE \
- CREDITS PACKAGING STATUS BUGS Changes \
- spamc/README.qmail \
- sample-nonspam.txt sample-spam.txt spamd/README \
- spamd/README.vpopmail
- @${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f}
- @${ECHO} "${DOC_SUBDIR}/${f}" >> ${PLIST_ADD}
-.endfor
-.for f in STATISTICS-set0.txt STATISTICS-set1.txt STATISTICS-set2.txt \
- STATISTICS-set3.txt
- @${INSTALL_DATA} ${WRKSRC}/rules/${f} ${DESTDIR}${DOCDIR}
- @${ECHO} "${DOC_SUBDIR}/${f}" >> ${PLIST_ADD}
-.endfor
-.for dir in masses sql ldap tools
- @cd ${WRKSRC}; \
- for d in `${FIND} ${dir} -type d -print`; do \
- ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/$$d; \
- done; \
- for f in `${FIND} ${dir} -type f -print`; do \
- if ${TEST} -x $$f ; then \
- ${SED} -e "1s,#!.*/bin/perl,#!${PERL5}," < $$f \
- > $${f}.fixed && \
- ${MV} $${f}.fixed $$f && \
- ${CHMOD} +x $$f && \
- ${INSTALL_SCRIPT} $$f ${DESTDIR}${DOCDIR}/$$f; \
- else \
- ${INSTALL_DATA} $$f ${DESTDIR}${DOCDIR}/$$f; \
- fi; \
- ${ECHO} "${DOC_SUBDIR}/$$f" >> ${PLIST_ADD}; \
- done; \
- { for d in `${FIND} ${dir} -type d -print`; do \
- ${ECHO} "@dirrm ${DOC_SUBDIR}/$$d"; \
- done; } | ${SORT} -r >> ${PLIST_ADD};
-.endfor
- @cd ${WRKSRC}/rules; \
- for f in [0-9]*.cf; do \
- ${ECHO} "${RULE_SUBDIR}/$$f" >> ${PLIST_ADD}; \
- done; \
- for f in ${PRE_FILES}; do \
- ${INSTALL_DATA} $$f ${DESTDIR}${EGDIR} && \
- ${ECHO} ${EG_SUBDIR}/$$f >> ${PLIST_ADD}; \
- done
- @# examples are in the static PLIST
- @${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${DESTDIR}${EGDIR}
- @${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${DESTDIR}${EGDIR}
- @${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${DESTDIR}${EGDIR}
- @${CHOWN} ${SHAREOWN} ${DESTDIR}${RULESDIR}/*
- @${CHGRP} ${SHAREGRP} ${DESTDIR}${RULESDIR}/*
- @${CHMOD} a=r ${DESTDIR}${RULESDIR}/*
- @{ for d in ${INSTALLATION_DIRS}; do \
- ${ECHO} "@dirrm $$d"; \
- done; } | ${SORT} -r >> ${PLIST_ADD};
-
-# make sure we install the patched version of init.pre but can run the
-# tests with the original file
-pre-patch:
- @${CP} ${WRKSRC}/rules/init.pre ${WRKDIR}/init.pre.notpatched
-
-post-patch:
- @${CP} ${WRKSRC}/rules/init.pre ${WRKDIR}/init.pre.patched
-
-pre-test:
- @${CP} ${WRKDIR}/init.pre.notpatched ${WRKSRC}/rules/init.pre
-
-post-test:
- @${CP} ${WRKDIR}/init.pre.patched ${WRKSRC}/rules/init.pre
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/spamassassin/PLIST b/mail/spamassassin/PLIST
deleted file mode 100644
index 80848de4fec..00000000000
--- a/mail/spamassassin/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.19 2006/05/26 20:53:00 heinz Exp $
-@comment Most of this PLIST is auto-generated; see Makefile.
-share/examples/rc.d/spamd
-share/examples/spamassassin/local.cf
-share/examples/spamassassin/netbsd_lists.cf
-share/examples/spamassassin/procmailrc.example
-share/spamassassin/languages
-share/spamassassin/sa-update-pubkey.txt
-share/spamassassin/triplets.txt
-share/spamassassin/user_prefs.template
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
deleted file mode 100644
index ca2a45bad97..00000000000
--- a/mail/spamassassin/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.43 2007/02/15 21:43:43 heinz Exp $
-
-SHA1 (Mail-SpamAssassin-3.1.8.tar.gz) = 08f81f72d8a783887cf815dfc55ea38e3582b966
-RMD160 (Mail-SpamAssassin-3.1.8.tar.gz) = 9e1af7219e3d6c1297181748b85853b812d2cdc4
-Size (Mail-SpamAssassin-3.1.8.tar.gz) = 1173847 bytes
-SHA1 (patch-ab) = df95d87a2f2e7af238c27c3d5468d9aad7eb000d
-SHA1 (patch-ae) = 1461b24978c75c394c607ae1d49cb49dd086b563
-SHA1 (patch-aq) = 495a3ac94a05129520e5d7018fdd56b6dad3c951
-SHA1 (patch-ay) = 7d805e7ef86e279a19e7d3d2f03e2227624317f8
diff --git a/mail/spamassassin/files/netbsd_lists.cf b/mail/spamassassin/files/netbsd_lists.cf
deleted file mode 100644
index 150e2256cfd..00000000000
--- a/mail/spamassassin/files/netbsd_lists.cf
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: netbsd_lists.cf,v 1.3 2005/11/13 22:48:32 heinz Exp $
-
-#
-# Rules to minimize false positives of NetBSD related emails
-#
-# This file is not meant to be modified by the user/admin.
-# If you want to add rules for a site, please use local.cf.
-#
-# Any rules which might be appropriate for this file can be contributed
-# with send-pr(1), category 'pkg'.
-#
-
-#
-# compensate for problem reports with confusing content for SpamAssassin
-#
-
-header __PR_SUBJECT Subject =~ /\b(?:bin|install|kern|lib|misc|pkg|port-[a-z][a-z0-9]{1,15}|pr|security|standards|toolchain|xsrc|y2k)\/\d{4,6}\b/i
-header __NETBSD_RCVD Received =~ /\bby\s+(?:mail|narn)\.netbsd\.org\b/i
-
-# PR to netbsd-bugs@NetBSD.org
-#
-header __NETBSD_BUGS_SENDER Sender =~ /\bnetbsd-bugs-owner\@netbsd\.org\b/i
-header __NETBSD_BUGS_DELIVERED Delivered-To =~ /\bnetbsd-bugs\@netbsd\.org\b/i
-
-meta NETBSD_PR (__PR_SUBJECT && __NETBSD_RCVD && __NETBSD_BUGS_SENDER && __NETBSD_BUGS_DELIVERED)
-describe NETBSD_PR Problem report or comment on the netbsd-bugs list
-score NETBSD_PR -2.5
-
-# PR to pkgsrc-bugs@NetBSD.org
-#
-header __PKGSRC_BUGS_SENDER Sender =~ /\bpkgsrc-bugs-owner\@netbsd\.org\b/i
-header __PKGSRC_BUGS_DELIVERED Delivered-To =~ /\bpkgsrc-bugs\@netbsd\.org\b/i
-
-meta PKGSRC_PR (__PR_SUBJECT && __NETBSD_RCVD && __PKGSRC_BUGS_SENDER && __PKGSRC_BUGS_DELIVERED)
-describe PKGSRC_PR Problem report or comment on the pkgsrc-bugs list
-score PKGSRC_PR -2.5
diff --git a/mail/spamassassin/options.mk b/mail/spamassassin/options.mk
deleted file mode 100644
index 0d204359497..00000000000
--- a/mail/spamassassin/options.mk
+++ /dev/null
@@ -1,109 +0,0 @@
-# $NetBSD: options.mk,v 1.6 2006/05/26 20:53:00 heinz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.spamassassin
-PKG_SUPPORTED_OPTIONS= \
- online-tests \
- spamassassin-perl-warnings \
- spamassassin-taint-checks \
- spamassassin-test-awl-sql \
- spamassassin-test-bayes-sql \
- spamassassin-test-prefork \
- ssl
-PKG_OPTIONS_LEGACY_OPTS+= \
- awl-sql-tests:spamassassin-test-awl-sql \
- bayes-sql-tests:spamassassin-test-bayes-sql \
- net-tests:online-tests \
- perl-taint-checks:spamassassin-taint-checks \
- perl-warnings:spamassassin-perl-warnings \
- spamassassin-test-net:online-tests
-
-#
-# Default options
-#
-PKG_SUGGESTED_OPTIONS= spamassassin-taint-checks \
- spamassassin-perl-warnings \
- ssl
-.include "../../mk/bsd.options.mk"
-
-#
-# change t/config according to all the options
-#
-SUBST_CLASSES+= satests
-SUBST_STAGE.satests= post-configure
-SUBST_FILES.satests= t/config
-SUBST_SED.satests= -e s!awl_sql_tests=n!awl_sql_tests=${AWL_SQL_TEST}!
-SUBST_SED.satests+= -e s!bayes_sql_tests=n!bayes_sql_tests=${BAYES_SQL_TEST}!
-SUBST_SED.satests+= -e s!run_net_tests=n!run_net_tests=${NET_TEST}!
-SUBST_SED.satests+= -e s!prefork_stress_test=n!prefork_stress_test=${PREFORK_TEST}!
-
-#
-# Enable tests of the SQL storage module for the automatic whitelist
-# (AWL). This option enables interactive questions about the database
-# configuration during 'configure' phase.
-#
-.if !empty(PKG_OPTIONS:Mspamassassin-test-awl-sql)
-AWL_SQL_TEST=y
-.else
-AWL_SQL_TEST=n
-.endif
-
-#
-# Enable tests of the SQL storage module for Bayes information.
-# This option enables interactive questions about the database
-# configuration during 'configure' phase.
-#
-.if !empty(PKG_OPTIONS:Mspamassassin-test-bayes-sql)
-BAYES_SQL_TEST=y
-.else
-BAYES_SQL_TEST=n
-.endif
-
-#
-# Enable Internet based tests during 'make test' (Razor, Pyzor, etc.)
-#
-.if !empty(PKG_OPTIONS:Monline-tests)
-NET_TEST=y
-.else
-NET_TEST=n
-.endif
-
-#
-# Enable Perl warnings in spamd and spamassassin
-#
-.if !empty(PKG_OPTIONS:Mspamassassin-perl-warnings)
-MAKE_PARAMS+= PERL_WARN=yes
-.else
-MAKE_PARAMS+= PERL_WARN=no
-.endif
-
-#
-# Enable Perl taint checks in spamd and spamassassin to improve security
-#
-.if !empty(PKG_OPTIONS:Mspamassassin-taint-checks)
-MAKE_PARAMS+= PERL_TAINT=yes
-.else
-MAKE_PARAMS+= PERL_TAINT=no
-.endif
-
-#
-# Enable spamd prefork stress test (will kill any processes containing the
-# string 'spam child' in their process title).
-#
-.if !empty(PKG_OPTIONS:Mspamassassin-test-prefork)
-PREFORK_TEST=y
-.else
-PREFORK_TEST=n
-.endif
-
-#
-# Build spamc and spamd with support for connections over SSL
-#
-.if !empty(PKG_OPTIONS:Mssl)
-. include "../../security/openssl/buildlink3.mk"
-DEPENDS+= p5-IO-Socket-SSL>=0.92:../../security/p5-IO-Socket-SSL
-CONFIGURE_ARGS+= --enable-ssl
-MAKE_PARAMS+= ENABLE_SSL=yes
-.else
-CONFIGURE_ARGS+= --disable-ssl
-MAKE_PARAMS+= ENABLE_SSL=no
-.endif
diff --git a/mail/spamassassin/patches/patch-ab b/mail/spamassassin/patches/patch-ab
deleted file mode 100644
index 676d8127052..00000000000
--- a/mail/spamassassin/patches/patch-ab
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ab,v 1.12 2006/05/26 20:53:00 heinz Exp $
-
---- Makefile.PL.orig 2006-05-24 22:07:30.000000000 +0200
-+++ Makefile.PL
-@@ -163,6 +163,7 @@ my %makefile = (
- 'spamassassin.raw' => 'spamassassin',
- 'sa-learn.raw' => 'sa-learn',
- 'sa-update.raw' => 'sa-update',
-+ 'spamc/qmail-spamc.c' => 'spamc/qmail-spamc$(EXE_EXT)',
- 'spamc/spamc.c' => 'spamc/spamc$(EXE_EXT)',
- 'spamd/spamd.raw' => 'spamd/spamd',
- },
-@@ -1146,16 +1147,18 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
-
- conf__install:
- -$(MKPATH) $(B_CONFDIR)
-- $(PERL) -MFile::Copy -e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf}"
-- $(PERL) -MFile::Copy -e "copy(q{rules/init.pre}, q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre}"
-- $(PERL) -MFile::Copy -e "copy(q{rules/v310.pre}, q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}"
-- $(PERL) -MFile::Copy -e "copy(q{rules/v312.pre}, q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}"
-+ @ # manage local.cf and *.pre through pkgsrc .mk files
-+ @ # $(PERL) -MFile::Copy -e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf}"
-+ @ # $(PERL) -MFile::Copy -e "copy(q{rules/init.pre}, q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre}"
-+ @ # $(PERL) -MFile::Copy -e "copy(q{rules/v310.pre}, q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}"
-+ @ # $(PERL) -MFile::Copy -e "copy(q{rules/v312.pre}, q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}"
-
- data__install:
- -$(MKPATH) $(B_DATADIR)
- $(PERL) -e "map unlink, <$(B_DATADIR)/*>"
- $(PREPROCESS) $(FIXVARS) -m$(PERM_RW) -Irules -O$(B_DATADIR) $(DATAFILES)
-- $(CHMOD) $(PERM_RWX) $(B_DATADIR)
-+ @ # no change of directory created by pkgsrc
-+ @ # $(CHMOD) $(PERM_RWX) $(B_DATADIR)
-
- text_html_doc: made-doc-stamp
- $(NOOP)
diff --git a/mail/spamassassin/patches/patch-ae b/mail/spamassassin/patches/patch-ae
deleted file mode 100644
index 0be53ad864a..00000000000
--- a/mail/spamassassin/patches/patch-ae
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ae,v 1.11 2005/11/13 22:48:32 heinz Exp $
-
---- spamd/spamd.raw.orig Wed Sep 14 04:07:32 2005
-+++ spamd/spamd.raw
-@@ -2073,8 +2073,9 @@ sub backtrace_handler {
- }
-
- sub daemonize {
-- # Pretty command line in ps
-- $0 = join (' ', $ORIG_ARG0, @ORIG_ARGV) unless would_log("dbg");
-+ # no pretty 'ps' command line (easier for pkgsrc rc script)
-+ # # Pretty command line in ps
-+ # $0 = join (' ', $ORIG_ARG0, @ORIG_ARGV) unless would_log("dbg");
-
- # be a nice daemon and chdir to the root so we don't block any
- # unmount attempts
-@@ -2273,12 +2274,12 @@ Create user preferences files if they do
- =item B<-C> I<path>, B<--configpath>=I<path>
-
- Use the specified path for locating the distributed configuration files.
--Ignore the default directories (usually C</usr/share/spamassassin> or similar).
-+Ignore the default directories (usually C<@@DEF_RULES_DIR@@> or similar).
-
- =item B<--siteconfigpath>=I<path>
-
- Use the specified path for locating site-specific configuration files. Ignore
--the default directories (usually C</etc/mail/spamassassin> or similar).
-+the default directories (usually C<@@LOCAL_RULES_DIR@@> or similar).
-
- =item B<-d>, B<--daemonize>
-
diff --git a/mail/spamassassin/patches/patch-aq b/mail/spamassassin/patches/patch-aq
deleted file mode 100644
index c1a5d7761f5..00000000000
--- a/mail/spamassassin/patches/patch-aq
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-aq,v 1.6 2005/11/13 22:48:32 heinz Exp $
-
---- README.orig Wed Sep 14 04:07:32 2005
-+++ README
-@@ -99,18 +99,18 @@ Mail::SpamAssassin::Conf class (run the
- the standard defaults that people use. There is an explanation of all the
- default locations that SpamAssassin will look at the end.
-
-- - /usr/share/spamassassin/*.cf:
-+ - @@PREFIX@@/share/spamassassin/*.cf:
-
- Distributed configuration files, with all defaults. Do not modify
- these, as they are overwritten when you upgrade.
-
-- - /etc/mail/spamassassin/*.cf:
-+ - @PKG_SYSCONFDIR@/*.cf:
-
- Site config files, for system admins to create, modify, and
- add local rules and scores to. Modifications here will be
- appended to the config loaded from the above directory.
-
-- - /etc/mail/spamassassin/*.pre:
-+ - @PKG_SYSCONFDIR@/*.pre:
-
- Plugin control files, installed from the distribution. These are
- used to control what plugins are loaded. Modifications here will
-@@ -119,22 +119,22 @@ default locations that SpamAssassin will
-
- You want to modify these files if you want to load additional
- plugins, or inhibit loading a plugin that is enabled by default.
-- If the files exist in /etc/mail/spamassassin, they will not
-+ If the files exist in @PKG_SYSCONFDIR@, they will not
- be overwritten during future installs.
-
-- - /usr/share/spamassassin/user_prefs.template:
-+ - @@PREFIX@@/share/spamassassin/user_prefs.template:
-
- Distributed default user preferences. Do not modify this, as it is
- overwritten when you upgrade.
-
-- - /etc/mail/spamassassin/user_prefs.template:
-+ - @PKG_SYSCONFDIR@/user_prefs.template:
-
- Default user preferences, for system admins to create, modify, and
- set defaults for users' preferences files. Takes precedence over
- the above prefs file, if it exists.
-
- Do not put system-wide settings in here; put them in a file in the
-- "/etc/mail/spamassassin" directory ending in ".cf". This file is
-+ "@PKG_SYSCONFDIR@" directory ending in ".cf". This file is
- just a template, which will be copied to a user's home directory
- for them to change.
-
-@@ -187,6 +187,12 @@ These are:
- /usr/local /usr/local/share/spamassassin /etc/mail/spamassassin
- /opt/$DIR /opt/$DIR/share/spamassassin /etc/opt/mail/spamassassin
- $DIR $DIR/share/spamassassin $DIR/etc/mail/spamassassin
-+
-+(Pkgsrc note: the pkgsrc build process used the following path names
-+ __prefix__: @@PREFIX@@
-+ __def_rules_dir__: @@PREFIX@@/share/spamassassin
-+ __local_rules_dir__: @PKG_SYSCONFDIR@
-+)
-
- The files themselves are then looked for in these paths:
-
diff --git a/mail/spamassassin/patches/patch-ay b/mail/spamassassin/patches/patch-ay
deleted file mode 100644
index 362d5454417..00000000000
--- a/mail/spamassassin/patches/patch-ay
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2006/03/13 21:11:57 heinz Exp $
-
---- rules/init.pre.orig 2006-03-10 20:30:02.000000000 +0100
-+++ rules/init.pre
-@@ -25,5 +25,8 @@ loadplugin Mail::SpamAssassin::Plugin::H
-
- # SPF - perform SPF verification.
- #
--loadplugin Mail::SpamAssassin::Plugin::SPF
-+# By default SPF is _not_ a prerequisite for SpamAssassin so we disable it
-+# in pkgsrc to avoid confusing warnings in the log file.
-+# If you use SPF, just reenable it.
-+#loadplugin Mail::SpamAssassin::Plugin::SPF
-
diff --git a/mail/spamd/DESCR b/mail/spamd/DESCR
deleted file mode 100644
index 122d50b76bc..00000000000
--- a/mail/spamd/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-Tarpits like spamd are fake SMTP servers, which accept connections but don't
-deliver mail. Instead, they keep the connections open and reply very slowly.
-If the peer is patient enough to actually complete the SMTP dialogue (which
-will take ten minutes or more), the tarpit returns a 'temporary error' code
-(4xx), which indicates that the mail could not be delivered successfully and
-that the sender should keep the mail in his queue and retry again later.
-If the spammer does, the same procedure repeats. Until, after several attempts,
-wasting both his queue space and socket handles for several days, the spammer
-gives up. The resources the spamd server has to waste to do this are minimal.
-
-If the sender is badly configured, an uncooperative recipient might actually
-delay his entire queue handling for several minutes each time he connects to
-the tarpit. And many spammers use badly configured open relays.
diff --git a/mail/spamd/MESSAGE b/mail/spamd/MESSAGE
deleted file mode 100644
index 260eaedd0b3..00000000000
--- a/mail/spamd/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2005/06/28 12:43:57 peter Exp $
-
-Don't forget to add the spamd ports to /etc/services:
-
-spamd 8025/tcp # spamd(8)
-spamd-cfg 8026/tcp # spamd(8) configuration
-
-===========================================================================
diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile
deleted file mode 100644
index 374f1ed9348..00000000000
--- a/mail/spamd/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:44 wiz Exp $
-
-DISTNAME= spamd-20060330
-CATEGORIES= mail
-MASTER_SITES= http://nedbsd.nl/~ppostma/pf/
-
-MAINTAINER= peter@pointless.nl
-HOMEPAGE= http://www.benzedrine.cx/relaydb.html
-COMMENT= OpenBSD spam deferral daemon
-
-ONLY_FOR_PLATFORM= NetBSD-*-* OpenBSD-*-* FreeBSD-*-* DragonFly-*-*
-
-NO_CONFIGURE= yes
-
-SPAMD_HOME= ${VARBASE}/chroot/spamd
-OWN_DIRS= ${SPAMD_HOME}
-
-CPPFLAGS+= -DPATH_SPAMD_HOME=\"${SPAMD_HOME}\"
-CPPFLAGS+= -DPATH_SPAMD_DB=\"${VARBASE}/db/spamd\"
-CPPFLAGS+= -DPATH_PFCTL=\"${PFCTL}\"
-CPPFLAGS+= -DPATH_SPAMD_CONF=\"${SPAMD_CONF}\"
-
-PKG_GROUPS= _spamd
-PKG_USERS= _spamd:_spamd
-PKG_GECOS._spamd= Spam Daemon User
-PKG_HOME._spamd= ${SPAMD_HOME}
-
-RCD_SCRIPTS= pfspamd
-
-SPAMD_CONF= ${PKG_SYSCONFDIR}/spamd.conf
-CONF_FILES= ${PREFIX}/share/examples/spamd/spamd.conf ${SPAMD_CONF}
-
-SUBST_CLASSES+= fix
-SUBST_STAGE.fix= post-patch
-SUBST_FILES.fix= spamd/spamd.8
-SUBST_FILES.fix+= spamd-setup/spamd-setup.8
-SUBST_SED.fix= -e 's,/etc/spamd.conf,${SPAMD_CONF},g'
-SUBST_MESSAGE.fix= Fixing configuration paths.
-
-INSTALLATION_DIRS+= libexec sbin ${PKGMANDIR}/cat5 ${PKGMANDIR}/man5
-INSTALLATION_DIRS+= ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 share/examples/spamd
-
-do-install:
- ${INSTALL_MAN} ${WRKSRC}/man/spamd.conf.5 ${PREFIX}/${PKGMANDIR}/man5
- ${INSTALL_MAN} ${WRKSRC}/man/spamd.conf.cat5 ${PREFIX}/${PKGMANDIR}/cat5/spamd.conf.0
- ${INSTALL_MAN} ${WRKSRC}/spamd/spamd.8 ${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_MAN} ${WRKSRC}/spamd/spamd.cat8 ${PREFIX}/${PKGMANDIR}/cat8/spamd.0
- ${INSTALL_MAN} ${WRKSRC}/spamd-setup/spamd-setup.8 ${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_MAN} ${WRKSRC}/spamd-setup/spamd-setup.cat8 ${PREFIX}/${PKGMANDIR}/cat8/spamd-setup.0
- ${INSTALL_MAN} ${WRKSRC}/spamdb/spamdb.8 ${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_MAN} ${WRKSRC}/spamdb/spamdb.cat8 ${PREFIX}/${PKGMANDIR}/cat8/spamdb.0
- ${INSTALL_MAN} ${WRKSRC}/spamlogd/spamlogd.8 ${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_MAN} ${WRKSRC}/spamlogd/spamlogd.cat8 ${PREFIX}/${PKGMANDIR}/cat8/spamlogd.0
-
- ${INSTALL_PROGRAM} ${WRKSRC}/spamd-setup/spamd-setup ${PREFIX}/libexec
- ${INSTALL_PROGRAM} ${WRKSRC}/spamd/spamd ${PREFIX}/libexec
- ${INSTALL_PROGRAM} ${WRKSRC}/spamdb/spamdb ${PREFIX}/sbin
- ${INSTALL_PROGRAM} ${WRKSRC}/spamlogd/spamlogd ${PREFIX}/libexec
- ${INSTALL_DATA} ${WRKSRC}/etc/spamd.conf ${PREFIX}/share/examples/spamd
-
-.include "../../security/pflkm/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/spamd/PLIST b/mail/spamd/PLIST
deleted file mode 100644
index 94eeeaf97f4..00000000000
--- a/mail/spamd/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/07/02 11:34:28 peter Exp $
-libexec/spamd
-libexec/spamd-setup
-libexec/spamlogd
-man/cat5/spamd.conf.0
-man/cat8/spamd-setup.0
-man/cat8/spamd.0
-man/cat8/spamdb.0
-man/cat8/spamlogd.0
-man/man5/spamd.conf.5
-man/man8/spamd-setup.8
-man/man8/spamd.8
-man/man8/spamdb.8
-man/man8/spamlogd.8
-sbin/spamdb
-share/examples/rc.d/pfspamd
-share/examples/spamd/spamd.conf
-@dirrm share/examples/spamd
diff --git a/mail/spamd/distinfo b/mail/spamd/distinfo
deleted file mode 100644
index f5496a9d42a..00000000000
--- a/mail/spamd/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/04/01 12:14:27 peter Exp $
-
-SHA1 (spamd-20060330.tar.gz) = 152b8da2baac9eeedd9b69a9a7a2f8169ca55d9e
-RMD160 (spamd-20060330.tar.gz) = 94707f9714e7a67c778aad12032339eba452a490
-Size (spamd-20060330.tar.gz) = 34509 bytes
diff --git a/mail/spamd/files/pfspamd.sh b/mail/spamd/files/pfspamd.sh
deleted file mode 100644
index 6aa0c314373..00000000000
--- a/mail/spamd/files/pfspamd.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: pfspamd.sh,v 1.1.1.1 2005/06/28 12:43:57 peter Exp $
-#
-# PROVIDE: pfspamd
-# REQUIRE: DAEMON
-#
-
-. /etc/rc.subr
-
-name="pfspamd"
-rcvar=$name
-command="@PREFIX@/libexec/spamd"
-
-pfspamd_postcmd()
-{
- if [ -x @PREFIX@/libexec/spamd-setup ]; then
- @PREFIX@/libexec/spamd-setup
- fi
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/spamprobe/DESCR b/mail/spamprobe/DESCR
deleted file mode 100644
index db823d9ebb1..00000000000
--- a/mail/spamprobe/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-Spamprobe is a fast, intelligent, automatic spam detector using
-Bayesian analysis of terms contained in emails. Works with procmail,
-maildrop or a similar tool to produce a complete server or client side
-spam filtering system.
-
-Features:
- * Spam detection using Bayesian analysis of terms contained in each
- email.
- * Automatically learns from incoming mails as they are
- classified. Incorporates user's feedback to tailor classification to
- each user's personal tastes.
- * Analyzes image attachments to derive useful information from them.
- * Natively supports mbox, MBX, and Maildir mail box formats.
- * And many more..
diff --git a/mail/spamprobe/MESSAGE b/mail/spamprobe/MESSAGE
deleted file mode 100644
index 5080ffe2e55..00000000000
--- a/mail/spamprobe/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2004/03/11 14:13:51 lukem Exp $
-
-If you are going to use ${PKGNAME} in conjunction with procmail,
-ensure that you are running at least
- procmail-3.22nb1
-as there are bugs in earlier versions of procmail that prevent ${PKGNAME}
-from functioning correctly as a procmail filter.
-===========================================================================
diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile
deleted file mode 100644
index b58e256f430..00000000000
--- a/mail/spamprobe/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2006/08/04 20:12:31 ghen Exp $
-
-DISTNAME= spamprobe-1.4b
-PKGNAME= spamprobe-1.4.2
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=spamprobe/}
-
-MAINTAINER= oherrala@ee.oulu.fi
-HOMEPAGE= http://spamprobe.sourceforge.net/
-COMMENT= Spam detector using Bayesian analysis of word counts
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_LANGUAGES= c c++
-GNU_CONFIGURE= YES
-
-CONFIGURE_ARGS+= --enable-default-8bit
-
-.include "options.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/spamprobe/PLIST b/mail/spamprobe/PLIST
deleted file mode 100644
index 5c3d9d8def5..00000000000
--- a/mail/spamprobe/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/02/17 13:53:08 zuntum Exp $
-bin/spamprobe
-man/man1/spamprobe.1
diff --git a/mail/spamprobe/distinfo b/mail/spamprobe/distinfo
deleted file mode 100644
index 4d0e9c673be..00000000000
--- a/mail/spamprobe/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2006/08/13 10:13:42 wiz Exp $
-
-SHA1 (spamprobe-1.4b.tar.gz) = a20a6c4a3ab831dd39b392c755170140d91cc372
-RMD160 (spamprobe-1.4b.tar.gz) = e3d08b6ea4eb603f4341b9c683a2092db3ba3aa5
-Size (spamprobe-1.4b.tar.gz) = 255023 bytes
-SHA1 (patch-aa) = d3367dbd5cb309c6629d174574daf9e2899ce62a
diff --git a/mail/spamprobe/options.mk b/mail/spamprobe/options.mk
deleted file mode 100644
index d4ae2b4772e..00000000000
--- a/mail/spamprobe/options.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: options.mk,v 1.4 2007/02/22 19:26:44 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.spamprobe
-PKG_SUPPORTED_OPTIONS= bdb gif
-PKG_SUGGESTED_OPTIONS= gif
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mbdb)
-BDB_ACCEPTED= db4 # db3 db2 (not tested)
-.include "../../mk/bdb.buildlink3.mk"
-CONFIGURE_ARGS+= --with-db=${BDBBASE:Q}
-.endif
-
-.if !empty(PKG_OPTIONS:Mgif)
-.include "../../graphics/libungif/buildlink3.mk"
-.endif
diff --git a/mail/spamprobe/patches/patch-aa b/mail/spamprobe/patches/patch-aa
deleted file mode 100644
index 20b6b46cbc6..00000000000
--- a/mail/spamprobe/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/08/13 10:13:42 wiz Exp $
-
---- src/spamprobe/Command_import.cc.orig 2006-01-04 14:32:17.000000000 +0000
-+++ src/spamprobe/Command_import.cc
-@@ -28,6 +28,7 @@
- // http://www.cooldevtools.com/qpl.html
- //
-
-+#include <assert.h>
- #include <fstream>
- #include "LineReader.h"
- #include "IstreamCharReader.h"
diff --git a/mail/squirrelmail-decode/DESCR b/mail/squirrelmail-decode/DESCR
deleted file mode 100644
index 228bfb2af5f..00000000000
--- a/mail/squirrelmail-decode/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-SquirrelMail decoding functions are used to display and convert messages
-encoded in different character sets. Extra decoding library provides support
-of some complex Eastern character sets and some rarely used Apple character
-sets. Current release supports Big5, Windows-874 (cp874, Thai), Windows-949
-(UHC, Korean), EUC-CN, EUC-JP, EUC-KR, EUC-TW, GB18030, GB2312, ISO-2022-CN,
-ISO-2022-JP, ISO-2022-JP-2, ISO-2022-KR, Shift_JIS and various x-mac-*
-character sets.
diff --git a/mail/squirrelmail-decode/Makefile b/mail/squirrelmail-decode/Makefile
deleted file mode 100644
index dfde29f5e6f..00000000000
--- a/mail/squirrelmail-decode/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:56 joerg Exp $
-
-DISTNAME= squirrelmail-decode-1.0
-PKGREVISION= 2
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= martti@NetBSD.org
-HOMEPAGE= http://www.squirrelmail.org/
-COMMENT= Extra decoding library for SquirrelMail
-
-NO_BUILD= yes
-
-DEPENDS+= ${PHP_PKG_PREFIX}-iconv>=4.3.3:../../converters/php-iconv
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC:Q}/eastasia/*.php ${WRKSRC:Q}/x-mac/*.php \
- ${PREFIX:Q}/share/squirrelmail/functions/decode
-
-.include "../../lang/php/phpversion.mk"
-.include "../../mail/squirrelmail/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/squirrelmail-decode/PLIST b/mail/squirrelmail-decode/PLIST
deleted file mode 100644
index f60b6feee27..00000000000
--- a/mail/squirrelmail-decode/PLIST
+++ /dev/null
@@ -1,34 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/11/13 18:36:16 martti Exp $
-share/squirrelmail/functions/decode/big5.php
-share/squirrelmail/functions/decode/cp874.php
-share/squirrelmail/functions/decode/cp949.php
-share/squirrelmail/functions/decode/euc_cn.php
-share/squirrelmail/functions/decode/euc_jp.php
-share/squirrelmail/functions/decode/euc_kr.php
-share/squirrelmail/functions/decode/euc_tw.php
-share/squirrelmail/functions/decode/gb18030.php
-share/squirrelmail/functions/decode/gb2312.php
-share/squirrelmail/functions/decode/iso_2022_cn.php
-share/squirrelmail/functions/decode/iso_2022_jp.php
-share/squirrelmail/functions/decode/iso_2022_jp_2.php
-share/squirrelmail/functions/decode/iso_2022_kr.php
-share/squirrelmail/functions/decode/iso_2022_support.php
-share/squirrelmail/functions/decode/shift_jis.php
-share/squirrelmail/functions/decode/x_mac_arabic.php
-share/squirrelmail/functions/decode/x_mac_ce.php
-share/squirrelmail/functions/decode/x_mac_chinsimp.php
-share/squirrelmail/functions/decode/x_mac_chintrad.php
-share/squirrelmail/functions/decode/x_mac_croatian.php
-share/squirrelmail/functions/decode/x_mac_cyrillic.php
-share/squirrelmail/functions/decode/x_mac_devanagari.php
-share/squirrelmail/functions/decode/x_mac_farsi.php
-share/squirrelmail/functions/decode/x_mac_greek.php
-share/squirrelmail/functions/decode/x_mac_gujarati.php
-share/squirrelmail/functions/decode/x_mac_gurmukhi.php
-share/squirrelmail/functions/decode/x_mac_hebrew.php
-share/squirrelmail/functions/decode/x_mac_icelandic.php
-share/squirrelmail/functions/decode/x_mac_roman.php
-share/squirrelmail/functions/decode/x_mac_romanian.php
-share/squirrelmail/functions/decode/x_mac_thai.php
-share/squirrelmail/functions/decode/x_mac_turkish.php
-share/squirrelmail/functions/decode/x_mac_ukrainian.php
diff --git a/mail/squirrelmail-decode/distinfo b/mail/squirrelmail-decode/distinfo
deleted file mode 100644
index 52b05d8156f..00000000000
--- a/mail/squirrelmail-decode/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/11/13 18:36:16 martti Exp $
-
-SHA1 (squirrelmail-decode-1.0.tar.bz2) = 5a8942d9b058feaa756d3d04bb47719acc1201c6
-RMD160 (squirrelmail-decode-1.0.tar.bz2) = bdf91bc60c5708df441a0ce358a56dbedffb4235
-Size (squirrelmail-decode-1.0.tar.bz2) = 333265 bytes
diff --git a/mail/squirrelmail-locales/DESCR b/mail/squirrelmail-locales/DESCR
deleted file mode 100644
index 7c620545654..00000000000
--- a/mail/squirrelmail-locales/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Locale package (contains translations) for SquirrelMail.
diff --git a/mail/squirrelmail-locales/Makefile b/mail/squirrelmail-locales/Makefile
deleted file mode 100644
index bb485c35181..00000000000
--- a/mail/squirrelmail-locales/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2007/01/10 14:24:26 martti Exp $
-
-DISTNAME= all_locales-${VER}-20070106
-PKGNAME= squirrelmail-locales-${VER}
-#PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= martti@NetBSD.org
-HOMEPAGE= http://www.squirrelmail.org/
-COMMENT= Locale package for SquirrelMail
-
-VER= 1.4.9
-
-NO_CONFIGURE= yes
-USE_TOOLS+= tar
-INSTALLATION_DIRS= share/squirrelmail
-
-WRKSRC= ${WRKDIR}
-
-do-build:
- cd ${WRKDIR:Q}/help && rm -rf en_US
-
-do-install:
- cd ${WRKDIR:Q} && tar -cf - help images locale | \
- tar -xf - -C ${PREFIX:Q}/share/squirrelmail/
-
-.include "../../mail/squirrelmail/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/squirrelmail-locales/PLIST b/mail/squirrelmail-locales/PLIST
deleted file mode 100644
index 867c3dccfb1..00000000000
--- a/mail/squirrelmail-locales/PLIST
+++ /dev/null
@@ -1,973 +0,0 @@
-@comment $NetBSD: PLIST,v 1.12 2007/01/10 14:24:26 martti Exp $
-share/squirrelmail/help/bg_BG/FAQ.hlp
-share/squirrelmail/help/bg_BG/addresses.hlp
-share/squirrelmail/help/bg_BG/basic.hlp
-share/squirrelmail/help/bg_BG/compose.hlp
-share/squirrelmail/help/bg_BG/folders.hlp
-share/squirrelmail/help/bg_BG/main_folder.hlp
-share/squirrelmail/help/bg_BG/options.hlp
-share/squirrelmail/help/bg_BG/read_mail.hlp
-share/squirrelmail/help/bg_BG/search.hlp
-share/squirrelmail/help/ca_ES/FAQ.hlp
-share/squirrelmail/help/ca_ES/addresses.hlp
-share/squirrelmail/help/ca_ES/basic.hlp
-share/squirrelmail/help/ca_ES/compose.hlp
-share/squirrelmail/help/ca_ES/folders.hlp
-share/squirrelmail/help/ca_ES/main_folder.hlp
-share/squirrelmail/help/ca_ES/options.hlp
-share/squirrelmail/help/ca_ES/read_mail.hlp
-share/squirrelmail/help/ca_ES/search.hlp
-share/squirrelmail/help/cs_CZ/FAQ.hlp
-share/squirrelmail/help/cs_CZ/addresses.hlp
-share/squirrelmail/help/cs_CZ/basic.hlp
-share/squirrelmail/help/cs_CZ/compose.hlp
-share/squirrelmail/help/cs_CZ/folders.hlp
-share/squirrelmail/help/cs_CZ/main_folder.hlp
-share/squirrelmail/help/cs_CZ/options.hlp
-share/squirrelmail/help/cs_CZ/read_mail.hlp
-share/squirrelmail/help/cs_CZ/search.hlp
-share/squirrelmail/help/cy_GB/FAQ.hlp
-share/squirrelmail/help/cy_GB/addresses.hlp
-share/squirrelmail/help/cy_GB/basic.hlp
-share/squirrelmail/help/cy_GB/compose.hlp
-share/squirrelmail/help/cy_GB/folders.hlp
-share/squirrelmail/help/cy_GB/main_folder.hlp
-share/squirrelmail/help/cy_GB/options.hlp
-share/squirrelmail/help/cy_GB/read_mail.hlp
-share/squirrelmail/help/cy_GB/search.hlp
-share/squirrelmail/help/da_DK/FAQ.hlp
-share/squirrelmail/help/da_DK/addresses.hlp
-share/squirrelmail/help/da_DK/basic.hlp
-share/squirrelmail/help/da_DK/compose.hlp
-share/squirrelmail/help/da_DK/folders.hlp
-share/squirrelmail/help/da_DK/main_folder.hlp
-share/squirrelmail/help/da_DK/options.hlp
-share/squirrelmail/help/da_DK/read_mail.hlp
-share/squirrelmail/help/da_DK/search.hlp
-share/squirrelmail/help/de_DE/FAQ.hlp
-share/squirrelmail/help/de_DE/addresses.hlp
-share/squirrelmail/help/de_DE/basic.hlp
-share/squirrelmail/help/de_DE/compose.hlp
-share/squirrelmail/help/de_DE/folders.hlp
-share/squirrelmail/help/de_DE/main_folder.hlp
-share/squirrelmail/help/de_DE/options.hlp
-share/squirrelmail/help/de_DE/read_mail.hlp
-share/squirrelmail/help/de_DE/search.hlp
-share/squirrelmail/help/en_GB/FAQ.hlp
-share/squirrelmail/help/en_GB/addresses.hlp
-share/squirrelmail/help/en_GB/basic.hlp
-share/squirrelmail/help/en_GB/compose.hlp
-share/squirrelmail/help/en_GB/folders.hlp
-share/squirrelmail/help/en_GB/main_folder.hlp
-share/squirrelmail/help/en_GB/options.hlp
-share/squirrelmail/help/en_GB/read_mail.hlp
-share/squirrelmail/help/en_GB/search.hlp
-share/squirrelmail/help/es_ES/FAQ.hlp
-share/squirrelmail/help/es_ES/addresses.hlp
-share/squirrelmail/help/es_ES/basic.hlp
-share/squirrelmail/help/es_ES/compose.hlp
-share/squirrelmail/help/es_ES/folders.hlp
-share/squirrelmail/help/es_ES/main_folder.hlp
-share/squirrelmail/help/es_ES/options.hlp
-share/squirrelmail/help/es_ES/read_mail.hlp
-share/squirrelmail/help/es_ES/search.hlp
-share/squirrelmail/help/fi_FI/FAQ.hlp
-share/squirrelmail/help/fi_FI/addresses.hlp
-share/squirrelmail/help/fi_FI/basic.hlp
-share/squirrelmail/help/fi_FI/compose.hlp
-share/squirrelmail/help/fi_FI/folders.hlp
-share/squirrelmail/help/fi_FI/main_folder.hlp
-share/squirrelmail/help/fi_FI/options.hlp
-share/squirrelmail/help/fi_FI/read_mail.hlp
-share/squirrelmail/help/fi_FI/search.hlp
-share/squirrelmail/help/fr_FR/FAQ.hlp
-share/squirrelmail/help/fr_FR/addresses.hlp
-share/squirrelmail/help/fr_FR/basic.hlp
-share/squirrelmail/help/fr_FR/compose.hlp
-share/squirrelmail/help/fr_FR/folders.hlp
-share/squirrelmail/help/fr_FR/main_folder.hlp
-share/squirrelmail/help/fr_FR/options.hlp
-share/squirrelmail/help/fr_FR/read_mail.hlp
-share/squirrelmail/help/fr_FR/search.hlp
-share/squirrelmail/help/id_ID/FAQ.hlp
-share/squirrelmail/help/id_ID/addresses.hlp
-share/squirrelmail/help/id_ID/basic.hlp
-share/squirrelmail/help/id_ID/compose.hlp
-share/squirrelmail/help/id_ID/folders.hlp
-share/squirrelmail/help/id_ID/main_folder.hlp
-share/squirrelmail/help/id_ID/options.hlp
-share/squirrelmail/help/id_ID/read_mail.hlp
-share/squirrelmail/help/id_ID/search.hlp
-share/squirrelmail/help/it_IT/FAQ.hlp
-share/squirrelmail/help/it_IT/addresses.hlp
-share/squirrelmail/help/it_IT/basic.hlp
-share/squirrelmail/help/it_IT/compose.hlp
-share/squirrelmail/help/it_IT/folders.hlp
-share/squirrelmail/help/it_IT/main_folder.hlp
-share/squirrelmail/help/it_IT/options.hlp
-share/squirrelmail/help/it_IT/read_mail.hlp
-share/squirrelmail/help/it_IT/search.hlp
-share/squirrelmail/help/ja_JP/FAQ.hlp
-share/squirrelmail/help/ja_JP/addresses.hlp
-share/squirrelmail/help/ja_JP/basic.hlp
-share/squirrelmail/help/ja_JP/compose.hlp
-share/squirrelmail/help/ja_JP/folders.hlp
-share/squirrelmail/help/ja_JP/main_folder.hlp
-share/squirrelmail/help/ja_JP/options.hlp
-share/squirrelmail/help/ja_JP/read_mail.hlp
-share/squirrelmail/help/ja_JP/search.hlp
-share/squirrelmail/help/ko_KR/FAQ.hlp
-share/squirrelmail/help/ko_KR/addresses.hlp
-share/squirrelmail/help/ko_KR/basic.hlp
-share/squirrelmail/help/ko_KR/compose.hlp
-share/squirrelmail/help/ko_KR/folders.hlp
-share/squirrelmail/help/ko_KR/main_folder.hlp
-share/squirrelmail/help/ko_KR/options.hlp
-share/squirrelmail/help/ko_KR/read_mail.hlp
-share/squirrelmail/help/ko_KR/search.hlp
-share/squirrelmail/help/lt_LT/FAQ.hlp
-share/squirrelmail/help/lt_LT/addresses.hlp
-share/squirrelmail/help/lt_LT/basic.hlp
-share/squirrelmail/help/lt_LT/compose.hlp
-share/squirrelmail/help/lt_LT/folders.hlp
-share/squirrelmail/help/lt_LT/main_folder.hlp
-share/squirrelmail/help/lt_LT/options.hlp
-share/squirrelmail/help/lt_LT/read_mail.hlp
-share/squirrelmail/help/lt_LT/search.hlp
-share/squirrelmail/help/nl_NL/FAQ.hlp
-share/squirrelmail/help/nl_NL/addresses.hlp
-share/squirrelmail/help/nl_NL/basic.hlp
-share/squirrelmail/help/nl_NL/compose.hlp
-share/squirrelmail/help/nl_NL/folders.hlp
-share/squirrelmail/help/nl_NL/main_folder.hlp
-share/squirrelmail/help/nl_NL/options.hlp
-share/squirrelmail/help/nl_NL/read_mail.hlp
-share/squirrelmail/help/nl_NL/search.hlp
-share/squirrelmail/help/pl_PL/FAQ.hlp
-share/squirrelmail/help/pl_PL/addresses.hlp
-share/squirrelmail/help/pl_PL/basic.hlp
-share/squirrelmail/help/pl_PL/compose.hlp
-share/squirrelmail/help/pl_PL/folders.hlp
-share/squirrelmail/help/pl_PL/main_folder.hlp
-share/squirrelmail/help/pl_PL/options.hlp
-share/squirrelmail/help/pl_PL/read_mail.hlp
-share/squirrelmail/help/pl_PL/search.hlp
-share/squirrelmail/help/pt_BR/FAQ.hlp
-share/squirrelmail/help/pt_BR/addresses.hlp
-share/squirrelmail/help/pt_BR/basic.hlp
-share/squirrelmail/help/pt_BR/compose.hlp
-share/squirrelmail/help/pt_BR/folders.hlp
-share/squirrelmail/help/pt_BR/main_folder.hlp
-share/squirrelmail/help/pt_BR/options.hlp
-share/squirrelmail/help/pt_BR/read_mail.hlp
-share/squirrelmail/help/pt_BR/search.hlp
-share/squirrelmail/help/pt_PT/FAQ.hlp
-share/squirrelmail/help/pt_PT/addresses.hlp
-share/squirrelmail/help/pt_PT/basic.hlp
-share/squirrelmail/help/pt_PT/compose.hlp
-share/squirrelmail/help/pt_PT/folders.hlp
-share/squirrelmail/help/pt_PT/main_folder.hlp
-share/squirrelmail/help/pt_PT/options.hlp
-share/squirrelmail/help/pt_PT/read_mail.hlp
-share/squirrelmail/help/pt_PT/search.hlp
-share/squirrelmail/help/ru_RU/FAQ.hlp
-share/squirrelmail/help/ru_RU/addresses.hlp
-share/squirrelmail/help/ru_RU/basic.hlp
-share/squirrelmail/help/ru_RU/compose.hlp
-share/squirrelmail/help/ru_RU/folders.hlp
-share/squirrelmail/help/ru_RU/main_folder.hlp
-share/squirrelmail/help/ru_RU/options.hlp
-share/squirrelmail/help/ru_RU/read_mail.hlp
-share/squirrelmail/help/ru_RU/search.hlp
-share/squirrelmail/help/sk_SK/FAQ.hlp
-share/squirrelmail/help/sk_SK/addresses.hlp
-share/squirrelmail/help/sk_SK/basic.hlp
-share/squirrelmail/help/sk_SK/compose.hlp
-share/squirrelmail/help/sk_SK/folders.hlp
-share/squirrelmail/help/sk_SK/main_folder.hlp
-share/squirrelmail/help/sk_SK/options.hlp
-share/squirrelmail/help/sk_SK/read_mail.hlp
-share/squirrelmail/help/sk_SK/search.hlp
-share/squirrelmail/help/sl_SI/FAQ.hlp
-share/squirrelmail/help/sl_SI/addresses.hlp
-share/squirrelmail/help/sl_SI/basic.hlp
-share/squirrelmail/help/sl_SI/compose.hlp
-share/squirrelmail/help/sl_SI/folders.hlp
-share/squirrelmail/help/sl_SI/main_folder.hlp
-share/squirrelmail/help/sl_SI/options.hlp
-share/squirrelmail/help/sl_SI/read_mail.hlp
-share/squirrelmail/help/sl_SI/search.hlp
-share/squirrelmail/help/sr_YU/FAQ.hlp
-share/squirrelmail/help/sr_YU/addresses.hlp
-share/squirrelmail/help/sr_YU/basic.hlp
-share/squirrelmail/help/sr_YU/compose.hlp
-share/squirrelmail/help/sr_YU/folders.hlp
-share/squirrelmail/help/sr_YU/main_folder.hlp
-share/squirrelmail/help/sr_YU/options.hlp
-share/squirrelmail/help/sr_YU/read_mail.hlp
-share/squirrelmail/help/sr_YU/search.hlp
-share/squirrelmail/help/sv_SE/FAQ.hlp
-share/squirrelmail/help/sv_SE/addresses.hlp
-share/squirrelmail/help/sv_SE/basic.hlp
-share/squirrelmail/help/sv_SE/compose.hlp
-share/squirrelmail/help/sv_SE/folders.hlp
-share/squirrelmail/help/sv_SE/main_folder.hlp
-share/squirrelmail/help/sv_SE/options.hlp
-share/squirrelmail/help/sv_SE/read_mail.hlp
-share/squirrelmail/help/sv_SE/search.hlp
-share/squirrelmail/help/uk_UA/FAQ.hlp
-share/squirrelmail/help/uk_UA/addresses.hlp
-share/squirrelmail/help/uk_UA/basic.hlp
-share/squirrelmail/help/uk_UA/compose.hlp
-share/squirrelmail/help/uk_UA/folders.hlp
-share/squirrelmail/help/uk_UA/main_folder.hlp
-share/squirrelmail/help/uk_UA/options.hlp
-share/squirrelmail/help/uk_UA/read_mail.hlp
-share/squirrelmail/help/uk_UA/search.hlp
-share/squirrelmail/help/zh_CN/FAQ.hlp
-share/squirrelmail/help/zh_CN/addresses.hlp
-share/squirrelmail/help/zh_CN/basic.hlp
-share/squirrelmail/help/zh_CN/compose.hlp
-share/squirrelmail/help/zh_CN/folders.hlp
-share/squirrelmail/help/zh_CN/main_folder.hlp
-share/squirrelmail/help/zh_CN/options.hlp
-share/squirrelmail/help/zh_CN/read_mail.hlp
-share/squirrelmail/help/zh_CN/search.hlp
-share/squirrelmail/images/sec_remove_bn_IN.png
-share/squirrelmail/images/sec_remove_cs_CZ.png
-share/squirrelmail/images/sec_remove_da_DK.png
-share/squirrelmail/images/sec_remove_de_DE.png
-share/squirrelmail/images/sec_remove_el_GR.png
-share/squirrelmail/images/sec_remove_es_ES.png
-share/squirrelmail/images/sec_remove_et_EE.png
-share/squirrelmail/images/sec_remove_fi_FI.png
-share/squirrelmail/images/sec_remove_fo_FO.png
-share/squirrelmail/images/sec_remove_fr_FR.png
-share/squirrelmail/images/sec_remove_he_IL.png
-share/squirrelmail/images/sec_remove_hr_HR.png
-share/squirrelmail/images/sec_remove_hu_HU.png
-share/squirrelmail/images/sec_remove_id_ID.png
-share/squirrelmail/images/sec_remove_it_IT.png
-share/squirrelmail/images/sec_remove_ja_JP.png
-share/squirrelmail/images/sec_remove_ko_KR.png
-share/squirrelmail/images/sec_remove_lt_LT.png
-share/squirrelmail/images/sec_remove_nb_NO.png
-share/squirrelmail/images/sec_remove_nl_NL.png
-share/squirrelmail/images/sec_remove_nn_NO.png
-share/squirrelmail/images/sec_remove_pt_BR.png
-share/squirrelmail/images/sec_remove_pt_PT.png
-share/squirrelmail/images/sec_remove_ru_RU.png
-share/squirrelmail/images/sec_remove_sk_SK.png
-share/squirrelmail/images/sec_remove_sl_SI.png
-share/squirrelmail/images/sec_remove_sr_YU.png
-share/squirrelmail/images/sec_remove_sv_SE.png
-share/squirrelmail/images/sec_remove_tr_TR.png
-share/squirrelmail/images/sec_remove_ug.png
-share/squirrelmail/images/sec_remove_uk_UA.png
-share/squirrelmail/locale/ar/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ar/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/ar/setup.php
-share/squirrelmail/locale/bg_BG/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/bg_BG/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/bg_BG/setup.php
-share/squirrelmail/locale/bn_IN/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/bn_IN/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/bn_IN/setup.php
-share/squirrelmail/locale/ca_ES/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ca_ES/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/ca_ES/setup.php
-share/squirrelmail/locale/cs_CZ/LC_MESSAGES/abook_import_export.mo
-share/squirrelmail/locale/cs_CZ/LC_MESSAGES/abook_import_export.po
-share/squirrelmail/locale/cs_CZ/LC_MESSAGES/compatibility.mo
-share/squirrelmail/locale/cs_CZ/LC_MESSAGES/compatibility.po
-share/squirrelmail/locale/cs_CZ/LC_MESSAGES/proon.mo
-share/squirrelmail/locale/cs_CZ/LC_MESSAGES/proon.po
-share/squirrelmail/locale/cs_CZ/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/cs_CZ/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/cs_CZ/LC_MESSAGES/vacation_local.mo
-share/squirrelmail/locale/cs_CZ/LC_MESSAGES/vacation_local.po
-share/squirrelmail/locale/cs_CZ/LC_MESSAGES/vkeyboard.mo
-share/squirrelmail/locale/cs_CZ/LC_MESSAGES/vkeyboard.po
-share/squirrelmail/locale/cs_CZ/LC_MESSAGES/yelp.mo
-share/squirrelmail/locale/cs_CZ/LC_MESSAGES/yelp.po
-share/squirrelmail/locale/cs_CZ/setup.php
-share/squirrelmail/locale/cy_GB/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/cy_GB/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/cy_GB/setup.php
-share/squirrelmail/locale/da_DK/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/da_DK/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/da_DK/setup.php
-share/squirrelmail/locale/de_DE/LC_MESSAGES/abook_import_export.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/abook_import_export.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/archive_mail.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/archive_mail.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/askuserinfo.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/askuserinfo.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/calendar.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/calendar.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/change_sqlpass.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/change_sqlpass.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/compatibility.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/compatibility.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/empty_folders.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/empty_folders.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/expire.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/expire.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/folder_sizes.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/folder_sizes.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/ldapquery.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/ldapquery.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/limit_languages.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/limit_languages.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/login_alias.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/login_alias.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/naguser.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/naguser.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/newuser_wiz.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/newuser_wiz.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/reply_buttons.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/reply_buttons.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/restrict_senders.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/restrict_senders.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/select_language.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/select_language.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/serversidefilter.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/serversidefilter.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/show_ssl_link.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/show_ssl_link.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/squirrel_logger.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/squirrel_logger.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/templates.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/templates.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/unsafe_image_rules.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/unsafe_image_rules.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/vacation_local.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/vacation_local.po
-share/squirrelmail/locale/de_DE/LC_MESSAGES/verify_reply_to.mo
-share/squirrelmail/locale/de_DE/LC_MESSAGES/verify_reply_to.po
-share/squirrelmail/locale/de_DE/setup.php
-share/squirrelmail/locale/el_GR/LC_MESSAGES/ldapquery.mo
-share/squirrelmail/locale/el_GR/LC_MESSAGES/ldapquery.po
-share/squirrelmail/locale/el_GR/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/el_GR/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/el_GR/setup.php
-share/squirrelmail/locale/en_GB/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/en_GB/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/en_GB/setup.php
-share/squirrelmail/locale/es_ES/LC_MESSAGES/askuserinfo.mo
-share/squirrelmail/locale/es_ES/LC_MESSAGES/askuserinfo.po
-share/squirrelmail/locale/es_ES/LC_MESSAGES/change_sqlpass.mo
-share/squirrelmail/locale/es_ES/LC_MESSAGES/change_sqlpass.po
-share/squirrelmail/locale/es_ES/LC_MESSAGES/smallcal.mo
-share/squirrelmail/locale/es_ES/LC_MESSAGES/smallcal.po
-share/squirrelmail/locale/es_ES/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/es_ES/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/es_ES/LC_MESSAGES/unsafe_image_rules.mo
-share/squirrelmail/locale/es_ES/LC_MESSAGES/unsafe_image_rules.po
-share/squirrelmail/locale/es_ES/LC_MESSAGES/vkeyboard.mo
-share/squirrelmail/locale/es_ES/LC_MESSAGES/vkeyboard.po
-share/squirrelmail/locale/es_ES/setup.php
-share/squirrelmail/locale/et_EE/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/et_EE/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/et_EE/setup.php
-share/squirrelmail/locale/eu_ES/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/eu_ES/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/eu_ES/setup.php
-share/squirrelmail/locale/fa_IR/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/fa_IR/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/fa_IR/setup.php
-share/squirrelmail/locale/fi_FI/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/fi_FI/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/fi_FI/setup.php
-share/squirrelmail/locale/fo_FO/LC_MESSAGES/abook_import_export.mo
-share/squirrelmail/locale/fo_FO/LC_MESSAGES/abook_import_export.po
-share/squirrelmail/locale/fo_FO/LC_MESSAGES/archive_mail.mo
-share/squirrelmail/locale/fo_FO/LC_MESSAGES/archive_mail.po
-share/squirrelmail/locale/fo_FO/LC_MESSAGES/askuserinfo.mo
-share/squirrelmail/locale/fo_FO/LC_MESSAGES/askuserinfo.po
-share/squirrelmail/locale/fo_FO/LC_MESSAGES/compatibility.mo
-share/squirrelmail/locale/fo_FO/LC_MESSAGES/compatibility.po
-share/squirrelmail/locale/fo_FO/LC_MESSAGES/empty_folders.mo
-share/squirrelmail/locale/fo_FO/LC_MESSAGES/empty_folders.po
-share/squirrelmail/locale/fo_FO/LC_MESSAGES/folder_settings.mo
-share/squirrelmail/locale/fo_FO/LC_MESSAGES/folder_settings.po
-share/squirrelmail/locale/fo_FO/LC_MESSAGES/html_mail.mo
-share/squirrelmail/locale/fo_FO/LC_MESSAGES/html_mail.po
-share/squirrelmail/locale/fo_FO/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/fo_FO/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/fo_FO/setup.php
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/archive_mail.mo
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/archive_mail.po
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/calendar.mo
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/calendar.po
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/change_sqlpass.mo
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/change_sqlpass.po
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/empty_folders.mo
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/empty_folders.po
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/spam_buttons.mo
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/spam_buttons.po
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/vacation_local.mo
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/vacation_local.po
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/vkeyboard.mo
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/vkeyboard.po
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/yelp.mo
-share/squirrelmail/locale/fr_FR/LC_MESSAGES/yelp.po
-share/squirrelmail/locale/fr_FR/setup.php
-share/squirrelmail/locale/he_IL/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/he_IL/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/he_IL/setup.php
-share/squirrelmail/locale/hr_HR/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/hr_HR/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/hr_HR/setup.php
-share/squirrelmail/locale/hu_HU/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/hu_HU/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/hu_HU/setup.php
-share/squirrelmail/locale/id_ID/LC_MESSAGES/askuserinfo.mo
-share/squirrelmail/locale/id_ID/LC_MESSAGES/askuserinfo.po
-share/squirrelmail/locale/id_ID/LC_MESSAGES/compatibility.mo
-share/squirrelmail/locale/id_ID/LC_MESSAGES/compatibility.po
-share/squirrelmail/locale/id_ID/LC_MESSAGES/cookie_warning.mo
-share/squirrelmail/locale/id_ID/LC_MESSAGES/cookie_warning.po
-share/squirrelmail/locale/id_ID/LC_MESSAGES/folder_sizes.mo
-share/squirrelmail/locale/id_ID/LC_MESSAGES/folder_sizes.po
-share/squirrelmail/locale/id_ID/LC_MESSAGES/select_language.mo
-share/squirrelmail/locale/id_ID/LC_MESSAGES/select_language.po
-share/squirrelmail/locale/id_ID/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/id_ID/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/id_ID/setup.php
-share/squirrelmail/locale/is_IS/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/is_IS/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/is_IS/setup.php
-share/squirrelmail/locale/it_IT/LC_MESSAGES/archive_mail.mo
-share/squirrelmail/locale/it_IT/LC_MESSAGES/archive_mail.po
-share/squirrelmail/locale/it_IT/LC_MESSAGES/calendar.mo
-share/squirrelmail/locale/it_IT/LC_MESSAGES/calendar.po
-share/squirrelmail/locale/it_IT/LC_MESSAGES/html_mail.mo
-share/squirrelmail/locale/it_IT/LC_MESSAGES/html_mail.po
-share/squirrelmail/locale/it_IT/LC_MESSAGES/newuser_wiz.mo
-share/squirrelmail/locale/it_IT/LC_MESSAGES/newuser_wiz.po
-share/squirrelmail/locale/it_IT/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/it_IT/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/it_IT/LC_MESSAGES/vacation_local.mo
-share/squirrelmail/locale/it_IT/LC_MESSAGES/vacation_local.po
-share/squirrelmail/locale/it_IT/setup.php
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/archive_mail.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/archive_mail.po
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/askuserinfo.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/askuserinfo.po
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/compatibility.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/compatibility.po
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/cookie_warning.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/cookie_warning.po
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/custom_charset.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/custom_charset.po
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/debugger.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/debugger.po
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/html_mail.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/html_mail.po
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/mini.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/mini.po
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/reply_buttons.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/reply_buttons.po
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/sasql.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/sasql.po
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/select_language.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/select_language.po
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/serversidefilter.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/serversidefilter.po
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/show_ssl_link.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/show_ssl_link.po
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/smallcal.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/smallcal.po
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/spam_buttons.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/spam_buttons.po
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/squirrel_logger.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/squirrel_logger.po
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/web_search.mo
-share/squirrelmail/locale/ja_JP/LC_MESSAGES/web_search.po
-share/squirrelmail/locale/ja_JP/setup.php
-share/squirrelmail/locale/ka/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ka/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/ka/setup.php
-share/squirrelmail/locale/ko_KR/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ko_KR/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/ko_KR/setup.php
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/abook_import_export.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/abook_import_export.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/advanced_settings.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/advanced_settings.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/archive_mail.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/archive_mail.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/askuserinfo.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/askuserinfo.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/calendar.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/calendar.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/change_sqlpass.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/change_sqlpass.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/compatibility.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/compatibility.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/compose_fix.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/compose_fix.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/cookie_warning.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/cookie_warning.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/custom_charset.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/custom_charset.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/debugger.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/debugger.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/empty_folders.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/empty_folders.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/expire.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/expire.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/folder_settings.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/folder_settings.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/folder_sizes.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/folder_sizes.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/html_mail.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/html_mail.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/ldapquery.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/ldapquery.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/limit_languages.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/limit_languages.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/login_alias.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/login_alias.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/mini.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/mini.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/multilogin.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/multilogin.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/naguser.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/naguser.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/newuser_wiz.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/newuser_wiz.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/proon.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/proon.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/qmailadmin_login.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/qmailadmin_login.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/reply_buttons.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/reply_buttons.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/restrict_senders.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/restrict_senders.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/sasql.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/sasql.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/select_language.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/select_language.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/serversidefilter.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/serversidefilter.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/show_ssl_link.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/show_ssl_link.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/smallcal.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/smallcal.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/spam_buttons.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/spam_buttons.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/squirrel_logger.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/squirrel_logger.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/templates.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/templates.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/unsafe_image_rules.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/unsafe_image_rules.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/vacation_local.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/vacation_local.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/verify_reply_to.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/verify_reply_to.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/vkeyboard.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/vkeyboard.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/web_search.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/web_search.po
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/yelp.mo
-share/squirrelmail/locale/lt_LT/LC_MESSAGES/yelp.po
-share/squirrelmail/locale/lt_LT/setup.php
-share/squirrelmail/locale/ms_MY/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ms_MY/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/ms_MY/setup.php
-share/squirrelmail/locale/nb_NO/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/nb_NO/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/nb_NO/setup.php
-share/squirrelmail/locale/nl_NL/LC_MESSAGES/archive_mail.mo
-share/squirrelmail/locale/nl_NL/LC_MESSAGES/archive_mail.po
-share/squirrelmail/locale/nl_NL/LC_MESSAGES/askuserinfo.mo
-share/squirrelmail/locale/nl_NL/LC_MESSAGES/askuserinfo.po
-share/squirrelmail/locale/nl_NL/LC_MESSAGES/calendar.mo
-share/squirrelmail/locale/nl_NL/LC_MESSAGES/calendar.po
-share/squirrelmail/locale/nl_NL/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/nl_NL/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/nl_NL/LC_MESSAGES/vacation_local.mo
-share/squirrelmail/locale/nl_NL/LC_MESSAGES/vacation_local.po
-share/squirrelmail/locale/nl_NL/LC_MESSAGES/vkeyboard.mo
-share/squirrelmail/locale/nl_NL/LC_MESSAGES/vkeyboard.po
-share/squirrelmail/locale/nl_NL/setup.php
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/abook_import_export.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/abook_import_export.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/advanced_settings.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/advanced_settings.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/archive_mail.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/archive_mail.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/askuserinfo.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/askuserinfo.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/calendar.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/calendar.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/change_sqlpass.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/change_sqlpass.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/compatibility.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/compatibility.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/compose_fix.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/compose_fix.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/cookie_warning.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/cookie_warning.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/custom_charset.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/custom_charset.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/debugger.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/debugger.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/empty_folders.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/empty_folders.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/expire.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/expire.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/folder_settings.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/folder_settings.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/folder_sizes.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/folder_sizes.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/html_mail.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/html_mail.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/ldapquery.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/ldapquery.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/limit_languages.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/limit_languages.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/login_alias.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/login_alias.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/mini.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/mini.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/multilogin.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/multilogin.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/naguser.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/naguser.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/newuser_wiz.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/newuser_wiz.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/proon.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/proon.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/qmailadmin_login.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/qmailadmin_login.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/reply_buttons.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/reply_buttons.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/restrict_senders.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/restrict_senders.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/sasql.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/sasql.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/select_language.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/select_language.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/serversidefilter.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/serversidefilter.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/show_ssl_link.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/show_ssl_link.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/smallcal.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/smallcal.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/spam_buttons.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/spam_buttons.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/squirrel_logger.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/squirrel_logger.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/templates.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/templates.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/unsafe_image_rules.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/unsafe_image_rules.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/vacation_local.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/vacation_local.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/verify_reply_to.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/verify_reply_to.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/vkeyboard.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/vkeyboard.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/web_search.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/web_search.po
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/yelp.mo
-share/squirrelmail/locale/nn_NO/LC_MESSAGES/yelp.po
-share/squirrelmail/locale/nn_NO/setup.php
-share/squirrelmail/locale/pl_PL/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/pl_PL/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/pl_PL/setup.php
-share/squirrelmail/locale/pt_BR/LC_MESSAGES/abook_import_export.mo
-share/squirrelmail/locale/pt_BR/LC_MESSAGES/abook_import_export.po
-share/squirrelmail/locale/pt_BR/LC_MESSAGES/archive_mail.mo
-share/squirrelmail/locale/pt_BR/LC_MESSAGES/archive_mail.po
-share/squirrelmail/locale/pt_BR/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/pt_BR/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/pt_BR/LC_MESSAGES/unsafe_image_rules.mo
-share/squirrelmail/locale/pt_BR/LC_MESSAGES/unsafe_image_rules.po
-share/squirrelmail/locale/pt_BR/LC_MESSAGES/vkeyboard.mo
-share/squirrelmail/locale/pt_BR/LC_MESSAGES/vkeyboard.po
-share/squirrelmail/locale/pt_BR/setup.php
-share/squirrelmail/locale/pt_PT/LC_MESSAGES/askuserinfo.mo
-share/squirrelmail/locale/pt_PT/LC_MESSAGES/askuserinfo.po
-share/squirrelmail/locale/pt_PT/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/pt_PT/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/pt_PT/LC_MESSAGES/unsafe_image_rules.mo
-share/squirrelmail/locale/pt_PT/LC_MESSAGES/unsafe_image_rules.po
-share/squirrelmail/locale/pt_PT/setup.php
-share/squirrelmail/locale/ro_RO/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ro_RO/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/ro_RO/setup.php
-share/squirrelmail/locale/ru_RU/LC_MESSAGES/custom_charset.mo
-share/squirrelmail/locale/ru_RU/LC_MESSAGES/custom_charset.po
-share/squirrelmail/locale/ru_RU/LC_MESSAGES/sasql.mo
-share/squirrelmail/locale/ru_RU/LC_MESSAGES/sasql.po
-share/squirrelmail/locale/ru_RU/LC_MESSAGES/serversidefilter.mo
-share/squirrelmail/locale/ru_RU/LC_MESSAGES/serversidefilter.po
-share/squirrelmail/locale/ru_RU/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ru_RU/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/ru_RU/setup.php
-share/squirrelmail/locale/sk_SK/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/sk_SK/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/sk_SK/setup.php
-share/squirrelmail/locale/sl_SI/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/sl_SI/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/sl_SI/setup.php
-share/squirrelmail/locale/sr_YU/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/sr_YU/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/sr_YU/setup.php
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/abook_import_export.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/abook_import_export.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/archive_mail.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/archive_mail.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/askuserinfo.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/askuserinfo.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/change_sqlpass.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/change_sqlpass.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/compatibility.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/compatibility.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/compose_fix.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/compose_fix.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/cookie_warning.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/cookie_warning.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/custom_charset.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/custom_charset.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/debugger.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/debugger.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/empty_folders.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/empty_folders.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/expire.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/expire.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/folder_settings.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/folder_settings.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/folder_sizes.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/folder_sizes.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/html_mail.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/html_mail.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/limit_languages.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/limit_languages.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/login_alias.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/login_alias.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/mini.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/mini.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/multilogin.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/multilogin.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/naguser.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/naguser.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/newuser_wiz.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/newuser_wiz.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/qmailadmin_login.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/qmailadmin_login.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/reply_buttons.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/reply_buttons.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/restrict_senders.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/restrict_senders.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/sasql.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/sasql.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/select_language.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/select_language.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/serversidefilter.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/serversidefilter.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/show_ssl_link.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/show_ssl_link.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/smallcal.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/smallcal.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/spam_buttons.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/spam_buttons.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/squirrel_logger.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/squirrel_logger.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/templates.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/templates.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/unsafe_image_rules.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/unsafe_image_rules.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/vacation_local.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/vacation_local.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/verify_reply_to.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/verify_reply_to.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/web_search.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/web_search.po
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/yelp.mo
-share/squirrelmail/locale/sv_SE/LC_MESSAGES/yelp.po
-share/squirrelmail/locale/sv_SE/setup.php
-share/squirrelmail/locale/tr_TR/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/tr_TR/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/tr_TR/setup.php
-share/squirrelmail/locale/ug/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ug/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/ug/setup.php
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/abook_import_export.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/abook_import_export.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/archive_mail.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/archive_mail.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/askuserinfo.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/askuserinfo.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/calendar.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/calendar.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/compatibility.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/compatibility.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/custom_charset.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/custom_charset.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/folder_sizes.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/folder_sizes.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/html_mail.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/html_mail.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/mini.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/mini.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/newuser_wiz.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/newuser_wiz.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/sasql.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/sasql.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/serversidefilter.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/serversidefilter.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/smallcal.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/smallcal.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/templates.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/templates.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/vacation_local.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/vacation_local.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/vkeyboard.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/vkeyboard.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/web_search.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/web_search.po
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/yelp.mo
-share/squirrelmail/locale/uk_UA/LC_MESSAGES/yelp.po
-share/squirrelmail/locale/uk_UA/setup.php
-share/squirrelmail/locale/zh_CN/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/zh_CN/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/zh_CN/setup.php
-share/squirrelmail/locale/zh_TW/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/zh_TW/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/zh_TW/setup.php
-@dirrm share/squirrelmail/locale/zh_TW/LC_MESSAGES
-@dirrm share/squirrelmail/locale/zh_TW
-@dirrm share/squirrelmail/locale/zh_CN/LC_MESSAGES
-@dirrm share/squirrelmail/locale/zh_CN
-@dirrm share/squirrelmail/locale/uk_UA/LC_MESSAGES
-@dirrm share/squirrelmail/locale/uk_UA
-@dirrm share/squirrelmail/locale/ug/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ug
-@dirrm share/squirrelmail/locale/tr_TR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/tr_TR
-@dirrm share/squirrelmail/locale/sv_SE/LC_MESSAGES
-@dirrm share/squirrelmail/locale/sv_SE
-@dirrm share/squirrelmail/locale/sr_YU/LC_MESSAGES
-@dirrm share/squirrelmail/locale/sr_YU
-@dirrm share/squirrelmail/locale/sl_SI/LC_MESSAGES
-@dirrm share/squirrelmail/locale/sl_SI
-@dirrm share/squirrelmail/locale/sk_SK/LC_MESSAGES
-@dirrm share/squirrelmail/locale/sk_SK
-@dirrm share/squirrelmail/locale/ru_RU/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ru_RU
-@dirrm share/squirrelmail/locale/ro_RO/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ro_RO
-@dirrm share/squirrelmail/locale/pt_PT/LC_MESSAGES
-@dirrm share/squirrelmail/locale/pt_PT
-@dirrm share/squirrelmail/locale/pt_BR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/pt_BR
-@dirrm share/squirrelmail/locale/pl_PL/LC_MESSAGES
-@dirrm share/squirrelmail/locale/pl_PL
-@dirrm share/squirrelmail/locale/nn_NO/LC_MESSAGES
-@dirrm share/squirrelmail/locale/nn_NO
-@dirrm share/squirrelmail/locale/nl_NL/LC_MESSAGES
-@dirrm share/squirrelmail/locale/nl_NL
-@dirrm share/squirrelmail/locale/nb_NO/LC_MESSAGES
-@dirrm share/squirrelmail/locale/nb_NO
-@dirrm share/squirrelmail/locale/ms_MY/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ms_MY
-@dirrm share/squirrelmail/locale/lt_LT/LC_MESSAGES
-@dirrm share/squirrelmail/locale/lt_LT
-@dirrm share/squirrelmail/locale/ko_KR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ko_KR
-@dirrm share/squirrelmail/locale/ka/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ka
-@dirrm share/squirrelmail/locale/ja_JP/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ja_JP
-@dirrm share/squirrelmail/locale/it_IT/LC_MESSAGES
-@dirrm share/squirrelmail/locale/it_IT
-@dirrm share/squirrelmail/locale/is_IS/LC_MESSAGES
-@dirrm share/squirrelmail/locale/is_IS
-@dirrm share/squirrelmail/locale/id_ID/LC_MESSAGES
-@dirrm share/squirrelmail/locale/id_ID
-@dirrm share/squirrelmail/locale/hu_HU/LC_MESSAGES
-@dirrm share/squirrelmail/locale/hu_HU
-@dirrm share/squirrelmail/locale/hr_HR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/hr_HR
-@dirrm share/squirrelmail/locale/he_IL/LC_MESSAGES
-@dirrm share/squirrelmail/locale/he_IL
-@dirrm share/squirrelmail/locale/fr_FR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/fr_FR
-@dirrm share/squirrelmail/locale/fo_FO/LC_MESSAGES
-@dirrm share/squirrelmail/locale/fo_FO
-@dirrm share/squirrelmail/locale/fi_FI/LC_MESSAGES
-@dirrm share/squirrelmail/locale/fi_FI
-@dirrm share/squirrelmail/locale/fa_IR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/fa_IR
-@dirrm share/squirrelmail/locale/eu_ES/LC_MESSAGES
-@dirrm share/squirrelmail/locale/eu_ES
-@dirrm share/squirrelmail/locale/et_EE/LC_MESSAGES
-@dirrm share/squirrelmail/locale/et_EE
-@dirrm share/squirrelmail/locale/es_ES/LC_MESSAGES
-@dirrm share/squirrelmail/locale/es_ES
-@dirrm share/squirrelmail/locale/en_GB/LC_MESSAGES
-@dirrm share/squirrelmail/locale/en_GB
-@dirrm share/squirrelmail/locale/el_GR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/el_GR
-@dirrm share/squirrelmail/locale/de_DE/LC_MESSAGES
-@dirrm share/squirrelmail/locale/de_DE
-@dirrm share/squirrelmail/locale/da_DK/LC_MESSAGES
-@dirrm share/squirrelmail/locale/da_DK
-@dirrm share/squirrelmail/locale/cy_GB/LC_MESSAGES
-@dirrm share/squirrelmail/locale/cy_GB
-@dirrm share/squirrelmail/locale/cs_CZ/LC_MESSAGES
-@dirrm share/squirrelmail/locale/cs_CZ
-@dirrm share/squirrelmail/locale/ca_ES/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ca_ES
-@dirrm share/squirrelmail/locale/bn_IN/LC_MESSAGES
-@dirrm share/squirrelmail/locale/bn_IN
-@dirrm share/squirrelmail/locale/bg_BG/LC_MESSAGES
-@dirrm share/squirrelmail/locale/bg_BG
-@dirrm share/squirrelmail/locale/ar/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ar
-@dirrm share/squirrelmail/help/zh_CN
-@dirrm share/squirrelmail/help/uk_UA
-@dirrm share/squirrelmail/help/sv_SE
-@dirrm share/squirrelmail/help/sr_YU
-@dirrm share/squirrelmail/help/sl_SI
-@dirrm share/squirrelmail/help/sk_SK
-@dirrm share/squirrelmail/help/ru_RU
-@dirrm share/squirrelmail/help/pt_PT
-@dirrm share/squirrelmail/help/pt_BR
-@dirrm share/squirrelmail/help/pl_PL
-@dirrm share/squirrelmail/help/nl_NL
-@dirrm share/squirrelmail/help/lt_LT
-@dirrm share/squirrelmail/help/ko_KR
-@dirrm share/squirrelmail/help/ja_JP
-@dirrm share/squirrelmail/help/it_IT
-@dirrm share/squirrelmail/help/id_ID
-@dirrm share/squirrelmail/help/fr_FR
-@dirrm share/squirrelmail/help/fi_FI
-@dirrm share/squirrelmail/help/es_ES
-@dirrm share/squirrelmail/help/en_GB
-@dirrm share/squirrelmail/help/de_DE
-@dirrm share/squirrelmail/help/da_DK
-@dirrm share/squirrelmail/help/cy_GB
-@dirrm share/squirrelmail/help/cs_CZ
-@dirrm share/squirrelmail/help/ca_ES
-@dirrm share/squirrelmail/help/bg_BG
diff --git a/mail/squirrelmail-locales/distinfo b/mail/squirrelmail-locales/distinfo
deleted file mode 100644
index 5e9fbc1517c..00000000000
--- a/mail/squirrelmail-locales/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.9 2007/01/10 14:24:26 martti Exp $
-
-SHA1 (all_locales-1.4.9-20070106.tar.bz2) = d187a9b77384b398a0945f51aaaf248379fdfa15
-RMD160 (all_locales-1.4.9-20070106.tar.bz2) = 9da0e3df1bc5a89b861f7dd9ac244a3885a45417
-Size (all_locales-1.4.9-20070106.tar.bz2) = 2699569 bytes
diff --git a/mail/squirrelmail/DESCR b/mail/squirrelmail/DESCR
deleted file mode 100644
index fd192e718df..00000000000
--- a/mail/squirrelmail/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-SquirrelMail is a standards-based webmail package written in PHP4. It
-includes built-in pure PHP support for the IMAP and SMTP protocols, and all
-pages render in pure HTML 4.0 (with no Javascript) for maximum compatibility
-across browsers. It has very few requirements and is very easy to configure
-and install. SquirrelMail has a all the functionality you would want from an
-email client, including strong MIME support, address books, and folder
-manipulation.
diff --git a/mail/squirrelmail/MESSAGE b/mail/squirrelmail/MESSAGE
deleted file mode 100644
index dc62056b593..00000000000
--- a/mail/squirrelmail/MESSAGE
+++ /dev/null
@@ -1,23 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.5 2005/07/20 15:42:34 taca Exp $
-
-Please run the SquirrelMail configuration script:
-
- cd ${SMDIR}/config && ./conf.pl
-
-to customize the SquirrelMail webmail system for your site.
-
-You will need to make SquirrelMail accessible through your HTTP server.
-If you are running Apache and ap-php, then you may either symlink
-
- ${SMDIR}
-
-into DocumentRoot, or add the following line to httpd.conf:
-
- Include ${PKG_SYSCONFDIR}/squirrelmail.conf
-
-to make IMAP accounts accessible through:
-
- http://www.example.com/squirrelmail/
-
-===========================================================================
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
deleted file mode 100644
index 7bca57f22d1..00000000000
--- a/mail/squirrelmail/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-# $NetBSD: Makefile,v 1.81 2006/12/07 16:16:07 joerg Exp $
-
-DISTNAME= squirrelmail-1.4.9a
-CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= martti@NetBSD.org
-HOMEPAGE= http://www.squirrelmail.org/
-COMMENT= PHP webmail package
-
-CONFLICTS= sq-attachment-handlers-[0-9]*
-CONFLICTS+= sq-squirrelspell-[0-9]*
-CONFLICTS+= ja-squirrelspell-[0-9]*
-CONFLICTS+= ja-squirrelmail-[0-9]*
-
-DEPENDS+= ${PHP_PKG_PREFIX}-gettext>=4.3.3:../../devel/php-gettext
-
-USE_LANGUAGES= # empty
-NO_BUILD= yes
-USE_TOOLS+= perl:run
-REPLACE_PERL+= config/conf.pl
-BUILD_DEFS+= APACHE_GROUP APACHE_USER VARBASE
-
-.include "../../mk/bsd.prefs.mk"
-
-PKG_SYSCONFSUBDIR?= httpd
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-
-EGDIR= ${PREFIX}/share/examples/squirrelmail
-SMDIR= ${PREFIX}/share/squirrelmail
-DATADIR= ${VARBASE}/spool/squirrelmail
-ATTACHMENTS_DIR= ${DATADIR}/attachments
-USER_PREFS_DIR= ${DATADIR}/data
-
-MESSAGE_SUBST+= SMDIR=${SMDIR:Q}
-FILES_SUBST+= SMDIR=${SMDIR:Q}
-
-CONF_FILES= ${SMDIR:Q}/config/config_default.php \
- ${SMDIR:Q}/config/config.php
-CONF_FILES+= ${SMDIR:Q}/data/default_pref \
- ${DATADIR:Q}/data/default_pref
-CONF_FILES+= ${EGDIR:Q}/squirrelmail.conf \
- ${PKG_SYSCONFDIR:Q}/squirrelmail.conf
-
-REQD_DIRS+= ${SMDIR:Q} ${SMDIR:Q}/config
-
-OWN_DIRS= ${DATADIR}
-OWN_DIRS_PERMS= ${ATTACHMENTS_DIR} ${ROOT_USER} ${APACHE_GROUP} 730
-OWN_DIRS_PERMS+= ${USER_PREFS_DIR} ${APACHE_USER} ${APACHE_GROUP} 755
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= ${WRKDIR:Q}/squirrelmail.conf.dist
-SUBST_FILES.paths+= config/config_default.php
-SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+= -e 's,@ATTACHMENTS_DIR@,${ATTACHMENTS_DIR},g'
-SUBST_SED.paths+= -e 's,@USER_PREFS_DIR@,${USER_PREFS_DIR},g'
-SUBST_SED.paths+= -e 's,@SMDIR@,${SMDIR},g'
-SUBST_STAGE.paths= post-patch
-
-post-extract:
- ${CP} ${FILESDIR:Q}/squirrelmail.conf.dist \
- ${WRKDIR:Q}/squirrelmail.conf.dist
-
-pre-configure:
- ${FIND} ${WRKSRC:Q} \( -name "*.orig*" -o -name ".cvsignore" \) -print | ${XARGS} ${RM} -f
-
-do-install:
- ${INSTALL_DATA_DIR} ${EGDIR:Q}
- ${INSTALL_DATA_DIR} ${SMDIR:Q}
- ${INSTALL_DATA} ${WRKDIR:Q}/squirrelmail.conf.dist ${EGDIR:Q}/squirrelmail.conf
- ${CP} -R ${WRKSRC:Q}/* ${SMDIR:Q}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SMDIR}
- ${FIND} ${SMDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
- ${FIND} ${SMDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
- ${CHMOD} a+x ${SMDIR:Q}/config/conf.pl
- ${INSTALL_DATA} ${WRKSRC:Q}/data/index.php ${USER_PREFS_DIR:Q}/
- ${INSTALL_DATA} ${WRKSRC:Q}/data/.htaccess ${USER_PREFS_DIR:Q}/
- ${MV} ${PREFIX}/share/squirrelmail/contrib/conf.pl.8 \
- ${PREFIX}/${PKGMANDIR}/man8/squirrelmail-conf.pl.8
-
-.include "../../lang/php/phpversion.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
deleted file mode 100644
index 27154d839e1..00000000000
--- a/mail/squirrelmail/PLIST
+++ /dev/null
@@ -1,478 +0,0 @@
-@comment $NetBSD: PLIST,v 1.20 2006/12/04 13:06:01 obache Exp $
-man/man8/squirrelmail-conf.pl.8
-share/examples/squirrelmail/squirrelmail.conf
-share/squirrelmail/AUTHORS
-share/squirrelmail/COPYING
-share/squirrelmail/ChangeLog
-share/squirrelmail/INSTALL
-share/squirrelmail/README
-share/squirrelmail/ReleaseNotes
-share/squirrelmail/UPGRADE
-share/squirrelmail/class/deliver/Deliver.class.php
-share/squirrelmail/class/deliver/Deliver_IMAP.class.php
-share/squirrelmail/class/deliver/Deliver_SMTP.class.php
-share/squirrelmail/class/deliver/Deliver_SendMail.class.php
-share/squirrelmail/class/deliver/index.php
-share/squirrelmail/class/helper/VCard.class.php
-share/squirrelmail/class/helper/index.php
-share/squirrelmail/class/html.class.php
-share/squirrelmail/class/index.php
-share/squirrelmail/class/mime.class.php
-share/squirrelmail/class/mime/AddressStructure.class.php
-share/squirrelmail/class/mime/ContentType.class.php
-share/squirrelmail/class/mime/Disposition.class.php
-share/squirrelmail/class/mime/Language.class.php
-share/squirrelmail/class/mime/Message.class.php
-share/squirrelmail/class/mime/MessageHeader.class.php
-share/squirrelmail/class/mime/Rfc822Header.class.php
-share/squirrelmail/class/mime/SMimeMessage.class.php
-share/squirrelmail/class/mime/index.php
-share/squirrelmail/config/conf.pl
-share/squirrelmail/config/config_default.php
-share/squirrelmail/config/config_local.php
-share/squirrelmail/config/index.php
-share/squirrelmail/configure
-share/squirrelmail/contrib/RPM/config.php.redhat
-share/squirrelmail/contrib/RPM/squirrelmail.conf
-share/squirrelmail/contrib/RPM/squirrelmail.cron
-share/squirrelmail/contrib/RPM/squirrelmail.spec
-share/squirrelmail/contrib/decrypt_headers.php
-share/squirrelmail/contrib/squirrelmail.mailto.NT2KXP.reg
-share/squirrelmail/contrib/squirrelmail.mailto.Win9x.reg
-share/squirrelmail/contrib/squirrelmail.mailto.reg
-share/squirrelmail/data/.htaccess
-share/squirrelmail/data/default_pref
-share/squirrelmail/data/index.php
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.0.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.1.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.2.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.3.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.4.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.5.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.6.txt
-share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.0.txt
-share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.1.txt
-share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.2.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.0.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.1.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.2.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3a.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.4.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.5.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.6.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.7.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.8.txt
-share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.9.txt
-share/squirrelmail/doc/authentication.txt
-share/squirrelmail/doc/db-backend.txt
-share/squirrelmail/doc/ie_ssl.txt
-share/squirrelmail/doc/index.html
-share/squirrelmail/doc/presets.txt
-share/squirrelmail/doc/russian_apache.txt
-share/squirrelmail/doc/security.txt
-share/squirrelmail/doc/themes.txt
-share/squirrelmail/doc/translating.txt
-share/squirrelmail/doc/translating_help.txt
-share/squirrelmail/functions/abook_database.php
-share/squirrelmail/functions/abook_ldap_server.php
-share/squirrelmail/functions/abook_local_file.php
-share/squirrelmail/functions/addressbook.php
-share/squirrelmail/functions/attachment_common.php
-share/squirrelmail/functions/auth.php
-share/squirrelmail/functions/constants.php
-share/squirrelmail/functions/date.php
-share/squirrelmail/functions/db_prefs.php
-share/squirrelmail/functions/decode/cp1250.php
-share/squirrelmail/functions/decode/cp1251.php
-share/squirrelmail/functions/decode/cp1252.php
-share/squirrelmail/functions/decode/cp1253.php
-share/squirrelmail/functions/decode/cp1254.php
-share/squirrelmail/functions/decode/cp1255.php
-share/squirrelmail/functions/decode/cp1256.php
-share/squirrelmail/functions/decode/cp1257.php
-share/squirrelmail/functions/decode/cp1258.php
-share/squirrelmail/functions/decode/cp855.php
-share/squirrelmail/functions/decode/cp866.php
-share/squirrelmail/functions/decode/index.php
-share/squirrelmail/functions/decode/iso_8859_1.php
-share/squirrelmail/functions/decode/iso_8859_10.php
-share/squirrelmail/functions/decode/iso_8859_11.php
-share/squirrelmail/functions/decode/iso_8859_13.php
-share/squirrelmail/functions/decode/iso_8859_14.php
-share/squirrelmail/functions/decode/iso_8859_15.php
-share/squirrelmail/functions/decode/iso_8859_16.php
-share/squirrelmail/functions/decode/iso_8859_2.php
-share/squirrelmail/functions/decode/iso_8859_3.php
-share/squirrelmail/functions/decode/iso_8859_4.php
-share/squirrelmail/functions/decode/iso_8859_5.php
-share/squirrelmail/functions/decode/iso_8859_6.php
-share/squirrelmail/functions/decode/iso_8859_7.php
-share/squirrelmail/functions/decode/iso_8859_8.php
-share/squirrelmail/functions/decode/iso_8859_9.php
-share/squirrelmail/functions/decode/iso_ir_111.php
-share/squirrelmail/functions/decode/koi8_r.php
-share/squirrelmail/functions/decode/koi8_u.php
-share/squirrelmail/functions/decode/ns_4551_1.php
-share/squirrelmail/functions/decode/tis_620.php
-share/squirrelmail/functions/decode/us_ascii.php
-share/squirrelmail/functions/decode/utf_8.php
-share/squirrelmail/functions/display_messages.php
-share/squirrelmail/functions/encode/cp1251.php
-share/squirrelmail/functions/encode/cp1255.php
-share/squirrelmail/functions/encode/cp1256.php
-share/squirrelmail/functions/encode/index.php
-share/squirrelmail/functions/encode/iso_8859_1.php
-share/squirrelmail/functions/encode/iso_8859_15.php
-share/squirrelmail/functions/encode/iso_8859_2.php
-share/squirrelmail/functions/encode/iso_8859_7.php
-share/squirrelmail/functions/encode/iso_8859_9.php
-share/squirrelmail/functions/encode/koi8_r.php
-share/squirrelmail/functions/encode/koi8_u.php
-share/squirrelmail/functions/encode/tis_620.php
-share/squirrelmail/functions/encode/us_ascii.php
-share/squirrelmail/functions/encode/utf_8.php
-share/squirrelmail/functions/file_prefs.php
-share/squirrelmail/functions/forms.php
-share/squirrelmail/functions/gettext.php
-share/squirrelmail/functions/global.php
-share/squirrelmail/functions/html.php
-share/squirrelmail/functions/i18n.php
-share/squirrelmail/functions/identity.php
-share/squirrelmail/functions/imap.php
-share/squirrelmail/functions/imap_general.php
-share/squirrelmail/functions/imap_mailbox.php
-share/squirrelmail/functions/imap_messages.php
-share/squirrelmail/functions/imap_search.php
-share/squirrelmail/functions/imap_utf7_local.php
-share/squirrelmail/functions/index.php
-share/squirrelmail/functions/mailbox_display.php
-share/squirrelmail/functions/mime.php
-share/squirrelmail/functions/options.php
-share/squirrelmail/functions/page_header.php
-share/squirrelmail/functions/plugin.php
-share/squirrelmail/functions/prefs.php
-share/squirrelmail/functions/strings.php
-share/squirrelmail/functions/tree.php
-share/squirrelmail/functions/url_parser.php
-share/squirrelmail/help/en_US/FAQ.hlp
-share/squirrelmail/help/en_US/addresses.hlp
-share/squirrelmail/help/en_US/basic.hlp
-share/squirrelmail/help/en_US/compose.hlp
-share/squirrelmail/help/en_US/folders.hlp
-share/squirrelmail/help/en_US/main_folder.hlp
-share/squirrelmail/help/en_US/options.hlp
-share/squirrelmail/help/en_US/read_mail.hlp
-share/squirrelmail/help/en_US/search.hlp
-share/squirrelmail/help/index.php
-share/squirrelmail/images/blank.png
-share/squirrelmail/images/delitem.png
-share/squirrelmail/images/down_pointer.png
-share/squirrelmail/images/draft.png
-share/squirrelmail/images/folder.png
-share/squirrelmail/images/inbox.png
-share/squirrelmail/images/index.php
-share/squirrelmail/images/minus.png
-share/squirrelmail/images/plus.png
-share/squirrelmail/images/sec_remove_eng.png
-share/squirrelmail/images/senti.png
-share/squirrelmail/images/sm_logo.png
-share/squirrelmail/images/sort_none.png
-share/squirrelmail/images/up_pointer.png
-share/squirrelmail/include/index.php
-share/squirrelmail/include/load_prefs.php
-share/squirrelmail/include/options/display.php
-share/squirrelmail/include/options/folder.php
-share/squirrelmail/include/options/index.php
-share/squirrelmail/include/options/personal.php
-share/squirrelmail/include/validate.php
-share/squirrelmail/index.php
-share/squirrelmail/locale/README.locales
-share/squirrelmail/locale/index.php
-share/squirrelmail/locale/timezones.cfg
-share/squirrelmail/plugins/README.plugins
-share/squirrelmail/plugins/abook_take/README
-share/squirrelmail/plugins/abook_take/index.php
-share/squirrelmail/plugins/abook_take/setup.php
-share/squirrelmail/plugins/abook_take/take.php
-share/squirrelmail/plugins/administrator/INSTALL
-share/squirrelmail/plugins/administrator/auth.php
-share/squirrelmail/plugins/administrator/defines.php
-share/squirrelmail/plugins/administrator/index.php
-share/squirrelmail/plugins/administrator/options.php
-share/squirrelmail/plugins/administrator/setup.php
-share/squirrelmail/plugins/bug_report/INSTALL
-share/squirrelmail/plugins/bug_report/README
-share/squirrelmail/plugins/bug_report/bug_report.php
-share/squirrelmail/plugins/bug_report/index.php
-share/squirrelmail/plugins/bug_report/setup.php
-share/squirrelmail/plugins/calendar/README
-share/squirrelmail/plugins/calendar/calendar.php
-share/squirrelmail/plugins/calendar/calendar_data.php
-share/squirrelmail/plugins/calendar/day.php
-share/squirrelmail/plugins/calendar/event_create.php
-share/squirrelmail/plugins/calendar/event_delete.php
-share/squirrelmail/plugins/calendar/event_edit.php
-share/squirrelmail/plugins/calendar/functions.php
-share/squirrelmail/plugins/calendar/index.php
-share/squirrelmail/plugins/calendar/setup.php
-share/squirrelmail/plugins/delete_move_next/README
-share/squirrelmail/plugins/delete_move_next/index.php
-share/squirrelmail/plugins/delete_move_next/setup.php
-share/squirrelmail/plugins/filters/CHANGES
-share/squirrelmail/plugins/filters/README
-share/squirrelmail/plugins/filters/bulkquery/INSTALL
-share/squirrelmail/plugins/filters/bulkquery/Makefile
-share/squirrelmail/plugins/filters/bulkquery/README
-share/squirrelmail/plugins/filters/bulkquery/bq.in
-share/squirrelmail/plugins/filters/bulkquery/bq.out
-share/squirrelmail/plugins/filters/bulkquery/bulkquery.c
-share/squirrelmail/plugins/filters/bulkquery/index.php
-share/squirrelmail/plugins/filters/filters.php
-share/squirrelmail/plugins/filters/index.php
-share/squirrelmail/plugins/filters/options.php
-share/squirrelmail/plugins/filters/setup.php
-share/squirrelmail/plugins/filters/spamoptions.php
-share/squirrelmail/plugins/fortune/INSTALL
-share/squirrelmail/plugins/fortune/index.php
-share/squirrelmail/plugins/fortune/setup.php
-share/squirrelmail/plugins/index.php
-share/squirrelmail/plugins/info/README
-share/squirrelmail/plugins/info/functions.php
-share/squirrelmail/plugins/info/index.php
-share/squirrelmail/plugins/info/options.php
-share/squirrelmail/plugins/info/setup.php
-share/squirrelmail/plugins/listcommands/README
-share/squirrelmail/plugins/listcommands/index.php
-share/squirrelmail/plugins/listcommands/mailout.php
-share/squirrelmail/plugins/listcommands/setup.php
-share/squirrelmail/plugins/mail_fetch/README
-share/squirrelmail/plugins/mail_fetch/class.POP3.php
-share/squirrelmail/plugins/mail_fetch/fetch.php
-share/squirrelmail/plugins/mail_fetch/functions.php
-share/squirrelmail/plugins/mail_fetch/index.php
-share/squirrelmail/plugins/mail_fetch/options.php
-share/squirrelmail/plugins/mail_fetch/setup.php
-share/squirrelmail/plugins/message_details/index.php
-share/squirrelmail/plugins/message_details/message_details_bottom.php
-share/squirrelmail/plugins/message_details/message_details_main.php
-share/squirrelmail/plugins/message_details/message_details_top.php
-share/squirrelmail/plugins/message_details/setup.php
-share/squirrelmail/plugins/newmail/HISTORY
-share/squirrelmail/plugins/newmail/README
-share/squirrelmail/plugins/newmail/index.php
-share/squirrelmail/plugins/newmail/newmail.php
-share/squirrelmail/plugins/newmail/newmail_opt.php
-share/squirrelmail/plugins/newmail/setup.php
-share/squirrelmail/plugins/newmail/sounds/FanFair.wav
-share/squirrelmail/plugins/newmail/sounds/Friends.wav
-share/squirrelmail/plugins/newmail/sounds/MontyPython.wav
-share/squirrelmail/plugins/newmail/sounds/Notify.wav
-share/squirrelmail/plugins/newmail/sounds/index.php
-share/squirrelmail/plugins/newmail/testsound.php
-share/squirrelmail/plugins/sent_subfolders/index.php
-share/squirrelmail/plugins/sent_subfolders/setup.php
-share/squirrelmail/plugins/spamcop/README
-share/squirrelmail/plugins/spamcop/index.php
-share/squirrelmail/plugins/spamcop/options.php
-share/squirrelmail/plugins/spamcop/setup.php
-share/squirrelmail/plugins/spamcop/spamcop.php
-share/squirrelmail/plugins/squirrelspell/INSTALL
-share/squirrelmail/plugins/squirrelspell/doc/CRYPTO
-share/squirrelmail/plugins/squirrelspell/doc/ChangeLog
-share/squirrelmail/plugins/squirrelspell/doc/PRIVACY
-share/squirrelmail/plugins/squirrelspell/doc/README
-share/squirrelmail/plugins/squirrelspell/doc/UPGRADING
-share/squirrelmail/plugins/squirrelspell/doc/index.php
-share/squirrelmail/plugins/squirrelspell/index.php
-share/squirrelmail/plugins/squirrelspell/js/WHATISTHIS
-share/squirrelmail/plugins/squirrelspell/js/check_me.js
-share/squirrelmail/plugins/squirrelspell/js/crypto_settings.js
-share/squirrelmail/plugins/squirrelspell/js/decrypt_error.js
-share/squirrelmail/plugins/squirrelspell/js/index.php
-share/squirrelmail/plugins/squirrelspell/js/init.js
-share/squirrelmail/plugins/squirrelspell/modules/.htaccess
-share/squirrelmail/plugins/squirrelspell/modules/WHATISTHIS
-share/squirrelmail/plugins/squirrelspell/modules/check_me.mod
-share/squirrelmail/plugins/squirrelspell/modules/crypto.mod
-share/squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod
-share/squirrelmail/plugins/squirrelspell/modules/edit_dic.mod
-share/squirrelmail/plugins/squirrelspell/modules/enc_setup.mod
-share/squirrelmail/plugins/squirrelspell/modules/forget_me.mod
-share/squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod
-share/squirrelmail/plugins/squirrelspell/modules/index.php
-share/squirrelmail/plugins/squirrelspell/modules/init.mod
-share/squirrelmail/plugins/squirrelspell/modules/lang_change.mod
-share/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod
-share/squirrelmail/plugins/squirrelspell/modules/options_main.mod
-share/squirrelmail/plugins/squirrelspell/setup.php
-share/squirrelmail/plugins/squirrelspell/sqspell_config.php
-share/squirrelmail/plugins/squirrelspell/sqspell_functions.php
-share/squirrelmail/plugins/squirrelspell/sqspell_interface.php
-share/squirrelmail/plugins/squirrelspell/sqspell_options.php
-share/squirrelmail/plugins/translate/INSTALL
-share/squirrelmail/plugins/translate/README
-share/squirrelmail/plugins/translate/index.php
-share/squirrelmail/plugins/translate/options.php
-share/squirrelmail/plugins/translate/setup.php
-share/squirrelmail/po/compilepo
-share/squirrelmail/po/independent_strings.txt
-share/squirrelmail/po/index.php
-share/squirrelmail/po/mergepo
-share/squirrelmail/po/squirrelmail.pot
-share/squirrelmail/po/xgetpo
-share/squirrelmail/src/addrbook_popup.php
-share/squirrelmail/src/addrbook_search.php
-share/squirrelmail/src/addrbook_search_html.php
-share/squirrelmail/src/addressbook.php
-share/squirrelmail/src/compose.php
-share/squirrelmail/src/configtest.php
-share/squirrelmail/src/delete_message.php
-share/squirrelmail/src/download.php
-share/squirrelmail/src/empty_trash.php
-share/squirrelmail/src/folders.php
-share/squirrelmail/src/folders_create.php
-share/squirrelmail/src/folders_delete.php
-share/squirrelmail/src/folders_rename_do.php
-share/squirrelmail/src/folders_rename_getname.php
-share/squirrelmail/src/folders_subscribe.php
-share/squirrelmail/src/help.php
-share/squirrelmail/src/image.php
-share/squirrelmail/src/index.php
-share/squirrelmail/src/left_main.php
-share/squirrelmail/src/login.php
-share/squirrelmail/src/mailto.php
-share/squirrelmail/src/move_messages.php
-share/squirrelmail/src/options.php
-share/squirrelmail/src/options_highlight.php
-share/squirrelmail/src/options_identities.php
-share/squirrelmail/src/options_order.php
-share/squirrelmail/src/printer_friendly_bottom.php
-share/squirrelmail/src/printer_friendly_main.php
-share/squirrelmail/src/printer_friendly_top.php
-share/squirrelmail/src/read_body.php
-share/squirrelmail/src/redirect.php
-share/squirrelmail/src/right_main.php
-share/squirrelmail/src/search.php
-share/squirrelmail/src/signout.php
-share/squirrelmail/src/vcard.php
-share/squirrelmail/src/view_header.php
-share/squirrelmail/src/view_text.php
-share/squirrelmail/src/webmail.php
-share/squirrelmail/themes/README.themes
-share/squirrelmail/themes/alien_glow.php
-share/squirrelmail/themes/autumn.php
-share/squirrelmail/themes/autumn2.php
-share/squirrelmail/themes/black_bean_burrito_theme.php
-share/squirrelmail/themes/blue_grey_theme.php
-share/squirrelmail/themes/blue_on_blue.php
-share/squirrelmail/themes/bluesnews_theme.php
-share/squirrelmail/themes/bluesome.php
-share/squirrelmail/themes/bluesteel_theme.php
-share/squirrelmail/themes/christmas.php
-share/squirrelmail/themes/classic_blue.php
-share/squirrelmail/themes/classic_blue2.php
-share/squirrelmail/themes/css/comic-sans-08.css
-share/squirrelmail/themes/css/comic-sans-10.css
-share/squirrelmail/themes/css/comic-sans-12.css
-share/squirrelmail/themes/css/index.php
-share/squirrelmail/themes/css/sans-08.css
-share/squirrelmail/themes/css/sans-10.css
-share/squirrelmail/themes/css/sans-12.css
-share/squirrelmail/themes/css/serif-10.css
-share/squirrelmail/themes/css/serif-12.css
-share/squirrelmail/themes/css/tahoma-08.css
-share/squirrelmail/themes/css/tahoma-10.css
-share/squirrelmail/themes/css/tahoma-12.css
-share/squirrelmail/themes/css/verdana-08.css
-share/squirrelmail/themes/css/verdana-10.css
-share/squirrelmail/themes/css/verdana-12.css
-share/squirrelmail/themes/dark_green.php
-share/squirrelmail/themes/dark_grey_theme.php
-share/squirrelmail/themes/darkness.php
-share/squirrelmail/themes/deepocean2_theme.php
-share/squirrelmail/themes/deepocean_theme.php
-share/squirrelmail/themes/default_theme.php
-share/squirrelmail/themes/dompie_theme.php
-share/squirrelmail/themes/forest_theme.php
-share/squirrelmail/themes/greenhouse_effect.php
-share/squirrelmail/themes/high_contrast_theme.php
-share/squirrelmail/themes/ice_theme.php
-share/squirrelmail/themes/in_the_pink.php
-share/squirrelmail/themes/index.php
-share/squirrelmail/themes/kind_of_blue.php
-share/squirrelmail/themes/maize_theme.php
-share/squirrelmail/themes/methodical_theme.php
-share/squirrelmail/themes/midnight.php
-share/squirrelmail/themes/minimal_bw.php
-share/squirrelmail/themes/monostochastic.php
-share/squirrelmail/themes/netstyle_theme.php
-share/squirrelmail/themes/penguin.php
-share/squirrelmail/themes/plain_blue_theme.php
-share/squirrelmail/themes/powder_blue.php
-share/squirrelmail/themes/purple_theme.php
-share/squirrelmail/themes/random.php
-share/squirrelmail/themes/redmond.php
-share/squirrelmail/themes/sandstorm_theme.php
-share/squirrelmail/themes/seaspray_theme.php
-share/squirrelmail/themes/servery_theme.php
-share/squirrelmail/themes/shades_of_grey.php
-share/squirrelmail/themes/silver_steel_theme.php
-share/squirrelmail/themes/simple_green2.php
-share/squirrelmail/themes/simple_green_theme.php
-share/squirrelmail/themes/simple_purple.php
-share/squirrelmail/themes/slashdot_theme.php
-share/squirrelmail/themes/spice_of_life.php
-share/squirrelmail/themes/spice_of_life_dark.php
-share/squirrelmail/themes/spice_of_life_lite.php
-share/squirrelmail/themes/techno_blue.php
-share/squirrelmail/themes/turquoise.php
-share/squirrelmail/themes/wood_theme.php
-@dirrm share/squirrelmail/themes/css
-@dirrm share/squirrelmail/themes
-@dirrm share/squirrelmail/src
-@dirrm share/squirrelmail/po
-@dirrm share/squirrelmail/plugins/translate
-@dirrm share/squirrelmail/plugins/squirrelspell/modules
-@dirrm share/squirrelmail/plugins/squirrelspell/js
-@dirrm share/squirrelmail/plugins/squirrelspell/doc
-@dirrm share/squirrelmail/plugins/squirrelspell
-@dirrm share/squirrelmail/plugins/spamcop
-@dirrm share/squirrelmail/plugins/sent_subfolders
-@dirrm share/squirrelmail/plugins/newmail/sounds
-@dirrm share/squirrelmail/plugins/newmail
-@dirrm share/squirrelmail/plugins/message_details
-@dirrm share/squirrelmail/plugins/mail_fetch
-@dirrm share/squirrelmail/plugins/listcommands
-@dirrm share/squirrelmail/plugins/info
-@dirrm share/squirrelmail/plugins/fortune
-@dirrm share/squirrelmail/plugins/filters/bulkquery
-@dirrm share/squirrelmail/plugins/filters
-@dirrm share/squirrelmail/plugins/delete_move_next
-@dirrm share/squirrelmail/plugins/calendar
-@dirrm share/squirrelmail/plugins/bug_report
-@dirrm share/squirrelmail/plugins/administrator
-@dirrm share/squirrelmail/plugins/abook_take
-@dirrm share/squirrelmail/plugins
-@dirrm share/squirrelmail/locale
-@dirrm share/squirrelmail/include/options
-@dirrm share/squirrelmail/include
-@dirrm share/squirrelmail/images
-@dirrm share/squirrelmail/help/en_US
-@dirrm share/squirrelmail/help
-@dirrm share/squirrelmail/functions/encode
-@dirrm share/squirrelmail/functions/decode
-@dirrm share/squirrelmail/functions
-@dirrm share/squirrelmail/doc/ReleaseNotes/1.4
-@dirrm share/squirrelmail/doc/ReleaseNotes/1.3
-@dirrm share/squirrelmail/doc/ReleaseNotes/1.2
-@dirrm share/squirrelmail/doc/ReleaseNotes
-@dirrm share/squirrelmail/doc
-@dirrm share/squirrelmail/data
-@dirrm share/squirrelmail/contrib/RPM
-@dirrm share/squirrelmail/contrib
-@dirrm share/squirrelmail/class/mime
-@dirrm share/squirrelmail/class/helper
-@dirrm share/squirrelmail/class/deliver
-@dirrm share/squirrelmail/class
-@dirrm share/examples/squirrelmail
diff --git a/mail/squirrelmail/buildlink3.mk b/mail/squirrelmail/buildlink3.mk
deleted file mode 100644
index a419e2fe716..00000000000
--- a/mail/squirrelmail/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.14 2007/01/10 14:34:39 martti Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-SQUIRRELMAIL_BUILDLINK3_MK:= ${SQUIRRELMAIL_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= squirrelmail
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsquirrelmail}
-BUILDLINK_PACKAGES+= squirrelmail
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}squirrelmail
-
-.if ${SQUIRRELMAIL_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.squirrelmail+= squirrelmail>=1.4.9a
-BUILDLINK_PKGSRCDIR.squirrelmail?= ../../mail/squirrelmail
-.endif # SQUIRRELMAIL_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
deleted file mode 100644
index 07a75b05af7..00000000000
--- a/mail/squirrelmail/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.35 2006/12/04 13:06:01 obache Exp $
-
-SHA1 (squirrelmail-1.4.9a.tar.bz2) = c9fc139c331cc99aa9bb54886106d2beccdd390a
-RMD160 (squirrelmail-1.4.9a.tar.bz2) = ccb4c0b4d74341862fecc4abe7f1fa63a4535984
-Size (squirrelmail-1.4.9a.tar.bz2) = 481601 bytes
-SHA1 (patch-aa) = 8b2f277985e2b7a723e10c3a1c60bd7bde69086f
diff --git a/mail/squirrelmail/files/squirrelmail.conf.dist b/mail/squirrelmail/files/squirrelmail.conf.dist
deleted file mode 100644
index 732b7005f76..00000000000
--- a/mail/squirrelmail/files/squirrelmail.conf.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: squirrelmail.conf.dist,v 1.4 2002/12/31 10:49:30 chris Exp $
-#
-# SquirrelMail configuration file fragment for Apache
-
-<IfModule mod_alias.c>
- Alias /squirrelmail/ "@SMDIR@/"
-</IfModule>
-
-<Directory "@SMDIR@">
- Options Indexes MultiViews
- AllowOverride None
- Order allow,deny
- Allow from all
-</Directory>
diff --git a/mail/squirrelmail/patches/patch-aa b/mail/squirrelmail/patches/patch-aa
deleted file mode 100644
index 99cb8079fe3..00000000000
--- a/mail/squirrelmail/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2006/12/04 13:06:01 obache Exp $
-
---- config/config_default.php.orig 2006-10-07 11:58:42.000000000 +0000
-+++ config/config_default.php
-@@ -414,7 +414,7 @@ $default_sub_of_inbox = true;
- * false. (Cyrus works fine whether it's true OR false).
- * @global bool $show_contain_subfolders_option
- */
--$show_contain_subfolders_option = false;
-+$show_contain_subfolders_option = true;
-
- /**
- * These next two options set the defaults for the way that the
-@@ -459,7 +459,7 @@ $noselect_fix_enable = false;
- * $data_dir = SM_PATH . 'data/';
- * @global string $data_dir
- */
--$data_dir = SM_PATH . 'data/';
-+$data_dir = '@USER_PREFS_DIR@/';
-
- /**
- * Attachments directory
-@@ -477,7 +477,7 @@ $data_dir = SM_PATH . 'data/';
- * + It should probably be another directory than data_dir.
- * @global string $attachment_dir
- */
--$attachment_dir = $data_dir;
-+$attachment_dir = '@ATTACHMENTS_DIR@/';
-
- /**
- * Hash level used for data directory.
diff --git a/mail/squirrelmail/plugin.mk b/mail/squirrelmail/plugin.mk
deleted file mode 100644
index 3b7cd1beb9b..00000000000
--- a/mail/squirrelmail/plugin.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: plugin.mk,v 1.3 2006/02/17 07:04:25 martti Exp $
-
-DISTNAME?= ${PLUGIN_NAME}-${PLUGIN_VERSION}
-PKGNAME= sm-${PLUGIN_NAME}-${PLUGIN_VERSION}
-CATEGORIES?= mail
-MASTER_SITES?= http://www.squirrelmail.org/plugins/
-
-WRKSRC?= ${WRKDIR}/${PLUGIN_NAME}
-NO_CONFIGURE?= YES
-NO_BUILD?= YES
-
-SM_PLUGINDIR= share/squirrelmail/plugins
-PLUGIN_DIR= ${SM_PLUGINDIR}/${PLUGIN_NAME}
-FULL_PLUGIN_DIR= ${PREFIX}/${PLUGIN_DIR}
-
-INSTALLATION_DIRS+= ${PLUGIN_DIR}
-
-PLIST_SUBST+= PLUGIN_DIR=${PLUGIN_DIR:Q}
-
-do-install:
- cd ${WRKSRC:Q} && \
- ${FIND} . -type f ! -name '*.orig' 2>/dev/null | \
- ${PAX} -rw ${FULL_PLUGIN_DIR}
-
-.include "../../mail/squirrelmail/buildlink3.mk"
diff --git a/mail/sqwebmail/DEINSTALL b/mail/sqwebmail/DEINSTALL
deleted file mode 100644
index d01d9aa1e25..00000000000
--- a/mail/sqwebmail/DEINSTALL
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.4 2005/02/18 22:12:56 jlam Exp $
-
-case ${STAGE} in
-DEINSTALL)
- #
- # Note some additional files that may be created by the sysadmin
- # that can probably be removed.
- #
- if ${TEST} -x ./+FILES; then
- for file in \
- ${PKG_SYSCONFDIR}/authcharset \
- ${PKG_SYSCONFDIR}/autoresponsesquota \
- ${PKG_SYSCONFDIR}/defaultdomain \
- ${PKG_SYSCONFDIR}/logindomainlist \
- ${PKG_SYSCONFDIR}/maildirfilterconfig
- do
- ${ECHO} "# FILE: $file . /dev/null" >> ./+FILES
- done
- fi
-
- sockfile="@SQWEBMAIL_STATEDIR@/sqwebmail.sock"
- if ${TEST} -f "$sockfile"; then
- # Unconditionally remove the SqWebMail socket.
- ${ECHO} "Removing sqwebmail socket file:"
- ${ECHO} " $sockfile"
- ${RM} -f $sockfile
- fi
- ;;
-esac
diff --git a/mail/sqwebmail/DESCR b/mail/sqwebmail/DESCR
deleted file mode 100644
index 7722974c92a..00000000000
--- a/mail/sqwebmail/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-SqWebMail is a web CGI client for sending and receiving E-mail using
-maildir mailboxes. It is very lightweight -- it reads mail directly
-from maildirs. It also contains a web-based calendar application.
-
-This package differs from a vanilla SqWebMail installation in that
-the files are installed at locations that more closely correspond to
-a Courier installation.
diff --git a/mail/sqwebmail/INSTALL b/mail/sqwebmail/INSTALL
deleted file mode 100644
index cbd18035422..00000000000
--- a/mail/sqwebmail/INSTALL
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: INSTALL,v 1.3 2006/04/28 18:16:25 jlam Exp $
-
-case ${STAGE} in
-POST-INSTALL)
- if ${TEST} -d "@VARBASE@/sqwebmail"; then
- ${CAT} << EOF
-===========================================================================
-
-If you are upgrading SqWebMail from a previous version, please note
-that the Courier directory for keeping local state has moved. In
-order to preserve your existing users' calendar information, you will
-need to move:
-
- @VARBASE@/sqwebmail
-to
- @SQWEBMAIL_STATEDIR@/sqwebmail
-
-===========================================================================
-EOF
- fi
- ;;
-esac
diff --git a/mail/sqwebmail/MESSAGE b/mail/sqwebmail/MESSAGE
deleted file mode 100644
index ce442d873fa..00000000000
--- a/mail/sqwebmail/MESSAGE
+++ /dev/null
@@ -1,36 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.7 2006/04/28 18:16:25 jlam Exp $
-
-You must create a cron job that runs at regular intervals (one hour is
-fine) that executes the following Perl script to clean the SqWebMail
-user cache:
-
- ${PKG_SYSCONFDIR}/cleancache.pl
-
-There are two things which must be done to make SqWebMail accessible
-through your HTTP server:
-
- (1) Copy the ``sqwebmail'' CGI binary to the appropriate place in your
- HTTP document root, e.g. ${PREFIX}/libexec/cgi-bin, then Maildir
- accounts would be accessible through:
-
- http://your.domain.com/cgi-bin/sqwebmail
-
- (2) Make URLs with path ``${IMAGEURL}/'' resolve to the images located
- in the ${IMAGEDIR} directory.
- For Apache, you can add the following to httpd.conf:
-
- <IfModule mod_alias.c>
- Alias ${IMAGEURL}/ "${IMAGEDIR}/"
- </IfModule>
-
-If you're using a non-default sendmail program, you will need to edit:
-
- ${PKG_SYSCONFDIR}/sendit.sh
-
-To use GPG with SqWebMail, you will need to install the security/gnupg
-package and you should read the documentation at:
-
- ${PREFIX}/share/doc/courier/sqwebmail/README.gpg.html
-
-===========================================================================
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
deleted file mode 100644
index 00b8092213b..00000000000
--- a/mail/sqwebmail/Makefile
+++ /dev/null
@@ -1,134 +0,0 @@
-# $NetBSD: Makefile,v 1.50 2006/06/17 19:26:48 jlam Exp $
-
-DISTNAME= sqwebmail-5.1.2
-PKGREVISION= 1
-CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= jlam@pkgsrc.org
-COMMENT= Webmail CGI for access to maildir-style mailboxes
-HOMEPAGE= http://www.courier-mta.org/sqwebmail/
-
-DEPENDS+= courier-maildir>=0.53.1:../../mail/courier-maildir
-DEPENDS+= maildrop>=2.0.1:../../mail/maildrop
-
-USE_TOOLS+= env gmake gzip:run perl:run
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-
-PKG_SUPPORTED_OPTIONS+= fam
-
-# PKGNAME is a parameter to the following file.
-PKGNAME= ${DISTNAME}
-.include "../../mail/courier-mta/Makefile.common"
-
-INSTALL_AM_MAKEFLAGS= sysconfdir=${EGDIR}
-INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
-
-SQWEBMAIL_STATEDIR= ${COURIER_STATEDIR}/sqwebmail
-SQWEBMAIL_CACHEDIR= ${SQWEBMAIL_STATEDIR}/logincache
-SQWEBMAIL_CALENDARDIR= ${SQWEBMAIL_STATEDIR}/calendar
-SQWEBMAIL_IMAGEDIR= ${PREFIX}/share/courier/sqwebmail/images
-SQWEBMAIL_IMAGEURL?= /sqwebmail
-BUILD_DEFS+= SQWEBMAIL_IMAGEURL
-FILES_SUBST+= SQWEBMAIL_STATEDIR=${SQWEBMAIL_STATEDIR:Q}
-FILES_SUBST+= SQWEBMAIL_CACHEDIR=${SQWEBMAIL_CACHEDIR:Q}
-FILES_SUBST+= SQWEBMAIL_CALENDARDIR=${SQWEBMAIL_CALENDARDIR:Q}
-FILES_SUBST+= ROOT_USER=${ROOT_USER:Q}
-MESSAGE_SUBST+= IMAGEDIR=${SQWEBMAIL_IMAGEDIR}
-MESSAGE_SUBST+= IMAGEURL=${SQWEBMAIL_IMAGEURL}
-
-SENDMAIL?= /usr/sbin/sendmail
-MIME_TYPES= ${PKG_SYSCONFDIR}/mime.types:${PKG_SYSCONFBASEDIR}/httpd/mime.types:${PREFIX}/etc/mime.types:/etc/mime.types
-
-# This is used by the sqwebmail configure script to set the location of
-# the sqwebmaild socket file and lockfile.
-#
-CONFIGURE_ARGS+= --localstatedir=${SQWEBMAIL_STATEDIR:Q}
-
-CONFIGURE_ARGS+= --datadir=${PREFIX}/share/courier
-CONFIGURE_ARGS+= --program-transform-name='s/\.rc$$//'
-
-CONFIGURE_ARGS+= --enable-cgibindir=${PREFIX}/libexec/courier/cgi-bin
-CONFIGURE_ARGS+= --enable-https=auto
-CONFIGURE_ARGS+= --enable-imagedir=${SQWEBMAIL_IMAGEDIR:Q}
-CONFIGURE_ARGS+= --enable-imageurl=${SQWEBMAIL_IMAGEURL:Q}
-CONFIGURE_ARGS+= --enable-mimetypes=${MIME_TYPES:Q}
-CONFIGURE_ARGS+= --with-cachedir=${SQWEBMAIL_CACHEDIR:Q}
-CONFIGURE_ARGS+= --with-cacheowner=${ROOT_USER:Q}
-CONFIGURE_ARGS+= --with-calendardir=${SQWEBMAIL_CALENDARDIR:Q}
-CONFIGURE_ARGS+= --with-ispell="${LOCALBASE}/bin/ispell"
-CONFIGURE_ARGS+= --with-mailer="${SENDMAIL} -oi -t"
-CONFIGURE_ARGS+= --with-mailgroup=${COURIER_GROUP:Q}
-CONFIGURE_ARGS+= --with-piddir=${VARBASE}/run
-
-CONFIGURE_ENV+= GZIP=${TOOLS_PATH.gzip:Q}
-CONFIGURE_ENV+= GPG="${LOCALBASE}/bin/gpg"
-CONFIGURE_ENV+= ldapsearch="${LOCALBASE}/bin/ldapsearch"
-
-REQD_DIRS+= ${DATADIR} ${DOCDIR} ${EGDIR} ${LIBEXECDIR}
-REQD_DIRS_PERMS+= ${LIBEXECDIR}/cgi-bin \
- ${ROOT_USER} ${ROOT_GROUP} 0700
-MAKE_DIRS+= ${VARBASE}/run ${LOCALSTATEDIR}
-OWN_DIRS+= ${SQWEBMAIL_STATEDIR}
-OWN_DIRS+= ${SQWEBMAIL_CACHEDIR}
-OWN_DIRS_PERMS= ${SQWEBMAIL_CALENDARDIR} \
- ${ROOT_USER} ${COURIER_GROUP} 0755
-OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR}/public \
- ${ROOT_USER} ${COURIER_GROUP} 0755
-OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR}/private \
- ${ROOT_USER} ${COURIER_GROUP} 0750
-OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR}/localcache \
- ${ROOT_USER} ${COURIER_GROUP} 0700
-
-.for _file_ in calendarmode ldapaddressbook.dist sqwebmaild.dist
-CONF_FILES_PERMS+= ${EGDIR}/${_file_} \
- ${PKG_SYSCONFDIR}/${_file_:S/.dist$//} \
- ${COURIER_FILE_PERMS}
-.endfor
-.for _file_ in cleancache.pl ldapsearch sendit.sh
-CONF_FILES_PERMS+= ${PREFIX}/share/courier/sqwebmail/${_file_} \
- ${PKG_SYSCONFDIR}/${_file_} \
- ${COURIER_SCRIPT_PERMS}
-.endfor
-SPECIAL_PERMS= ${LIBEXECDIR}/sqwebpasswd \
- ${COURIER_USER} ${COURIER_GROUP} 2755
-
-RCD_SCRIPTS= sqwebmail
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 sbin
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../security/courier-authlib/buildlink3.mk"
-
-# Default to non-groupware calendar-mode.
-post-build:
- ${ECHO} "local" > ${WRKDIR}/calendarmode
-
-# The sqwebmail install target incorrectly overwrites the mode on
-# cgi-bin directory, so fix it back to the right value.
-#
-fix-perms:
- ${CHMOD} 0700 ${LIBEXECDIR}/cgi-bin
-
-post-install: fix-perms
- ${LN} -s ${PREFIX}/share/courier/sqwebmail/webgpg ${PREFIX}/sbin
- ${INSTALL_PROGRAM} ${WRKSRC}/gpglib/mimegpg ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/gpglib/mimegpg.1 ${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_DATA} ${WRKSRC}/gpglib/mimegpg.html ${DOCDIR}
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKDIR}/calendarmode ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/sqwebmail/sqwebmail.pamconf \
- ${EGDIR}/webmail.authpam
- ${INSTALL_DATA_DIR} ${DOCDIR}/sqwebmail
- ${INSTALL_DATA} ${WRKSRC}/README.logindomainlist.html \
- ${DOCDIR}/sqwebmail
- ${INSTALL_DATA} ${WRKSRC}/INSTALL.html ${DOCDIR}/sqwebmail
- ${INSTALL_DATA} ${WRKSRC}/gpglib/README.html \
- ${DOCDIR}/sqwebmail/README.gpg.html
- ${INSTALL_DATA} ${WRKSRC}/pcp/README.html \
- ${DOCDIR}/pcp_README.html
- ${INSTALL_DATA} ${WRKSRC}/sqwebmail/BUGS.html ${DOCDIR}/sqwebmail
- ${INSTALL_DATA} ${WRKSRC}/sqwebmail/SECURITY.html ${DOCDIR}/sqwebmail
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/sqwebmail/PLIST b/mail/sqwebmail/PLIST
deleted file mode 100644
index e72037cbfa9..00000000000
--- a/mail/sqwebmail/PLIST
+++ /dev/null
@@ -1,128 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2006/06/09 22:12:01 jlam Exp $
-bin/mimegpg
-libexec/courier/cgi-bin/sqwebmail
-libexec/courier/pcpd
-libexec/courier/sqwebmaild
-libexec/courier/sqwebpasswd
-man/man1/mimegpg.1
-sbin/sqwebmaild
-sbin/webgpg
-share/courier/sqwebmail/cleancache.pl
-share/courier/sqwebmail/html/en
-share/courier/sqwebmail/html/en-us/CHARSET
-share/courier/sqwebmail/html/en-us/ISPELLDICT
-share/courier/sqwebmail/html/en-us/LANGUAGE
-share/courier/sqwebmail/html/en-us/LANGUAGE_PREF
-share/courier/sqwebmail/html/en-us/LOCALE
-share/courier/sqwebmail/html/en-us/TIMEZONELIST
-share/courier/sqwebmail/html/en-us/abooklist.html
-share/courier/sqwebmail/html/en-us/acl.html
-share/courier/sqwebmail/html/en-us/attachments.html
-share/courier/sqwebmail/html/en-us/autoresponder.html
-share/courier/sqwebmail/html/en-us/calendarlogin.inc.html
-share/courier/sqwebmail/html/en-us/empty.html
-share/courier/sqwebmail/html/en-us/eventacl.html
-share/courier/sqwebmail/html/en-us/eventdaily.html
-share/courier/sqwebmail/html/en-us/eventdelete.html
-share/courier/sqwebmail/html/en-us/eventmonthly.html
-share/courier/sqwebmail/html/en-us/eventnotifydelete.txt
-share/courier/sqwebmail/html/en-us/eventnotifynew.txt
-share/courier/sqwebmail/html/en-us/eventnotifysubject.txt
-share/courier/sqwebmail/html/en-us/eventshow.html
-share/courier/sqwebmail/html/en-us/eventweekly.html
-share/courier/sqwebmail/html/en-us/expired.html
-share/courier/sqwebmail/html/en-us/filter.html
-share/courier/sqwebmail/html/en-us/folder.html
-share/courier/sqwebmail/html/en-us/folders.html
-share/courier/sqwebmail/html/en-us/gpg.html
-share/courier/sqwebmail/html/en-us/gpgcreate.html
-share/courier/sqwebmail/html/en-us/gpgerr.html
-share/courier/sqwebmail/html/en-us/index.html
-share/courier/sqwebmail/html/en-us/invalid.html
-share/courier/sqwebmail/html/en-us/keyimport.html
-share/courier/sqwebmail/html/en-us/ldaplist.html
-share/courier/sqwebmail/html/en-us/ldapsearch.html
-share/courier/sqwebmail/html/en-us/login.html
-share/courier/sqwebmail/html/en-us/loginform.inc.html
-share/courier/sqwebmail/html/en-us/navbar.inc.html
-share/courier/sqwebmail/html/en-us/navbar2.inc.html
-share/courier/sqwebmail/html/en-us/navbar3.inc.html
-share/courier/sqwebmail/html/en-us/newevent.html
-share/courier/sqwebmail/html/en-us/newmsg.html
-share/courier/sqwebmail/html/en-us/preferences.html
-share/courier/sqwebmail/html/en-us/print.html
-share/courier/sqwebmail/html/en-us/printnocookie.html
-share/courier/sqwebmail/html/en-us/printredirect.html
-share/courier/sqwebmail/html/en-us/quickadd.html
-share/courier/sqwebmail/html/en-us/readmsg.html
-share/courier/sqwebmail/html/en-us/redirect.html
-share/courier/sqwebmail/html/en-us/refreshfr.html
-share/courier/sqwebmail/html/en-us/smileys.txt
-share/courier/sqwebmail/html/en-us/spellchk.html
-share/courier/sqwebmail/images/bg.png
-share/courier/sqwebmail/images/bluebottomleft.png
-share/courier/sqwebmail/images/bluebottomright.png
-share/courier/sqwebmail/images/bluetopleft.png
-share/courier/sqwebmail/images/bluetopright.png
-share/courier/sqwebmail/images/calendar.png
-share/courier/sqwebmail/images/cancel.png
-share/courier/sqwebmail/images/eventadd.png
-share/courier/sqwebmail/images/eventedit.png
-share/courier/sqwebmail/images/first.png
-share/courier/sqwebmail/images/folder.png
-share/courier/sqwebmail/images/folder2.png
-share/courier/sqwebmail/images/folders.png
-share/courier/sqwebmail/images/forward.png
-share/courier/sqwebmail/images/forwardatt.png
-share/courier/sqwebmail/images/fullheaders.png
-share/courier/sqwebmail/images/graybottomleft.png
-share/courier/sqwebmail/images/graybottomright.png
-share/courier/sqwebmail/images/graytopleft.png
-share/courier/sqwebmail/images/graytopright.png
-share/courier/sqwebmail/images/key.png
-share/courier/sqwebmail/images/last.png
-share/courier/sqwebmail/images/left.png
-share/courier/sqwebmail/images/left2.png
-share/courier/sqwebmail/images/logo.png
-share/courier/sqwebmail/images/print.png
-share/courier/sqwebmail/images/reply.png
-share/courier/sqwebmail/images/replyall.png
-share/courier/sqwebmail/images/replylist.png
-share/courier/sqwebmail/images/right.png
-share/courier/sqwebmail/images/right2.png
-share/courier/sqwebmail/images/save.png
-share/courier/sqwebmail/images/sep.png
-share/courier/sqwebmail/images/signin.png
-share/courier/sqwebmail/images/sm-frowney.png
-share/courier/sqwebmail/images/sm-frowney2.png
-share/courier/sqwebmail/images/sm-notsmiley.png
-share/courier/sqwebmail/images/sm-notsmiley2.png
-share/courier/sqwebmail/images/sm-ohno.png
-share/courier/sqwebmail/images/sm-smiley.png
-share/courier/sqwebmail/images/sm-smiley2.png
-share/courier/sqwebmail/images/sm-wink.png
-share/courier/sqwebmail/images/sm-wink2.png
-share/courier/sqwebmail/images/sqwebmail.css
-share/courier/sqwebmail/images/trash2.png
-share/courier/sqwebmail/images/uncancel.png
-share/courier/sqwebmail/images/wikifmt.html
-share/courier/sqwebmail/ldapsearch
-share/courier/sqwebmail/sendit.sh
-share/courier/sqwebmail/webgpg
-share/doc/courier/mimegpg.html
-share/doc/courier/pcp_README.html
-share/doc/courier/sqwebmail/BUGS.html
-share/doc/courier/sqwebmail/INSTALL.html
-share/doc/courier/sqwebmail/README.gpg.html
-share/doc/courier/sqwebmail/README.logindomainlist.html
-share/doc/courier/sqwebmail/SECURITY.html
-share/examples/courier/calendarmode
-share/examples/courier/ldapaddressbook.dist
-share/examples/courier/sqwebmaild.dist
-share/examples/courier/webmail.authpam
-share/examples/rc.d/sqwebmail
-@dirrm share/doc/courier/sqwebmail
-@dirrm share/courier/sqwebmail/images
-@dirrm share/courier/sqwebmail/html/en-us
-@dirrm share/courier/sqwebmail/html
-@dirrm share/courier/sqwebmail
diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo
deleted file mode 100644
index cc37e36602c..00000000000
--- a/mail/sqwebmail/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.15 2006/06/09 22:12:01 jlam Exp $
-
-SHA1 (sqwebmail-5.1.2.tar.bz2) = 0ddcf4f9b53304a356ba40e4ae3ea27bb9118108
-RMD160 (sqwebmail-5.1.2.tar.bz2) = af66ac38d40ef69da4aa57450915ba954c45703a
-Size (sqwebmail-5.1.2.tar.bz2) = 3743815 bytes
-SHA1 (patch-aa) = 5f263487244e8127845050a19d3b68356f846aa2
-SHA1 (patch-ad) = 5aad3cb93e747f7522c023e46496b8ba956ea664
-SHA1 (patch-ah) = b4f198638e3c9e6b4cd0a88f058b85a196c7ac9d
-SHA1 (patch-ai) = def2f4d30bf5f15ea78f401f3c4ca2f2ec8c0ad2
-SHA1 (patch-aj) = 2ad7d2500a54ca4f94ba00aaab89df29adcf864e
diff --git a/mail/sqwebmail/files/sqwebmail.sh b/mail/sqwebmail/files/sqwebmail.sh
deleted file mode 100644
index a16ff572e4d..00000000000
--- a/mail/sqwebmail/files/sqwebmail.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: sqwebmail.sh,v 1.7 2006/11/20 11:45:14 cube Exp $
-#
-# Courier SqWebMail services daemon
-#
-# PROVIDE: sqwebmail
-# REQUIRE: authdaemond
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="sqwebmail"
-rcvar=${name}
-command="@PREFIX@/sbin/courierlogger"
-ctl_command="@PREFIX@/sbin/sqwebmaild"
-pidfile="@VARBASE@/run/sqwebmaild.pid"
-required_files="@PKG_SYSCONFDIR@/calendarmode @PKG_SYSCONFDIR@/sqwebmaild"
-
-start_precmd="sqwebmail_prestart"
-start_cmd="sqwebmail_doit start"
-stop_cmd="sqwebmail_doit stop"
-
-mkdir_perms() {
- dir="$1"; user="$2"; group="$3"; mode="$4"
- @TEST@ -d $dir || @MKDIR@ $dir
- @CHOWN@ $user $dir
- @CHGRP@ $group $dir
- @CHMOD@ $mode $dir
-}
-
-sqwebmail_prestart()
-{
- # Courier webmail and calendar (pcp) directories
- @MKDIR@ @SQWEBMAIL_STATEDIR@
- @MKDIR@ @SQWEBMAIL_CACHEDIR@
- mkdir_perms @SQWEBMAIL_CALENDARDIR@ \
- @ROOT_USER@ @COURIER_GROUP@ 0755
- mkdir_perms @SQWEBMAIL_CALENDARDIR@/public \
- @ROOT_USER@ @COURIER_GROUP@ 0755
- mkdir_perms @SQWEBMAIL_CALENDARDIR@/private \
- @ROOT_USER@ @COURIER_GROUP@ 0750
- mkdir_perms @SQWEBMAIL_CALENDARDIR@/localcache \
- @ROOT_USER@ @COURIER_GROUP@ 0750
-}
-
-sqwebmail_doit()
-{
- action=$1
- case $action in
- start)
- for f in $required_files; do
- if [ ! -r "$f" ]; then
- @ECHO@ 1>&2 "$0: WARNING: $f is not readable"
- return 1
- fi
- done
- @ECHO@ "Starting ${name}."
- ${ctl_command} $action
- ;;
- stop)
- @ECHO@ "Stopping ${name}."
- ${ctl_command} $action
- ;;
- esac
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/sqwebmail/patches/patch-aa b/mail/sqwebmail/patches/patch-aa
deleted file mode 100644
index dbbb7cb20c2..00000000000
--- a/mail/sqwebmail/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2006/01/03 05:59:12 jlam Exp $
-
---- Makefile.in.orig 2005-12-25 17:02:47.000000000 -0500
-+++ Makefile.in
-@@ -237,19 +237,18 @@ EXTRA_DIST = INSTALL.html README NEWS RE
- pgpkeys.txt
-
- scriptbindir = $(sbindir)
--scriptbin_SCRIPTS = \
-- sharedindexinstall sharedindexsplit
-+scriptbin_SCRIPTS = sqwebmaild.rc
-
--pkglibPROGRAMS = maildirmake deliverquota reformime makemime pcpd
--pkglibexecdir = $(libexecdir)/sqwebmail
--libexec_SCRIPTS = sqwebmaild.rc
-+pkglibPROGRAMS = pcpd
-+pkglibexecdir = $(libexecdir)/courier
-+libexec_SCRIPTS =
- CLEANFILES = $(pkgman1_DATA) $(pkgman8_DATA) $(sysconf_DATA) \
- sharedindexinstall sharedindexsplit
-
- pkgman8dir = @mandir@/man8
--pkgman8_DATA = deliverquota.8
-+pkgman8_DATA =
- pkgman1dir = @mandir@/man1
--pkgman1_DATA = maildirmake.1
-+pkgman1_DATA =
- @HAVE_HTMLPAGES_TRUE@NEWS_SOURCE = html/main.html
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/mail/sqwebmail/patches/patch-ad b/mail/sqwebmail/patches/patch-ad
deleted file mode 100644
index bf7a257e8ae..00000000000
--- a/mail/sqwebmail/patches/patch-ad
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2006/06/09 22:12:01 jlam Exp $
-
---- sqwebmail/Makefile.in.orig 2006-05-24 19:48:14.000000000 -0400
-+++ sqwebmail/Makefile.in
-@@ -992,7 +992,7 @@ install-perms-local: install-perms-cache
-
- htmllibdir.h: config.status
- echo '#define HTMLLIBDIR "@htmldir@"' >htmllibdir.h
-- echo '#define SENDITSH "$(scriptdir)/sendit.sh"' >>htmllibdir.h
-+ echo '#define SENDITSH "$(sysconfdir)/sendit.sh"' >>htmllibdir.h
- echo '#define CALENDARMODE "$(sysconfdir)/calendarmode"' >>htmllibdir.h
- echo '#define LOGINDOMAINLIST "$(sysconfdir)/logindomainlist"' >>htmllibdir.h
- echo '#define MAXMSGSIZE @MAXMSGSIZE@' >>htmllibdir.h
-@@ -1000,7 +1000,7 @@ htmllibdir.h: config.status
- echo '#define SOCKDIR "$(localstatedir)"' >>htmllibdir.h
- echo '#define SHAREDINDEXFILE "$(sysconfdir)/shared/index"' >>htmllibdir.h
- echo '#define SQWEBPASSWD "$(pkglibexecdir)/sqwebpasswd"' >>htmllibdir.h
-- if test -d $(srcdir)/../courier \
-+ if true || test -d $(srcdir)/../courier \
- ; then \
- echo '#define HOSTNAMEFILE "$(sysconfdir)/defaultdomain"' >>htmllibdir.h \
- ; echo '#define MAKEMIME "$(bindir)/makemime"' >>htmllibdir.h \
-@@ -1009,7 +1009,7 @@ htmllibdir.h: config.status
- ; echo '#define MAKEMIME "$(pkglibexecdir)/makemime"' >>htmllibdir.h \
- ; fi
- echo '#define LDAPADDRESSBOOK "$(sysconfdir)/ldapaddressbook"' >>htmllibdir.h
-- echo '#define LDAPSEARCH "$(scriptdir)/ldapsearch"' >>htmllibdir.h
-+ echo '#define LDAPSEARCH "$(sysconfdir)/ldapsearch"' >>htmllibdir.h
- echo '#define AUTHCHARSET "$(sysconfdir)/authcharset"' >>htmllibdir.h
-
- ldapsearch: ../ldapaddressbook/ldapsearch
-@@ -1037,9 +1037,6 @@ install-perms-cache:
- @echo "@cachedir@ 700 @cacheowner@ bin" >>permissions.dat
-
- cache-reminder:
-- -$(mkinstalldirs) $(DESTDIR)@cachedir@
-- -$(mkinstalldirs) $(DESTDIR)$(piddir)
-- test -w /etc || exit 0; chown @cacheowner@ $(DESTDIR)@cachedir@
- @rm -f cron.cmd
- @echo '#! @SHELL@' >cron.cmd
- @echo 'su -p -c "$(scriptdir)/cleancache.pl" @cacheowner@' >>cron.cmd
diff --git a/mail/sqwebmail/patches/patch-ah b/mail/sqwebmail/patches/patch-ah
deleted file mode 100644
index 74216c5814e..00000000000
--- a/mail/sqwebmail/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2006/06/09 22:12:01 jlam Exp $
-
---- sqwebmail/configure.orig 2006-05-24 19:48:13.000000000 -0400
-+++ sqwebmail/configure
-@@ -20269,7 +20269,7 @@ fi;
-
-
-
--if test -d ${srcdir}/../courier
-+if true || test -d ${srcdir}/../courier
- then
- pkglibexecdir='$(libexecdir)/courier'
- else
diff --git a/mail/sqwebmail/patches/patch-ai b/mail/sqwebmail/patches/patch-ai
deleted file mode 100644
index 121bf9ad31d..00000000000
--- a/mail/sqwebmail/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2005/08/11 00:03:51 jlam Exp $
-
---- sqwebmaild.rc.in.orig 2005-07-05 08:37:46.000000000 -0400
-+++ sqwebmaild.rc.in
-@@ -28,7 +28,7 @@ startpcp() {
- libexecdir=${libexecdir} ;
- . @sysconfdir@/sqwebmaild ; \
- @courierlogger@ -pid=${PIDFILE}.pcp $LOGGEROPTS -start \
-- ${libexecdir}/sqwebmail/pcpd server"
-+ ${libexecdir}/courier/pcpd server"
- ;;
- *)
- ;;
-@@ -46,7 +46,7 @@ start)
- libexecdir=${libexecdir} ;
- . @sysconfdir@/sqwebmaild ; \
- @courierlogger@ -pid=${PIDFILE} $LOGGEROPTS -start \
-- ${libexecdir}/sqwebmail/sqwebmaild"
-+ ${libexecdir}/courier/sqwebmaild"
- ;;
-
- stop)
diff --git a/mail/sqwebmail/patches/patch-aj b/mail/sqwebmail/patches/patch-aj
deleted file mode 100644
index 35af1e6c656..00000000000
--- a/mail/sqwebmail/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.5 2006/04/28 18:16:25 jlam Exp $
-
---- INSTALL.html.orig 2006-02-25 12:13:16.000000000 -0500
-+++ INSTALL.html
-@@ -707,7 +707,7 @@ Qmail box.</p>
- installation. The following presumes that SqWebMail's configuration files are
- installed in <code>/usr/lib/sqwebmail</code> (the default).</p>
-
--<p><code>/usr/lib/sqwebmail/etc/hostname</code> - when SqWebMail is installed
-+<p><code>/usr/lib/sqwebmail/etc/defaultdomain</code> - when SqWebMail is installed
- with a basic configuration for a single domain, SqWebMail sets the domain in
- the return address for outgoing messages to the defined system hostname. If
- this file exists it will be used instead of the defined system hostname.</p>
diff --git a/mail/ssmtp/DESCR b/mail/ssmtp/DESCR
deleted file mode 100644
index 5ec5e45f1e2..00000000000
--- a/mail/ssmtp/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-A secure, effective and simple way of getting mail off a system to your
-mail hub. It contains no suid-binaries or other dangerous things - no mail
-spool to poke around in, and no daemons running in the background. Mail is
-simply forwarded to the configured mailhost. Extremely easy configuration.
-
-WARNING: the above is all it does; it does not receive mail, expand aliases
-or manage a queue. That belongs on a mail hub with a system administrator.
-
-This program is especially recommended for mutt users who send emails via
-ISP's smtp server.
diff --git a/mail/ssmtp/MESSAGE b/mail/ssmtp/MESSAGE
deleted file mode 100644
index d1431776e52..00000000000
--- a/mail/ssmtp/MESSAGE
+++ /dev/null
@@ -1,15 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2003/06/19 22:01:46 jlam Exp $
-
-*BEFORE* using the program, you will need to edit the following files:
-
- ${PKG_SYSCONFDIR}/ssmtp.conf
- ${PKG_SYSCONFDIR}/revaliases
-
-especially the variables `mailhub' and `hostname' in ssmtp.conf. You may
-optionally install:
-
- ${PREFIX}/share/examples/ssmtp/mailer.conf
-
-as /etc/mailer.conf to use ssmtp in place of the system sendmail.
-===========================================================================
diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
deleted file mode 100644
index bce3768eb5a..00000000000
--- a/mail/ssmtp/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2006/02/05 23:09:58 joerg Exp $
-#
-# TLS functionality needs testing. Please let me know the result,
-# and preferably info about your system.
-#
-# pkg@pop.707.to
-# Toru TAKAMIZU
-
-DISTNAME= ssmtp_2.61.orig
-PKGNAME= ssmtp-2.61
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/s/ssmtp/}
-
-MAINTAINER= pkg@pop.707.to
-HOMEPAGE= http://packages.debian.org/testing/mail/ssmtp.html
-COMMENT= Extremely simple MTA to forward mail to a mail hub
-
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/.orig$//}
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q}
-
-.include "options.mk"
-
-PKG_SYSCONFSUBDIR= ${PKGBASE}
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES= ${EGDIR}/ssmtp.conf ${PKG_SYSCONFDIR}/ssmtp.conf
-CONF_FILES+= ${EGDIR}/revaliases ${PKG_SYSCONFDIR}/revaliases
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= ${WRKDIR}/mailer.conf ssmtp.c ssmtp.conf ssmtp.8
-SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+= -e 's,/etc/ssl/certs,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+= -e 's,/etc/ssmtp,${PKG_SYSCONFDIR},g'
-SUBST_STAGE.paths= post-patch
-
-post-extract:
- @${RM} -rf ${WRKSRC}/RCS
- ${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/ssmtp.conf ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/revaliases ${EGDIR}
- ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EGDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/ssmtp/PLIST b/mail/ssmtp/PLIST
deleted file mode 100644
index 716887c7ec4..00000000000
--- a/mail/ssmtp/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/06/19 22:01:47 jlam Exp $
-man/man8/ssmtp.8
-sbin/ssmtp
-share/examples/ssmtp/mailer.conf
-share/examples/ssmtp/revaliases
-share/examples/ssmtp/ssmtp.conf
-@dirrm share/examples/ssmtp
diff --git a/mail/ssmtp/distinfo b/mail/ssmtp/distinfo
deleted file mode 100644
index b7025730965..00000000000
--- a/mail/ssmtp/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 09:59:29 agc Exp $
-
-SHA1 (ssmtp_2.61.orig.tar.gz) = bc4b6c20bf8c2c9e66b359e3c24545a2615a1988
-RMD160 (ssmtp_2.61.orig.tar.gz) = da76ee6dd86fc663e6fd69fcb2fb5f550f716de7
-Size (ssmtp_2.61.orig.tar.gz) = 53341 bytes
-SHA1 (patch-aa) = 73681fd5585fe520fb9620e2f8358c41ad42cfd8
-SHA1 (patch-ab) = fd4fb2e5baeacd9f1e60c04cd6c4229c39fa2641
-SHA1 (patch-ac) = c42d3fbfc3054cd1cc730c9fdde57f2d9498bcb4
-SHA1 (patch-ad) = 92c666b84e8fa20103103f6d24f887a587d57a4c
-SHA1 (patch-ae) = ef626358229731e6afff2e194928780e5fc908a3
diff --git a/mail/ssmtp/files/mailer.conf b/mail/ssmtp/files/mailer.conf
deleted file mode 100644
index 2afd462e9a2..00000000000
--- a/mail/ssmtp/files/mailer.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: mailer.conf,v 1.1 2003/06/19 22:01:47 jlam Exp $
-#
-# Use "ssmtp" as a replacement for "sendmail".
-#
-sendmail @PREFIX@/sbin/ssmtp
-send-mail @PREFIX@/sbin/ssmtp
diff --git a/mail/ssmtp/options.mk b/mail/ssmtp/options.mk
deleted file mode 100644
index 5800ad47ac1..00000000000
--- a/mail/ssmtp/options.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:38 dillo Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.ssmtp
-PKG_SUPPORTED_OPTIONS= inet6 ssl
-PKG_SUGGESTED_OPTIONS= ssl
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-inet6
-.endif
-
-.if !empty(PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+= --enable-ssl
-.include "../../security/openssl/buildlink3.mk"
-.endif
diff --git a/mail/ssmtp/patches/patch-aa b/mail/ssmtp/patches/patch-aa
deleted file mode 100644
index 45d156b4da5..00000000000
--- a/mail/ssmtp/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/06/19 20:39:10 jlam Exp $
-
---- arpadate.c.orig Sun Dec 8 18:30:13 2002
-+++ arpadate.c Mon Apr 7 01:17:58 2003
-@@ -79,7 +79,7 @@
- time_t now;
-
- /* RFC822 format string borrowed from GNU shellutils date.c */
-- const char *format = "%a, %_d %b %Y %H:%M:%S %z";
-+ const char *format = "%a, %e %b %Y %H:%M:%S %z";
-
- now = time(NULL);
-
diff --git a/mail/ssmtp/patches/patch-ab b/mail/ssmtp/patches/patch-ab
deleted file mode 100644
index 7cfa05be6a9..00000000000
--- a/mail/ssmtp/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/10/22 14:45:47 tv Exp $
-
---- ssmtp.c.orig Fri Jul 23 01:58:48 2004
-+++ ssmtp.c
-@@ -12,8 +12,9 @@
- See COPYRIGHT for the license
-
- */
--#define VERSION "2.60.4"
-+#define VERSION "2.61"
-
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <sys/param.h>
diff --git a/mail/ssmtp/patches/patch-ac b/mail/ssmtp/patches/patch-ac
deleted file mode 100644
index 1ff46ec4ded..00000000000
--- a/mail/ssmtp/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/06/17 11:35:28 grant Exp $
-
---- Makefile.in.orig 2002-09-27 22:32:53.000000000 +1000
-+++ Makefile.in
-@@ -50,8 +50,8 @@ install: ssmtp $(GEN_CONFIG)
- $(INSTALL) -d -m 755 $(mandir)
- $(INSTALL) -m 644 $(srcdir)/ssmtp.8 $(mandir)/ssmtp.8
- $(INSTALL) -d -m 755 $(SSMTPCONFDIR)
-- $(INSTALL) -m 644 $(srcdir)/revaliases $(INSTALLED_REVALIASES_FILE)
-- $(GEN_CONFIG) $(INSTALLED_CONFIGURATION_FILE)
-+# $(INSTALL) -m 644 $(srcdir)/revaliases $(INSTALLED_REVALIASES_FILE)
-+# $(GEN_CONFIG) $(INSTALLED_CONFIGURATION_FILE)
-
-
- .PHONY: install-sendmail
-@@ -78,7 +78,7 @@ uninstall-sendmail: uninstall
-
- # Binaries:
- ssmtp: $(OBJS)
-- $(CC) -o ssmtp $(OBJS) @LIBS@
-+ $(CC) -o ssmtp $(OBJS) $(LDFLAGS) @LIBS@
-
- .PHONY: clean
- clean:
diff --git a/mail/ssmtp/patches/patch-ad b/mail/ssmtp/patches/patch-ad
deleted file mode 100644
index 9993ae1102b..00000000000
--- a/mail/ssmtp/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/06/19 20:39:10 jlam Exp $
-
---- configure.orig Fri Sep 27 14:47:52 2002
-+++ configure Mon Apr 7 01:03:46 2003
-@@ -1340,7 +1340,7 @@
- #define HAVE_SSL 1
- EOF
-
-- LIBS="$LIBS -lssl"
-+ LIBS="$LIBS -lssl -lcrypto"
- fi
- enableval=""
-
diff --git a/mail/ssmtp/patches/patch-ae b/mail/ssmtp/patches/patch-ae
deleted file mode 100644
index 71b1222d8c2..00000000000
--- a/mail/ssmtp/patches/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2003/06/19 20:39:10 jlam Exp $
-
---- ssmtp.8.orig Fri Sep 27 05:48:59 2002
-+++ ssmtp.8 Thu Jun 19 13:12:40 2003
-@@ -1,11 +1,8 @@
- .TH SSMTP 8 "Last change: 5 February 2000"
- .SH NAME
--ssmtp, sendmail \- send a message using smtp
-+ssmtp \- send a message using smtp
- .SH SYNOPSIS
- .B ssmtp
--.RI "[ " flags " ] [ " address " " ... " ]"
--.br
--.B /usr/lib/sendmail
- .RI "[ " flags " ] [ " address " " ... " ]"
- .br
- .SH DESCRIPTION
diff --git a/mail/sylpheed-claws/DESCR b/mail/sylpheed-claws/DESCR
deleted file mode 100644
index 032099e4d0e..00000000000
--- a/mail/sylpheed-claws/DESCR
+++ /dev/null
@@ -1,21 +0,0 @@
-Sylpheed is an e-mail client (and news reader) based on GTK+, running on
-X Window System, and aiming for
-
- * Quick response
- * Graceful, and sophisticated interface
- * Easy configuration, intuitive operation
- * Abundant features
-
-The appearance and interface are similar to some popular e-mail clients for
-Windows, such as Outlook Express, Becky!, and Datula. The interface is also
-designed to emulate the mailers on Emacsen, and almost all commands are
-accessible with the keyboard.
-
-The messages are managed by MH format, and you'll be able to use it together
-with another mailer based on MH format (like Mew). You can also utilize
-fetchmail or/and procmail, and external programs on receiving (like inc or
-imget).
-
-Sylpheed-Claws was based on Sylpheed, but now this extended version
-adds many useful and powerful features, such as a plugin mechanism,
-built-in image viewer, drag-n-drop support, and a lot more.
diff --git a/mail/sylpheed-claws/MESSAGE.plugins b/mail/sylpheed-claws/MESSAGE.plugins
deleted file mode 100644
index 9de48bf363d..00000000000
--- a/mail/sylpheed-claws/MESSAGE.plugins
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.plugins,v 1.2 2005/03/06 16:45:47 chris Exp $
-
-To use ${PKGNAME}, you must manually load the plugin
-through Configuration/Plugins.
-
-===========================================================================
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
deleted file mode 100644
index 2b0a717fa3e..00000000000
--- a/mail/sylpheed-claws/Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
-# $NetBSD: Makefile,v 1.54 2007/02/22 19:26:44 wiz Exp $
-
-.include "Makefile.common"
-
-#PKGNAME= sylpheed-claws-${SYLPHEED_VERSION}
-
-MAINTAINER= reed@NetBSD.org
-COMMENT= X based e-mail and netnews client
-
-CONFLICTS= sylpheed-[0-9]* sylpheed-gtk2-[0-9]*
-
-USE_TOOLS+= msgfmt
-PKGCONFIG_OVERRIDE+= sylpheed-claws.pc.in
-
-#BUILDLINK_ABI_DEPENDS.libetpan+= libetpan>=0.46
-
-CONFIGURE_ARGS+= --enable-aspell
-CONFIGURE_ARGS+= --enable-nls
-CONFIGURE_ARGS+= --enable-openssl
-CONFIGURE_ARGS+= --enable-gpgme
-CONFIGURE_ARGS+= --enable-compface
-#CONFIGURE_ARGS+= --enable-libetpan
-CONFIGURE_ARGS+= --disable-libetpan
-CONFIGURE_ARGS+= --disable-trayicon-plugin
-CONFIGURE_ARGS+= --disable-image-viewer-plugin
-CONFIGURE_ARGS+= --disable-clamav-plugin
-CONFIGURE_ARGS+= --disable-dillo-viewer-plugin
-CONFIGURE_ARGS+= --disable-spamassassin-plugin
-CONFIGURE_ARGS+= --disable-mathml-viewer-plugin
-CONFIGURE_ARGS+= --disable-pgpcore-plugin
-CONFIGURE_ARGS+= --disable-pgpmime-plugin
-CONFIGURE_ARGS+= --disable-pgpinline-plugin
-CONFIGURE_ARGS+= --disable-bogofilter-plugin
-CONFIGURE_ARGS+= --disable-gnomeprint
-
-# for SMTP, POP3 and IMAP over SSL
-# set these just in case we don't have a pkg-config file for openssl
-CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${BUILDLINK_PREFIX.openssl}/include"
-CONFIGURE_ENV+= OPENSSL_LIBS="-L${BUILDLINK_PREFIX.openssl}/lib -lssl -lcrypto"
-
-PKG_SYSCONFSUBDIR= sylpheed-claws
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-FACES_IS_INSTALLED!= ${PKG_INFO} -e faces || ${ECHO}
-.if empty(FACES_IS_INSTALLED)
-. include "../../graphics/compface/buildlink3.mk"
-.else
-. include "../../mail/faces/buildlink3.mk"
-.endif
-
-EGDIR= ${PREFIX}/share/examples/sylpheed-claws
-CONF_FILES= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.sylpheed-claws
-PKG_SUPPORTED_OPTIONS= jpilot ldap inet6
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mjpilot)
-CONFIGURE_ARGS+= --enable-jpilot
-. include "../../comms/pilot-link-libs/buildlink3.mk"
-. include "../../comms/jpilot/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-jpilot
-.endif
-
-.if !empty(PKG_OPTIONS:Mldap)
-CONFIGURE_ARGS+= --enable-ldap
-. include "../../databases/openldap-client/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-ldap
-.endif
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-ipv6
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${FILESDIR}/mime.types ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/sylpheed*.png ${PREFIX}/share/sylpheed-claws
-
-.include "../../converters/libiconv/buildlink3.mk"
-#.include "../../mail/libetpan/buildlink3.mk"
-.include "../../security/gpgme/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../textproc/aspell/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/sylpheed-claws/Makefile.common b/mail/sylpheed-claws/Makefile.common
deleted file mode 100644
index 94bdc57a742..00000000000
--- a/mail/sylpheed-claws/Makefile.common
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile.common,v 1.20 2007/02/22 19:01:22 wiz Exp $
-
-DISTNAME= sylpheed-claws-${SYLPHEED_VERSION}
-CATEGORIES= mail news x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
-EXTRACT_SUFX= .tar.bz2
-
-HOMEPAGE= http://www.claws-mail.org/
-
-DISTINFO_FILE= ${.CURDIR}/../../mail/sylpheed-claws/distinfo
-PATCHDIR= ${.CURDIR}/../../mail/sylpheed-claws/patches
-
-USE_TOOLS+= gmake pkg-config
-USE_LIBTOOL= YES
-USE_PKGLOCALEDIR= YES
-
-GNU_CONFIGURE= YES
-# Force gnome detection off to avoid installing some extra files
-CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG="no"
-
-SYLPHEED_VERSION= 2.5.5
diff --git a/mail/sylpheed-claws/PLIST b/mail/sylpheed-claws/PLIST
deleted file mode 100644
index 51a75eeeb05..00000000000
--- a/mail/sylpheed-claws/PLIST
+++ /dev/null
@@ -1,251 +0,0 @@
-@comment $NetBSD: PLIST,v 1.18 2006/10/16 13:06:09 reed Exp $
-bin/sylpheed-claws
-include/sylpheed-claws/account.h
-include/sylpheed-claws/action.h
-include/sylpheed-claws/adbookbase.h
-include/sylpheed-claws/addr_compl.h
-include/sylpheed-claws/addrbook.h
-include/sylpheed-claws/addrcache.h
-include/sylpheed-claws/addrclip.h
-include/sylpheed-claws/addrdefs.h
-include/sylpheed-claws/addressadd.h
-include/sylpheed-claws/addressbook.h
-include/sylpheed-claws/addressbook_foldersel.h
-include/sylpheed-claws/addressitem.h
-include/sylpheed-claws/addrgather.h
-include/sylpheed-claws/addrharvest.h
-include/sylpheed-claws/addrindex.h
-include/sylpheed-claws/addritem.h
-include/sylpheed-claws/addrquery.h
-include/sylpheed-claws/addrselect.h
-include/sylpheed-claws/alertpanel.h
-include/sylpheed-claws/browseldap.h
-include/sylpheed-claws/codeconv.h
-include/sylpheed-claws/common/base64.h
-include/sylpheed-claws/common/defs.h
-include/sylpheed-claws/common/hooks.h
-include/sylpheed-claws/common/log.h
-include/sylpheed-claws/common/md5.h
-include/sylpheed-claws/common/mgutils.h
-include/sylpheed-claws/common/nntp.h
-include/sylpheed-claws/common/passcrypt.h
-include/sylpheed-claws/common/plugin.h
-include/sylpheed-claws/common/prefs.h
-include/sylpheed-claws/common/progressindicator.h
-include/sylpheed-claws/common/quoted-printable.h
-include/sylpheed-claws/common/session.h
-include/sylpheed-claws/common/smtp.h
-include/sylpheed-claws/common/socket.h
-include/sylpheed-claws/common/ssl.h
-include/sylpheed-claws/common/ssl_certificate.h
-include/sylpheed-claws/common/string_match.h
-include/sylpheed-claws/common/stringtable.h
-include/sylpheed-claws/common/sylpheed.h
-include/sylpheed-claws/common/template.h
-include/sylpheed-claws/common/timing.h
-include/sylpheed-claws/common/utils.h
-include/sylpheed-claws/common/uuencode.h
-include/sylpheed-claws/common/version.h
-include/sylpheed-claws/common/xml.h
-include/sylpheed-claws/common/xmlprops.h
-include/sylpheed-claws/compose.h
-include/sylpheed-claws/config.h
-include/sylpheed-claws/crash.h
-include/sylpheed-claws/customheader.h
-include/sylpheed-claws/displayheader.h
-include/sylpheed-claws/editaddress.h
-include/sylpheed-claws/editbook.h
-include/sylpheed-claws/editgroup.h
-include/sylpheed-claws/editjpilot.h
-include/sylpheed-claws/editldap.h
-include/sylpheed-claws/editldap_basedn.h
-include/sylpheed-claws/editvcard.h
-include/sylpheed-claws/enriched.h
-@comment include/sylpheed-claws/etpan/etpan-errors.h
-@comment include/sylpheed-claws/etpan/etpan-log.h
-@comment include/sylpheed-claws/etpan/etpan-thread-manager-types.h
-@comment include/sylpheed-claws/etpan/etpan-thread-manager.h
-@comment include/sylpheed-claws/etpan/imap-thread.h
-include/sylpheed-claws/exphtmldlg.h
-include/sylpheed-claws/expldifdlg.h
-include/sylpheed-claws/export.h
-include/sylpheed-claws/exporthtml.h
-include/sylpheed-claws/exportldif.h
-include/sylpheed-claws/filtering.h
-include/sylpheed-claws/folder.h
-include/sylpheed-claws/folder_item_prefs.h
-include/sylpheed-claws/foldersel.h
-include/sylpheed-claws/folderutils.h
-include/sylpheed-claws/folderview.h
-include/sylpheed-claws/gedit-print.h
-include/sylpheed-claws/grouplistdialog.h
-include/sylpheed-claws/gtk/about.h
-include/sylpheed-claws/gtk/colorlabel.h
-include/sylpheed-claws/gtk/colorsel.h
-include/sylpheed-claws/gtk/combobox.h
-include/sylpheed-claws/gtk/description_window.h
-include/sylpheed-claws/gtk/filesel.h
-include/sylpheed-claws/gtk/foldersort.h
-include/sylpheed-claws/gtk/gtkaspell.h
-include/sylpheed-claws/gtk/gtksctree.h
-include/sylpheed-claws/gtk/gtkshruler.h
-include/sylpheed-claws/gtk/gtksourceprintjob.h
-include/sylpheed-claws/gtk/gtkutils.h
-include/sylpheed-claws/gtk/gtkvscrollbutton.h
-include/sylpheed-claws/gtk/icon_legend.h
-include/sylpheed-claws/gtk/inputdialog.h
-include/sylpheed-claws/gtk/logwindow.h
-include/sylpheed-claws/gtk/manage_window.h
-include/sylpheed-claws/gtk/menu.h
-include/sylpheed-claws/gtk/pluginwindow.h
-include/sylpheed-claws/gtk/prefswindow.h
-include/sylpheed-claws/gtk/progressdialog.h
-include/sylpheed-claws/gtk/quicksearch.h
-include/sylpheed-claws/gtk/sslcertwindow.h
-include/sylpheed-claws/gtk/sylpheed-marshal.h
-include/sylpheed-claws/headerview.h
-include/sylpheed-claws/html.h
-include/sylpheed-claws/image_viewer.h
-include/sylpheed-claws/imap.h
-include/sylpheed-claws/imap_gtk.h
-include/sylpheed-claws/import.h
-include/sylpheed-claws/importldif.h
-include/sylpheed-claws/importmutt.h
-include/sylpheed-claws/importpine.h
-include/sylpheed-claws/inc.h
-include/sylpheed-claws/jpilot.h
-include/sylpheed-claws/ldapctrl.h
-include/sylpheed-claws/ldaplocate.h
-include/sylpheed-claws/ldapquery.h
-include/sylpheed-claws/ldapserver.h
-include/sylpheed-claws/ldaputil.h
-include/sylpheed-claws/ldif.h
-include/sylpheed-claws/localfolder.h
-include/sylpheed-claws/main.h
-include/sylpheed-claws/mainwindow.h
-include/sylpheed-claws/manual.h
-include/sylpheed-claws/matcher.h
-include/sylpheed-claws/matcher_parser.h
-include/sylpheed-claws/matcher_parser_lex.h
-include/sylpheed-claws/matcher_parser_parse.h
-include/sylpheed-claws/mbox.h
-include/sylpheed-claws/message_search.h
-include/sylpheed-claws/messageview.h
-include/sylpheed-claws/mh.h
-include/sylpheed-claws/mh_gtk.h
-include/sylpheed-claws/mimeview.h
-include/sylpheed-claws/msgcache.h
-include/sylpheed-claws/mutt.h
-include/sylpheed-claws/news.h
-include/sylpheed-claws/news_gtk.h
-include/sylpheed-claws/noticeview.h
-include/sylpheed-claws/partial_download.h
-include/sylpheed-claws/pine.h
-include/sylpheed-claws/pop.h
-include/sylpheed-claws/prefs_account.h
-include/sylpheed-claws/prefs_actions.h
-include/sylpheed-claws/prefs_common.h
-include/sylpheed-claws/prefs_compose_writing.h
-include/sylpheed-claws/prefs_customheader.h
-include/sylpheed-claws/prefs_display_header.h
-include/sylpheed-claws/prefs_ext_prog.h
-include/sylpheed-claws/prefs_filtering.h
-include/sylpheed-claws/prefs_filtering_action.h
-include/sylpheed-claws/prefs_folder_column.h
-include/sylpheed-claws/prefs_folder_item.h
-include/sylpheed-claws/prefs_fonts.h
-include/sylpheed-claws/prefs_gtk.h
-include/sylpheed-claws/prefs_image_viewer.h
-include/sylpheed-claws/prefs_matcher.h
-include/sylpheed-claws/prefs_message.h
-include/sylpheed-claws/prefs_msg_colors.h
-include/sylpheed-claws/prefs_other.h
-include/sylpheed-claws/prefs_quote.h
-include/sylpheed-claws/prefs_receive.h
-include/sylpheed-claws/prefs_send.h
-include/sylpheed-claws/prefs_spelling.h
-include/sylpheed-claws/prefs_summaries.h
-include/sylpheed-claws/prefs_summary_column.h
-include/sylpheed-claws/prefs_template.h
-include/sylpheed-claws/prefs_themes.h
-include/sylpheed-claws/prefs_toolbar.h
-include/sylpheed-claws/prefs_wrapping.h
-include/sylpheed-claws/privacy.h
-include/sylpheed-claws/procheader.h
-include/sylpheed-claws/procmime.h
-include/sylpheed-claws/procmsg.h
-include/sylpheed-claws/quote_fmt.h
-include/sylpheed-claws/quote_fmt_lex.h
-include/sylpheed-claws/quote_fmt_parse.h
-include/sylpheed-claws/recv.h
-include/sylpheed-claws/remotefolder.h
-include/sylpheed-claws/send_message.h
-include/sylpheed-claws/setup.h
-include/sylpheed-claws/sourcewindow.h
-include/sylpheed-claws/ssl_manager.h
-include/sylpheed-claws/statusbar.h
-include/sylpheed-claws/stock_pixmap.h
-include/sylpheed-claws/summary_search.h
-include/sylpheed-claws/summaryview.h
-include/sylpheed-claws/textview.h
-include/sylpheed-claws/toolbar.h
-include/sylpheed-claws/undo.h
-include/sylpheed-claws/unmime.h
-include/sylpheed-claws/vcard.h
-include/sylpheed-claws/wizard.h
-lib/pkgconfig/sylpheed-claws.pc
-man/man1/sylpheed-claws.1
-share/examples/sylpheed-claws/mime.types
-share/locale/bg/LC_MESSAGES/sylpheed-claws.mo
-share/locale/ca/LC_MESSAGES/sylpheed-claws.mo
-share/locale/cs/LC_MESSAGES/sylpheed-claws.mo
-share/locale/de/LC_MESSAGES/sylpheed-claws.mo
-share/locale/el/LC_MESSAGES/sylpheed-claws.mo
-share/locale/en_GB/LC_MESSAGES/sylpheed-claws.mo
-share/locale/es/LC_MESSAGES/sylpheed-claws.mo
-share/locale/fi/LC_MESSAGES/sylpheed-claws.mo
-share/locale/fr/LC_MESSAGES/sylpheed-claws.mo
-share/locale/hr/LC_MESSAGES/sylpheed-claws.mo
-share/locale/hu/LC_MESSAGES/sylpheed-claws.mo
-share/locale/it/LC_MESSAGES/sylpheed-claws.mo
-share/locale/ja/LC_MESSAGES/sylpheed-claws.mo
-share/locale/ko/LC_MESSAGES/sylpheed-claws.mo
-share/locale/nb/LC_MESSAGES/sylpheed-claws.mo
-share/locale/nl/LC_MESSAGES/sylpheed-claws.mo
-share/locale/pl/LC_MESSAGES/sylpheed-claws.mo
-share/locale/pt_BR/LC_MESSAGES/sylpheed-claws.mo
-share/locale/ru/LC_MESSAGES/sylpheed-claws.mo
-share/locale/sk/LC_MESSAGES/sylpheed-claws.mo
-share/locale/sr/LC_MESSAGES/sylpheed-claws.mo
-share/locale/sv/LC_MESSAGES/sylpheed-claws.mo
-share/locale/zh_CN/LC_MESSAGES/sylpheed-claws.mo
-share/locale/zh_TW/LC_MESSAGES/sylpheed-claws.mo
-share/sylpheed-claws/manual/en/sylpheed-claws-manual.html
-share/sylpheed-claws/manual/en/sylpheed-claws-manual.pdf
-share/sylpheed-claws/manual/en/sylpheed-claws-manual.ps
-share/sylpheed-claws/manual/en/sylpheed-claws-manual.txt
-share/sylpheed-claws/manual/es/sylpheed-claws-manual.html
-share/sylpheed-claws/manual/es/sylpheed-claws-manual.pdf
-share/sylpheed-claws/manual/es/sylpheed-claws-manual.ps
-share/sylpheed-claws/manual/es/sylpheed-claws-manual.txt
-share/sylpheed-claws/manual/fr/sylpheed-claws-manual.html
-share/sylpheed-claws/manual/fr/sylpheed-claws-manual.pdf
-share/sylpheed-claws/manual/fr/sylpheed-claws-manual.ps
-share/sylpheed-claws/manual/fr/sylpheed-claws-manual.txt
-share/sylpheed-claws/manual/pl/sylpheed-claws-manual.html
-share/sylpheed-claws/manual/pl/sylpheed-claws-manual.pdf
-share/sylpheed-claws/manual/pl/sylpheed-claws-manual.ps
-share/sylpheed-claws/manual/pl/sylpheed-claws-manual.txt
-share/sylpheed-claws/sylpheed-claws-128x128.png
-share/sylpheed-claws/sylpheed-claws-64x64.png
-share/sylpheed-claws/sylpheed-claws.png
-@dirrm share/sylpheed-claws/manual/pl
-@dirrm share/sylpheed-claws/manual/fr
-@dirrm share/sylpheed-claws/manual/es
-@dirrm share/sylpheed-claws/manual/en
-@dirrm share/sylpheed-claws/manual
-@dirrm share/sylpheed-claws
-@dirrm share/examples/sylpheed-claws
-@dirrm include/sylpheed-claws/gtk
-@dirrm include/sylpheed-claws/common
-@dirrm include/sylpheed-claws
diff --git a/mail/sylpheed-claws/PLIST.plugins b/mail/sylpheed-claws/PLIST.plugins
deleted file mode 100644
index 3f4ae9f813e..00000000000
--- a/mail/sylpheed-claws/PLIST.plugins
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.plugins,v 1.3 2004/09/22 08:09:42 jlam Exp $
-lib/sylpheed-claws/plugins/${PLUGIN_NAME}.la
-@unexec ${RMDIR} %D/lib/sylpheed-claws/plugins 2>/dev/null || ${TRUE}
diff --git a/mail/sylpheed-claws/buildlink3.mk b/mail/sylpheed-claws/buildlink3.mk
deleted file mode 100644
index be181340b15..00000000000
--- a/mail/sylpheed-claws/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/10/16 13:06:09 reed Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-SYLPHEED_CLAWS_BUILDLINK3_MK:= ${SYLPHEED_CLAWS_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= sylpheed-claws
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsylpheed-claws}
-BUILDLINK_PACKAGES+= sylpheed-claws
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sylpheed-claws
-
-.if !empty(SYLPHEED_CLAWS_BUILDLINK3_MK:M+)
-.if ${SYLPHEED_CLAWS_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.sylpheed-claws+= sylpheed-claws>=2.4.0
-BUILDLINK_PKGSRCDIR.sylpheed-claws?= ../../mail/sylpheed-claws
-.endif # SYLPHEED_CLAWS_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/sylpheed-claws/distinfo b/mail/sylpheed-claws/distinfo
deleted file mode 100644
index 39c0e839fab..00000000000
--- a/mail/sylpheed-claws/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.25 2006/10/16 13:06:09 reed Exp $
-
-SHA1 (sylpheed-claws-2.5.5.tar.bz2) = 1908c485af6f0a3baee373e4734f71010a26d182
-RMD160 (sylpheed-claws-2.5.5.tar.bz2) = 3cad84790a50029fbe1f8d6b91383e01a10459eb
-Size (sylpheed-claws-2.5.5.tar.bz2) = 5038409 bytes
-SHA1 (patch-ab) = 926d79d328cb3a94f4c53bc5d3d2657f8534114d
diff --git a/mail/sylpheed-claws/files/mime.types b/mail/sylpheed-claws/files/mime.types
deleted file mode 100644
index 195474f4d35..00000000000
--- a/mail/sylpheed-claws/files/mime.types
+++ /dev/null
@@ -1,471 +0,0 @@
-# This is a comment. I love comments.
-
-# This file controls what Internet media types are sent to the client for
-# given file extension(s). Sending the correct media type to the client
-# is important so they know how to handle the content of the file.
-# Extra types can either be added here or by using an AddType directive
-# in your config files. For more information about Internet media types,
-# please read RFC 2045, 2046, 2047, 2048, and 2077. The Internet media type
-# registry is at <ftp://ftp.iana.org/assignments/media-types/>.
-
-# MIME type Extension
-application/EDI-Consent
-application/EDI-X12
-application/EDIFACT
-application/activemessage
-application/andrew-inset ez
-application/applefile
-application/atomicmail
-application/batch-SMTP
-application/beep+xml
-application/cals-1840
-application/commonground
-application/cybercash
-application/dca-rft
-application/dec-dx
-application/dvcs
-application/eshop
-application/http
-application/hyperstudio
-application/iges
-application/index
-application/index.cmd
-application/index.obj
-application/index.response
-application/index.vnd
-application/iotp
-application/ipp
-application/isup
-application/font-tdpfr
-application/mac-binhex40 hqx
-application/mac-compactpro cpt
-application/macwriteii
-application/marc
-application/mathematica
-application/mathematica-old
-application/msword doc
-application/news-message-id
-application/news-transmission
-application/ocsp-request
-application/ocsp-response
-application/octet-stream bin dms lha lzh exe class so dll
-application/oda oda
-application/parityfec
-application/pdf pdf
-application/pgp-encrypted
-application/pgp-keys
-application/pgp-signature
-application/pkcs10
-application/pkcs7-mime
-application/pkcs7-signature
-application/pkix-cert
-application/pkix-crl
-application/pkixcmp
-application/postscript ai eps ps
-application/prs.alvestrand.titrax-sheet
-application/prs.cww
-application/prs.nprend
-application/qsig
-application/remote-printing
-application/riscos
-application/rtf
-application/sdp
-application/set-payment
-application/set-payment-initiation
-application/set-registration
-application/set-registration-initiation
-application/sgml
-application/sgml-open-catalog
-application/sieve
-application/slate
-application/smil smi smil
-application/timestamp-query
-application/timestamp-reply
-application/vemmi
-application/vnd.3M.Post-it-Notes
-application/vnd.FloGraphIt
-application/vnd.accpac.simply.aso
-application/vnd.accpac.simply.imp
-application/vnd.acucobol
-application/vnd.aether.imp
-application/vnd.anser-web-certificate-issue-initiation
-application/vnd.anser-web-funds-transfer-initiation
-application/vnd.audiograph
-application/vnd.businessobjects
-application/vnd.bmi
-application/vnd.canon-cpdl
-application/vnd.canon-lips
-application/vnd.claymore
-application/vnd.commerce-battelle
-application/vnd.commonspace
-application/vnd.comsocaller
-application/vnd.contact.cmsg
-application/vnd.cosmocaller
-application/vnd.cups-postscript
-application/vnd.cups-raster
-application/vnd.cups-raw
-application/vnd.ctc-posml
-application/vnd.cybank
-application/vnd.dna
-application/vnd.dpgraph
-application/vnd.dxr
-application/vnd.ecdis-update
-application/vnd.ecowin.chart
-application/vnd.ecowin.filerequest
-application/vnd.ecowin.fileupdate
-application/vnd.ecowin.series
-application/vnd.ecowin.seriesrequest
-application/vnd.ecowin.seriesupdate
-application/vnd.enliven
-application/vnd.epson.esf
-application/vnd.epson.msf
-application/vnd.epson.quickanime
-application/vnd.epson.salt
-application/vnd.epson.ssf
-application/vnd.ericsson.quickcall
-application/vnd.eudora.data
-application/vnd.fdf
-application/vnd.ffsns
-application/vnd.framemaker
-application/vnd.fsc.weblaunch
-application/vnd.fujitsu.oasys
-application/vnd.fujitsu.oasys2
-application/vnd.fujitsu.oasys3
-application/vnd.fujitsu.oasysgp
-application/vnd.fujitsu.oasysprs
-application/vnd.fujixerox.ddd
-application/vnd.fujixerox.docuworks
-application/vnd.fujixerox.docuworks.binder
-application/vnd.fut-misnet
-application/vnd.grafeq
-application/vnd.groove-account
-application/vnd.groove-identity-message
-application/vnd.groove-injector
-application/vnd.groove-tool-message
-application/vnd.groove-tool-template
-application/vnd.groove-vcard
-application/vnd.hhe.lesson-player
-application/vnd.hp-HPGL
-application/vnd.hp-PCL
-application/vnd.hp-PCLXL
-application/vnd.hp-hpid
-application/vnd.hp-hps
-application/vnd.httphone
-application/vnd.hzn-3d-crossword
-application/vnd.ibm.afplinedata
-application/vnd.ibm.MiniPay
-application/vnd.ibm.modcap
-application/vnd.informix-visionary
-application/vnd.intercon.formnet
-application/vnd.intertrust.digibox
-application/vnd.intertrust.nncp
-application/vnd.intu.qbo
-application/vnd.intu.qfx
-application/vnd.irepository.package+xml
-application/vnd.is-xpr
-application/vnd.japannet-directory-service
-application/vnd.japannet-jpnstore-wakeup
-application/vnd.japannet-payment-wakeup
-application/vnd.japannet-registration
-application/vnd.japannet-registration-wakeup
-application/vnd.japannet-setstore-wakeup
-application/vnd.japannet-verification
-application/vnd.japannet-verification-wakeup
-application/vnd.koan
-application/vnd.lotus-1-2-3
-application/vnd.lotus-approach
-application/vnd.lotus-freelance
-application/vnd.lotus-notes
-application/vnd.lotus-organizer
-application/vnd.lotus-screencam
-application/vnd.lotus-wordpro
-application/vnd.mcd
-application/vnd.mediastation.cdkey
-application/vnd.meridian-slingshot
-application/vnd.mif mif
-application/vnd.minisoft-hp3000-save
-application/vnd.mitsubishi.misty-guard.trustweb
-application/vnd.mobius.daf
-application/vnd.mobius.dis
-application/vnd.mobius.msl
-application/vnd.mobius.plc
-application/vnd.mobius.txf
-application/vnd.motorola.flexsuite
-application/vnd.motorola.flexsuite.adsi
-application/vnd.motorola.flexsuite.fis
-application/vnd.motorola.flexsuite.gotap
-application/vnd.motorola.flexsuite.kmr
-application/vnd.motorola.flexsuite.ttc
-application/vnd.motorola.flexsuite.wem
-application/vnd.mozilla.xul+xml
-application/vnd.ms-artgalry
-application/vnd.ms-asf
-application/vnd.ms-excel xls
-application/vnd.ms-lrm
-application/vnd.ms-powerpoint ppt
-application/vnd.ms-project
-application/vnd.ms-tnef
-application/vnd.ms-works
-application/vnd.mseq
-application/vnd.msign
-application/vnd.music-niff
-application/vnd.musician
-application/vnd.netfpx
-application/vnd.noblenet-directory
-application/vnd.noblenet-sealer
-application/vnd.noblenet-web
-application/vnd.novadigm.EDM
-application/vnd.novadigm.EDX
-application/vnd.novadigm.EXT
-application/vnd.osa.netdeploy
-application/vnd.palm
-application/vnd.pg.format
-application/vnd.pg.osasli
-application/vnd.powerbuilder6
-application/vnd.powerbuilder6-s
-application/vnd.powerbuilder7
-application/vnd.powerbuilder7-s
-application/vnd.powerbuilder75
-application/vnd.powerbuilder75-s
-application/vnd.previewsystems.box
-application/vnd.publishare-delta-tree
-application/vnd.pvi.ptid1
-application/vnd.pwg-xhtml-print+xml
-application/vnd.rapid
-application/vnd.s3sms
-application/vnd.seemail
-application/vnd.shana.informed.formdata
-application/vnd.shana.informed.formtemplate
-application/vnd.shana.informed.interchange
-application/vnd.shana.informed.package
-application/vnd.sss-cod
-application/vnd.sss-dtf
-application/vnd.sss-ntf
-application/vnd.street-stream
-application/vnd.svd
-application/vnd.swiftview-ics
-application/vnd.triscape.mxs
-application/vnd.trueapp
-application/vnd.truedoc
-application/vnd.tve-trigger
-application/vnd.ufdl
-application/vnd.uplanet.alert
-application/vnd.uplanet.alert-wbxml
-application/vnd.uplanet.bearer-choice-wbxml
-application/vnd.uplanet.bearer-choice
-application/vnd.uplanet.cacheop
-application/vnd.uplanet.cacheop-wbxml
-application/vnd.uplanet.channel
-application/vnd.uplanet.channel-wbxml
-application/vnd.uplanet.list
-application/vnd.uplanet.list-wbxml
-application/vnd.uplanet.listcmd
-application/vnd.uplanet.listcmd-wbxml
-application/vnd.uplanet.signal
-application/vnd.vcx
-application/vnd.vectorworks
-application/vnd.vidsoft.vidconference
-application/vnd.visio
-application/vnd.vividence.scriptfile
-application/vnd.wap.sic
-application/vnd.wap.slc
-application/vnd.wap.wbxml wbxml
-application/vnd.wap.wmlc wmlc
-application/vnd.wap.wmlscriptc wmlsc
-application/vnd.webturbo
-application/vnd.wrq-hp3000-labelled
-application/vnd.wt.stf
-application/vnd.xara
-application/vnd.xfdl
-application/vnd.yellowriver-custom-menu
-application/whoispp-query
-application/whoispp-response
-application/wita
-application/wordperfect5.1
-application/x-bcpio bcpio
-application/x-cdlink vcd
-application/x-chess-pgn pgn
-application/x-compress
-application/x-cpio cpio
-application/x-csh csh
-application/x-director dcr dir dxr
-application/x-dvi dvi
-application/x-futuresplash spl
-application/x-gtar gtar
-application/x-gzip
-application/x-hdf hdf
-application/x-javascript js
-application/x-koan skp skd skt skm
-application/x-latex latex
-application/x-netcdf nc cdf
-application/x-sh sh
-application/x-shar shar
-application/x-shockwave-flash swf
-application/x-stuffit sit
-application/x-sv4cpio sv4cpio
-application/x-sv4crc sv4crc
-application/x-tar tar
-application/x-tcl tcl
-application/x-tex tex
-application/x-texinfo texinfo texi
-application/x-troff t tr roff
-application/x-troff-man man
-application/x-troff-me me
-application/x-troff-ms ms
-application/x-ustar ustar
-application/x-wais-source src
-application/x400-bp
-application/xhtml+xml xhtml xht
-application/xml
-application/xml-dtd
-application/xml-external-parsed-entity
-application/zip zip
-audio/32kadpcm
-audio/basic au snd
-audio/g.722.1
-audio/l16
-audio/midi mid midi kar
-audio/mp4a-latm
-audio/mpa-robust
-audio/mpeg mpga mp2 mp3
-audio/parityfec
-audio/prs.sid
-audio/telephone-event
-audio/tone
-audio/vnd.cisco.nse
-audio/vnd.cns.anp1
-audio/vnd.cns.inf1
-audio/vnd.digital-winds
-audio/vnd.everad.plj
-audio/vnd.lucent.voice
-audio/vnd.nortel.vbk
-audio/vnd.nuera.ecelp4800
-audio/vnd.nuera.ecelp7470
-audio/vnd.nuera.ecelp9600
-audio/vnd.octel.sbc
-audio/vnd.qcelp
-audio/vnd.rhetorex.32kadpcm
-audio/vnd.vmx.cvsd
-audio/x-aiff aif aiff aifc
-audio/x-mpegurl m3u
-audio/x-pn-realaudio ram rm
-audio/x-pn-realaudio-plugin rpm
-audio/x-realaudio ra
-audio/x-wav wav
-chemical/x-pdb pdb
-chemical/x-xyz xyz
-image/bmp bmp
-image/cgm
-image/g3fax
-image/gif gif
-image/ief ief
-image/jpeg jpeg jpg jpe
-image/naplps
-image/png png
-image/prs.btif
-image/prs.pti
-image/tiff tiff tif
-image/vnd.cns.inf2
-image/vnd.djvu djvu djv
-image/vnd.dwg
-image/vnd.dxf
-image/vnd.fastbidsheet
-image/vnd.fpx
-image/vnd.fst
-image/vnd.fujixerox.edmics-mmr
-image/vnd.fujixerox.edmics-rlc
-image/vnd.mix
-image/vnd.net-fpx
-image/vnd.svf
-image/vnd.wap.wbmp wbmp
-image/vnd.xiff
-image/x-cmu-raster ras
-image/x-portable-anymap pnm
-image/x-portable-bitmap pbm
-image/x-portable-graymap pgm
-image/x-portable-pixmap ppm
-image/x-rgb rgb
-image/x-xbitmap xbm
-image/x-xpixmap xpm
-image/x-xwindowdump xwd
-message/delivery-status
-message/disposition-notification
-message/external-body
-message/http
-message/news
-message/partial
-message/rfc822
-message/s-http
-model/iges igs iges
-model/mesh msh mesh silo
-model/vnd.dwf
-model/vnd.flatland.3dml
-model/vnd.gdl
-model/vnd.gs-gdl
-model/vnd.gtw
-model/vnd.mts
-model/vnd.vtu
-model/vrml wrl vrml
-multipart/alternative
-multipart/appledouble
-multipart/byteranges
-multipart/digest
-multipart/encrypted
-multipart/form-data
-multipart/header-set
-multipart/mixed
-multipart/parallel
-multipart/related
-multipart/report
-multipart/signed
-multipart/voice-message
-text/calendar
-text/css css
-text/directory
-text/enriched
-text/html html htm
-text/parityfec
-text/plain asc txt
-text/prs.lines.tag
-text/rfc822-headers
-text/richtext rtx
-text/rtf rtf
-text/sgml sgml sgm
-text/tab-separated-values tsv
-text/t140
-text/uri-list
-text/vnd.DMClientScript
-text/vnd.IPTC.NITF
-text/vnd.IPTC.NewsML
-text/vnd.abc
-text/vnd.curl
-text/vnd.flatland.3dml
-text/vnd.fly
-text/vnd.fmi.flexstor
-text/vnd.in3d.3dml
-text/vnd.in3d.spot
-text/vnd.latex-z
-text/vnd.motorola.reflex
-text/vnd.ms-mediapackage
-text/vnd.wap.si
-text/vnd.wap.sl
-text/vnd.wap.wml wml
-text/vnd.wap.wmlscript wmls
-text/x-setext etx
-text/xml xml xsl
-text/xml-external-parsed-entity
-video/mp4v-es
-video/mpeg mpeg mpg mpe
-video/parityfec
-video/pointer
-video/quicktime qt mov
-video/vnd.fvt
-video/vnd.motorola.video
-video/vnd.motorola.videop
-video/vnd.mpegurl mxu
-video/vnd.mts
-video/vnd.nokia.interleaved-multimedia
-video/vnd.vivo
-video/x-msvideo avi
-video/x-sgi-movie movie
-x-conference/x-cooltalk ice
diff --git a/mail/sylpheed-claws/patches/patch-ab b/mail/sylpheed-claws/patches/patch-ab
deleted file mode 100644
index 7f4b0672d94..00000000000
--- a/mail/sylpheed-claws/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig 2006-08-28 02:07:05.000000000 -0500
-+++ po/Makefile.in.in 2006-10-11 09:52:32.000000000 -0500
-@@ -30,7 +30,7 @@
-
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--mkinstalldirs = $(SHELL) @install_sh@ -d
-+mkinstalldirs = @install_sh@ -d
- mkdir_p = @mkdir_p@
-
- GMSGFMT_ = @GMSGFMT@
diff --git a/mail/sylpheed-claws/plugins.mk b/mail/sylpheed-claws/plugins.mk
deleted file mode 100644
index 010cd68717a..00000000000
--- a/mail/sylpheed-claws/plugins.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: plugins.mk,v 1.8 2007/02/22 19:26:44 wiz Exp $
-#
-
-.include "../../mail/sylpheed-claws/Makefile.common"
-
-PKGNAME= sylpheed-claws-${PLUGIN_NAME:S/_/-/}-${SYLPHEED_VERSION}
-
-CONFIGURE_DIRS= ${WRKDIR}/${DISTNAME}
-BUILD_DIRS= ${WRKDIR}/${DISTNAME}/src/plugins/${PLUGIN_NAME}
-INSTALL_DIRS= ${WRKDIR}/${DISTNAME}/src/plugins/${PLUGIN_NAME}
-
-DEPENDS+= sylpheed-claws>=${SYLPHEED_VERSION}:../../mail/sylpheed-claws
-
-LIBTOOL_OVERRIDE= ../../../libtool
-
-CONFIGURE_ARGS+= --disable-aspell
-CONFIGURE_ARGS+= --disable-nls
-CONFIGURE_ARGS+= --disable-openssl
-CONFIGURE_ARGS+= --disable-gpgme
-CONFIGURE_ARGS+= --disable-compface
-CONFIGURE_ARGS+= --disable-ipv6
-CONFIGURE_ARGS+= --disable-trayicon-plugin
-CONFIGURE_ARGS+= --disable-image-viewer-plugin
-CONFIGURE_ARGS+= --disable-clamav-plugin
-CONFIGURE_ARGS+= --disable-dillo-viewer-plugin
-CONFIGURE_ARGS+= --disable-spamassassin-plugin
-CONFIGURE_ARGS+= --disable-mathml-viewer-plugin
-CONFIGURE_ARGS+= --disable-pgpmime-plugin
-
-PLIST_SRC= ${.CURDIR}/../../mail/sylpheed-claws/PLIST.plugins
-PLIST_SUBST+= PLUGIN_NAME=${PLUGIN_NAME:Q}
-
-MESSAGE_SRC+= ${.CURDIR}/../../mail/sylpheed-claws/MESSAGE.plugins
diff --git a/mail/sylpheed-devel/DESCR b/mail/sylpheed-devel/DESCR
deleted file mode 100644
index 9c0f8feca79..00000000000
--- a/mail/sylpheed-devel/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-Sylpheed is an e-mail client (and news reader) based on GTK+ v2, running on
-X Window System, and aiming for
-
- * Quick response
- * Graceful, and sophisticated interface
- * Easy configuration, intuitive operation
- * Abundant features
-
-The appearance and interface are similar to some popular e-mail clients for
-Windows, such as Outlook Express, Becky!, and Datula. The interface is also
-designed to emulate the mailers on Emacsen, and almost all commands are
-accessible with the keyboard.
-
-The messages are managed by MH format, and you'll be able to use it together
-with another mailer based on MH format (like Mew). You can also utilize
-fetchmail or/and procmail, and external programs on receiving (like inc or
-imget).
diff --git a/mail/sylpheed-devel/Makefile b/mail/sylpheed-devel/Makefile
deleted file mode 100644
index 7ad11759fb9..00000000000
--- a/mail/sylpheed-devel/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.44 2007/03/19 19:51:39 xtraeme Exp $
-
-DISTNAME= sylpheed-2.4.0beta5
-PKGNAME= ${DISTNAME:S/-/-devel-/}
-CATEGORIES= mail news x11
-MASTER_SITES= http://sylpheed.sraoss.jp/sylpheed/v2.4beta/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= chris@NetBSD.org
-HOMEPAGE= http://sylpheed.sraoss.jp/en/
-COMMENT= X based e-mail and netnews client
-
-CONFLICTS= sylpheed-claws-[0-9]* sylpheed-[0-9]*
-
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake msgfmt pkg-config
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --enable-nls
-CONFIGURE_ARGS+= --enable-ssl
-CONFIGURE_ARGS+= --enable-compface
-
-PKG_SYSCONFSUBDIR= sylpheed
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-
-EGDIR= ${PREFIX}/share/examples/sylpheed
-CONF_FILES= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${FILESDIR}/mime.types ${EGDIR}
-
-.include "options.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/sylpheed-devel/PLIST b/mail/sylpheed-devel/PLIST
deleted file mode 100644
index b497ad455af..00000000000
--- a/mail/sylpheed-devel/PLIST
+++ /dev/null
@@ -1,111 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2007/03/19 19:51:39 xtraeme Exp $
-bin/sylpheed
-share/examples/sylpheed/mime.types
-share/locale/be/LC_MESSAGES/sylpheed.mo
-share/locale/bg/LC_MESSAGES/sylpheed.mo
-share/locale/cs/LC_MESSAGES/sylpheed.mo
-share/locale/da/LC_MESSAGES/sylpheed.mo
-share/locale/de/LC_MESSAGES/sylpheed.mo
-share/locale/el/LC_MESSAGES/sylpheed.mo
-share/locale/es/LC_MESSAGES/sylpheed.mo
-share/locale/et/LC_MESSAGES/sylpheed.mo
-share/locale/fr/LC_MESSAGES/sylpheed.mo
-share/locale/gl/LC_MESSAGES/sylpheed.mo
-share/locale/hr/LC_MESSAGES/sylpheed.mo
-share/locale/hu/LC_MESSAGES/sylpheed.mo
-share/locale/it/LC_MESSAGES/sylpheed.mo
-share/locale/ja/LC_MESSAGES/sylpheed.mo
-share/locale/ko/LC_MESSAGES/sylpheed.mo
-share/locale/lt/LC_MESSAGES/sylpheed.mo
-share/locale/nl/LC_MESSAGES/sylpheed.mo
-share/locale/pl/LC_MESSAGES/sylpheed.mo
-share/locale/pt_BR/LC_MESSAGES/sylpheed.mo
-share/locale/ro/LC_MESSAGES/sylpheed.mo
-share/locale/ru/LC_MESSAGES/sylpheed.mo
-share/locale/sk/LC_MESSAGES/sylpheed.mo
-share/locale/sl/LC_MESSAGES/sylpheed.mo
-share/locale/sr/LC_MESSAGES/sylpheed.mo
-share/locale/sv/LC_MESSAGES/sylpheed.mo
-share/locale/tr/LC_MESSAGES/sylpheed.mo
-share/locale/uk/LC_MESSAGES/sylpheed.mo
-share/locale/vi/LC_MESSAGES/sylpheed.mo
-share/locale/zh_CN/LC_MESSAGES/sylpheed.mo
-share/locale/zh_TW/LC_MESSAGES/sylpheed.mo
-share/sylpheed/faq/de/sylpheed-faq-1.html
-share/sylpheed/faq/de/sylpheed-faq-2.html
-share/sylpheed/faq/de/sylpheed-faq-3.html
-share/sylpheed/faq/de/sylpheed-faq.html
-share/sylpheed/faq/en/sylpheed-faq-1.html
-share/sylpheed/faq/en/sylpheed-faq-2.html
-share/sylpheed/faq/en/sylpheed-faq-3.html
-share/sylpheed/faq/en/sylpheed-faq.html
-share/sylpheed/faq/es/sylpheed-faq-1.html
-share/sylpheed/faq/es/sylpheed-faq-2.html
-share/sylpheed/faq/es/sylpheed-faq-3.html
-share/sylpheed/faq/es/sylpheed-faq.html
-share/sylpheed/faq/fr/sylpheed-faq-1.html
-share/sylpheed/faq/fr/sylpheed-faq-2.html
-share/sylpheed/faq/fr/sylpheed-faq-3.html
-share/sylpheed/faq/fr/sylpheed-faq.html
-share/sylpheed/faq/it/sylpheed-faq-1.html
-share/sylpheed/faq/it/sylpheed-faq-2.html
-share/sylpheed/faq/it/sylpheed-faq-3.html
-share/sylpheed/faq/it/sylpheed-faq.html
-share/sylpheed/manual/en/sylpheed-1.html
-share/sylpheed/manual/en/sylpheed-10.html
-share/sylpheed/manual/en/sylpheed-11.html
-share/sylpheed/manual/en/sylpheed-12.html
-share/sylpheed/manual/en/sylpheed-13.html
-share/sylpheed/manual/en/sylpheed-14.html
-share/sylpheed/manual/en/sylpheed-15.html
-share/sylpheed/manual/en/sylpheed-16.html
-share/sylpheed/manual/en/sylpheed-17.html
-share/sylpheed/manual/en/sylpheed-18.html
-share/sylpheed/manual/en/sylpheed-19.html
-share/sylpheed/manual/en/sylpheed-2.html
-share/sylpheed/manual/en/sylpheed-20.html
-share/sylpheed/manual/en/sylpheed-3.html
-share/sylpheed/manual/en/sylpheed-4.html
-share/sylpheed/manual/en/sylpheed-5.html
-share/sylpheed/manual/en/sylpheed-6.html
-share/sylpheed/manual/en/sylpheed-7.html
-share/sylpheed/manual/en/sylpheed-8.html
-share/sylpheed/manual/en/sylpheed-9.html
-share/sylpheed/manual/en/sylpheed.html
-share/sylpheed/manual/ja/sylpheed-1.html
-share/sylpheed/manual/ja/sylpheed-10.html
-share/sylpheed/manual/ja/sylpheed-11.html
-share/sylpheed/manual/ja/sylpheed-12.html
-share/sylpheed/manual/ja/sylpheed-13.html
-share/sylpheed/manual/ja/sylpheed-14.html
-share/sylpheed/manual/ja/sylpheed-15.html
-share/sylpheed/manual/ja/sylpheed-16.html
-share/sylpheed/manual/ja/sylpheed-17.html
-share/sylpheed/manual/ja/sylpheed-18.html
-share/sylpheed/manual/ja/sylpheed-19.html
-share/sylpheed/manual/ja/sylpheed-2.html
-share/sylpheed/manual/ja/sylpheed-20.html
-share/sylpheed/manual/ja/sylpheed-21.html
-share/sylpheed/manual/ja/sylpheed-22.html
-share/sylpheed/manual/ja/sylpheed-23.html
-share/sylpheed/manual/ja/sylpheed-24.html
-share/sylpheed/manual/ja/sylpheed-3.html
-share/sylpheed/manual/ja/sylpheed-4.html
-share/sylpheed/manual/ja/sylpheed-5.html
-share/sylpheed/manual/ja/sylpheed-6.html
-share/sylpheed/manual/ja/sylpheed-7.html
-share/sylpheed/manual/ja/sylpheed-8.html
-share/sylpheed/manual/ja/sylpheed-9.html
-share/sylpheed/manual/ja/sylpheed.html
-share/sylpheed/manual/ja/sylpheed.sgml
-@dirrm share/sylpheed/manual/ja
-@dirrm share/sylpheed/manual/en
-@dirrm share/sylpheed/manual
-@dirrm share/sylpheed/faq/it
-@dirrm share/sylpheed/faq/fr
-@dirrm share/sylpheed/faq/es
-@dirrm share/sylpheed/faq/en
-@dirrm share/sylpheed/faq/de
-@dirrm share/sylpheed/faq
-@dirrm share/sylpheed
-@dirrm share/examples/sylpheed
diff --git a/mail/sylpheed-devel/distinfo b/mail/sylpheed-devel/distinfo
deleted file mode 100644
index 40437d657ed..00000000000
--- a/mail/sylpheed-devel/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.31 2007/03/19 19:51:39 xtraeme Exp $
-
-SHA1 (sylpheed-2.4.0beta5.tar.bz2) = d783d685028c07dc0b507b3068e54771260a73c0
-RMD160 (sylpheed-2.4.0beta5.tar.bz2) = e65cdec0922c17f421e8d986fc020d0584b6350b
-Size (sylpheed-2.4.0beta5.tar.bz2) = 2691490 bytes
diff --git a/mail/sylpheed-devel/files/mime.types b/mail/sylpheed-devel/files/mime.types
deleted file mode 100644
index 3485692d111..00000000000
--- a/mail/sylpheed-devel/files/mime.types
+++ /dev/null
@@ -1,592 +0,0 @@
-# This is a comment. I love comments.
-
-# This file controls what Internet media types are sent to the client for
-# given file extension(s). Sending the correct media type to the client
-# is important so they know how to handle the content of the file.
-# Extra types can either be added here or by using an AddType directive
-# in your config files. For more information about Internet media types,
-# please read RFC 2045, 2046, 2047, 2048, and 2077. The Internet media type
-# registry is at <http://www.iana.org/assignments/media-types/>.
-
-# MIME type Extensions
-application/activemessage
-application/andrew-inset ez
-application/applefile
-application/atom+xml atom
-application/atomicmail
-application/batch-smtp
-application/beep+xml
-application/cals-1840
-application/cnrp+xml
-application/commonground
-application/cpl+xml
-application/cybercash
-application/dca-rft
-application/dec-dx
-application/dvcs
-application/edi-consent
-application/edifact
-application/edi-x12
-application/eshop
-application/font-tdpfr
-application/http
-application/hyperstudio
-application/iges
-application/index
-application/index.cmd
-application/index.obj
-application/index.response
-application/index.vnd
-application/iotp
-application/ipp
-application/isup
-application/mac-binhex40 hqx
-application/mac-compactpro cpt
-application/macwriteii
-application/marc
-application/mathematica
-application/mathml+xml mathml
-application/msword doc
-application/news-message-id
-application/news-transmission
-application/ocsp-request
-application/ocsp-response
-application/octet-stream bin dms lha lzh exe class so dll dmg
-application/oda oda
-application/ogg ogg
-application/parityfec
-application/pdf pdf
-application/pgp-encrypted
-application/pgp-keys
-application/pgp-signature
-application/pkcs10
-application/pkcs7-mime
-application/pkcs7-signature
-application/pkix-cert
-application/pkix-crl
-application/pkixcmp
-application/postscript ai eps ps
-application/prs.alvestrand.titrax-sheet
-application/prs.cww
-application/prs.nprend
-application/prs.plucker
-application/qsig
-application/rdf+xml rdf
-application/reginfo+xml
-application/remote-printing
-application/riscos
-application/rtf
-application/sdp
-application/set-payment
-application/set-payment-initiation
-application/set-registration
-application/set-registration-initiation
-application/sgml
-application/sgml-open-catalog
-application/sieve
-application/slate
-application/smil smi smil
-application/srgs gram
-application/srgs+xml grxml
-application/timestamp-query
-application/timestamp-reply
-application/tve-trigger
-application/vemmi
-application/vnd.3gpp.pic-bw-large
-application/vnd.3gpp.pic-bw-small
-application/vnd.3gpp.pic-bw-var
-application/vnd.3gpp.sms
-application/vnd.3m.post-it-notes
-application/vnd.accpac.simply.aso
-application/vnd.accpac.simply.imp
-application/vnd.acucobol
-application/vnd.acucorp
-application/vnd.adobe.xfdf
-application/vnd.aether.imp
-application/vnd.amiga.ami
-application/vnd.anser-web-certificate-issue-initiation
-application/vnd.anser-web-funds-transfer-initiation
-application/vnd.audiograph
-application/vnd.blueice.multipass
-application/vnd.bmi
-application/vnd.businessobjects
-application/vnd.canon-cpdl
-application/vnd.canon-lips
-application/vnd.cinderella
-application/vnd.claymore
-application/vnd.commerce-battelle
-application/vnd.commonspace
-application/vnd.contact.cmsg
-application/vnd.cosmocaller
-application/vnd.criticaltools.wbs+xml
-application/vnd.ctc-posml
-application/vnd.cups-postscript
-application/vnd.cups-raster
-application/vnd.cups-raw
-application/vnd.curl
-application/vnd.cybank
-application/vnd.data-vision.rdz
-application/vnd.dna
-application/vnd.dpgraph
-application/vnd.dreamfactory
-application/vnd.dxr
-application/vnd.ecdis-update
-application/vnd.ecowin.chart
-application/vnd.ecowin.filerequest
-application/vnd.ecowin.fileupdate
-application/vnd.ecowin.series
-application/vnd.ecowin.seriesrequest
-application/vnd.ecowin.seriesupdate
-application/vnd.enliven
-application/vnd.epson.esf
-application/vnd.epson.msf
-application/vnd.epson.quickanime
-application/vnd.epson.salt
-application/vnd.epson.ssf
-application/vnd.ericsson.quickcall
-application/vnd.eudora.data
-application/vnd.fdf
-application/vnd.ffsns
-application/vnd.fints
-application/vnd.flographit
-application/vnd.framemaker
-application/vnd.fsc.weblaunch
-application/vnd.fujitsu.oasys
-application/vnd.fujitsu.oasys2
-application/vnd.fujitsu.oasys3
-application/vnd.fujitsu.oasysgp
-application/vnd.fujitsu.oasysprs
-application/vnd.fujixerox.ddd
-application/vnd.fujixerox.docuworks
-application/vnd.fujixerox.docuworks.binder
-application/vnd.fut-misnet
-application/vnd.grafeq
-application/vnd.groove-account
-application/vnd.groove-help
-application/vnd.groove-identity-message
-application/vnd.groove-injector
-application/vnd.groove-tool-message
-application/vnd.groove-tool-template
-application/vnd.groove-vcard
-application/vnd.hbci
-application/vnd.hhe.lesson-player
-application/vnd.hp-hpgl
-application/vnd.hp-hpid
-application/vnd.hp-hps
-application/vnd.hp-pcl
-application/vnd.hp-pclxl
-application/vnd.httphone
-application/vnd.hzn-3d-crossword
-application/vnd.ibm.afplinedata
-application/vnd.ibm.electronic-media
-application/vnd.ibm.minipay
-application/vnd.ibm.modcap
-application/vnd.ibm.rights-management
-application/vnd.ibm.secure-container
-application/vnd.informix-visionary
-application/vnd.intercon.formnet
-application/vnd.intertrust.digibox
-application/vnd.intertrust.nncp
-application/vnd.intu.qbo
-application/vnd.intu.qfx
-application/vnd.irepository.package+xml
-application/vnd.is-xpr
-application/vnd.japannet-directory-service
-application/vnd.japannet-jpnstore-wakeup
-application/vnd.japannet-payment-wakeup
-application/vnd.japannet-registration
-application/vnd.japannet-registration-wakeup
-application/vnd.japannet-setstore-wakeup
-application/vnd.japannet-verification
-application/vnd.japannet-verification-wakeup
-application/vnd.jisp
-application/vnd.kde.karbon
-application/vnd.kde.kchart
-application/vnd.kde.kformula
-application/vnd.kde.kivio
-application/vnd.kde.kontour
-application/vnd.kde.kpresenter
-application/vnd.kde.kspread
-application/vnd.kde.kword
-application/vnd.kenameaapp
-application/vnd.koan
-application/vnd.liberty-request+xml
-application/vnd.llamagraphics.life-balance.desktop
-application/vnd.llamagraphics.life-balance.exchange+xml
-application/vnd.lotus-1-2-3
-application/vnd.lotus-approach
-application/vnd.lotus-freelance
-application/vnd.lotus-notes
-application/vnd.lotus-organizer
-application/vnd.lotus-screencam
-application/vnd.lotus-wordpro
-application/vnd.mcd
-application/vnd.mediastation.cdkey
-application/vnd.meridian-slingshot
-application/vnd.micrografx.flo
-application/vnd.micrografx.igx
-application/vnd.mif mif
-application/vnd.minisoft-hp3000-save
-application/vnd.mitsubishi.misty-guard.trustweb
-application/vnd.mobius.daf
-application/vnd.mobius.dis
-application/vnd.mobius.mbk
-application/vnd.mobius.mqy
-application/vnd.mobius.msl
-application/vnd.mobius.plc
-application/vnd.mobius.txf
-application/vnd.mophun.application
-application/vnd.mophun.certificate
-application/vnd.motorola.flexsuite
-application/vnd.motorola.flexsuite.adsi
-application/vnd.motorola.flexsuite.fis
-application/vnd.motorola.flexsuite.gotap
-application/vnd.motorola.flexsuite.kmr
-application/vnd.motorola.flexsuite.ttc
-application/vnd.motorola.flexsuite.wem
-application/vnd.mozilla.xul+xml xul
-application/vnd.ms-artgalry
-application/vnd.ms-asf
-application/vnd.ms-excel xls
-application/vnd.ms-lrm
-application/vnd.ms-powerpoint ppt
-application/vnd.ms-project
-application/vnd.ms-tnef
-application/vnd.ms-works
-application/vnd.ms-wpl
-application/vnd.mseq
-application/vnd.msign
-application/vnd.music-niff
-application/vnd.musician
-application/vnd.netfpx
-application/vnd.noblenet-directory
-application/vnd.noblenet-sealer
-application/vnd.noblenet-web
-application/vnd.novadigm.edm
-application/vnd.novadigm.edx
-application/vnd.novadigm.ext
-application/vnd.obn
-application/vnd.osa.netdeploy
-application/vnd.palm
-application/vnd.pg.format
-application/vnd.pg.osasli
-application/vnd.powerbuilder6
-application/vnd.powerbuilder6-s
-application/vnd.powerbuilder7
-application/vnd.powerbuilder7-s
-application/vnd.powerbuilder75
-application/vnd.powerbuilder75-s
-application/vnd.previewsystems.box
-application/vnd.publishare-delta-tree
-application/vnd.pvi.ptid1
-application/vnd.pwg-multiplexed
-application/vnd.pwg-xhtml-print+xml
-application/vnd.quark.quarkxpress
-application/vnd.rapid
-application/vnd.s3sms
-application/vnd.sealed.net
-application/vnd.seemail
-application/vnd.shana.informed.formdata
-application/vnd.shana.informed.formtemplate
-application/vnd.shana.informed.interchange
-application/vnd.shana.informed.package
-application/vnd.smaf
-application/vnd.sss-cod
-application/vnd.sss-dtf
-application/vnd.sss-ntf
-application/vnd.street-stream
-application/vnd.svd
-application/vnd.swiftview-ics
-application/vnd.triscape.mxs
-application/vnd.trueapp
-application/vnd.truedoc
-application/vnd.ufdl
-application/vnd.uplanet.alert
-application/vnd.uplanet.alert-wbxml
-application/vnd.uplanet.bearer-choice
-application/vnd.uplanet.bearer-choice-wbxml
-application/vnd.uplanet.cacheop
-application/vnd.uplanet.cacheop-wbxml
-application/vnd.uplanet.channel
-application/vnd.uplanet.channel-wbxml
-application/vnd.uplanet.list
-application/vnd.uplanet.list-wbxml
-application/vnd.uplanet.listcmd
-application/vnd.uplanet.listcmd-wbxml
-application/vnd.uplanet.signal
-application/vnd.vcx
-application/vnd.vectorworks
-application/vnd.vidsoft.vidconference
-application/vnd.visio
-application/vnd.visionary
-application/vnd.vividence.scriptfile
-application/vnd.vsf
-application/vnd.wap.sic
-application/vnd.wap.slc
-application/vnd.wap.wbxml wbxml
-application/vnd.wap.wmlc wmlc
-application/vnd.wap.wmlscriptc wmlsc
-application/vnd.webturbo
-application/vnd.wrq-hp3000-labelled
-application/vnd.wt.stf
-application/vnd.wv.csp+wbxml
-application/vnd.xara
-application/vnd.xfdl
-application/vnd.yamaha.hv-dic
-application/vnd.yamaha.hv-script
-application/vnd.yamaha.hv-voice
-application/vnd.yellowriver-custom-menu
-application/voicexml+xml vxml
-application/watcherinfo+xml
-application/whoispp-query
-application/whoispp-response
-application/wita
-application/wordperfect5.1
-application/x-bcpio bcpio
-application/x-cdlink vcd
-application/x-chess-pgn pgn
-application/x-compress
-application/x-cpio cpio
-application/x-csh csh
-application/x-director dcr dir dxr
-application/x-dvi dvi
-application/x-futuresplash spl
-application/x-gtar gtar
-application/x-gzip
-application/x-hdf hdf
-application/x-javascript js
-application/x-koan skp skd skt skm
-application/x-latex latex
-application/x-netcdf nc cdf
-application/x-sh sh
-application/x-shar shar
-application/x-shockwave-flash swf
-application/x-stuffit sit
-application/x-sv4cpio sv4cpio
-application/x-sv4crc sv4crc
-application/x-tar tar
-application/x-tcl tcl
-application/x-tex tex
-application/x-texinfo texinfo texi
-application/x-troff t tr roff
-application/x-troff-man man
-application/x-troff-me me
-application/x-troff-ms ms
-application/x-ustar ustar
-application/x-wais-source src
-application/x400-bp
-application/xhtml+xml xhtml xht
-application/xslt+xml xslt
-application/xml xml xsl
-application/xml-dtd dtd
-application/xml-external-parsed-entity
-application/zip zip
-audio/32kadpcm
-audio/amr
-audio/amr-wb
-audio/basic au snd
-audio/cn
-audio/dat12
-audio/dsr-es201108
-audio/dvi4
-audio/evrc
-audio/evrc0
-audio/g722
-audio/g.722.1
-audio/g723
-audio/g726-16
-audio/g726-24
-audio/g726-32
-audio/g726-40
-audio/g728
-audio/g729
-audio/g729D
-audio/g729E
-audio/gsm
-audio/gsm-efr
-audio/l8
-audio/l16
-audio/l20
-audio/l24
-audio/lpc
-audio/midi mid midi kar
-audio/mpa
-audio/mpa-robust
-audio/mp4a-latm
-audio/mpeg mpga mp2 mp3
-audio/parityfec
-audio/pcma
-audio/pcmu
-audio/prs.sid
-audio/qcelp
-audio/red
-audio/smv
-audio/smv0
-audio/telephone-event
-audio/tone
-audio/vdvi
-audio/vnd.3gpp.iufp
-audio/vnd.cisco.nse
-audio/vnd.cns.anp1
-audio/vnd.cns.inf1
-audio/vnd.digital-winds
-audio/vnd.everad.plj
-audio/vnd.lucent.voice
-audio/vnd.nortel.vbk
-audio/vnd.nuera.ecelp4800
-audio/vnd.nuera.ecelp7470
-audio/vnd.nuera.ecelp9600
-audio/vnd.octel.sbc
-audio/vnd.qcelp
-audio/vnd.rhetorex.32kadpcm
-audio/vnd.vmx.cvsd
-audio/x-aiff aif aiff aifc
-audio/x-alaw-basic
-audio/x-mpegurl m3u
-audio/x-pn-realaudio ram ra
-audio/x-pn-realaudio-plugin
-application/vnd.rn-realmedia rm
-audio/x-wav wav
-chemical/x-pdb pdb
-chemical/x-xyz xyz
-image/bmp bmp
-image/cgm cgm
-image/g3fax
-image/gif gif
-image/ief ief
-image/jpeg jpeg jpg jpe
-image/naplps
-image/png png
-image/prs.btif
-image/prs.pti
-image/svg+xml svg
-image/t38
-image/tiff tiff tif
-image/tiff-fx
-image/vnd.cns.inf2
-image/vnd.djvu djvu djv
-image/vnd.dwg
-image/vnd.dxf
-image/vnd.fastbidsheet
-image/vnd.fpx
-image/vnd.fst
-image/vnd.fujixerox.edmics-mmr
-image/vnd.fujixerox.edmics-rlc
-image/vnd.globalgraphics.pgb
-image/vnd.mix
-image/vnd.ms-modi
-image/vnd.net-fpx
-image/vnd.svf
-image/vnd.wap.wbmp wbmp
-image/vnd.xiff
-image/x-cmu-raster ras
-image/x-icon ico
-image/x-portable-anymap pnm
-image/x-portable-bitmap pbm
-image/x-portable-graymap pgm
-image/x-portable-pixmap ppm
-image/x-rgb rgb
-image/x-xbitmap xbm
-image/x-xpixmap xpm
-image/x-xwindowdump xwd
-message/delivery-status
-message/disposition-notification
-message/external-body
-message/http
-message/news
-message/partial
-message/rfc822
-message/s-http
-message/sip
-message/sipfrag
-model/iges igs iges
-model/mesh msh mesh silo
-model/vnd.dwf
-model/vnd.flatland.3dml
-model/vnd.gdl
-model/vnd.gs-gdl
-model/vnd.gtw
-model/vnd.mts
-model/vnd.parasolid.transmit.binary
-model/vnd.parasolid.transmit.text
-model/vnd.vtu
-model/vrml wrl vrml
-multipart/alternative
-multipart/appledouble
-multipart/byteranges
-multipart/digest
-multipart/encrypted
-multipart/form-data
-multipart/header-set
-multipart/mixed
-multipart/parallel
-multipart/related
-multipart/report
-multipart/signed
-multipart/voice-message
-text/calendar ics ifb
-text/css css
-text/directory
-text/enriched
-text/html html htm
-text/parityfec
-text/plain asc txt
-text/prs.lines.tag
-text/rfc822-headers
-text/richtext rtx
-text/rtf rtf
-text/sgml sgml sgm
-text/t140
-text/tab-separated-values tsv
-text/uri-list
-text/vnd.abc
-text/vnd.curl
-text/vnd.dmclientscript
-text/vnd.fly
-text/vnd.fmi.flexstor
-text/vnd.in3d.3dml
-text/vnd.in3d.spot
-text/vnd.iptc.nitf
-text/vnd.iptc.newsml
-text/vnd.latex-z
-text/vnd.motorola.reflex
-text/vnd.ms-mediapackage
-text/vnd.net2phone.commcenter.command
-text/vnd.sun.j2me.app-descriptor
-text/vnd.wap.si
-text/vnd.wap.sl
-text/vnd.wap.wml wml
-text/vnd.wap.wmlscript wmls
-text/x-setext etx
-text/xml
-text/xml-external-parsed-entity
-video/bmpeg
-video/bt656
-video/celb
-video/dv
-video/h261
-video/h263
-video/h263-1998
-video/h263-2000
-video/jpeg
-video/mp1s
-video/mp2p
-video/mp2t
-video/mp4v-es
-video/mpv
-video/mpeg mpeg mpg mpe
-video/nv
-video/parityfec
-video/pointer
-video/quicktime qt mov
-video/smpte292m
-video/vnd.fvt
-video/vnd.motorola.video
-video/vnd.motorola.videop
-video/vnd.mpegurl mxu m4u
-video/vnd.nokia.interleaved-multimedia
-video/vnd.objectvideo
-video/vnd.vivo
-video/x-msvideo avi
-video/x-sgi-movie movie
-x-conference/x-cooltalk ice
diff --git a/mail/sylpheed-devel/options.mk b/mail/sylpheed-devel/options.mk
deleted file mode 100644
index c3c14e4f628..00000000000
--- a/mail/sylpheed-devel/options.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2006/05/31 18:22:24 ghen Exp $
-#
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.sylpheed-devel
-PKG_SUPPORTED_OPTIONS= jpilot ldap inet6 gtkspell gpgme
-PKG_SUGGESTED_OPTIONS= inet6 gpgme
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-ipv6
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
-FACES_IS_INSTALLED!= ${PKG_INFO} -e faces || ${ECHO}
-.if empty(FACES_IS_INSTALLED)
-. include "../../graphics/compface/buildlink3.mk"
-.else
-. include "../../mail/faces/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mldap)
-CONFIGURE_ARGS+= --enable-ldap
-.include "../../databases/openldap-client/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mjpilot)
-CONFIGURE_ARGS+= --enable-jpilot
-.include "../../comms/pilot-link-libs/buildlink3.mk"
-.include "../../comms/jpilot/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mgtkspell)
-CONFIGURE_ARGS+= --enable-gtkspell
-. include "../../textproc/gtkspell/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-gtkspell
-.endif
-
-.if !empty(PKG_OPTIONS:Mgpgme)
-CONFIGURE_ARGS+= --enable-gpgme
-. include "../../security/gpgme/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-gpgme
-.endif
-
diff --git a/mail/sylpheed/DESCR b/mail/sylpheed/DESCR
deleted file mode 100644
index d73fab042ba..00000000000
--- a/mail/sylpheed/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-Sylpheed is an e-mail client (and news reader) based on GTK+, running on
-X Window System, and aiming for
-
- * Quick response
- * Graceful, and sophisticated interface
- * Easy configuration, intuitive operation
- * Abundant features
-
-The appearance and interface are similar to some popular e-mail clients for
-Windows, such as Outlook Express, Becky!, and Datula. The interface is also
-designed to emulate the mailers on Emacsen, and almost all commands are
-accessible with the keyboard.
-
-The messages are managed by MH format, and you'll be able to use it together
-with another mailer based on MH format (like Mew). You can also utilize
-fetchmail or/and procmail, and external programs on receiving (like inc or
-imget).
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
deleted file mode 100644
index dfb84719f9e..00000000000
--- a/mail/sylpheed/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.103 2007/02/22 19:26:44 wiz Exp $
-
-DISTNAME= sylpheed-2.3.1
-CATEGORIES= mail news x11
-MASTER_SITES= http://sylpheed.sraoss.jp/sylpheed/v2.3/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= chris@NetBSD.org
-HOMEPAGE= http://sylpheed.sraoss.jp/en/
-COMMENT= X based e-mail and netnews client
-
-CONFLICTS= sylpheed-claws-[0-9]* sylpheed-gtk2-[0-9]*
-
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake msgfmt pkg-config
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --enable-nls
-CONFIGURE_ARGS+= --enable-ssl
-CONFIGURE_ARGS+= --enable-compface
-
-PKG_SYSCONFSUBDIR= sylpheed
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-
-EGDIR= ${PREFIX}/share/examples/sylpheed
-CONF_FILES= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${FILESDIR}/mime.types ${EGDIR}
-
-.include "options.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/sylpheed/PLIST b/mail/sylpheed/PLIST
deleted file mode 100644
index ad07ed8556f..00000000000
--- a/mail/sylpheed/PLIST
+++ /dev/null
@@ -1,110 +0,0 @@
-@comment $NetBSD: PLIST,v 1.14 2006/12/28 15:52:06 xtraeme Exp $
-bin/sylpheed
-share/examples/sylpheed/mime.types
-share/locale/bg/LC_MESSAGES/sylpheed.mo
-share/locale/cs/LC_MESSAGES/sylpheed.mo
-share/locale/da/LC_MESSAGES/sylpheed.mo
-share/locale/de/LC_MESSAGES/sylpheed.mo
-share/locale/el/LC_MESSAGES/sylpheed.mo
-share/locale/es/LC_MESSAGES/sylpheed.mo
-share/locale/et/LC_MESSAGES/sylpheed.mo
-share/locale/fr/LC_MESSAGES/sylpheed.mo
-share/locale/gl/LC_MESSAGES/sylpheed.mo
-share/locale/hr/LC_MESSAGES/sylpheed.mo
-share/locale/hu/LC_MESSAGES/sylpheed.mo
-share/locale/it/LC_MESSAGES/sylpheed.mo
-share/locale/ja/LC_MESSAGES/sylpheed.mo
-share/locale/ko/LC_MESSAGES/sylpheed.mo
-share/locale/lt/LC_MESSAGES/sylpheed.mo
-share/locale/nl/LC_MESSAGES/sylpheed.mo
-share/locale/pl/LC_MESSAGES/sylpheed.mo
-share/locale/pt_BR/LC_MESSAGES/sylpheed.mo
-share/locale/ro/LC_MESSAGES/sylpheed.mo
-share/locale/ru/LC_MESSAGES/sylpheed.mo
-share/locale/sk/LC_MESSAGES/sylpheed.mo
-share/locale/sl/LC_MESSAGES/sylpheed.mo
-share/locale/sr/LC_MESSAGES/sylpheed.mo
-share/locale/sv/LC_MESSAGES/sylpheed.mo
-share/locale/tr/LC_MESSAGES/sylpheed.mo
-share/locale/uk/LC_MESSAGES/sylpheed.mo
-share/locale/vi/LC_MESSAGES/sylpheed.mo
-share/locale/zh_CN/LC_MESSAGES/sylpheed.mo
-share/locale/zh_TW/LC_MESSAGES/sylpheed.mo
-share/sylpheed/faq/de/sylpheed-faq-1.html
-share/sylpheed/faq/de/sylpheed-faq-2.html
-share/sylpheed/faq/de/sylpheed-faq-3.html
-share/sylpheed/faq/de/sylpheed-faq.html
-share/sylpheed/faq/en/sylpheed-faq-1.html
-share/sylpheed/faq/en/sylpheed-faq-2.html
-share/sylpheed/faq/en/sylpheed-faq-3.html
-share/sylpheed/faq/en/sylpheed-faq.html
-share/sylpheed/faq/es/sylpheed-faq-1.html
-share/sylpheed/faq/es/sylpheed-faq-2.html
-share/sylpheed/faq/es/sylpheed-faq-3.html
-share/sylpheed/faq/es/sylpheed-faq.html
-share/sylpheed/faq/fr/sylpheed-faq-1.html
-share/sylpheed/faq/fr/sylpheed-faq-2.html
-share/sylpheed/faq/fr/sylpheed-faq-3.html
-share/sylpheed/faq/fr/sylpheed-faq.html
-share/sylpheed/faq/it/sylpheed-faq-1.html
-share/sylpheed/faq/it/sylpheed-faq-2.html
-share/sylpheed/faq/it/sylpheed-faq-3.html
-share/sylpheed/faq/it/sylpheed-faq.html
-share/sylpheed/manual/en/sylpheed-1.html
-share/sylpheed/manual/en/sylpheed-10.html
-share/sylpheed/manual/en/sylpheed-11.html
-share/sylpheed/manual/en/sylpheed-12.html
-share/sylpheed/manual/en/sylpheed-13.html
-share/sylpheed/manual/en/sylpheed-14.html
-share/sylpheed/manual/en/sylpheed-15.html
-share/sylpheed/manual/en/sylpheed-16.html
-share/sylpheed/manual/en/sylpheed-17.html
-share/sylpheed/manual/en/sylpheed-18.html
-share/sylpheed/manual/en/sylpheed-19.html
-share/sylpheed/manual/en/sylpheed-2.html
-share/sylpheed/manual/en/sylpheed-20.html
-share/sylpheed/manual/en/sylpheed-3.html
-share/sylpheed/manual/en/sylpheed-4.html
-share/sylpheed/manual/en/sylpheed-5.html
-share/sylpheed/manual/en/sylpheed-6.html
-share/sylpheed/manual/en/sylpheed-7.html
-share/sylpheed/manual/en/sylpheed-8.html
-share/sylpheed/manual/en/sylpheed-9.html
-share/sylpheed/manual/en/sylpheed.html
-share/sylpheed/manual/ja/sylpheed-1.html
-share/sylpheed/manual/ja/sylpheed-10.html
-share/sylpheed/manual/ja/sylpheed-11.html
-share/sylpheed/manual/ja/sylpheed-12.html
-share/sylpheed/manual/ja/sylpheed-13.html
-share/sylpheed/manual/ja/sylpheed-14.html
-share/sylpheed/manual/ja/sylpheed-15.html
-share/sylpheed/manual/ja/sylpheed-16.html
-share/sylpheed/manual/ja/sylpheed-17.html
-share/sylpheed/manual/ja/sylpheed-18.html
-share/sylpheed/manual/ja/sylpheed-19.html
-share/sylpheed/manual/ja/sylpheed-2.html
-share/sylpheed/manual/ja/sylpheed-20.html
-share/sylpheed/manual/ja/sylpheed-21.html
-share/sylpheed/manual/ja/sylpheed-22.html
-share/sylpheed/manual/ja/sylpheed-23.html
-share/sylpheed/manual/ja/sylpheed-24.html
-share/sylpheed/manual/ja/sylpheed-3.html
-share/sylpheed/manual/ja/sylpheed-4.html
-share/sylpheed/manual/ja/sylpheed-5.html
-share/sylpheed/manual/ja/sylpheed-6.html
-share/sylpheed/manual/ja/sylpheed-7.html
-share/sylpheed/manual/ja/sylpheed-8.html
-share/sylpheed/manual/ja/sylpheed-9.html
-share/sylpheed/manual/ja/sylpheed.html
-share/sylpheed/manual/ja/sylpheed.sgml
-@dirrm share/sylpheed/manual/ja
-@dirrm share/sylpheed/manual/en
-@dirrm share/sylpheed/manual
-@dirrm share/sylpheed/faq/it
-@dirrm share/sylpheed/faq/fr
-@dirrm share/sylpheed/faq/es
-@dirrm share/sylpheed/faq/en
-@dirrm share/sylpheed/faq/de
-@dirrm share/sylpheed/faq
-@dirrm share/sylpheed
-@dirrm share/examples/sylpheed
diff --git a/mail/sylpheed/distinfo b/mail/sylpheed/distinfo
deleted file mode 100644
index eab17027595..00000000000
--- a/mail/sylpheed/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.55 2007/02/04 09:00:57 xtraeme Exp $
-
-SHA1 (sylpheed-2.3.1.tar.bz2) = a88e728853ac5a546d063247ba9f7755d54adc52
-RMD160 (sylpheed-2.3.1.tar.bz2) = 2ef027681b34641c32e2c962159fc990fd3c2ef3
-Size (sylpheed-2.3.1.tar.bz2) = 2614551 bytes
diff --git a/mail/sylpheed/files/mime.types b/mail/sylpheed/files/mime.types
deleted file mode 100644
index 3485692d111..00000000000
--- a/mail/sylpheed/files/mime.types
+++ /dev/null
@@ -1,592 +0,0 @@
-# This is a comment. I love comments.
-
-# This file controls what Internet media types are sent to the client for
-# given file extension(s). Sending the correct media type to the client
-# is important so they know how to handle the content of the file.
-# Extra types can either be added here or by using an AddType directive
-# in your config files. For more information about Internet media types,
-# please read RFC 2045, 2046, 2047, 2048, and 2077. The Internet media type
-# registry is at <http://www.iana.org/assignments/media-types/>.
-
-# MIME type Extensions
-application/activemessage
-application/andrew-inset ez
-application/applefile
-application/atom+xml atom
-application/atomicmail
-application/batch-smtp
-application/beep+xml
-application/cals-1840
-application/cnrp+xml
-application/commonground
-application/cpl+xml
-application/cybercash
-application/dca-rft
-application/dec-dx
-application/dvcs
-application/edi-consent
-application/edifact
-application/edi-x12
-application/eshop
-application/font-tdpfr
-application/http
-application/hyperstudio
-application/iges
-application/index
-application/index.cmd
-application/index.obj
-application/index.response
-application/index.vnd
-application/iotp
-application/ipp
-application/isup
-application/mac-binhex40 hqx
-application/mac-compactpro cpt
-application/macwriteii
-application/marc
-application/mathematica
-application/mathml+xml mathml
-application/msword doc
-application/news-message-id
-application/news-transmission
-application/ocsp-request
-application/ocsp-response
-application/octet-stream bin dms lha lzh exe class so dll dmg
-application/oda oda
-application/ogg ogg
-application/parityfec
-application/pdf pdf
-application/pgp-encrypted
-application/pgp-keys
-application/pgp-signature
-application/pkcs10
-application/pkcs7-mime
-application/pkcs7-signature
-application/pkix-cert
-application/pkix-crl
-application/pkixcmp
-application/postscript ai eps ps
-application/prs.alvestrand.titrax-sheet
-application/prs.cww
-application/prs.nprend
-application/prs.plucker
-application/qsig
-application/rdf+xml rdf
-application/reginfo+xml
-application/remote-printing
-application/riscos
-application/rtf
-application/sdp
-application/set-payment
-application/set-payment-initiation
-application/set-registration
-application/set-registration-initiation
-application/sgml
-application/sgml-open-catalog
-application/sieve
-application/slate
-application/smil smi smil
-application/srgs gram
-application/srgs+xml grxml
-application/timestamp-query
-application/timestamp-reply
-application/tve-trigger
-application/vemmi
-application/vnd.3gpp.pic-bw-large
-application/vnd.3gpp.pic-bw-small
-application/vnd.3gpp.pic-bw-var
-application/vnd.3gpp.sms
-application/vnd.3m.post-it-notes
-application/vnd.accpac.simply.aso
-application/vnd.accpac.simply.imp
-application/vnd.acucobol
-application/vnd.acucorp
-application/vnd.adobe.xfdf
-application/vnd.aether.imp
-application/vnd.amiga.ami
-application/vnd.anser-web-certificate-issue-initiation
-application/vnd.anser-web-funds-transfer-initiation
-application/vnd.audiograph
-application/vnd.blueice.multipass
-application/vnd.bmi
-application/vnd.businessobjects
-application/vnd.canon-cpdl
-application/vnd.canon-lips
-application/vnd.cinderella
-application/vnd.claymore
-application/vnd.commerce-battelle
-application/vnd.commonspace
-application/vnd.contact.cmsg
-application/vnd.cosmocaller
-application/vnd.criticaltools.wbs+xml
-application/vnd.ctc-posml
-application/vnd.cups-postscript
-application/vnd.cups-raster
-application/vnd.cups-raw
-application/vnd.curl
-application/vnd.cybank
-application/vnd.data-vision.rdz
-application/vnd.dna
-application/vnd.dpgraph
-application/vnd.dreamfactory
-application/vnd.dxr
-application/vnd.ecdis-update
-application/vnd.ecowin.chart
-application/vnd.ecowin.filerequest
-application/vnd.ecowin.fileupdate
-application/vnd.ecowin.series
-application/vnd.ecowin.seriesrequest
-application/vnd.ecowin.seriesupdate
-application/vnd.enliven
-application/vnd.epson.esf
-application/vnd.epson.msf
-application/vnd.epson.quickanime
-application/vnd.epson.salt
-application/vnd.epson.ssf
-application/vnd.ericsson.quickcall
-application/vnd.eudora.data
-application/vnd.fdf
-application/vnd.ffsns
-application/vnd.fints
-application/vnd.flographit
-application/vnd.framemaker
-application/vnd.fsc.weblaunch
-application/vnd.fujitsu.oasys
-application/vnd.fujitsu.oasys2
-application/vnd.fujitsu.oasys3
-application/vnd.fujitsu.oasysgp
-application/vnd.fujitsu.oasysprs
-application/vnd.fujixerox.ddd
-application/vnd.fujixerox.docuworks
-application/vnd.fujixerox.docuworks.binder
-application/vnd.fut-misnet
-application/vnd.grafeq
-application/vnd.groove-account
-application/vnd.groove-help
-application/vnd.groove-identity-message
-application/vnd.groove-injector
-application/vnd.groove-tool-message
-application/vnd.groove-tool-template
-application/vnd.groove-vcard
-application/vnd.hbci
-application/vnd.hhe.lesson-player
-application/vnd.hp-hpgl
-application/vnd.hp-hpid
-application/vnd.hp-hps
-application/vnd.hp-pcl
-application/vnd.hp-pclxl
-application/vnd.httphone
-application/vnd.hzn-3d-crossword
-application/vnd.ibm.afplinedata
-application/vnd.ibm.electronic-media
-application/vnd.ibm.minipay
-application/vnd.ibm.modcap
-application/vnd.ibm.rights-management
-application/vnd.ibm.secure-container
-application/vnd.informix-visionary
-application/vnd.intercon.formnet
-application/vnd.intertrust.digibox
-application/vnd.intertrust.nncp
-application/vnd.intu.qbo
-application/vnd.intu.qfx
-application/vnd.irepository.package+xml
-application/vnd.is-xpr
-application/vnd.japannet-directory-service
-application/vnd.japannet-jpnstore-wakeup
-application/vnd.japannet-payment-wakeup
-application/vnd.japannet-registration
-application/vnd.japannet-registration-wakeup
-application/vnd.japannet-setstore-wakeup
-application/vnd.japannet-verification
-application/vnd.japannet-verification-wakeup
-application/vnd.jisp
-application/vnd.kde.karbon
-application/vnd.kde.kchart
-application/vnd.kde.kformula
-application/vnd.kde.kivio
-application/vnd.kde.kontour
-application/vnd.kde.kpresenter
-application/vnd.kde.kspread
-application/vnd.kde.kword
-application/vnd.kenameaapp
-application/vnd.koan
-application/vnd.liberty-request+xml
-application/vnd.llamagraphics.life-balance.desktop
-application/vnd.llamagraphics.life-balance.exchange+xml
-application/vnd.lotus-1-2-3
-application/vnd.lotus-approach
-application/vnd.lotus-freelance
-application/vnd.lotus-notes
-application/vnd.lotus-organizer
-application/vnd.lotus-screencam
-application/vnd.lotus-wordpro
-application/vnd.mcd
-application/vnd.mediastation.cdkey
-application/vnd.meridian-slingshot
-application/vnd.micrografx.flo
-application/vnd.micrografx.igx
-application/vnd.mif mif
-application/vnd.minisoft-hp3000-save
-application/vnd.mitsubishi.misty-guard.trustweb
-application/vnd.mobius.daf
-application/vnd.mobius.dis
-application/vnd.mobius.mbk
-application/vnd.mobius.mqy
-application/vnd.mobius.msl
-application/vnd.mobius.plc
-application/vnd.mobius.txf
-application/vnd.mophun.application
-application/vnd.mophun.certificate
-application/vnd.motorola.flexsuite
-application/vnd.motorola.flexsuite.adsi
-application/vnd.motorola.flexsuite.fis
-application/vnd.motorola.flexsuite.gotap
-application/vnd.motorola.flexsuite.kmr
-application/vnd.motorola.flexsuite.ttc
-application/vnd.motorola.flexsuite.wem
-application/vnd.mozilla.xul+xml xul
-application/vnd.ms-artgalry
-application/vnd.ms-asf
-application/vnd.ms-excel xls
-application/vnd.ms-lrm
-application/vnd.ms-powerpoint ppt
-application/vnd.ms-project
-application/vnd.ms-tnef
-application/vnd.ms-works
-application/vnd.ms-wpl
-application/vnd.mseq
-application/vnd.msign
-application/vnd.music-niff
-application/vnd.musician
-application/vnd.netfpx
-application/vnd.noblenet-directory
-application/vnd.noblenet-sealer
-application/vnd.noblenet-web
-application/vnd.novadigm.edm
-application/vnd.novadigm.edx
-application/vnd.novadigm.ext
-application/vnd.obn
-application/vnd.osa.netdeploy
-application/vnd.palm
-application/vnd.pg.format
-application/vnd.pg.osasli
-application/vnd.powerbuilder6
-application/vnd.powerbuilder6-s
-application/vnd.powerbuilder7
-application/vnd.powerbuilder7-s
-application/vnd.powerbuilder75
-application/vnd.powerbuilder75-s
-application/vnd.previewsystems.box
-application/vnd.publishare-delta-tree
-application/vnd.pvi.ptid1
-application/vnd.pwg-multiplexed
-application/vnd.pwg-xhtml-print+xml
-application/vnd.quark.quarkxpress
-application/vnd.rapid
-application/vnd.s3sms
-application/vnd.sealed.net
-application/vnd.seemail
-application/vnd.shana.informed.formdata
-application/vnd.shana.informed.formtemplate
-application/vnd.shana.informed.interchange
-application/vnd.shana.informed.package
-application/vnd.smaf
-application/vnd.sss-cod
-application/vnd.sss-dtf
-application/vnd.sss-ntf
-application/vnd.street-stream
-application/vnd.svd
-application/vnd.swiftview-ics
-application/vnd.triscape.mxs
-application/vnd.trueapp
-application/vnd.truedoc
-application/vnd.ufdl
-application/vnd.uplanet.alert
-application/vnd.uplanet.alert-wbxml
-application/vnd.uplanet.bearer-choice
-application/vnd.uplanet.bearer-choice-wbxml
-application/vnd.uplanet.cacheop
-application/vnd.uplanet.cacheop-wbxml
-application/vnd.uplanet.channel
-application/vnd.uplanet.channel-wbxml
-application/vnd.uplanet.list
-application/vnd.uplanet.list-wbxml
-application/vnd.uplanet.listcmd
-application/vnd.uplanet.listcmd-wbxml
-application/vnd.uplanet.signal
-application/vnd.vcx
-application/vnd.vectorworks
-application/vnd.vidsoft.vidconference
-application/vnd.visio
-application/vnd.visionary
-application/vnd.vividence.scriptfile
-application/vnd.vsf
-application/vnd.wap.sic
-application/vnd.wap.slc
-application/vnd.wap.wbxml wbxml
-application/vnd.wap.wmlc wmlc
-application/vnd.wap.wmlscriptc wmlsc
-application/vnd.webturbo
-application/vnd.wrq-hp3000-labelled
-application/vnd.wt.stf
-application/vnd.wv.csp+wbxml
-application/vnd.xara
-application/vnd.xfdl
-application/vnd.yamaha.hv-dic
-application/vnd.yamaha.hv-script
-application/vnd.yamaha.hv-voice
-application/vnd.yellowriver-custom-menu
-application/voicexml+xml vxml
-application/watcherinfo+xml
-application/whoispp-query
-application/whoispp-response
-application/wita
-application/wordperfect5.1
-application/x-bcpio bcpio
-application/x-cdlink vcd
-application/x-chess-pgn pgn
-application/x-compress
-application/x-cpio cpio
-application/x-csh csh
-application/x-director dcr dir dxr
-application/x-dvi dvi
-application/x-futuresplash spl
-application/x-gtar gtar
-application/x-gzip
-application/x-hdf hdf
-application/x-javascript js
-application/x-koan skp skd skt skm
-application/x-latex latex
-application/x-netcdf nc cdf
-application/x-sh sh
-application/x-shar shar
-application/x-shockwave-flash swf
-application/x-stuffit sit
-application/x-sv4cpio sv4cpio
-application/x-sv4crc sv4crc
-application/x-tar tar
-application/x-tcl tcl
-application/x-tex tex
-application/x-texinfo texinfo texi
-application/x-troff t tr roff
-application/x-troff-man man
-application/x-troff-me me
-application/x-troff-ms ms
-application/x-ustar ustar
-application/x-wais-source src
-application/x400-bp
-application/xhtml+xml xhtml xht
-application/xslt+xml xslt
-application/xml xml xsl
-application/xml-dtd dtd
-application/xml-external-parsed-entity
-application/zip zip
-audio/32kadpcm
-audio/amr
-audio/amr-wb
-audio/basic au snd
-audio/cn
-audio/dat12
-audio/dsr-es201108
-audio/dvi4
-audio/evrc
-audio/evrc0
-audio/g722
-audio/g.722.1
-audio/g723
-audio/g726-16
-audio/g726-24
-audio/g726-32
-audio/g726-40
-audio/g728
-audio/g729
-audio/g729D
-audio/g729E
-audio/gsm
-audio/gsm-efr
-audio/l8
-audio/l16
-audio/l20
-audio/l24
-audio/lpc
-audio/midi mid midi kar
-audio/mpa
-audio/mpa-robust
-audio/mp4a-latm
-audio/mpeg mpga mp2 mp3
-audio/parityfec
-audio/pcma
-audio/pcmu
-audio/prs.sid
-audio/qcelp
-audio/red
-audio/smv
-audio/smv0
-audio/telephone-event
-audio/tone
-audio/vdvi
-audio/vnd.3gpp.iufp
-audio/vnd.cisco.nse
-audio/vnd.cns.anp1
-audio/vnd.cns.inf1
-audio/vnd.digital-winds
-audio/vnd.everad.plj
-audio/vnd.lucent.voice
-audio/vnd.nortel.vbk
-audio/vnd.nuera.ecelp4800
-audio/vnd.nuera.ecelp7470
-audio/vnd.nuera.ecelp9600
-audio/vnd.octel.sbc
-audio/vnd.qcelp
-audio/vnd.rhetorex.32kadpcm
-audio/vnd.vmx.cvsd
-audio/x-aiff aif aiff aifc
-audio/x-alaw-basic
-audio/x-mpegurl m3u
-audio/x-pn-realaudio ram ra
-audio/x-pn-realaudio-plugin
-application/vnd.rn-realmedia rm
-audio/x-wav wav
-chemical/x-pdb pdb
-chemical/x-xyz xyz
-image/bmp bmp
-image/cgm cgm
-image/g3fax
-image/gif gif
-image/ief ief
-image/jpeg jpeg jpg jpe
-image/naplps
-image/png png
-image/prs.btif
-image/prs.pti
-image/svg+xml svg
-image/t38
-image/tiff tiff tif
-image/tiff-fx
-image/vnd.cns.inf2
-image/vnd.djvu djvu djv
-image/vnd.dwg
-image/vnd.dxf
-image/vnd.fastbidsheet
-image/vnd.fpx
-image/vnd.fst
-image/vnd.fujixerox.edmics-mmr
-image/vnd.fujixerox.edmics-rlc
-image/vnd.globalgraphics.pgb
-image/vnd.mix
-image/vnd.ms-modi
-image/vnd.net-fpx
-image/vnd.svf
-image/vnd.wap.wbmp wbmp
-image/vnd.xiff
-image/x-cmu-raster ras
-image/x-icon ico
-image/x-portable-anymap pnm
-image/x-portable-bitmap pbm
-image/x-portable-graymap pgm
-image/x-portable-pixmap ppm
-image/x-rgb rgb
-image/x-xbitmap xbm
-image/x-xpixmap xpm
-image/x-xwindowdump xwd
-message/delivery-status
-message/disposition-notification
-message/external-body
-message/http
-message/news
-message/partial
-message/rfc822
-message/s-http
-message/sip
-message/sipfrag
-model/iges igs iges
-model/mesh msh mesh silo
-model/vnd.dwf
-model/vnd.flatland.3dml
-model/vnd.gdl
-model/vnd.gs-gdl
-model/vnd.gtw
-model/vnd.mts
-model/vnd.parasolid.transmit.binary
-model/vnd.parasolid.transmit.text
-model/vnd.vtu
-model/vrml wrl vrml
-multipart/alternative
-multipart/appledouble
-multipart/byteranges
-multipart/digest
-multipart/encrypted
-multipart/form-data
-multipart/header-set
-multipart/mixed
-multipart/parallel
-multipart/related
-multipart/report
-multipart/signed
-multipart/voice-message
-text/calendar ics ifb
-text/css css
-text/directory
-text/enriched
-text/html html htm
-text/parityfec
-text/plain asc txt
-text/prs.lines.tag
-text/rfc822-headers
-text/richtext rtx
-text/rtf rtf
-text/sgml sgml sgm
-text/t140
-text/tab-separated-values tsv
-text/uri-list
-text/vnd.abc
-text/vnd.curl
-text/vnd.dmclientscript
-text/vnd.fly
-text/vnd.fmi.flexstor
-text/vnd.in3d.3dml
-text/vnd.in3d.spot
-text/vnd.iptc.nitf
-text/vnd.iptc.newsml
-text/vnd.latex-z
-text/vnd.motorola.reflex
-text/vnd.ms-mediapackage
-text/vnd.net2phone.commcenter.command
-text/vnd.sun.j2me.app-descriptor
-text/vnd.wap.si
-text/vnd.wap.sl
-text/vnd.wap.wml wml
-text/vnd.wap.wmlscript wmls
-text/x-setext etx
-text/xml
-text/xml-external-parsed-entity
-video/bmpeg
-video/bt656
-video/celb
-video/dv
-video/h261
-video/h263
-video/h263-1998
-video/h263-2000
-video/jpeg
-video/mp1s
-video/mp2p
-video/mp2t
-video/mp4v-es
-video/mpv
-video/mpeg mpeg mpg mpe
-video/nv
-video/parityfec
-video/pointer
-video/quicktime qt mov
-video/smpte292m
-video/vnd.fvt
-video/vnd.motorola.video
-video/vnd.motorola.videop
-video/vnd.mpegurl mxu m4u
-video/vnd.nokia.interleaved-multimedia
-video/vnd.objectvideo
-video/vnd.vivo
-video/x-msvideo avi
-video/x-sgi-movie movie
-x-conference/x-cooltalk ice
diff --git a/mail/sylpheed/options.mk b/mail/sylpheed/options.mk
deleted file mode 100644
index 6d4abe60909..00000000000
--- a/mail/sylpheed/options.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2006/05/31 18:22:24 ghen Exp $
-#
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.sylpheed
-PKG_SUPPORTED_OPTIONS= jpilot ldap inet6 gtkspell gpgme
-PKG_SUGGESTED_OPTIONS= inet6 gpgme
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-ipv6
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
-FACES_IS_INSTALLED!= ${PKG_INFO} -e faces || ${ECHO}
-.if empty(FACES_IS_INSTALLED)
-. include "../../graphics/compface/buildlink3.mk"
-.else
-. include "../../mail/faces/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mldap)
-CONFIGURE_ARGS+= --enable-ldap
-.include "../../databases/openldap-client/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mjpilot)
-CONFIGURE_ARGS+= --enable-jpilot
-.include "../../comms/pilot-link-libs/buildlink3.mk"
-.include "../../comms/jpilot/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mgtkspell)
-CONFIGURE_ARGS+= --enable-gtkspell
-. include "../../textproc/gtkspell/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-gtkspell
-.endif
-
-.if !empty(PKG_OPTIONS:Mgpgme)
-CONFIGURE_ARGS+= --enable-gpgme
-. include "../../security/gpgme/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-gpgme
-.endif
diff --git a/mail/sympa/DESCR b/mail/sympa/DESCR
deleted file mode 100644
index db21d12e505..00000000000
--- a/mail/sympa/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-Sympa is a mailing-list manager. As such, its goal is to automate all
-mailing-list operation such as subscription with automatic authentication,
-unsubscription, but also archiving message, sending digests on a regular
-basis, expiration of addresses, and so on.
-
-Sympa is developped by the CRU (French Universities Network Committee) ;
-it is distributed under the terms of the GNU General Public License
-Version 2.
-
-Sympa is designed to be highly customizable, easy to manage and efficient.
-Sympa is therefore a nice solution for managing small intranet mailing
-lists as well as very large ISP mailing list services.
diff --git a/mail/sympa/MESSAGE b/mail/sympa/MESSAGE
deleted file mode 100644
index 1320ada4bac..00000000000
--- a/mail/sympa/MESSAGE
+++ /dev/null
@@ -1,15 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/09/26 20:13:34 seb Exp $
-
-Run ${SYMPA_BIN}/sympa_wizard.pl -c sympa.conf
-and ${SYMPA_BIN}/sympa_wizard.pl -c wwsympa.conf
-to create default configuration files in ${PKG_SYSCONFDIR}.
-
-Then re-run ${SYMPA_BIN}/sympa_wizard.pl
-for interactive configuration.
-
-If you are upgrading from a previous version please consult
-${PREFIX}/share/doc/sympa/NEWS
-for incompatible changes.
-
-===========================================================================
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
deleted file mode 100644
index e9c1bb43d0b..00000000000
--- a/mail/sympa/Makefile
+++ /dev/null
@@ -1,133 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2007/01/13 21:24:59 abs Exp $
-#
-
-DISTNAME= sympa-4.1.2
-PKGREVISION= 6
-CATEGORIES= mail
-MASTER_SITES= http://www.sympa.org/distribution/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.sympa.org/
-COMMENT= Mailing list manager
-
-DEPENDS+= p5-Archive-Zip>=1.05:../../archivers/p5-Archive-Zip
-DEPENDS+= p5-MIME-Base64>=1.0:../../converters/p5-MIME-Base64
-DEPENDS+= p5-DBD-Sybase>=0.90:../../databases/p5-DBD-Sybase
-DEPENDS+= p5-DBI>=1.06:../../databases/p5-DBI
-DEPENDS+= p5-perl-ldap>=0.27:../../databases/p5-perl-ldap
-DEPENDS+= p5-IO-stringy>=1.0:../../devel/p5-IO-stringy
-DEPENDS+= mhonarc-[0-9]*:../../mail/mhonarc
-DEPENDS+= p5-MIME-tools>=5.209:../../mail/p5-MIME-tools
-DEPENDS+= p5-MailTools>=1.51:../../mail/p5-MailTools
-DEPENDS+= p5-Net>=1.0:../../net/p5-Net
-DEPENDS+= p5-SOAP-Lite-[0-9]*:../../net/p5-SOAP-Lite
-DEPENDS+= p5-Crypt-CipherSaber>=0.50:../../security/p5-Crypt-CipherSaber
-DEPENDS+= p5-Digest-MD5>=2.00:../../security/p5-Digest-MD5
-DEPENDS+= p5-IO-Socket-SSL>=0.90:../../security/p5-IO-Socket-SSL
-DEPENDS+= p5-Net-SSLeay>=1.16:../../security/p5-Net-SSLeay
-DEPENDS+= p5-CGI>=2.52:../../www/p5-CGI
-DEPENDS+= p5-FCGI>=0.67:../../www/p5-FCGI
-DEPENDS+= p5-libwww>=1.09:../../www/p5-libwww
-DEPENDS.SunOS+= p5-DB_File>=1.75:../../databases/p5-DB_File
-
-OPSYSVARS+= DEPENDS
-
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --with-cgidir=${SYMPA_BIN:Q}
-CONFIGURE_ARGS+= --with-iconsdir=${SYMPA_PREFIX}/httpd/icons
-CONFIGURE_ARGS+= --with-bindir=${SYMPA_BIN:Q}
-CONFIGURE_ARGS+= --with-sbindir=${SYMPA_BIN:Q}
-CONFIGURE_ARGS+= --with-libexecdir=${SYMPA_BIN:Q}
-CONFIGURE_ARGS+= --with-libdir=${SYMPA_BIN:Q}
-CONFIGURE_ARGS+= --with-datadir=${SYMPA_BIN}/etc
-CONFIGURE_ARGS+= --with-expldir=${SYMPA_VARBASE}/expl
-CONFIGURE_ARGS+= --with-mandir=${PREFIX}/${PKGMANDIR}
-CONFIGURE_ARGS+= --with-lockdir=${SYMPA_VARBASE}/lock
-CONFIGURE_ARGS+= --with-piddir=${SYMPA_VARBASE}/run
-CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR}/sympa
-CONFIGURE_ARGS+= --with-nlsdir=${SYMPA_PREFIX}/nls
-CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/html/sympa
-CONFIGURE_ARGS+= --with-scriptdir=${SYMPA_BIN:Q}
-CONFIGURE_ARGS+= --with-sampledir=${PREFIX}/share/examples/sympa
-CONFIGURE_ARGS+= --with-spooldir=${SYMPA_SPOOL:Q}
-CONFIGURE_ARGS+= --with-perl=${PERL5:Q}
-CONFIGURE_ARGS+= --with-mhonarc=${MHONARC_PREFIX}/bin/mhonarc
-CONFIGURE_ARGS+= --with-openssl=${SSLBASE}/bin/openssl
-CONFIGURE_ARGS+= --with-user=${SYMPA_USER:Q}
-CONFIGURE_ARGS+= --with-group=${SYMPA_GROUP:Q}
-
-MHONARC_PREFIX_DEFAULT= ${LOCALBASE}
-EVAL_PREFIX+= MHONARC_PREFIX=mhonarc
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.sympa
-PKG_SUPPORTED_OPTIONS= mysql pgsql
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mmysql)
-DEPENDS+= p5-DBD-mysql>=2.0407:../../databases/p5-DBD-mysql
-.endif
-
-.if !empty(PKG_OPTIONS:Mpgsql)
-DEPENDS+= p5-DBD-postgresql>=0.90:../../databases/p5-DBD-postgresql
-.endif
-
-SYMPA_USER?= sympa
-SYMPA_GROUP?= sympa
-SYMPA_VARBASE?= ${HOMEBASE}/sympa
-
-BUILD_DEFS+= SYMPA_USER SYMPA_GROUP SYMPA_VARBASE
-
-SYMPA_PREFIX= ${PREFIX}/sympa
-SYMPA_SPOOL= ${SYMPA_VARBASE}/spool
-SYMPA_BIN= ${SYMPA_PREFIX}/bin
-
-PKG_GROUPS= ${SYMPA_GROUP}
-PKG_USERS= ${SYMPA_USER}:${SYMPA_GROUP}
-
-PKG_HOME.${SYMPA_USER}= ${SYMPA_VARBASE}
-
-.for d in sympa sympa/create_list_templates sympa/general_task_models \
- sympa/scenari sympa/task_models sympa/templates sympa/wws_templates
-OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/${d} ${SYMPA_USER} ${SYMPA_GROUP} 755
-.endfor
-OWN_DIRS_PERMS+= ${SYMPA_VARBASE} ${SYMPA_USER} ${SYMPA_GROUP} 770
-OWN_DIRS_PERMS+= ${SYMPA_VARBASE}/expl ${SYMPA_USER} ${SYMPA_GROUP} 770
-OWN_DIRS_PERMS+= ${SYMPA_VARBASE}/lock ${SYMPA_USER} ${SYMPA_GROUP} 770
-OWN_DIRS_PERMS+= ${SYMPA_VARBASE}/run ${SYMPA_USER} ${SYMPA_GROUP} 770
-OWN_DIRS_PERMS+= ${SYMPA_SPOOL} ${SYMPA_USER} ${SYMPA_GROUP} 770
-OWN_DIRS_PERMS+= ${SYMPA_SPOOL}/msg ${SYMPA_USER} ${SYMPA_GROUP} 770
-OWN_DIRS_PERMS+= ${SYMPA_SPOOL}/digest ${SYMPA_USER} ${SYMPA_GROUP} 770
-OWN_DIRS_PERMS+= ${SYMPA_SPOOL}/moderation ${SYMPA_USER} ${SYMPA_GROUP} 770
-OWN_DIRS_PERMS+= ${SYMPA_SPOOL}/expire ${SYMPA_USER} ${SYMPA_GROUP} 770
-OWN_DIRS_PERMS+= ${SYMPA_SPOOL}/auth ${SYMPA_USER} ${SYMPA_GROUP} 770
-OWN_DIRS_PERMS+= ${SYMPA_SPOOL}/outgoing ${SYMPA_USER} ${SYMPA_GROUP} 770
-OWN_DIRS_PERMS+= ${SYMPA_SPOOL}/task ${SYMPA_USER} ${SYMPA_GROUP} 770
-OWN_DIRS_PERMS+= ${SYMPA_SPOOL}/tmp ${SYMPA_USER} ${SYMPA_GROUP} 770
-
-SPECIAL_PERMS+= ${SYMPA_BIN}/aliaswrapper ${ROOT_USER} ${SYMPA_GROUP} 4750
-SPECIAL_PERMS+= ${SYMPA_BIN}/bouncequeue ${SYMPA_USER} ${SYMPA_GROUP} 4755
-SPECIAL_PERMS+= ${SYMPA_BIN}/queue ${SYMPA_USER} ${SYMPA_GROUP} 4755
-SPECIAL_PERMS+= ${SYMPA_BIN}/virtualwrapper ${ROOT_USER} ${SYMPA_GROUP} 4750
-
-# Which pkgsrc platforms support set-uid scripts?
-#SPECIAL_PERMS+= ${SYMPA_BIN}/sympa_soap_server.fcgi ${SYMPA_USER} ${SYMPA_GROUP} 6755
-#SPECIAL_PERMS+= ${SYMPA_BIN}/wwsympa.fcgi ${SYMPA_USER} ${SYMPA_GROUP} 6755
-
-MESSAGE_SUBST+= SYMPA_BIN=${SYMPA_BIN}
-
-INSTALLATION_DIRS+= share/doc/sympa
-
-.include "../../mk/bsd.prefs.mk"
-
-post-install:
-.if ${OPSYS} == "NetBSD"
- : We do not support set-uid scripts...
- ${CHMOD} ug-s ${SYMPA_BIN}/sympa_soap_server.fcgi
- ${CHMOD} ug-s ${SYMPA_BIN}/wwsympa.fcgi
-.endif
- ${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/sympa/NEWS
-
-.include "../../lang/perl5/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/sympa/PLIST b/mail/sympa/PLIST
deleted file mode 100644
index c46fb16c92a..00000000000
--- a/mail/sympa/PLIST
+++ /dev/null
@@ -1,1375 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/26 20:13:34 seb Exp $
-man/man8/alias_manager.8
-man/man8/archived.8
-man/man8/bounced.8
-man/man8/sympa.8
-share/doc/html/sympa/contents.png
-share/doc/html/sympa/crossref.png
-share/doc/html/sympa/img1.old
-share/doc/html/sympa/img1.png
-share/doc/html/sympa/img2.old
-share/doc/html/sympa/img2.png
-share/doc/html/sympa/index.html
-share/doc/html/sympa/index.png
-share/doc/html/sympa/next.png
-share/doc/html/sympa/next_g.png
-share/doc/html/sympa/node1.html
-share/doc/html/sympa/node10.html
-share/doc/html/sympa/node11.html
-share/doc/html/sympa/node12.html
-share/doc/html/sympa/node13.html
-share/doc/html/sympa/node14.html
-share/doc/html/sympa/node15.html
-share/doc/html/sympa/node16.html
-share/doc/html/sympa/node17.html
-share/doc/html/sympa/node18.html
-share/doc/html/sympa/node19.html
-share/doc/html/sympa/node2.html
-share/doc/html/sympa/node20.html
-share/doc/html/sympa/node21.html
-share/doc/html/sympa/node22.html
-share/doc/html/sympa/node23.html
-share/doc/html/sympa/node24.html
-share/doc/html/sympa/node3.html
-share/doc/html/sympa/node4.html
-share/doc/html/sympa/node5.html
-share/doc/html/sympa/node6.html
-share/doc/html/sympa/node7.html
-share/doc/html/sympa/node8.html
-share/doc/html/sympa/node9.html
-share/doc/html/sympa/prev.png
-share/doc/html/sympa/prev_g.png
-share/doc/html/sympa/sympa.css
-share/doc/html/sympa/sympa.html
-share/doc/html/sympa/sympa.pdf
-share/doc/html/sympa/sympa.ps
-share/doc/html/sympa/sympa.tex
-share/doc/html/sympa/up.png
-share/doc/html/sympa/up_g.png
-share/doc/sympa/NEWS
-share/examples/sympa/README
-share/examples/sympa/config.digest
-share/examples/sympa/config.include
-share/examples/sympa/config.moderation
-share/examples/sympa/config.privateorpublickey
-share/examples/sympa/config.public
-share/examples/sympa/sample-list/config
-share/examples/sympa/sample-list/info
-share/examples/sympa/sample-list/message.footer
-share/examples/sympa/sample-list/welcome.tpl
-share/examples/sympa/sympa.conf
-share/examples/sympa/topics.fr.conf
-share/examples/sympa/topics.hu.conf
-share/examples/sympa/wwsympa.conf
-sympa/bin/Archive.pm
-sympa/bin/Auth.pm
-sympa/bin/CAS.pm
-sympa/bin/Commands.pm
-sympa/bin/Conf.pm
-sympa/bin/Language.pm
-sympa/bin/Ldap.pm
-sympa/bin/List.pm
-sympa/bin/Log.pm
-sympa/bin/Marc.pm
-sympa/bin/Marc/Search.pm
-sympa/bin/Message.pm
-sympa/bin/SympaTransport.pm
-sympa/bin/Version.pm
-sympa/bin/X509.pm
-sympa/bin/alias_manager.pl
-sympa/bin/aliaswrapper
-sympa/bin/arc2webarc.pl
-sympa/bin/archived.pl
-sympa/bin/bounce-lib.pl
-sympa/bin/bounced.pl
-sympa/bin/bouncequeue
-sympa/bin/cookielib.pm
-sympa/bin/create_db.Oracle
-sympa/bin/create_db.Pg
-sympa/bin/create_db.Sybase
-sympa/bin/create_db.mysql
-sympa/bin/crypt_passwd.pl
-sympa/bin/etc/README
-sympa/bin/etc/auth.conf
-sympa/bin/etc/ca-bundle.crt
-sympa/bin/etc/create_list.conf
-sympa/bin/etc/create_list_templates/discussion_list/comment
-sympa/bin/etc/create_list_templates/discussion_list/config.tpl
-sympa/bin/etc/create_list_templates/hotline/comment
-sympa/bin/etc/create_list_templates/hotline/config.tpl
-sympa/bin/etc/create_list_templates/html-news-letter/comment
-sympa/bin/etc/create_list_templates/html-news-letter/config.tpl
-sympa/bin/etc/create_list_templates/intranet_list/comment
-sympa/bin/etc/create_list_templates/intranet_list/config.tpl
-sympa/bin/etc/create_list_templates/news-letter/comment
-sympa/bin/etc/create_list_templates/news-letter/config.tpl
-sympa/bin/etc/create_list_templates/private_working_group/comment
-sympa/bin/etc/create_list_templates/private_working_group/config.tpl
-sympa/bin/etc/create_list_templates/public_web_forum/comment
-sympa/bin/etc/create_list_templates/public_web_forum/config.tpl
-sympa/bin/etc/edit_list.conf
-sympa/bin/etc/global_task_models/chk_cert_expiration.daily.task
-sympa/bin/etc/global_task_models/crl_update.daily.task
-sympa/bin/etc/global_task_models/eval_bouncers.daily.task
-sympa/bin/etc/global_task_models/expire_bounce.daily.task
-sympa/bin/etc/global_task_models/process_bouncers.weekly.task
-sympa/bin/etc/global_task_models/purge_orphan_bounces.monthly.task
-sympa/bin/etc/global_task_models/purge_user_table.monthly.task
-sympa/bin/etc/list_aliases.tpl
-sympa/bin/etc/list_task_models/expire.yearly.task
-sympa/bin/etc/list_task_models/remind.2month.task
-sympa/bin/etc/list_task_models/remind.monthly.task
-sympa/bin/etc/list_task_models/remind.yearly.task
-sympa/bin/etc/list_task_models/sync_include.ttl.task
-sympa/bin/etc/mhonarc-ressources
-sympa/bin/etc/mime.types
-sympa/bin/etc/scenari/access_web_archive.closed
-sympa/bin/etc/scenari/access_web_archive.intranet
-sympa/bin/etc/scenari/access_web_archive.listmaster
-sympa/bin/etc/scenari/access_web_archive.owner
-sympa/bin/etc/scenari/access_web_archive.private
-sympa/bin/etc/scenari/access_web_archive.public
-sympa/bin/etc/scenari/add.auth
-sympa/bin/etc/scenari/add.closed
-sympa/bin/etc/scenari/add.default
-sympa/bin/etc/scenari/add.owner
-sympa/bin/etc/scenari/add.owner_notify
-sympa/bin/etc/scenari/create_list.intranet
-sympa/bin/etc/scenari/create_list.listmaster
-sympa/bin/etc/scenari/create_list.public_listmaster
-sympa/bin/etc/scenari/d_edit.default
-sympa/bin/etc/scenari/d_edit.owner
-sympa/bin/etc/scenari/d_edit.private
-sympa/bin/etc/scenari/d_edit.public
-sympa/bin/etc/scenari/d_read.default
-sympa/bin/etc/scenari/d_read.owner
-sympa/bin/etc/scenari/d_read.private
-sympa/bin/etc/scenari/d_read.public
-sympa/bin/etc/scenari/del.auth
-sympa/bin/etc/scenari/del.closed
-sympa/bin/etc/scenari/del.default
-sympa/bin/etc/scenari/del.owner
-sympa/bin/etc/scenari/del.owner_notify
-sympa/bin/etc/scenari/edit_list.closed
-sympa/bin/etc/scenari/edit_list.owner
-sympa/bin/etc/scenari/global_remind.listmaster
-sympa/bin/etc/scenari/info.default
-sympa/bin/etc/scenari/info.open
-sympa/bin/etc/scenari/info.private
-sympa/bin/etc/scenari/invite.closed
-sympa/bin/etc/scenari/invite.default
-sympa/bin/etc/scenari/invite.owner
-sympa/bin/etc/scenari/invite.private
-sympa/bin/etc/scenari/invite.public
-sympa/bin/etc/scenari/remind.default
-sympa/bin/etc/scenari/remind.listmaster
-sympa/bin/etc/scenari/remind.owner
-sympa/bin/etc/scenari/review.closed
-sympa/bin/etc/scenari/review.default
-sympa/bin/etc/scenari/review.intranet
-sympa/bin/etc/scenari/review.listmaster
-sympa/bin/etc/scenari/review.owner
-sympa/bin/etc/scenari/review.private
-sympa/bin/etc/scenari/review.public
-sympa/bin/etc/scenari/send.closed
-sympa/bin/etc/scenari/send.default
-sympa/bin/etc/scenari/send.editor
-sympa/bin/etc/scenari/send.editorkey
-sympa/bin/etc/scenari/send.editorkeyonly
-sympa/bin/etc/scenari/send.editorkeyonlyauth
-sympa/bin/etc/scenari/send.intranet
-sympa/bin/etc/scenari/send.intranetorprivate
-sympa/bin/etc/scenari/send.newsletter
-sympa/bin/etc/scenari/send.newsletterkeyonly
-sympa/bin/etc/scenari/send.private
-sympa/bin/etc/scenari/send.private_smime
-sympa/bin/etc/scenari/send.privateandeditorkey
-sympa/bin/etc/scenari/send.privateandnomultipartoreditorkey
-sympa/bin/etc/scenari/send.privatekey
-sympa/bin/etc/scenari/send.privatekeyandeditorkeyonly
-sympa/bin/etc/scenari/send.privateoreditorkey
-sympa/bin/etc/scenari/send.privateorpublickey
-sympa/bin/etc/scenari/send.public
-sympa/bin/etc/scenari/send.public_nobcc
-sympa/bin/etc/scenari/send.publickey
-sympa/bin/etc/scenari/send.publicnoattachment
-sympa/bin/etc/scenari/send.publicnomultipart
-sympa/bin/etc/scenari/subscribe.auth
-sympa/bin/etc/scenari/subscribe.auth_notify
-sympa/bin/etc/scenari/subscribe.auth_owner
-sympa/bin/etc/scenari/subscribe.closed
-sympa/bin/etc/scenari/subscribe.default
-sympa/bin/etc/scenari/subscribe.intranet
-sympa/bin/etc/scenari/subscribe.intranetorowner
-sympa/bin/etc/scenari/subscribe.open
-sympa/bin/etc/scenari/subscribe.open_notify
-sympa/bin/etc/scenari/subscribe.open_quiet
-sympa/bin/etc/scenari/subscribe.owner
-sympa/bin/etc/scenari/subscribe.smime
-sympa/bin/etc/scenari/subscribe.smimeorowner
-sympa/bin/etc/scenari/topics_visibility.conceal
-sympa/bin/etc/scenari/topics_visibility.default
-sympa/bin/etc/scenari/topics_visibility.identified
-sympa/bin/etc/scenari/topics_visibility.noconceal
-sympa/bin/etc/scenari/unsubscribe.auth
-sympa/bin/etc/scenari/unsubscribe.auth_notify
-sympa/bin/etc/scenari/unsubscribe.closed
-sympa/bin/etc/scenari/unsubscribe.default
-sympa/bin/etc/scenari/unsubscribe.open
-sympa/bin/etc/scenari/unsubscribe.open_notify
-sympa/bin/etc/scenari/unsubscribe.owner
-sympa/bin/etc/scenari/visibility.conceal
-sympa/bin/etc/scenari/visibility.default
-sympa/bin/etc/scenari/visibility.intranet
-sympa/bin/etc/scenari/visibility.noconceal
-sympa/bin/etc/scenari/visibility.secret
-sympa/bin/etc/sympa.wsdl
-sympa/bin/etc/templates/bye.cz.tpl
-sympa/bin/etc/templates/bye.de.tpl
-sympa/bin/etc/templates/bye.es.tpl
-sympa/bin/etc/templates/bye.et.tpl
-sympa/bin/etc/templates/bye.fi.tpl
-sympa/bin/etc/templates/bye.fr.tpl
-sympa/bin/etc/templates/bye.hu.tpl
-sympa/bin/etc/templates/bye.it.tpl
-sympa/bin/etc/templates/bye.nl.tpl
-sympa/bin/etc/templates/bye.pl.tpl
-sympa/bin/etc/templates/bye.pt.tpl
-sympa/bin/etc/templates/bye.ro.tpl
-sympa/bin/etc/templates/bye.tpl
-sympa/bin/etc/templates/bye.us.tpl
-sympa/bin/etc/templates/certif_warning.et.tpl
-sympa/bin/etc/templates/certif_warning.fi.tpl
-sympa/bin/etc/templates/certif_warning.fr.tpl
-sympa/bin/etc/templates/certif_warning.nl.tpl
-sympa/bin/etc/templates/certif_warning.ro.tpl
-sympa/bin/etc/templates/certif_warning.tpl
-sympa/bin/etc/templates/certif_warning.us.tpl
-sympa/bin/etc/templates/digest.cn.tpl
-sympa/bin/etc/templates/digest.cz.tpl
-sympa/bin/etc/templates/digest.de.tpl
-sympa/bin/etc/templates/digest.es.tpl
-sympa/bin/etc/templates/digest.et.tpl
-sympa/bin/etc/templates/digest.fi.tpl
-sympa/bin/etc/templates/digest.fr.tpl
-sympa/bin/etc/templates/digest.hu.tpl
-sympa/bin/etc/templates/digest.it.tpl
-sympa/bin/etc/templates/digest.nl.tpl
-sympa/bin/etc/templates/digest.pl.tpl
-sympa/bin/etc/templates/digest.ro.tpl
-sympa/bin/etc/templates/digest.tpl
-sympa/bin/etc/templates/digest.tw.tpl
-sympa/bin/etc/templates/digest.us.tpl
-sympa/bin/etc/templates/expire_deletion.et.tpl
-sympa/bin/etc/templates/expire_deletion.fi.tpl
-sympa/bin/etc/templates/expire_deletion.fr.tpl
-sympa/bin/etc/templates/expire_deletion.nl.tpl
-sympa/bin/etc/templates/expire_deletion.ro.tpl
-sympa/bin/etc/templates/expire_deletion.tpl
-sympa/bin/etc/templates/expire_deletion.us.tpl
-sympa/bin/etc/templates/expire_warning1.et.tpl
-sympa/bin/etc/templates/expire_warning1.fi.tpl
-sympa/bin/etc/templates/expire_warning1.fr.tpl
-sympa/bin/etc/templates/expire_warning1.nl.tpl
-sympa/bin/etc/templates/expire_warning1.ro.tpl
-sympa/bin/etc/templates/expire_warning1.tpl
-sympa/bin/etc/templates/expire_warning1.us.tpl
-sympa/bin/etc/templates/expire_warning2.et.tpl
-sympa/bin/etc/templates/expire_warning2.fi.tpl
-sympa/bin/etc/templates/expire_warning2.fr.tpl
-sympa/bin/etc/templates/expire_warning2.nl.tpl
-sympa/bin/etc/templates/expire_warning2.ro.tpl
-sympa/bin/etc/templates/expire_warning2.tpl
-sympa/bin/etc/templates/expire_warning2.us.tpl
-sympa/bin/etc/templates/global_remind.cz.tpl
-sympa/bin/etc/templates/global_remind.de.tpl
-sympa/bin/etc/templates/global_remind.es.tpl
-sympa/bin/etc/templates/global_remind.et.tpl
-sympa/bin/etc/templates/global_remind.fi.tpl
-sympa/bin/etc/templates/global_remind.fr.tpl
-sympa/bin/etc/templates/global_remind.hu.tpl
-sympa/bin/etc/templates/global_remind.it.tpl
-sympa/bin/etc/templates/global_remind.nl.tpl
-sympa/bin/etc/templates/global_remind.pl.tpl
-sympa/bin/etc/templates/global_remind.pt.tpl
-sympa/bin/etc/templates/global_remind.ro.tpl
-sympa/bin/etc/templates/global_remind.tpl
-sympa/bin/etc/templates/global_remind.us.tpl
-sympa/bin/etc/templates/helpfile.cz.tpl
-sympa/bin/etc/templates/helpfile.de.tpl
-sympa/bin/etc/templates/helpfile.es.tpl
-sympa/bin/etc/templates/helpfile.et.tpl
-sympa/bin/etc/templates/helpfile.fi.tpl
-sympa/bin/etc/templates/helpfile.fr.tpl
-sympa/bin/etc/templates/helpfile.hu.tpl
-sympa/bin/etc/templates/helpfile.it.tpl
-sympa/bin/etc/templates/helpfile.nl.tpl
-sympa/bin/etc/templates/helpfile.pl.tpl
-sympa/bin/etc/templates/helpfile.pt.tpl
-sympa/bin/etc/templates/helpfile.ro.tpl
-sympa/bin/etc/templates/helpfile.tpl
-sympa/bin/etc/templates/helpfile.us.tpl
-sympa/bin/etc/templates/info_report.cz.tpl
-sympa/bin/etc/templates/info_report.de.tpl
-sympa/bin/etc/templates/info_report.es.tpl
-sympa/bin/etc/templates/info_report.et.tpl
-sympa/bin/etc/templates/info_report.fi.tpl
-sympa/bin/etc/templates/info_report.fr.tpl
-sympa/bin/etc/templates/info_report.hu.tpl
-sympa/bin/etc/templates/info_report.it.tpl
-sympa/bin/etc/templates/info_report.nl.tpl
-sympa/bin/etc/templates/info_report.pl.tpl
-sympa/bin/etc/templates/info_report.ro.tpl
-sympa/bin/etc/templates/info_report.tpl
-sympa/bin/etc/templates/info_report.us.tpl
-sympa/bin/etc/templates/invite.cz.tpl
-sympa/bin/etc/templates/invite.de.tpl
-sympa/bin/etc/templates/invite.es.tpl
-sympa/bin/etc/templates/invite.et.tpl
-sympa/bin/etc/templates/invite.fi.tpl
-sympa/bin/etc/templates/invite.fr.tpl
-sympa/bin/etc/templates/invite.hu.tpl
-sympa/bin/etc/templates/invite.it.tpl
-sympa/bin/etc/templates/invite.nl.tpl
-sympa/bin/etc/templates/invite.pl.tpl
-sympa/bin/etc/templates/invite.pt.tpl
-sympa/bin/etc/templates/invite.ro.tpl
-sympa/bin/etc/templates/invite.tpl
-sympa/bin/etc/templates/invite.us.tpl
-sympa/bin/etc/templates/list_created.et.tpl
-sympa/bin/etc/templates/list_created.fi.tpl
-sympa/bin/etc/templates/list_created.fr.tpl
-sympa/bin/etc/templates/list_created.nl.tpl
-sympa/bin/etc/templates/list_created.ro.tpl
-sympa/bin/etc/templates/list_created.tpl
-sympa/bin/etc/templates/list_created.us.tpl
-sympa/bin/etc/templates/list_rejected.fr.tpl
-sympa/bin/etc/templates/list_rejected.tpl
-sympa/bin/etc/templates/list_rejected.us.tpl
-sympa/bin/etc/templates/list_unknown.et.tpl
-sympa/bin/etc/templates/list_unknown.fi.tpl
-sympa/bin/etc/templates/list_unknown.nl.tpl
-sympa/bin/etc/templates/list_unknown.ro.tpl
-sympa/bin/etc/templates/list_unknown.tpl
-sympa/bin/etc/templates/list_unknown.us.tpl
-sympa/bin/etc/templates/listmaster_notification.et.tpl
-sympa/bin/etc/templates/listmaster_notification.fi.tpl
-sympa/bin/etc/templates/listmaster_notification.fr.tpl
-sympa/bin/etc/templates/listmaster_notification.nl.tpl
-sympa/bin/etc/templates/listmaster_notification.tpl
-sympa/bin/etc/templates/listmaster_notification.us.tpl
-sympa/bin/etc/templates/listowner_notification.fi.tpl
-sympa/bin/etc/templates/listowner_notification.fr.tpl
-sympa/bin/etc/templates/listowner_notification.nl.tpl
-sympa/bin/etc/templates/listowner_notification.tpl
-sympa/bin/etc/templates/listowner_notification.us.tpl
-sympa/bin/etc/templates/listowner_notification2.ro.tpl
-sympa/bin/etc/templates/lists.cz.tpl
-sympa/bin/etc/templates/lists.de.tpl
-sympa/bin/etc/templates/lists.es.tpl
-sympa/bin/etc/templates/lists.et.tpl
-sympa/bin/etc/templates/lists.fi.tpl
-sympa/bin/etc/templates/lists.fr.tpl
-sympa/bin/etc/templates/lists.hu.tpl
-sympa/bin/etc/templates/lists.it.tpl
-sympa/bin/etc/templates/lists.nl.tpl
-sympa/bin/etc/templates/lists.pt.tpl
-sympa/bin/etc/templates/lists.ro.tpl
-sympa/bin/etc/templates/lists.tpl
-sympa/bin/etc/templates/lists.us.tpl
-sympa/bin/etc/templates/moderate.cz.tpl
-sympa/bin/etc/templates/moderate.de.tpl
-sympa/bin/etc/templates/moderate.es.tpl
-sympa/bin/etc/templates/moderate.et.tpl
-sympa/bin/etc/templates/moderate.fi.tpl
-sympa/bin/etc/templates/moderate.fr.tpl
-sympa/bin/etc/templates/moderate.hu.tpl
-sympa/bin/etc/templates/moderate.it.tpl
-sympa/bin/etc/templates/moderate.nl.tpl
-sympa/bin/etc/templates/moderate.pl.tpl
-sympa/bin/etc/templates/moderate.ro.tpl
-sympa/bin/etc/templates/moderate.tpl
-sympa/bin/etc/templates/moderate.us.tpl
-sympa/bin/etc/templates/modindex.cz.tpl
-sympa/bin/etc/templates/modindex.de.tpl
-sympa/bin/etc/templates/modindex.es.tpl
-sympa/bin/etc/templates/modindex.et.tpl
-sympa/bin/etc/templates/modindex.fi.tpl
-sympa/bin/etc/templates/modindex.fr.tpl
-sympa/bin/etc/templates/modindex.hu.tpl
-sympa/bin/etc/templates/modindex.it.tpl
-sympa/bin/etc/templates/modindex.nl.tpl
-sympa/bin/etc/templates/modindex.pl.tpl
-sympa/bin/etc/templates/modindex.ro.tpl
-sympa/bin/etc/templates/modindex.tpl
-sympa/bin/etc/templates/modindex.us.tpl
-sympa/bin/etc/templates/reject.cz.tpl
-sympa/bin/etc/templates/reject.de.tpl
-sympa/bin/etc/templates/reject.es.tpl
-sympa/bin/etc/templates/reject.et.tpl
-sympa/bin/etc/templates/reject.fi.tpl
-sympa/bin/etc/templates/reject.fr.tpl
-sympa/bin/etc/templates/reject.hu.tpl
-sympa/bin/etc/templates/reject.nl.tpl
-sympa/bin/etc/templates/reject.pl.tpl
-sympa/bin/etc/templates/reject.pt.tpl
-sympa/bin/etc/templates/reject.ro.tpl
-sympa/bin/etc/templates/reject.tpl
-sympa/bin/etc/templates/reject.us.tpl
-sympa/bin/etc/templates/remind.cz.tpl
-sympa/bin/etc/templates/remind.de.tpl
-sympa/bin/etc/templates/remind.es.tpl
-sympa/bin/etc/templates/remind.et.tpl
-sympa/bin/etc/templates/remind.fi.tpl
-sympa/bin/etc/templates/remind.fr.tpl
-sympa/bin/etc/templates/remind.hu.tpl
-sympa/bin/etc/templates/remind.it.tpl
-sympa/bin/etc/templates/remind.nl.tpl
-sympa/bin/etc/templates/remind.pl.tpl
-sympa/bin/etc/templates/remind.pt.tpl
-sympa/bin/etc/templates/remind.ro.tpl
-sympa/bin/etc/templates/remind.tpl
-sympa/bin/etc/templates/remind.us.tpl
-sympa/bin/etc/templates/removed.cz.tpl
-sympa/bin/etc/templates/removed.de.tpl
-sympa/bin/etc/templates/removed.es.tpl
-sympa/bin/etc/templates/removed.et.tpl
-sympa/bin/etc/templates/removed.fi.tpl
-sympa/bin/etc/templates/removed.fr.tpl
-sympa/bin/etc/templates/removed.hu.tpl
-sympa/bin/etc/templates/removed.it.tpl
-sympa/bin/etc/templates/removed.nl.tpl
-sympa/bin/etc/templates/removed.pl.tpl
-sympa/bin/etc/templates/removed.pt.tpl
-sympa/bin/etc/templates/removed.ro.tpl
-sympa/bin/etc/templates/removed.tpl
-sympa/bin/etc/templates/removed.us.tpl
-sympa/bin/etc/templates/review.cz.tpl
-sympa/bin/etc/templates/review.de.tpl
-sympa/bin/etc/templates/review.es.tpl
-sympa/bin/etc/templates/review.et.tpl
-sympa/bin/etc/templates/review.fi.tpl
-sympa/bin/etc/templates/review.fr.tpl
-sympa/bin/etc/templates/review.hu.tpl
-sympa/bin/etc/templates/review.it.tpl
-sympa/bin/etc/templates/review.nl.tpl
-sympa/bin/etc/templates/review.pl.tpl
-sympa/bin/etc/templates/review.ro.tpl
-sympa/bin/etc/templates/review.tpl
-sympa/bin/etc/templates/review.us.tpl
-sympa/bin/etc/templates/sendpasswd.cn.tpl
-sympa/bin/etc/templates/sendpasswd.cz.tpl
-sympa/bin/etc/templates/sendpasswd.de.tpl
-sympa/bin/etc/templates/sendpasswd.es.tpl
-sympa/bin/etc/templates/sendpasswd.et.tpl
-sympa/bin/etc/templates/sendpasswd.fi.tpl
-sympa/bin/etc/templates/sendpasswd.fr.tpl
-sympa/bin/etc/templates/sendpasswd.hu.tpl
-sympa/bin/etc/templates/sendpasswd.it.tpl
-sympa/bin/etc/templates/sendpasswd.nl.tpl
-sympa/bin/etc/templates/sendpasswd.ro.tpl
-sympa/bin/etc/templates/sendpasswd.tpl
-sympa/bin/etc/templates/sendpasswd.us.tpl
-sympa/bin/etc/templates/stats_report.cz.tpl
-sympa/bin/etc/templates/stats_report.de.tpl
-sympa/bin/etc/templates/stats_report.es.tpl
-sympa/bin/etc/templates/stats_report.et.tpl
-sympa/bin/etc/templates/stats_report.fi.tpl
-sympa/bin/etc/templates/stats_report.fr.tpl
-sympa/bin/etc/templates/stats_report.hu.tpl
-sympa/bin/etc/templates/stats_report.it.tpl
-sympa/bin/etc/templates/stats_report.nl.tpl
-sympa/bin/etc/templates/stats_report.pl.tpl
-sympa/bin/etc/templates/stats_report.ro.tpl
-sympa/bin/etc/templates/stats_report.tpl
-sympa/bin/etc/templates/stats_report.us.tpl
-sympa/bin/etc/templates/subscriber_notification.fr.tpl
-sympa/bin/etc/templates/subscriber_notification.tpl
-sympa/bin/etc/templates/subscriber_notification.us.tpl
-sympa/bin/etc/templates/summary.et.tpl
-sympa/bin/etc/templates/summary.fi.tpl
-sympa/bin/etc/templates/summary.nl.tpl
-sympa/bin/etc/templates/summary.ro.tpl
-sympa/bin/etc/templates/summary.tpl
-sympa/bin/etc/templates/summary.us.tpl
-sympa/bin/etc/templates/urlized_part.fr.tpl
-sympa/bin/etc/templates/urlized_part.tpl
-sympa/bin/etc/templates/urlized_part.us.tpl
-sympa/bin/etc/templates/welcome.cz.tpl
-sympa/bin/etc/templates/welcome.de.tpl
-sympa/bin/etc/templates/welcome.es.tpl
-sympa/bin/etc/templates/welcome.et.tpl
-sympa/bin/etc/templates/welcome.fi.tpl
-sympa/bin/etc/templates/welcome.fr.tpl
-sympa/bin/etc/templates/welcome.hu.tpl
-sympa/bin/etc/templates/welcome.it.tpl
-sympa/bin/etc/templates/welcome.nl.tpl
-sympa/bin/etc/templates/welcome.pl.tpl
-sympa/bin/etc/templates/welcome.pt.tpl
-sympa/bin/etc/templates/welcome.ro.tpl
-sympa/bin/etc/templates/welcome.tpl
-sympa/bin/etc/templates/welcome.us.tpl
-sympa/bin/etc/templates/x509-user-cert-missing.cz.tpl
-sympa/bin/etc/templates/x509-user-cert-missing.de.tpl
-sympa/bin/etc/templates/x509-user-cert-missing.et.tpl
-sympa/bin/etc/templates/x509-user-cert-missing.fi.tpl
-sympa/bin/etc/templates/x509-user-cert-missing.fr.tpl
-sympa/bin/etc/templates/x509-user-cert-missing.hu.tpl
-sympa/bin/etc/templates/x509-user-cert-missing.nl.tpl
-sympa/bin/etc/templates/x509-user-cert-missing.ro.tpl
-sympa/bin/etc/templates/x509-user-cert-missing.tpl
-sympa/bin/etc/templates/x509-user-cert-missing.us.tpl
-sympa/bin/etc/templates/your_infected_msg.de.tpl
-sympa/bin/etc/templates/your_infected_msg.et.tpl
-sympa/bin/etc/templates/your_infected_msg.fi.tpl
-sympa/bin/etc/templates/your_infected_msg.fr.tpl
-sympa/bin/etc/templates/your_infected_msg.it.tpl
-sympa/bin/etc/templates/your_infected_msg.nl.tpl
-sympa/bin/etc/templates/your_infected_msg.ro.tpl
-sympa/bin/etc/templates/your_infected_msg.tpl
-sympa/bin/etc/templates/your_infected_msg.us.tpl
-sympa/bin/etc/topics.conf
-sympa/bin/etc/wws_templates/add_request.cn.tpl
-sympa/bin/etc/wws_templates/add_request.cz.tpl
-sympa/bin/etc/wws_templates/add_request.de.tpl
-sympa/bin/etc/wws_templates/add_request.es.tpl
-sympa/bin/etc/wws_templates/add_request.et.tpl
-sympa/bin/etc/wws_templates/add_request.fi.tpl
-sympa/bin/etc/wws_templates/add_request.fr.tpl
-sympa/bin/etc/wws_templates/add_request.hu.tpl
-sympa/bin/etc/wws_templates/add_request.it.tpl
-sympa/bin/etc/wws_templates/add_request.nl.tpl
-sympa/bin/etc/wws_templates/add_request.ro.tpl
-sympa/bin/etc/wws_templates/add_request.tpl
-sympa/bin/etc/wws_templates/add_request.us.tpl
-sympa/bin/etc/wws_templates/admin.cn.tpl
-sympa/bin/etc/wws_templates/admin.cz.tpl
-sympa/bin/etc/wws_templates/admin.de.tpl
-sympa/bin/etc/wws_templates/admin.es.tpl
-sympa/bin/etc/wws_templates/admin.et.tpl
-sympa/bin/etc/wws_templates/admin.fi.tpl
-sympa/bin/etc/wws_templates/admin.fr.tpl
-sympa/bin/etc/wws_templates/admin.hu.tpl
-sympa/bin/etc/wws_templates/admin.it.tpl
-sympa/bin/etc/wws_templates/admin.ro.tpl
-sympa/bin/etc/wws_templates/admin.tpl
-sympa/bin/etc/wws_templates/admin.us.tpl
-sympa/bin/etc/wws_templates/admin_menu.cn.tpl
-sympa/bin/etc/wws_templates/admin_menu.cz.tpl
-sympa/bin/etc/wws_templates/admin_menu.de.tpl
-sympa/bin/etc/wws_templates/admin_menu.es.tpl
-sympa/bin/etc/wws_templates/admin_menu.et.tpl
-sympa/bin/etc/wws_templates/admin_menu.fi.tpl
-sympa/bin/etc/wws_templates/admin_menu.fr.tpl
-sympa/bin/etc/wws_templates/admin_menu.hu.tpl
-sympa/bin/etc/wws_templates/admin_menu.it.tpl
-sympa/bin/etc/wws_templates/admin_menu.nl.tpl
-sympa/bin/etc/wws_templates/admin_menu.ro.tpl
-sympa/bin/etc/wws_templates/admin_menu.tpl
-sympa/bin/etc/wws_templates/admin_menu.us.tpl
-sympa/bin/etc/wws_templates/arc.cn.tpl
-sympa/bin/etc/wws_templates/arc.cz.tpl
-sympa/bin/etc/wws_templates/arc.de.tpl
-sympa/bin/etc/wws_templates/arc.es.tpl
-sympa/bin/etc/wws_templates/arc.et.tpl
-sympa/bin/etc/wws_templates/arc.fi.tpl
-sympa/bin/etc/wws_templates/arc.fr.tpl
-sympa/bin/etc/wws_templates/arc.hu.tpl
-sympa/bin/etc/wws_templates/arc.it.tpl
-sympa/bin/etc/wws_templates/arc.nl.tpl
-sympa/bin/etc/wws_templates/arc.ro.tpl
-sympa/bin/etc/wws_templates/arc.tpl
-sympa/bin/etc/wws_templates/arc.us.tpl
-sympa/bin/etc/wws_templates/arc_manage.fr.tpl
-sympa/bin/etc/wws_templates/arc_manage.tpl
-sympa/bin/etc/wws_templates/arc_manage.us.tpl
-sympa/bin/etc/wws_templates/arc_protect.cn.tpl
-sympa/bin/etc/wws_templates/arc_protect.cz.tpl
-sympa/bin/etc/wws_templates/arc_protect.de.tpl
-sympa/bin/etc/wws_templates/arc_protect.es.tpl
-sympa/bin/etc/wws_templates/arc_protect.et.tpl
-sympa/bin/etc/wws_templates/arc_protect.fi.tpl
-sympa/bin/etc/wws_templates/arc_protect.fr.tpl
-sympa/bin/etc/wws_templates/arc_protect.hu.tpl
-sympa/bin/etc/wws_templates/arc_protect.it.tpl
-sympa/bin/etc/wws_templates/arc_protect.nl.tpl
-sympa/bin/etc/wws_templates/arc_protect.ro.tpl
-sympa/bin/etc/wws_templates/arc_protect.tpl
-sympa/bin/etc/wws_templates/arc_protect.us.tpl
-sympa/bin/etc/wws_templates/arcsearch.cn.tpl
-sympa/bin/etc/wws_templates/arcsearch.cz.tpl
-sympa/bin/etc/wws_templates/arcsearch.de.tpl
-sympa/bin/etc/wws_templates/arcsearch.es.tpl
-sympa/bin/etc/wws_templates/arcsearch.et.tpl
-sympa/bin/etc/wws_templates/arcsearch.fi.tpl
-sympa/bin/etc/wws_templates/arcsearch.fr.tpl
-sympa/bin/etc/wws_templates/arcsearch.hu.tpl
-sympa/bin/etc/wws_templates/arcsearch.it.tpl
-sympa/bin/etc/wws_templates/arcsearch.nl.tpl
-sympa/bin/etc/wws_templates/arcsearch.ro.tpl
-sympa/bin/etc/wws_templates/arcsearch.tpl
-sympa/bin/etc/wws_templates/arcsearch.us.tpl
-sympa/bin/etc/wws_templates/arcsearch_form.cn.tpl
-sympa/bin/etc/wws_templates/arcsearch_form.cz.tpl
-sympa/bin/etc/wws_templates/arcsearch_form.de.tpl
-sympa/bin/etc/wws_templates/arcsearch_form.es.tpl
-sympa/bin/etc/wws_templates/arcsearch_form.et.tpl
-sympa/bin/etc/wws_templates/arcsearch_form.fi.tpl
-sympa/bin/etc/wws_templates/arcsearch_form.fr.tpl
-sympa/bin/etc/wws_templates/arcsearch_form.hu.tpl
-sympa/bin/etc/wws_templates/arcsearch_form.it.tpl
-sympa/bin/etc/wws_templates/arcsearch_form.nl.tpl
-sympa/bin/etc/wws_templates/arcsearch_form.ro.tpl
-sympa/bin/etc/wws_templates/arcsearch_form.tpl
-sympa/bin/etc/wws_templates/arcsearch_form.us.tpl
-sympa/bin/etc/wws_templates/button_footer.fi.tpl
-sympa/bin/etc/wws_templates/button_footer.tpl
-sympa/bin/etc/wws_templates/button_footer.us.tpl
-sympa/bin/etc/wws_templates/button_header.fi.tpl
-sympa/bin/etc/wws_templates/button_header.tpl
-sympa/bin/etc/wws_templates/button_header.us.tpl
-sympa/bin/etc/wws_templates/change_email.cn.tpl
-sympa/bin/etc/wws_templates/change_email.cz.tpl
-sympa/bin/etc/wws_templates/change_email.de.tpl
-sympa/bin/etc/wws_templates/change_email.es.tpl
-sympa/bin/etc/wws_templates/change_email.et.tpl
-sympa/bin/etc/wws_templates/change_email.fi.tpl
-sympa/bin/etc/wws_templates/change_email.fr.tpl
-sympa/bin/etc/wws_templates/change_email.hu.tpl
-sympa/bin/etc/wws_templates/change_email.it.tpl
-sympa/bin/etc/wws_templates/change_email.nl.tpl
-sympa/bin/etc/wws_templates/change_email.ro.tpl
-sympa/bin/etc/wws_templates/change_email.tpl
-sympa/bin/etc/wws_templates/change_email.us.tpl
-sympa/bin/etc/wws_templates/choosepasswd.cn.tpl
-sympa/bin/etc/wws_templates/choosepasswd.cz.tpl
-sympa/bin/etc/wws_templates/choosepasswd.de.tpl
-sympa/bin/etc/wws_templates/choosepasswd.es.tpl
-sympa/bin/etc/wws_templates/choosepasswd.et.tpl
-sympa/bin/etc/wws_templates/choosepasswd.fi.tpl
-sympa/bin/etc/wws_templates/choosepasswd.fr.tpl
-sympa/bin/etc/wws_templates/choosepasswd.hu.tpl
-sympa/bin/etc/wws_templates/choosepasswd.it.tpl
-sympa/bin/etc/wws_templates/choosepasswd.nl.tpl
-sympa/bin/etc/wws_templates/choosepasswd.ro.tpl
-sympa/bin/etc/wws_templates/choosepasswd.tpl
-sympa/bin/etc/wws_templates/choosepasswd.us.tpl
-sympa/bin/etc/wws_templates/close_list.cn.tpl
-sympa/bin/etc/wws_templates/close_list.cz.tpl
-sympa/bin/etc/wws_templates/close_list.de.tpl
-sympa/bin/etc/wws_templates/close_list.es.tpl
-sympa/bin/etc/wws_templates/close_list.et.tpl
-sympa/bin/etc/wws_templates/close_list.fi.tpl
-sympa/bin/etc/wws_templates/close_list.fr.tpl
-sympa/bin/etc/wws_templates/close_list.hu.tpl
-sympa/bin/etc/wws_templates/close_list.it.tpl
-sympa/bin/etc/wws_templates/close_list.nl.tpl
-sympa/bin/etc/wws_templates/close_list.ro.tpl
-sympa/bin/etc/wws_templates/close_list.tpl
-sympa/bin/etc/wws_templates/close_list.us.tpl
-sympa/bin/etc/wws_templates/close_list_request.es.tpl
-sympa/bin/etc/wws_templates/compose_mail.cn.tpl
-sympa/bin/etc/wws_templates/compose_mail.cz.tpl
-sympa/bin/etc/wws_templates/compose_mail.de.tpl
-sympa/bin/etc/wws_templates/compose_mail.es.tpl
-sympa/bin/etc/wws_templates/compose_mail.et.tpl
-sympa/bin/etc/wws_templates/compose_mail.fi.tpl
-sympa/bin/etc/wws_templates/compose_mail.fr.tpl
-sympa/bin/etc/wws_templates/compose_mail.hu.tpl
-sympa/bin/etc/wws_templates/compose_mail.nl.tpl
-sympa/bin/etc/wws_templates/compose_mail.ro.tpl
-sympa/bin/etc/wws_templates/compose_mail.tpl
-sympa/bin/etc/wws_templates/compose_mail.us.tpl
-sympa/bin/etc/wws_templates/create_list.cn.tpl
-sympa/bin/etc/wws_templates/create_list.cz.tpl
-sympa/bin/etc/wws_templates/create_list.de.tpl
-sympa/bin/etc/wws_templates/create_list.es.tpl
-sympa/bin/etc/wws_templates/create_list.et.tpl
-sympa/bin/etc/wws_templates/create_list.fi.tpl
-sympa/bin/etc/wws_templates/create_list.fr.tpl
-sympa/bin/etc/wws_templates/create_list.hu.tpl
-sympa/bin/etc/wws_templates/create_list.it.tpl
-sympa/bin/etc/wws_templates/create_list.nl.tpl
-sympa/bin/etc/wws_templates/create_list.ro.tpl
-sympa/bin/etc/wws_templates/create_list.tpl
-sympa/bin/etc/wws_templates/create_list.us.tpl
-sympa/bin/etc/wws_templates/create_list_request.cn.tpl
-sympa/bin/etc/wws_templates/create_list_request.cz.tpl
-sympa/bin/etc/wws_templates/create_list_request.de.tpl
-sympa/bin/etc/wws_templates/create_list_request.es.tpl
-sympa/bin/etc/wws_templates/create_list_request.et.tpl
-sympa/bin/etc/wws_templates/create_list_request.fi.tpl
-sympa/bin/etc/wws_templates/create_list_request.fr.tpl
-sympa/bin/etc/wws_templates/create_list_request.hu.tpl
-sympa/bin/etc/wws_templates/create_list_request.it.tpl
-sympa/bin/etc/wws_templates/create_list_request.nl.tpl
-sympa/bin/etc/wws_templates/create_list_request.ro.tpl
-sympa/bin/etc/wws_templates/create_list_request.tpl
-sympa/bin/etc/wws_templates/create_list_request.us.tpl
-sympa/bin/etc/wws_templates/d_control.cn.tpl
-sympa/bin/etc/wws_templates/d_control.cz.tpl
-sympa/bin/etc/wws_templates/d_control.de.tpl
-sympa/bin/etc/wws_templates/d_control.es.tpl
-sympa/bin/etc/wws_templates/d_control.et.tpl
-sympa/bin/etc/wws_templates/d_control.fi.tpl
-sympa/bin/etc/wws_templates/d_control.fr.tpl
-sympa/bin/etc/wws_templates/d_control.hu.tpl
-sympa/bin/etc/wws_templates/d_control.it.tpl
-sympa/bin/etc/wws_templates/d_control.nl.tpl
-sympa/bin/etc/wws_templates/d_control.ro.tpl
-sympa/bin/etc/wws_templates/d_control.tpl
-sympa/bin/etc/wws_templates/d_control.us.tpl
-sympa/bin/etc/wws_templates/d_editfile.cn.tpl
-sympa/bin/etc/wws_templates/d_editfile.cz.tpl
-sympa/bin/etc/wws_templates/d_editfile.de.tpl
-sympa/bin/etc/wws_templates/d_editfile.es.tpl
-sympa/bin/etc/wws_templates/d_editfile.et.tpl
-sympa/bin/etc/wws_templates/d_editfile.fi.tpl
-sympa/bin/etc/wws_templates/d_editfile.fr.tpl
-sympa/bin/etc/wws_templates/d_editfile.hu.tpl
-sympa/bin/etc/wws_templates/d_editfile.it.tpl
-sympa/bin/etc/wws_templates/d_editfile.nl.tpl
-sympa/bin/etc/wws_templates/d_editfile.ro.tpl
-sympa/bin/etc/wws_templates/d_editfile.tpl
-sympa/bin/etc/wws_templates/d_editfile.us.tpl
-sympa/bin/etc/wws_templates/d_read.cn.tpl
-sympa/bin/etc/wws_templates/d_read.cz.tpl
-sympa/bin/etc/wws_templates/d_read.de.tpl
-sympa/bin/etc/wws_templates/d_read.es.tpl
-sympa/bin/etc/wws_templates/d_read.et.tpl
-sympa/bin/etc/wws_templates/d_read.fi.tpl
-sympa/bin/etc/wws_templates/d_read.fr.tpl
-sympa/bin/etc/wws_templates/d_read.hu.tpl
-sympa/bin/etc/wws_templates/d_read.it.tpl
-sympa/bin/etc/wws_templates/d_read.nl.tpl
-sympa/bin/etc/wws_templates/d_read.ro.tpl
-sympa/bin/etc/wws_templates/d_read.tpl
-sympa/bin/etc/wws_templates/d_read.us.tpl
-sympa/bin/etc/wws_templates/edit_list_request.cn.tpl
-sympa/bin/etc/wws_templates/edit_list_request.cz.tpl
-sympa/bin/etc/wws_templates/edit_list_request.de.tpl
-sympa/bin/etc/wws_templates/edit_list_request.es.tpl
-sympa/bin/etc/wws_templates/edit_list_request.et.tpl
-sympa/bin/etc/wws_templates/edit_list_request.fi.tpl
-sympa/bin/etc/wws_templates/edit_list_request.fr.tpl
-sympa/bin/etc/wws_templates/edit_list_request.hu.tpl
-sympa/bin/etc/wws_templates/edit_list_request.it.tpl
-sympa/bin/etc/wws_templates/edit_list_request.nl.tpl
-sympa/bin/etc/wws_templates/edit_list_request.ro.tpl
-sympa/bin/etc/wws_templates/edit_list_request.tpl
-sympa/bin/etc/wws_templates/edit_list_request.us.tpl
-sympa/bin/etc/wws_templates/editfile.cn.tpl
-sympa/bin/etc/wws_templates/editfile.cz.tpl
-sympa/bin/etc/wws_templates/editfile.de.tpl
-sympa/bin/etc/wws_templates/editfile.es.tpl
-sympa/bin/etc/wws_templates/editfile.et.tpl
-sympa/bin/etc/wws_templates/editfile.fi.tpl
-sympa/bin/etc/wws_templates/editfile.fr.tpl
-sympa/bin/etc/wws_templates/editfile.hu.tpl
-sympa/bin/etc/wws_templates/editfile.it.tpl
-sympa/bin/etc/wws_templates/editfile.nl.tpl
-sympa/bin/etc/wws_templates/editfile.ro.tpl
-sympa/bin/etc/wws_templates/editfile.tpl
-sympa/bin/etc/wws_templates/editfile.us.tpl
-sympa/bin/etc/wws_templates/editsubscriber.cn.tpl
-sympa/bin/etc/wws_templates/editsubscriber.cz.tpl
-sympa/bin/etc/wws_templates/editsubscriber.de.tpl
-sympa/bin/etc/wws_templates/editsubscriber.es.tpl
-sympa/bin/etc/wws_templates/editsubscriber.et.tpl
-sympa/bin/etc/wws_templates/editsubscriber.fi.tpl
-sympa/bin/etc/wws_templates/editsubscriber.fr.tpl
-sympa/bin/etc/wws_templates/editsubscriber.hu.tpl
-sympa/bin/etc/wws_templates/editsubscriber.it.tpl
-sympa/bin/etc/wws_templates/editsubscriber.nl.tpl
-sympa/bin/etc/wws_templates/editsubscriber.ro.tpl
-sympa/bin/etc/wws_templates/editsubscriber.tpl
-sympa/bin/etc/wws_templates/editsubscriber.us.tpl
-sympa/bin/etc/wws_templates/error.cn.tpl
-sympa/bin/etc/wws_templates/error.cz.tpl
-sympa/bin/etc/wws_templates/error.de.tpl
-sympa/bin/etc/wws_templates/error.es.tpl
-sympa/bin/etc/wws_templates/error.et.tpl
-sympa/bin/etc/wws_templates/error.fi.tpl
-sympa/bin/etc/wws_templates/error.fr.tpl
-sympa/bin/etc/wws_templates/error.hu.tpl
-sympa/bin/etc/wws_templates/error.it.tpl
-sympa/bin/etc/wws_templates/error.nl.tpl
-sympa/bin/etc/wws_templates/error.ro.tpl
-sympa/bin/etc/wws_templates/error.tpl
-sympa/bin/etc/wws_templates/error.us.tpl
-sympa/bin/etc/wws_templates/get_closed_lists.es.tpl
-sympa/bin/etc/wws_templates/get_closed_lists.et.tpl
-sympa/bin/etc/wws_templates/get_closed_lists.fi.tpl
-sympa/bin/etc/wws_templates/get_closed_lists.fr.tpl
-sympa/bin/etc/wws_templates/get_closed_lists.nl.tpl
-sympa/bin/etc/wws_templates/get_closed_lists.ro.tpl
-sympa/bin/etc/wws_templates/get_closed_lists.tpl
-sympa/bin/etc/wws_templates/get_closed_lists.us.tpl
-sympa/bin/etc/wws_templates/get_inactive_lists.tpl
-sympa/bin/etc/wws_templates/get_inactive_lists.us.tpl
-sympa/bin/etc/wws_templates/get_latest_lists.es.tpl
-sympa/bin/etc/wws_templates/get_latest_lists.et.tpl
-sympa/bin/etc/wws_templates/get_latest_lists.fi.tpl
-sympa/bin/etc/wws_templates/get_latest_lists.fr.tpl
-sympa/bin/etc/wws_templates/get_latest_lists.nl.tpl
-sympa/bin/etc/wws_templates/get_latest_lists.ro.tpl
-sympa/bin/etc/wws_templates/get_latest_lists.tpl
-sympa/bin/etc/wws_templates/get_latest_lists.us.tpl
-sympa/bin/etc/wws_templates/get_pending_lists.cn.tpl
-sympa/bin/etc/wws_templates/get_pending_lists.cz.tpl
-sympa/bin/etc/wws_templates/get_pending_lists.de.tpl
-sympa/bin/etc/wws_templates/get_pending_lists.es.tpl
-sympa/bin/etc/wws_templates/get_pending_lists.et.tpl
-sympa/bin/etc/wws_templates/get_pending_lists.fi.tpl
-sympa/bin/etc/wws_templates/get_pending_lists.fr.tpl
-sympa/bin/etc/wws_templates/get_pending_lists.hu.tpl
-sympa/bin/etc/wws_templates/get_pending_lists.it.tpl
-sympa/bin/etc/wws_templates/get_pending_lists.nl.tpl
-sympa/bin/etc/wws_templates/get_pending_lists.ro.tpl
-sympa/bin/etc/wws_templates/get_pending_lists.tpl
-sympa/bin/etc/wws_templates/get_pending_lists.us.tpl
-sympa/bin/etc/wws_templates/help.cn.tpl
-sympa/bin/etc/wws_templates/help.cz.tpl
-sympa/bin/etc/wws_templates/help.de.tpl
-sympa/bin/etc/wws_templates/help.es.tpl
-sympa/bin/etc/wws_templates/help.et.tpl
-sympa/bin/etc/wws_templates/help.fi.tpl
-sympa/bin/etc/wws_templates/help.fr.tpl
-sympa/bin/etc/wws_templates/help.hu.tpl
-sympa/bin/etc/wws_templates/help.it.tpl
-sympa/bin/etc/wws_templates/help.nl.tpl
-sympa/bin/etc/wws_templates/help.ro.tpl
-sympa/bin/etc/wws_templates/help.tpl
-sympa/bin/etc/wws_templates/help.us.tpl
-sympa/bin/etc/wws_templates/help_admin.cn.tpl
-sympa/bin/etc/wws_templates/help_admin.cz.tpl
-sympa/bin/etc/wws_templates/help_admin.de.tpl
-sympa/bin/etc/wws_templates/help_admin.es.tpl
-sympa/bin/etc/wws_templates/help_admin.et.tpl
-sympa/bin/etc/wws_templates/help_admin.fi.tpl
-sympa/bin/etc/wws_templates/help_admin.fr.tpl
-sympa/bin/etc/wws_templates/help_admin.hu.tpl
-sympa/bin/etc/wws_templates/help_admin.it.tpl
-sympa/bin/etc/wws_templates/help_admin.nl.tpl
-sympa/bin/etc/wws_templates/help_admin.ro.tpl
-sympa/bin/etc/wws_templates/help_admin.tpl
-sympa/bin/etc/wws_templates/help_admin.us.tpl
-sympa/bin/etc/wws_templates/help_editfile.cn.tpl
-sympa/bin/etc/wws_templates/help_editfile.cz.tpl
-sympa/bin/etc/wws_templates/help_editfile.de.tpl
-sympa/bin/etc/wws_templates/help_editfile.es.tpl
-sympa/bin/etc/wws_templates/help_editfile.et.tpl
-sympa/bin/etc/wws_templates/help_editfile.fi.tpl
-sympa/bin/etc/wws_templates/help_editfile.fr.tpl
-sympa/bin/etc/wws_templates/help_editfile.hu.tpl
-sympa/bin/etc/wws_templates/help_editfile.it.tpl
-sympa/bin/etc/wws_templates/help_editfile.nl.tpl
-sympa/bin/etc/wws_templates/help_editfile.ro.tpl
-sympa/bin/etc/wws_templates/help_editfile.tpl
-sympa/bin/etc/wws_templates/help_editfile.us.tpl
-sympa/bin/etc/wws_templates/help_editlist.cn.tpl
-sympa/bin/etc/wws_templates/help_editlist.cz.tpl
-sympa/bin/etc/wws_templates/help_editlist.de.tpl
-sympa/bin/etc/wws_templates/help_editlist.es.tpl
-sympa/bin/etc/wws_templates/help_editlist.et.tpl
-sympa/bin/etc/wws_templates/help_editlist.fi.tpl
-sympa/bin/etc/wws_templates/help_editlist.fr.tpl
-sympa/bin/etc/wws_templates/help_editlist.hu.tpl
-sympa/bin/etc/wws_templates/help_editlist.it.tpl
-sympa/bin/etc/wws_templates/help_editlist.nl.tpl
-sympa/bin/etc/wws_templates/help_editlist.ro.tpl
-sympa/bin/etc/wws_templates/help_editlist.tpl
-sympa/bin/etc/wws_templates/help_editlist.us.tpl
-sympa/bin/etc/wws_templates/help_user_options.es.tpl
-sympa/bin/etc/wws_templates/help_user_options.et.tpl
-sympa/bin/etc/wws_templates/help_user_options.fi.tpl
-sympa/bin/etc/wws_templates/help_user_options.fr.tpl
-sympa/bin/etc/wws_templates/help_user_options.nl.tpl
-sympa/bin/etc/wws_templates/help_user_options.ro.tpl
-sympa/bin/etc/wws_templates/help_user_options.tpl
-sympa/bin/etc/wws_templates/help_user_options.us.tpl
-sympa/bin/etc/wws_templates/home.cn.tpl
-sympa/bin/etc/wws_templates/home.cz.tpl
-sympa/bin/etc/wws_templates/home.de.tpl
-sympa/bin/etc/wws_templates/home.es.tpl
-sympa/bin/etc/wws_templates/home.et.tpl
-sympa/bin/etc/wws_templates/home.fi.tpl
-sympa/bin/etc/wws_templates/home.fr.tpl
-sympa/bin/etc/wws_templates/home.hu.tpl
-sympa/bin/etc/wws_templates/home.it.tpl
-sympa/bin/etc/wws_templates/home.nl.tpl
-sympa/bin/etc/wws_templates/home.ro.tpl
-sympa/bin/etc/wws_templates/home.tpl
-sympa/bin/etc/wws_templates/home.us.tpl
-sympa/bin/etc/wws_templates/info.de.tpl
-sympa/bin/etc/wws_templates/info.fi.tpl
-sympa/bin/etc/wws_templates/info.tpl
-sympa/bin/etc/wws_templates/info.us.tpl
-sympa/bin/etc/wws_templates/install_pending_list.cn.tpl
-sympa/bin/etc/wws_templates/install_pending_list.cz.tpl
-sympa/bin/etc/wws_templates/install_pending_list.de.tpl
-sympa/bin/etc/wws_templates/install_pending_list.es.tpl
-sympa/bin/etc/wws_templates/install_pending_list.et.tpl
-sympa/bin/etc/wws_templates/install_pending_list.fi.tpl
-sympa/bin/etc/wws_templates/install_pending_list.fr.tpl
-sympa/bin/etc/wws_templates/install_pending_list.hu.tpl
-sympa/bin/etc/wws_templates/install_pending_list.it.tpl
-sympa/bin/etc/wws_templates/install_pending_list.nl.tpl
-sympa/bin/etc/wws_templates/install_pending_list.ro.tpl
-sympa/bin/etc/wws_templates/install_pending_list.tpl
-sympa/bin/etc/wws_templates/install_pending_list.us.tpl
-sympa/bin/etc/wws_templates/list_button_footer.fi.tpl
-sympa/bin/etc/wws_templates/list_button_footer.tpl
-sympa/bin/etc/wws_templates/list_button_footer.us.tpl
-sympa/bin/etc/wws_templates/list_button_header.fi.tpl
-sympa/bin/etc/wws_templates/list_button_header.tpl
-sympa/bin/etc/wws_templates/list_button_header.us.tpl
-sympa/bin/etc/wws_templates/list_menu.cn.tpl
-sympa/bin/etc/wws_templates/list_menu.cz.tpl
-sympa/bin/etc/wws_templates/list_menu.de.tpl
-sympa/bin/etc/wws_templates/list_menu.es.tpl
-sympa/bin/etc/wws_templates/list_menu.et.tpl
-sympa/bin/etc/wws_templates/list_menu.fi.tpl
-sympa/bin/etc/wws_templates/list_menu.fr.tpl
-sympa/bin/etc/wws_templates/list_menu.hu.tpl
-sympa/bin/etc/wws_templates/list_menu.it.tpl
-sympa/bin/etc/wws_templates/list_menu.nl.tpl
-sympa/bin/etc/wws_templates/list_menu.ro.tpl
-sympa/bin/etc/wws_templates/list_menu.tpl
-sympa/bin/etc/wws_templates/list_menu.us.tpl
-sympa/bin/etc/wws_templates/lists.cn.tpl
-sympa/bin/etc/wws_templates/lists.cz.tpl
-sympa/bin/etc/wws_templates/lists.de.tpl
-sympa/bin/etc/wws_templates/lists.es.tpl
-sympa/bin/etc/wws_templates/lists.et.tpl
-sympa/bin/etc/wws_templates/lists.fi.tpl
-sympa/bin/etc/wws_templates/lists.fr.tpl
-sympa/bin/etc/wws_templates/lists.hu.tpl
-sympa/bin/etc/wws_templates/lists.it.tpl
-sympa/bin/etc/wws_templates/lists.nl.tpl
-sympa/bin/etc/wws_templates/lists.ro.tpl
-sympa/bin/etc/wws_templates/lists.tpl
-sympa/bin/etc/wws_templates/lists.us.tpl
-sympa/bin/etc/wws_templates/login.cn.tpl
-sympa/bin/etc/wws_templates/login.de.tpl
-sympa/bin/etc/wws_templates/login.es.tpl
-sympa/bin/etc/wws_templates/login.et.tpl
-sympa/bin/etc/wws_templates/login.fi.tpl
-sympa/bin/etc/wws_templates/login.fr.tpl
-sympa/bin/etc/wws_templates/login.hu.tpl
-sympa/bin/etc/wws_templates/login.nl.tpl
-sympa/bin/etc/wws_templates/login.ro.tpl
-sympa/bin/etc/wws_templates/login.tpl
-sympa/bin/etc/wws_templates/login.us.tpl
-sympa/bin/etc/wws_templates/loginbanner.cn.tpl
-sympa/bin/etc/wws_templates/loginbanner.cz.tpl
-sympa/bin/etc/wws_templates/loginbanner.de.tpl
-sympa/bin/etc/wws_templates/loginbanner.es.tpl
-sympa/bin/etc/wws_templates/loginbanner.et.tpl
-sympa/bin/etc/wws_templates/loginbanner.fi.tpl
-sympa/bin/etc/wws_templates/loginbanner.fr.tpl
-sympa/bin/etc/wws_templates/loginbanner.hu.tpl
-sympa/bin/etc/wws_templates/loginbanner.it.tpl
-sympa/bin/etc/wws_templates/loginbanner.nl.tpl
-sympa/bin/etc/wws_templates/loginbanner.ro.tpl
-sympa/bin/etc/wws_templates/loginbanner.tpl
-sympa/bin/etc/wws_templates/loginbanner.us.tpl
-sympa/bin/etc/wws_templates/loginrequest.cn.tpl
-sympa/bin/etc/wws_templates/loginrequest.cz.tpl
-sympa/bin/etc/wws_templates/loginrequest.de.tpl
-sympa/bin/etc/wws_templates/loginrequest.es.tpl
-sympa/bin/etc/wws_templates/loginrequest.et.tpl
-sympa/bin/etc/wws_templates/loginrequest.fi.tpl
-sympa/bin/etc/wws_templates/loginrequest.fr.tpl
-sympa/bin/etc/wws_templates/loginrequest.hu.tpl
-sympa/bin/etc/wws_templates/loginrequest.it.tpl
-sympa/bin/etc/wws_templates/loginrequest.ro.tpl
-sympa/bin/etc/wws_templates/loginrequest.tpl
-sympa/bin/etc/wws_templates/loginrequest.us.tpl
-sympa/bin/etc/wws_templates/main.tpl
-sympa/bin/etc/wws_templates/main.us.tpl
-sympa/bin/etc/wws_templates/menu.cn.tpl
-sympa/bin/etc/wws_templates/menu.cz.tpl
-sympa/bin/etc/wws_templates/menu.de.tpl
-sympa/bin/etc/wws_templates/menu.es.tpl
-sympa/bin/etc/wws_templates/menu.et.tpl
-sympa/bin/etc/wws_templates/menu.fi.tpl
-sympa/bin/etc/wws_templates/menu.fr.tpl
-sympa/bin/etc/wws_templates/menu.hu.tpl
-sympa/bin/etc/wws_templates/menu.it.tpl
-sympa/bin/etc/wws_templates/menu.nl.tpl
-sympa/bin/etc/wws_templates/menu.ro.tpl
-sympa/bin/etc/wws_templates/menu.tpl
-sympa/bin/etc/wws_templates/menu.us.tpl
-sympa/bin/etc/wws_templates/modindex.cn.tpl
-sympa/bin/etc/wws_templates/modindex.cz.tpl
-sympa/bin/etc/wws_templates/modindex.de.tpl
-sympa/bin/etc/wws_templates/modindex.es.tpl
-sympa/bin/etc/wws_templates/modindex.et.tpl
-sympa/bin/etc/wws_templates/modindex.fi.tpl
-sympa/bin/etc/wws_templates/modindex.fr.tpl
-sympa/bin/etc/wws_templates/modindex.hu.tpl
-sympa/bin/etc/wws_templates/modindex.it.tpl
-sympa/bin/etc/wws_templates/modindex.nl.tpl
-sympa/bin/etc/wws_templates/modindex.ro.tpl
-sympa/bin/etc/wws_templates/modindex.tpl
-sympa/bin/etc/wws_templates/modindex.us.tpl
-sympa/bin/etc/wws_templates/notice.cn.tpl
-sympa/bin/etc/wws_templates/notice.cz.tpl
-sympa/bin/etc/wws_templates/notice.de.tpl
-sympa/bin/etc/wws_templates/notice.es.tpl
-sympa/bin/etc/wws_templates/notice.et.tpl
-sympa/bin/etc/wws_templates/notice.fi.tpl
-sympa/bin/etc/wws_templates/notice.fr.tpl
-sympa/bin/etc/wws_templates/notice.hu.tpl
-sympa/bin/etc/wws_templates/notice.it.tpl
-sympa/bin/etc/wws_templates/notice.nl.tpl
-sympa/bin/etc/wws_templates/notice.ro.tpl
-sympa/bin/etc/wws_templates/notice.tpl
-sympa/bin/etc/wws_templates/notice.us.tpl
-sympa/bin/etc/wws_templates/pref.cn.tpl
-sympa/bin/etc/wws_templates/pref.cz.tpl
-sympa/bin/etc/wws_templates/pref.de.tpl
-sympa/bin/etc/wws_templates/pref.es.tpl
-sympa/bin/etc/wws_templates/pref.et.tpl
-sympa/bin/etc/wws_templates/pref.fi.tpl
-sympa/bin/etc/wws_templates/pref.fr.tpl
-sympa/bin/etc/wws_templates/pref.hu.tpl
-sympa/bin/etc/wws_templates/pref.it.tpl
-sympa/bin/etc/wws_templates/pref.nl.tpl
-sympa/bin/etc/wws_templates/pref.ro.tpl
-sympa/bin/etc/wws_templates/pref.tpl
-sympa/bin/etc/wws_templates/pref.us.tpl
-sympa/bin/etc/wws_templates/remindpasswd.cn.tpl
-sympa/bin/etc/wws_templates/remindpasswd.cz.tpl
-sympa/bin/etc/wws_templates/remindpasswd.de.tpl
-sympa/bin/etc/wws_templates/remindpasswd.es.tpl
-sympa/bin/etc/wws_templates/remindpasswd.et.tpl
-sympa/bin/etc/wws_templates/remindpasswd.fi.tpl
-sympa/bin/etc/wws_templates/remindpasswd.fr.tpl
-sympa/bin/etc/wws_templates/remindpasswd.hu.tpl
-sympa/bin/etc/wws_templates/remindpasswd.it.tpl
-sympa/bin/etc/wws_templates/remindpasswd.nl.tpl
-sympa/bin/etc/wws_templates/remindpasswd.ro.tpl
-sympa/bin/etc/wws_templates/remindpasswd.tpl
-sympa/bin/etc/wws_templates/remindpasswd.us.tpl
-sympa/bin/etc/wws_templates/remove_arc.cn.tpl
-sympa/bin/etc/wws_templates/remove_arc.cz.tpl
-sympa/bin/etc/wws_templates/remove_arc.de.tpl
-sympa/bin/etc/wws_templates/remove_arc.es.tpl
-sympa/bin/etc/wws_templates/remove_arc.et.tpl
-sympa/bin/etc/wws_templates/remove_arc.fi.tpl
-sympa/bin/etc/wws_templates/remove_arc.fr.tpl
-sympa/bin/etc/wws_templates/remove_arc.hu.tpl
-sympa/bin/etc/wws_templates/remove_arc.it.tpl
-sympa/bin/etc/wws_templates/remove_arc.nl.tpl
-sympa/bin/etc/wws_templates/remove_arc.ro.tpl
-sympa/bin/etc/wws_templates/remove_arc.tpl
-sympa/bin/etc/wws_templates/remove_arc.us.tpl
-sympa/bin/etc/wws_templates/rename_list_request.fr.tpl
-sympa/bin/etc/wws_templates/rename_list_request.tpl
-sympa/bin/etc/wws_templates/rename_list_request.us.tpl
-sympa/bin/etc/wws_templates/review.cn.tpl
-sympa/bin/etc/wws_templates/review.cz.tpl
-sympa/bin/etc/wws_templates/review.de.tpl
-sympa/bin/etc/wws_templates/review.es.tpl
-sympa/bin/etc/wws_templates/review.et.tpl
-sympa/bin/etc/wws_templates/review.fi.tpl
-sympa/bin/etc/wws_templates/review.fr.tpl
-sympa/bin/etc/wws_templates/review.hu.tpl
-sympa/bin/etc/wws_templates/review.it.tpl
-sympa/bin/etc/wws_templates/review.nl.tpl
-sympa/bin/etc/wws_templates/review.ro.tpl
-sympa/bin/etc/wws_templates/review.tpl
-sympa/bin/etc/wws_templates/review.us.tpl
-sympa/bin/etc/wws_templates/reviewbouncing.cn.tpl
-sympa/bin/etc/wws_templates/reviewbouncing.cz.tpl
-sympa/bin/etc/wws_templates/reviewbouncing.de.tpl
-sympa/bin/etc/wws_templates/reviewbouncing.es.tpl
-sympa/bin/etc/wws_templates/reviewbouncing.et.tpl
-sympa/bin/etc/wws_templates/reviewbouncing.fi.tpl
-sympa/bin/etc/wws_templates/reviewbouncing.fr.tpl
-sympa/bin/etc/wws_templates/reviewbouncing.hu.tpl
-sympa/bin/etc/wws_templates/reviewbouncing.it.tpl
-sympa/bin/etc/wws_templates/reviewbouncing.nl.tpl
-sympa/bin/etc/wws_templates/reviewbouncing.ro.tpl
-sympa/bin/etc/wws_templates/reviewbouncing.tpl
-sympa/bin/etc/wws_templates/reviewbouncing.us.tpl
-sympa/bin/etc/wws_templates/scenario_test.cn.tpl
-sympa/bin/etc/wws_templates/scenario_test.cz.tpl
-sympa/bin/etc/wws_templates/scenario_test.de.tpl
-sympa/bin/etc/wws_templates/scenario_test.es.tpl
-sympa/bin/etc/wws_templates/scenario_test.et.tpl
-sympa/bin/etc/wws_templates/scenario_test.fi.tpl
-sympa/bin/etc/wws_templates/scenario_test.hu.tpl
-sympa/bin/etc/wws_templates/scenario_test.it.tpl
-sympa/bin/etc/wws_templates/scenario_test.nl.tpl
-sympa/bin/etc/wws_templates/scenario_test.ro.tpl
-sympa/bin/etc/wws_templates/scenario_test.tpl
-sympa/bin/etc/wws_templates/scenario_test.us.tpl
-sympa/bin/etc/wws_templates/search.cn.tpl
-sympa/bin/etc/wws_templates/search.cz.tpl
-sympa/bin/etc/wws_templates/search.de.tpl
-sympa/bin/etc/wws_templates/search.es.tpl
-sympa/bin/etc/wws_templates/search.et.tpl
-sympa/bin/etc/wws_templates/search.fi.tpl
-sympa/bin/etc/wws_templates/search.fr.tpl
-sympa/bin/etc/wws_templates/search.hu.tpl
-sympa/bin/etc/wws_templates/search.it.tpl
-sympa/bin/etc/wws_templates/search.nl.tpl
-sympa/bin/etc/wws_templates/search.ro.tpl
-sympa/bin/etc/wws_templates/search.tpl
-sympa/bin/etc/wws_templates/search.us.tpl
-sympa/bin/etc/wws_templates/search_list.cn.tpl
-sympa/bin/etc/wws_templates/search_list.cz.tpl
-sympa/bin/etc/wws_templates/search_list.de.tpl
-sympa/bin/etc/wws_templates/search_list.es.tpl
-sympa/bin/etc/wws_templates/search_list.et.tpl
-sympa/bin/etc/wws_templates/search_list.fi.tpl
-sympa/bin/etc/wws_templates/search_list.fr.tpl
-sympa/bin/etc/wws_templates/search_list.hu.tpl
-sympa/bin/etc/wws_templates/search_list.it.tpl
-sympa/bin/etc/wws_templates/search_list.nl.tpl
-sympa/bin/etc/wws_templates/search_list.ro.tpl
-sympa/bin/etc/wws_templates/search_list.tpl
-sympa/bin/etc/wws_templates/search_list.us.tpl
-sympa/bin/etc/wws_templates/search_user.cn.tpl
-sympa/bin/etc/wws_templates/search_user.cz.tpl
-sympa/bin/etc/wws_templates/search_user.de.tpl
-sympa/bin/etc/wws_templates/search_user.es.tpl
-sympa/bin/etc/wws_templates/search_user.et.tpl
-sympa/bin/etc/wws_templates/search_user.fi.tpl
-sympa/bin/etc/wws_templates/search_user.fr.tpl
-sympa/bin/etc/wws_templates/search_user.hu.tpl
-sympa/bin/etc/wws_templates/search_user.it.tpl
-sympa/bin/etc/wws_templates/search_user.nl.tpl
-sympa/bin/etc/wws_templates/search_user.ro.tpl
-sympa/bin/etc/wws_templates/search_user.tpl
-sympa/bin/etc/wws_templates/search_user.us.tpl
-sympa/bin/etc/wws_templates/serveradmin.cn.tpl
-sympa/bin/etc/wws_templates/serveradmin.cz.tpl
-sympa/bin/etc/wws_templates/serveradmin.de.tpl
-sympa/bin/etc/wws_templates/serveradmin.es.tpl
-sympa/bin/etc/wws_templates/serveradmin.et.tpl
-sympa/bin/etc/wws_templates/serveradmin.fi.tpl
-sympa/bin/etc/wws_templates/serveradmin.fr.tpl
-sympa/bin/etc/wws_templates/serveradmin.hu.tpl
-sympa/bin/etc/wws_templates/serveradmin.it.tpl
-sympa/bin/etc/wws_templates/serveradmin.nl.tpl
-sympa/bin/etc/wws_templates/serveradmin.ro.tpl
-sympa/bin/etc/wws_templates/serveradmin.tpl
-sympa/bin/etc/wws_templates/serveradmin.us.tpl
-sympa/bin/etc/wws_templates/set_pending_list_request.cn.tpl
-sympa/bin/etc/wws_templates/set_pending_list_request.cz.tpl
-sympa/bin/etc/wws_templates/set_pending_list_request.de.tpl
-sympa/bin/etc/wws_templates/set_pending_list_request.es.tpl
-sympa/bin/etc/wws_templates/set_pending_list_request.et.tpl
-sympa/bin/etc/wws_templates/set_pending_list_request.fi.tpl
-sympa/bin/etc/wws_templates/set_pending_list_request.fr.tpl
-sympa/bin/etc/wws_templates/set_pending_list_request.hu.tpl
-sympa/bin/etc/wws_templates/set_pending_list_request.it.tpl
-sympa/bin/etc/wws_templates/set_pending_list_request.nl.tpl
-sympa/bin/etc/wws_templates/set_pending_list_request.ro.tpl
-sympa/bin/etc/wws_templates/set_pending_list_request.tpl
-sympa/bin/etc/wws_templates/set_pending_list_request.us.tpl
-sympa/bin/etc/wws_templates/show_cert.cn.tpl
-sympa/bin/etc/wws_templates/show_cert.cz.tpl
-sympa/bin/etc/wws_templates/show_cert.de.tpl
-sympa/bin/etc/wws_templates/show_cert.es.tpl
-sympa/bin/etc/wws_templates/show_cert.et.tpl
-sympa/bin/etc/wws_templates/show_cert.fi.tpl
-sympa/bin/etc/wws_templates/show_cert.fr.tpl
-sympa/bin/etc/wws_templates/show_cert.hu.tpl
-sympa/bin/etc/wws_templates/show_cert.nl.tpl
-sympa/bin/etc/wws_templates/show_cert.ro.tpl
-sympa/bin/etc/wws_templates/show_cert.tpl
-sympa/bin/etc/wws_templates/show_cert.us.tpl
-sympa/bin/etc/wws_templates/sigrequest.cn.tpl
-sympa/bin/etc/wws_templates/sigrequest.cz.tpl
-sympa/bin/etc/wws_templates/sigrequest.de.tpl
-sympa/bin/etc/wws_templates/sigrequest.es.tpl
-sympa/bin/etc/wws_templates/sigrequest.et.tpl
-sympa/bin/etc/wws_templates/sigrequest.fi.tpl
-sympa/bin/etc/wws_templates/sigrequest.fr.tpl
-sympa/bin/etc/wws_templates/sigrequest.hu.tpl
-sympa/bin/etc/wws_templates/sigrequest.it.tpl
-sympa/bin/etc/wws_templates/sigrequest.nl.tpl
-sympa/bin/etc/wws_templates/sigrequest.ro.tpl
-sympa/bin/etc/wws_templates/sigrequest.tpl
-sympa/bin/etc/wws_templates/sigrequest.us.tpl
-sympa/bin/etc/wws_templates/sso_login_succeeded.tpl
-sympa/bin/etc/wws_templates/sso_login_succeeded.us.tpl
-sympa/bin/etc/wws_templates/stats.fi.tpl
-sympa/bin/etc/wws_templates/stats.nl.tpl
-sympa/bin/etc/wws_templates/stats.tpl
-sympa/bin/etc/wws_templates/stats.us.tpl
-sympa/bin/etc/wws_templates/subindex.cn.tpl
-sympa/bin/etc/wws_templates/subindex.es.tpl
-sympa/bin/etc/wws_templates/subindex.et.tpl
-sympa/bin/etc/wws_templates/subindex.fi.tpl
-sympa/bin/etc/wws_templates/subindex.fr.tpl
-sympa/bin/etc/wws_templates/subindex.nl.tpl
-sympa/bin/etc/wws_templates/subindex.ro.tpl
-sympa/bin/etc/wws_templates/subindex.tpl
-sympa/bin/etc/wws_templates/subindex.us.tpl
-sympa/bin/etc/wws_templates/suboptions.cn.tpl
-sympa/bin/etc/wws_templates/suboptions.cz.tpl
-sympa/bin/etc/wws_templates/suboptions.de.tpl
-sympa/bin/etc/wws_templates/suboptions.es.tpl
-sympa/bin/etc/wws_templates/suboptions.et.tpl
-sympa/bin/etc/wws_templates/suboptions.fi.tpl
-sympa/bin/etc/wws_templates/suboptions.fr.tpl
-sympa/bin/etc/wws_templates/suboptions.hu.tpl
-sympa/bin/etc/wws_templates/suboptions.it.tpl
-sympa/bin/etc/wws_templates/suboptions.nl.tpl
-sympa/bin/etc/wws_templates/suboptions.ro.tpl
-sympa/bin/etc/wws_templates/suboptions.tpl
-sympa/bin/etc/wws_templates/suboptions.us.tpl
-sympa/bin/etc/wws_templates/subrequest.cn.tpl
-sympa/bin/etc/wws_templates/subrequest.cz.tpl
-sympa/bin/etc/wws_templates/subrequest.de.tpl
-sympa/bin/etc/wws_templates/subrequest.es.tpl
-sympa/bin/etc/wws_templates/subrequest.et.tpl
-sympa/bin/etc/wws_templates/subrequest.fi.tpl
-sympa/bin/etc/wws_templates/subrequest.fr.tpl
-sympa/bin/etc/wws_templates/subrequest.hu.tpl
-sympa/bin/etc/wws_templates/subrequest.it.tpl
-sympa/bin/etc/wws_templates/subrequest.nl.tpl
-sympa/bin/etc/wws_templates/subrequest.ro.tpl
-sympa/bin/etc/wws_templates/subrequest.tpl
-sympa/bin/etc/wws_templates/subrequest.us.tpl
-sympa/bin/etc/wws_templates/title.cn.tpl
-sympa/bin/etc/wws_templates/title.cz.tpl
-sympa/bin/etc/wws_templates/title.de.tpl
-sympa/bin/etc/wws_templates/title.es.tpl
-sympa/bin/etc/wws_templates/title.et.tpl
-sympa/bin/etc/wws_templates/title.fi.tpl
-sympa/bin/etc/wws_templates/title.fr.tpl
-sympa/bin/etc/wws_templates/title.hu.tpl
-sympa/bin/etc/wws_templates/title.it.tpl
-sympa/bin/etc/wws_templates/title.nl.tpl
-sympa/bin/etc/wws_templates/title.ro.tpl
-sympa/bin/etc/wws_templates/title.tpl
-sympa/bin/etc/wws_templates/title.us.tpl
-sympa/bin/etc/wws_templates/translate.tpl
-sympa/bin/etc/wws_templates/translate.us.tpl
-sympa/bin/etc/wws_templates/view_template.tpl
-sympa/bin/etc/wws_templates/view_template.us.tpl
-sympa/bin/etc/wws_templates/view_translations.cn.tpl
-sympa/bin/etc/wws_templates/view_translations.cz.tpl
-sympa/bin/etc/wws_templates/view_translations.de.tpl
-sympa/bin/etc/wws_templates/view_translations.es.tpl
-sympa/bin/etc/wws_templates/view_translations.et.tpl
-sympa/bin/etc/wws_templates/view_translations.fi.tpl
-sympa/bin/etc/wws_templates/view_translations.fr.tpl
-sympa/bin/etc/wws_templates/view_translations.hu.tpl
-sympa/bin/etc/wws_templates/view_translations.it.tpl
-sympa/bin/etc/wws_templates/view_translations.nl.tpl
-sympa/bin/etc/wws_templates/view_translations.ro.tpl
-sympa/bin/etc/wws_templates/view_translations.tpl
-sympa/bin/etc/wws_templates/view_translations.us.tpl
-sympa/bin/etc/wws_templates/viewbounce.tpl
-sympa/bin/etc/wws_templates/viewbounce.us.tpl
-sympa/bin/etc/wws_templates/viewmod.cn.tpl
-sympa/bin/etc/wws_templates/viewmod.cz.tpl
-sympa/bin/etc/wws_templates/viewmod.de.tpl
-sympa/bin/etc/wws_templates/viewmod.es.tpl
-sympa/bin/etc/wws_templates/viewmod.et.tpl
-sympa/bin/etc/wws_templates/viewmod.fi.tpl
-sympa/bin/etc/wws_templates/viewmod.fr.tpl
-sympa/bin/etc/wws_templates/viewmod.hu.tpl
-sympa/bin/etc/wws_templates/viewmod.it.tpl
-sympa/bin/etc/wws_templates/viewmod.nl.tpl
-sympa/bin/etc/wws_templates/viewmod.ro.tpl
-sympa/bin/etc/wws_templates/viewmod.tpl
-sympa/bin/etc/wws_templates/viewmod.us.tpl
-sympa/bin/etc/wws_templates/which.cn.tpl
-sympa/bin/etc/wws_templates/which.cz.tpl
-sympa/bin/etc/wws_templates/which.de.tpl
-sympa/bin/etc/wws_templates/which.es.tpl
-sympa/bin/etc/wws_templates/which.et.tpl
-sympa/bin/etc/wws_templates/which.fi.tpl
-sympa/bin/etc/wws_templates/which.fr.tpl
-sympa/bin/etc/wws_templates/which.hu.tpl
-sympa/bin/etc/wws_templates/which.it.tpl
-sympa/bin/etc/wws_templates/which.nl.tpl
-sympa/bin/etc/wws_templates/which.ro.tpl
-sympa/bin/etc/wws_templates/which.tpl
-sympa/bin/etc/wws_templates/which.us.tpl
-sympa/bin/init_comment.pl
-sympa/bin/load_subscribers.pl
-sympa/bin/mail.pm
-sympa/bin/mod2html.pl
-sympa/bin/msg.pl
-sympa/bin/p12topem.pl
-sympa/bin/parser.pl
-sympa/bin/queue
-sympa/bin/smtp.pm
-sympa/bin/sympa.pl
-sympa/bin/sympa_soap_client.pl
-sympa/bin/sympa_soap_server.fcgi
-sympa/bin/sympa_wizard.pl
-sympa/bin/sympasoap.pm
-sympa/bin/task_manager.pl
-sympa/bin/testldap.pl
-sympa/bin/testlogs.pl
-sympa/bin/tools.pl
-sympa/bin/virtualwrapper
-sympa/bin/wwslib.pm
-sympa/bin/wwsympa.fcgi
-sympa/httpd/icons/back.png
-sympa/httpd/icons/begin.png
-sympa/httpd/icons/binary.png
-sympa/httpd/icons/down.png
-sympa/httpd/icons/end.png
-sympa/httpd/icons/folder.open.png
-sympa/httpd/icons/folder.png
-sympa/httpd/icons/image2.png
-sympa/httpd/icons/left.png
-sympa/httpd/icons/link.png
-sympa/httpd/icons/locked.png
-sympa/httpd/icons/logo-s-lock.png
-sympa/httpd/icons/logo-s.png
-sympa/httpd/icons/movie.png
-sympa/httpd/icons/right.png
-sympa/httpd/icons/sound1.png
-sympa/httpd/icons/text.png
-sympa/httpd/icons/unknown.png
-sympa/nls/cn.msg
-sympa/nls/cz.msg
-sympa/nls/de.msg
-sympa/nls/es.msg
-sympa/nls/et.msg
-sympa/nls/fi.msg
-sympa/nls/fr.msg
-sympa/nls/hu.msg
-sympa/nls/it.msg
-sympa/nls/nl.msg
-sympa/nls/pl.msg
-sympa/nls/ro.msg
-sympa/nls/tw.msg
-sympa/nls/us.msg
-@dirrm sympa/nls
-@dirrm sympa/httpd/icons
-@dirrm sympa/httpd
-@dirrm sympa/bin/etc/wws_templates
-@dirrm sympa/bin/etc/templates
-@dirrm sympa/bin/etc/scenari
-@dirrm sympa/bin/etc/list_task_models
-@dirrm sympa/bin/etc/global_task_models
-@dirrm sympa/bin/etc/create_list_templates/public_web_forum
-@dirrm sympa/bin/etc/create_list_templates/private_working_group
-@dirrm sympa/bin/etc/create_list_templates/news-letter
-@dirrm sympa/bin/etc/create_list_templates/intranet_list
-@dirrm sympa/bin/etc/create_list_templates/html-news-letter
-@dirrm sympa/bin/etc/create_list_templates/hotline
-@dirrm sympa/bin/etc/create_list_templates/discussion_list
-@dirrm sympa/bin/etc/create_list_templates
-@dirrm sympa/bin/etc
-@dirrm sympa/bin/Marc
-@dirrm sympa/bin
-@dirrm sympa
-@dirrm share/examples/sympa/sample-list
-@dirrm share/examples/sympa
-@dirrm share/doc/sympa
-@dirrm share/doc/html/sympa
diff --git a/mail/sympa/distinfo b/mail/sympa/distinfo
deleted file mode 100644
index c2af8ed0d4c..00000000000
--- a/mail/sympa/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 09:59:30 agc Exp $
-
-SHA1 (sympa-4.1.2.tar.gz) = 68a122a8d762874e2b4bb0c80020e36d8bc344fc
-RMD160 (sympa-4.1.2.tar.gz) = 3821b18d1e62c584d49f31c4e133f0cd8f538d5a
-Size (sympa-4.1.2.tar.gz) = 2354843 bytes
-SHA1 (patch-aa) = 1653a5700572068348e93f659892119230795dae
-SHA1 (patch-ab) = 3b15442e7146dd56bfab698bcb062911a5bba599
-SHA1 (patch-ac) = 77802bab188da024c18810c07bf62064b28e3af1
-SHA1 (patch-ad) = a0230a55043e81267f14d662e45f16afd04b0e82
-SHA1 (patch-ae) = 3451dfed68e02fa298fc22be41e3c878ecc18c29
diff --git a/mail/sympa/patches/patch-aa b/mail/sympa/patches/patch-aa
deleted file mode 100644
index 8612226449f..00000000000
--- a/mail/sympa/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/10/10 15:09:23 seb Exp $
-
---- Makefile.in.orig 2004-07-16 17:26:51.000000000 +0000
-+++ Makefile.in
-@@ -483,7 +483,7 @@ clean:
- $(MAKE) PERL='${PERL}' clean) || exit 1; \
- done;
-
--install: importantchanges installsrc installnls installwws installman installscript installsample installdir installconfig installdoc installsoap
-+install: importantchanges installsrc installnls installwws installman installscript installsample installdir installdoc installsoap
-
- importantchanges:
- @( PERL=$(PERL); export PERL; \
-@@ -602,7 +602,7 @@ installdir:
- chmod 755 $(DESTDIR)$$dir; \
- fi \
- done
-- @if [ ! -f $(DESTDIR)$(CONFDIR)/sympa.conf ] ; then \
-+ @if false ; then \
- echo "First installation : installing conf directories..."; \
- for dir in create_list_templates templates wws_templates scenari \
- task_models general_task_models; do \
-@@ -614,7 +614,7 @@ installdir:
- fi \
- done \
- fi
-- @if [ ! -f $(DESTDIR)$(CONFDIR)/sympa.conf ] ; then \
-+ @if false ; then \
- echo "First installation : installing spool directories..."; \
- for dir in $(SPOOLDIR) $(SPOOLDIR)/msg $(SPOOLDIR)/digest $(SPOOLDIR)/moderation \
- $(SPOOLDIR)/expire $(SPOOLDIR)/auth $(SPOOLDIR)/outgoing $(SPOOLDIR)/tmp \
diff --git a/mail/sympa/patches/patch-ab b/mail/sympa/patches/patch-ab
deleted file mode 100644
index 9fe490bcdd9..00000000000
--- a/mail/sympa/patches/patch-ab
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/09/26 20:13:34 seb Exp $
-
---- check_perl_modules.pl.orig 2004-04-19 13:07:29.000000000 +0000
-+++ check_perl_modules.pl
-@@ -156,35 +156,7 @@ sub check_modules {
- # Install a CPAN module
- ##----------------------
- sub install_module {
-- my ($module, $default) = @_;
--
-- unless ($ENV{'FTP_PASSIVE'} eq 1) {
-- $ENV{'FTP_PASSIVE'} = 1;
-- print "Setting FTP Passive mode\n";
-- }
--
-- ## This is required on RedHat 9 for DBD::mysql installation
-- my $lang = $ENV{'LANG'};
-- $ENV{'LANG'} = 'C' if ($ENV{'LANG'} eq 'en_US.UTF-8');
--
-- unless ($> == 0) {
-- print "\#\# You need root privileges to install $module module. \#\#\n";
-- print "\#\# Press the Enter key to continue checking modules. \#\#\n";
-- my $t = <STDIN>;
-- return undef;
-- }
--
-- printf "Description: %s\n", $opt_features{$module};
-- print "Install module $module ? [$default]";
-- my $answer = <STDIN>; chomp $answer;
-- $answer ||= $default;
-- next unless ($answer =~ /^y$/i);
-- CPAN::Shell->conf('inactivity_timeout', 4);
-- CPAN::Shell->install($module);
--
-- ## Restore lang
-- $ENV{'LANG'} = $lang if (defined $lang);
--
-+ 1;
- }
-
- ###--------------------------
diff --git a/mail/sympa/patches/patch-ac b/mail/sympa/patches/patch-ac
deleted file mode 100644
index 60e2ea48a36..00000000000
--- a/mail/sympa/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/09/26 20:13:34 seb Exp $
-
---- src/etc/script/Makefile.orig 2003-05-12 09:32:42.000000000 +0000
-+++ src/etc/script/Makefile
-@@ -30,7 +30,7 @@ SCRIPTDIR = $(SBINDIR)
-
- all:
-
--install: makedir installsrc installsubstsrc installinit
-+install: makedir installsrc installsubstsrc
-
- clean:
- rm -rf $(DESTDIR)$(SCRIPTDIR)
diff --git a/mail/sympa/patches/patch-ad b/mail/sympa/patches/patch-ad
deleted file mode 100644
index c6bf148eadc..00000000000
--- a/mail/sympa/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/02/15 22:45:54 seb Exp $
-
---- src/bouncequeue.c.orig 2003-10-07 12:04:47.000000000 +0000
-+++ src/bouncequeue.c
-@@ -30,6 +30,11 @@ static char qfile[128];
- static char buf[16384];
- static int i, fd;
-
-+/* For HP-UX */
-+#ifndef EX_CONFIG
-+# define EX_CONFIG 78
-+#endif
-+
- #ifndef CONFIG
- # define CONFIG "/etc/sympa.conf"
- #endif
-@@ -97,7 +102,7 @@ main(int argn, char **argv)
- exit(EX_NOPERM);
- }
- umask(027);
-- sprintf(qfile, "T.%s.%ld.%d", listname, time(NULL), getpid());
-+ snprintf(qfile, sizeof(qfile), "T.%s.%ld.%d", listname, time(NULL), getpid());
- fd = open(qfile, O_CREAT|O_WRONLY, 0600);
- if (fd == -1)
- exit(EX_TEMPFAIL);
diff --git a/mail/sympa/patches/patch-ae b/mail/sympa/patches/patch-ae
deleted file mode 100644
index 87dc538c5e8..00000000000
--- a/mail/sympa/patches/patch-ae
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2005/02/15 22:45:54 seb Exp $
-
---- src/queue.c.orig 2003-10-07 12:04:47.000000000 +0000
-+++ src/queue.c
-@@ -32,6 +32,11 @@ static char qfile[128];
- static char buf[16384];
- static int i, fd;
-
-+/* For HP-UX */
-+#ifndef EX_CONFIG
-+# define EX_CONFIG 78
-+#endif
-+
- #ifndef CONFIG
- # define CONFIG "/etc/sympa.conf"
- #endif
-@@ -116,7 +121,7 @@ main(int argn, char **argv)
- exit(EX_NOPERM);
- }
- umask(027);
-- sprintf(qfile, "T.%s.%ld.%d", listname, time(NULL), getpid());
-+ snprintf(qfile, sizeof(qfile), "T.%s.%ld.%d", listname, time(NULL), getpid());
- fd = open(qfile, O_CREAT|O_WRONLY, 0600);
- if (fd == -1){
- char* buffer=(char*)malloc(strlen(argv[0])+strlen(queuedir)+80);
diff --git a/mail/teapop/DESCR b/mail/teapop/DESCR
deleted file mode 100644
index 55dadff9073..00000000000
--- a/mail/teapop/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Teapop is yet another RFC1939 compliant POP3 server. It includes
-flexible virtual domain support that distinguishes it from all other
-POP3 servers.
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
deleted file mode 100644
index c0cc895d65e..00000000000
--- a/mail/teapop/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.28 2006/12/06 19:44:46 joerg Exp $
-
-DISTNAME= teapop-0.3.8
-PKGREVISION= 5
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.toontown.org/pub/teapop/ \
- http://www.toontown.org/pub/teapop/
-
-MAINTAINER= dawszy@arhea.net
-HOMEPAGE= http://www.toontown.org/teapop/
-COMMENT= Yet another RFC1939 compliant POP3 server
-
-USE_TOOLS+= perl:run
-
-GNU_CONFIGURE= YES
-
-CONFIGURE_ARGS+= --enable-flock
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --enable-piddir=${VARBASE}/run
-
-EGDIR= ${PREFIX}/share/examples/teapop
-CONF_FILES= ${EGDIR}/teapop.passwd ${PKG_SYSCONFDIR}/teapop.passwd
-
-RCD_SCRIPTS= teapop
-
-.include "options.mk"
-
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/etc/teapop.passwd ${EGDIR}
-
-.include "../../security/tcp_wrappers/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/teapop/PLIST b/mail/teapop/PLIST
deleted file mode 100644
index 2cf3cd25149..00000000000
--- a/mail/teapop/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2005/05/02 20:34:01 reed Exp $
-libexec/teapop
-man/man8/teapop.8
-sbin/cronpopauth.pl
-share/examples/rc.d/teapop
-share/examples/teapop/teapop.passwd
-@dirrm share/examples/teapop
diff --git a/mail/teapop/distinfo b/mail/teapop/distinfo
deleted file mode 100644
index 9090b304513..00000000000
--- a/mail/teapop/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.11 2006/02/19 11:13:53 wiz Exp $
-
-SHA1 (teapop-0.3.8.tar.gz) = 33632cc34148d88408bcb9afa5433c1a103f3cf5
-RMD160 (teapop-0.3.8.tar.gz) = fce3606748c33bd71134c09d8bb3e65aaabcdfa3
-Size (teapop-0.3.8.tar.gz) = 147098 bytes
-SHA1 (patch-aa) = f6b8a9d20748bb1579c4fc234e40d7f11cccea42
-SHA1 (patch-ab) = 45ec8313606bc3c738f5e4a19e48470fd3b8beb6
diff --git a/mail/teapop/files/teapop.sh b/mail/teapop/files/teapop.sh
deleted file mode 100644
index dacdf1174fc..00000000000
--- a/mail/teapop/files/teapop.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: teapop.sh,v 1.1 2003/01/19 13:04:52 grant Exp $
-#
-# PROVIDE: teapop
-# REQUIRE: DAEMON
-
-. /etc/rc.subr
-
-name="teapop"
-rcvar=$name
-command="@PREFIX@/libexec/${name}"
-command_args="-s"
-pidfile="/var/run/${name}.pid"
-required_files="@PKG_SYSCONFDIR@/teapop.passwd"
-sig_stop="INT"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/teapop/options.mk b/mail/teapop/options.mk
deleted file mode 100644
index a9356ca08b6..00000000000
--- a/mail/teapop/options.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-# $NetBSD: options.mk,v 1.4 2006/05/31 18:22:24 ghen Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.teapop
-PKG_SUPPORTED_OPTIONS= drac mysql apop vpop tcpd pgsql ldap inet6
-PKG_SUGGESTED_OPTIONS= apop vpop tcpd
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mdrac)
-. include "../../mail/drac/buildlink3.mk"
-CONFIGURE_ARGS+= --with-drac=${BUILDLINK_PREFIX.drac}/lib
-CONFIGURE_ARGS+= --with-dracinc=${BUILDLINK_PREFIX.drac}/include
-.endif
-
-.if !empty(PKG_OPTIONS:Mmysql)
-. include "../../mk/mysql.buildlink3.mk"
-CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client}
-LDFLAGS+= ${BUILDLINK_LDFLAGS.mysql-client}
-.endif
-
-.if !empty(PKG_OPTIONS:Mapop)
-CONFIGURE_ARGS+= --enable-apop
-.else
-CONFIGURE_ARGS+= --disable-apop
-.endif
-
-.if !empty(PKG_OPTIONS:Mvpop)
-CONFIGURE_ARGS+= --enable-vpop
-.else
-CONFIGURE_ARGS+= --disable-vpop
-.endif
-
-.if !empty(PKG_OPTIONS:Mtcpd)
-. include "../../security/tcp_wrappers/buildlink3.mk"
-CONFIGURE_ARGS+= --with-tcpd
-.else
-CONFIGURE_ARGS+= --without-tcpd
-.endif
-
-.if !empty(PKG_OPTIONS:Mpgsql)
-. include "../../mk/pgsql.buildlink3.mk"
-CONFIGURE_ARGS+= --with-pgsql=${BUILDLINK_PREFIX.postgresql-lib}
-LDFLAGS+= ${BUILDLINK_LDFLAGS.postgresql-lib}
-.endif
-
-.if !empty(PKG_OPTIONS:Mldap)
-. include "../../databases/openldap-client/buildlink3.mk"
-CONFIGURE_ARGS+= --with-ldap=openldap
-CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client}
-LDFLAGS+= ${BUILDLINK_LDFLAGS.openldap-client}
-.endif
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-ipv6
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
diff --git a/mail/teapop/patches/patch-aa b/mail/teapop/patches/patch-aa
deleted file mode 100644
index 88d427a0668..00000000000
--- a/mail/teapop/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2004/12/04 14:50:32 wiz Exp $
-
---- teapop/Makefile.in.orig 2003-08-04 17:33:48.000000000 +0200
-+++ teapop/Makefile.in
-@@ -34,7 +34,7 @@ SRC=${OBJS:%.o=%.c}
- ${CC} ${CFLAGS} -c $< -o $@
-
- build: ${OBJS}
-- ${CC} ${CFLAGS} ${OBJS} ${LDFLAGS} ${LIBS} -o teapop
-+ ${CC} ${CFLAGS} ${OBJS} ${LDFLAGS} ${LIBS} -o teapop -lwrap
-
- install: build
- @ if [ -f ${DESTDIR}/${libexecdir} ]; then \
diff --git a/mail/teapop/patches/patch-ab b/mail/teapop/patches/patch-ab
deleted file mode 100644
index 4c56053c273..00000000000
--- a/mail/teapop/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/02/19 11:13:53 wiz Exp $
-
---- etc/Makefile.in.orig 2003-08-04 15:33:47.000000000 +0000
-+++ etc/Makefile.in
-@@ -23,6 +23,7 @@ build:
- fi
-
- install: build
-+dontinstall: build
- @ echo Checking for existing teapop.passwd; \
- if [ -f ${DESTDIR}/${sysconfdir}/teapop.passwd ]; then \
- echo "Exists...NOT installing teapop.passwd"; \
diff --git a/mail/thunderbird-bin-nightly/DESCR b/mail/thunderbird-bin-nightly/DESCR
deleted file mode 100644
index f8253abfdee..00000000000
--- a/mail/thunderbird-bin-nightly/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Mozilla Thunderbird is a redesign of the Mozilla mail component. The
-goal is to produce a cross platform stand alone mail application using
-the XUL user interface language.
diff --git a/mail/thunderbird-bin-nightly/Makefile b/mail/thunderbird-bin-nightly/Makefile
deleted file mode 100644
index 6af35fa1870..00000000000
--- a/mail/thunderbird-bin-nightly/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2006/09/24 16:44:36 salo Exp $
-
-MOZILLA= thunderbird
-
-HOMEPAGE= http://www.mozilla.org/projects/thunderbird/
-COMMENT= Redesign of the Mozilla mail client (nightly binary pkg)
-
-MOZ_GTK2= YES
-MOZ_EXTRA= # empty
-
-ONLY_FOR_PLATFORM+= Linux-*-i386
-ONLY_FOR_PLATFORM+= NetBSD-2.*-i386
-ONLY_FOR_PLATFORM+= SunOS-5.[789]*-sparc
-
-.include "../../www/seamonkey-bin-nightly/Makefile.common"
diff --git a/mail/thunderbird-bin-nightly/Makefile.Linux.i386 b/mail/thunderbird-bin-nightly/Makefile.Linux.i386
deleted file mode 100644
index 2687638eb4d..00000000000
--- a/mail/thunderbird-bin-nightly/Makefile.Linux.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile.Linux.i386,v 1.8 2004/04/28 23:40:12 grant Exp $
-
-DISTNAME= thunderbird-i686-linux-gtk2+xft
-MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/latest-trunk/
-
-MOZ_PLATFORM= linux
diff --git a/mail/thunderbird-bin-nightly/Makefile.NetBSD.i386 b/mail/thunderbird-bin-nightly/Makefile.NetBSD.i386
deleted file mode 100644
index 8e4c0af4112..00000000000
--- a/mail/thunderbird-bin-nightly/Makefile.NetBSD.i386
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.2 2004/05/25 13:42:35 grant Exp $
-
-DISTNAME= thunderbird-i386-unknown-netbsdelf2.0-gtk2
-MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/contrib/latest-trunk/
-EXTRACT_SUFX= .tar.bz2
-
-MOZ_PLATFORM= netbsd
diff --git a/mail/thunderbird-bin-nightly/Makefile.SunOS.sparc b/mail/thunderbird-bin-nightly/Makefile.SunOS.sparc
deleted file mode 100644
index b9603e8dcf9..00000000000
--- a/mail/thunderbird-bin-nightly/Makefile.SunOS.sparc
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile.SunOS.sparc,v 1.3 2004/03/05 00:45:32 grant Exp $
-
-DISTNAME= thunderbird-sparc-sun-solaris2.7
-MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/contrib/latest-trunk/
-
-MOZ_PLATFORM= solaris
diff --git a/mail/thunderbird-bin-nightly/PLIST b/mail/thunderbird-bin-nightly/PLIST
deleted file mode 100644
index 6c784fa2d98..00000000000
--- a/mail/thunderbird-bin-nightly/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/04 05:25:42 grant Exp $
-@comment this PLIST intentionally left blank
diff --git a/mail/thunderbird-gtk1/DESCR b/mail/thunderbird-gtk1/DESCR
deleted file mode 100644
index 13835ed7ec1..00000000000
--- a/mail/thunderbird-gtk1/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Mozilla Thunderbird is a redesign of the Mozilla mail component. The
-goal is to produce a cross platform stand alone mail application using
-the XUL user interface language. This version uses the gtk1 toolkit.
diff --git a/mail/thunderbird-gtk1/Makefile b/mail/thunderbird-gtk1/Makefile
deleted file mode 100644
index 34e71aed7ed..00000000000
--- a/mail/thunderbird-gtk1/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2007/03/07 21:32:53 dmcmahill Exp $
-
-MOZILLA= thunderbird-gtk1
-PKGREVISION= 1
-
-COMMENT= Mozilla mail client using the older GTK1 toolkit
-
-.include "../../mail/thunderbird/Makefile-thunderbird.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/thunderbird-gtk1/PLIST b/mail/thunderbird-gtk1/PLIST
deleted file mode 100644
index 85008dbc8d2..00000000000
--- a/mail/thunderbird-gtk1/PLIST
+++ /dev/null
@@ -1,2893 +0,0 @@
-@comment $NetBSD: PLIST,v 1.10 2007/03/07 21:32:54 dmcmahill Exp $
-bin/${MOZILLA}
-@comment begin PROGRAMS
-lib/${MOZILLA}/${MOZILLA_BIN}
-lib/${MOZILLA}/dirver
-lib/${MOZILLA}/mangle
-lib/${MOZILLA}/mozilla-xremote-client
-lib/${MOZILLA}/nsinstall
-lib/${MOZILLA}/regxpcom
-lib/${MOZILLA}/shlibsign
-lib/${MOZILLA}/xpcshell
-lib/${MOZILLA}/xpicleanup
-lib/${MOZILLA}/xpidl
-lib/${MOZILLA}/xpt_dump
-lib/${MOZILLA}/xpt_link
-@comment end PROGRAMS
-@comment begin SCRIPTS
-lib/${MOZILLA}/thunderbird-config
-@comment end SCRIPTS
-@comment begin DSO
-lib/${MOZILLA}/components/libaccessibility.${SO_SUFFIX}
-lib/${MOZILLA}/components/libappcomps.${SO_SUFFIX}
-lib/${MOZILLA}/components/libauth.${SO_SUFFIX}
-lib/${MOZILLA}/components/libautoconfig.${SO_SUFFIX}
-lib/${MOZILLA}/components/libcaps.${SO_SUFFIX}
-lib/${MOZILLA}/components/libchrome.${SO_SUFFIX}
-lib/${MOZILLA}/components/libcommandlines.${SO_SUFFIX}
-lib/${MOZILLA}/components/libcomposer.${SO_SUFFIX}
-lib/${MOZILLA}/components/libdocshell.${SO_SUFFIX}
-lib/${MOZILLA}/components/libeditor.${SO_SUFFIX}
-lib/${MOZILLA}/components/libembedcomponents.${SO_SUFFIX}
-lib/${MOZILLA}/components/libfileview.${SO_SUFFIX}
-lib/${MOZILLA}/components/libgfx_gtk.${SO_SUFFIX}
-lib/${MOZILLA}/components/libgfxps.${SO_SUFFIX}
-lib/${MOZILLA}/components/libgfxxprint.${SO_SUFFIX}
-lib/${MOZILLA}/components/libgklayout.${SO_SUFFIX}
-lib/${MOZILLA}/components/libhtmlpars.${SO_SUFFIX}
-lib/${MOZILLA}/components/libi18n.${SO_SUFFIX}
-lib/${MOZILLA}/components/libimglib2.${SO_SUFFIX}
-lib/${MOZILLA}/components/libimport.${SO_SUFFIX}
-lib/${MOZILLA}/components/libjar50.${SO_SUFFIX}
-lib/${MOZILLA}/components/libjsd.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmail.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmailcomps.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmork.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmozfind.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmozldap.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmsgsmime.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmyspell.${SO_SUFFIX}
-lib/${MOZILLA}/components/libnecko.${SO_SUFFIX}
-lib/${MOZILLA}/components/libnecko2.${SO_SUFFIX}
-lib/${MOZILLA}/components/libnsappshell.${SO_SUFFIX}
-lib/${MOZILLA}/components/libpipboot.${SO_SUFFIX}
-lib/${MOZILLA}/components/libpipnss.${SO_SUFFIX}
-lib/${MOZILLA}/components/libpippki.${SO_SUFFIX}
-lib/${MOZILLA}/components/libpref.${SO_SUFFIX}
-lib/${MOZILLA}/components/librdf.${SO_SUFFIX}
-lib/${MOZILLA}/components/libremoteservice.${SO_SUFFIX}
-lib/${MOZILLA}/components/libspellchecker.${SO_SUFFIX}
-lib/${MOZILLA}/components/libtoolkitcomps.${SO_SUFFIX}
-lib/${MOZILLA}/components/libtxmgr.${SO_SUFFIX}
-lib/${MOZILLA}/components/libuconv.${SO_SUFFIX}
-lib/${MOZILLA}/components/libuniversalchardet.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwallet.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwalletviewers.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwebbrwsr.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwebsrvcs.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwidget_gtk.${SO_SUFFIX}
-lib/${MOZILLA}/components/libxmlextras.${SO_SUFFIX}
-lib/${MOZILLA}/components/libxpcom_compat_c.${SO_SUFFIX}
-lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX}
-lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX}
-@comment libfreebl
-lib/${MOZILLA}/libgfxpsshar.${SO_SUFFIX}
-lib/${MOZILLA}/libgkgfx.${SO_SUFFIX}
-lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX}
-lib/${MOZILLA}/libgtksuperwin.${SO_SUFFIX}
-lib/${MOZILLA}/libgtkxtbin.${SO_SUFFIX}
-lib/${MOZILLA}/libldap50.${SO_SUFFIX}
-lib/${MOZILLA}/libmozjs.${SO_SUFFIX}
-lib/${MOZILLA}/libmozz.${SO_SUFFIX}
-lib/${MOZILLA}/libnspr4.${SO_SUFFIX}
-lib/${MOZILLA}/libnss3.${SO_SUFFIX}
-lib/${MOZILLA}/libnssckbi.${SO_SUFFIX}
-lib/${MOZILLA}/libplc4.${SO_SUFFIX}
-lib/${MOZILLA}/libplds4.${SO_SUFFIX}
-lib/${MOZILLA}/libprldap50.${SO_SUFFIX}
-lib/${MOZILLA}/libsmime3.${SO_SUFFIX}
-lib/${MOZILLA}/libsoftokn3.${SO_SUFFIX}
-lib/${MOZILLA}/libssl3.${SO_SUFFIX}
-lib/${MOZILLA}/libxlibrgb.${SO_SUFFIX}
-lib/${MOZILLA}/libxpcom.${SO_SUFFIX}
-lib/${MOZILLA}/libxpcom_compat.${SO_SUFFIX}
-lib/${MOZILLA}/libxpcom_core.${SO_SUFFIX}
-lib/${MOZILLA}/libxpistub.${SO_SUFFIX}
-@comment end DSO
-@comment begin DATA
-lib/${MOZILLA}/LICENSE.txt
-lib/${MOZILLA}/README.txt
-lib/${MOZILLA}/bloaturls.txt
-lib/${MOZILLA}/chrome/US.jar
-lib/${MOZILLA}/chrome/chromelist.txt
-lib/${MOZILLA}/chrome/classic.jar
-lib/${MOZILLA}/chrome/classic.manifest
-lib/${MOZILLA}/chrome/comm.jar
-lib/${MOZILLA}/chrome/comm.manifest
-lib/${MOZILLA}/chrome/en-US.jar
-lib/${MOZILLA}/chrome/en-US.manifest
-lib/${MOZILLA}/chrome/icons/default/abcardWindow.xpm
-lib/${MOZILLA}/chrome/icons/default/abcardWindow16.xpm
-lib/${MOZILLA}/chrome/icons/default/addressbookWindow.xpm
-lib/${MOZILLA}/chrome/icons/default/addressbookWindow16.xpm
-lib/${MOZILLA}/chrome/icons/default/messengerWindow.xpm
-lib/${MOZILLA}/chrome/icons/default/messengerWindow16.xpm
-lib/${MOZILLA}/chrome/icons/default/msgcomposeWindow.xpm
-lib/${MOZILLA}/chrome/icons/default/msgcomposeWindow16.xpm
-lib/${MOZILLA}/chrome/installed-chrome.txt
-lib/${MOZILLA}/chrome/messenger.jar
-lib/${MOZILLA}/chrome/messenger.manifest
-lib/${MOZILLA}/chrome/newsblog.jar
-lib/${MOZILLA}/chrome/newsblog.manifest
-lib/${MOZILLA}/chrome/offline.jar
-lib/${MOZILLA}/chrome/offline.manifest
-lib/${MOZILLA}/chrome/pippki.jar
-lib/${MOZILLA}/chrome/pippki.manifest
-lib/${MOZILLA}/chrome/toolkit.jar
-lib/${MOZILLA}/chrome/toolkit.manifest
-lib/${MOZILLA}/components/accessibility.xpt
-lib/${MOZILLA}/components/addrbook.xpt
-lib/${MOZILLA}/components/alerts.xpt
-lib/${MOZILLA}/components/appshell.xpt
-lib/${MOZILLA}/components/appstartup.xpt
-lib/${MOZILLA}/components/autocomplete.xpt
-lib/${MOZILLA}/components/autoconfig.xpt
-lib/${MOZILLA}/components/bookmarks.xpt
-lib/${MOZILLA}/components/caps.xpt
-lib/${MOZILLA}/components/chardet.xpt
-lib/${MOZILLA}/components/chrome.xpt
-lib/${MOZILLA}/components/commandhandler.xpt
-lib/${MOZILLA}/components/commandlines.xpt
-lib/${MOZILLA}/components/composer.xpt
-lib/${MOZILLA}/components/content_base.xpt
-lib/${MOZILLA}/components/content_html.xpt
-lib/${MOZILLA}/components/content_htmldoc.xpt
-lib/${MOZILLA}/components/content_xmldoc.xpt
-lib/${MOZILLA}/components/content_xslt.xpt
-lib/${MOZILLA}/components/content_xtf.xpt
-lib/${MOZILLA}/components/docshell.xpt
-lib/${MOZILLA}/components/dom.xpt
-lib/${MOZILLA}/components/dom_base.xpt
-lib/${MOZILLA}/components/dom_canvas.xpt
-lib/${MOZILLA}/components/dom_core.xpt
-lib/${MOZILLA}/components/dom_css.xpt
-lib/${MOZILLA}/components/dom_events.xpt
-lib/${MOZILLA}/components/dom_html.xpt
-lib/${MOZILLA}/components/dom_loadsave.xpt
-lib/${MOZILLA}/components/dom_range.xpt
-lib/${MOZILLA}/components/dom_stylesheets.xpt
-lib/${MOZILLA}/components/dom_traversal.xpt
-lib/${MOZILLA}/components/dom_views.xpt
-lib/${MOZILLA}/components/dom_xbl.xpt
-lib/${MOZILLA}/components/dom_xpath.xpt
-lib/${MOZILLA}/components/dom_xul.xpt
-lib/${MOZILLA}/components/downloadmanager.xpt
-lib/${MOZILLA}/components/downloads.xpt
-lib/${MOZILLA}/components/editor.xpt
-lib/${MOZILLA}/components/embed_base.xpt
-lib/${MOZILLA}/components/extensions.xpt
-lib/${MOZILLA}/components/exthandler.xpt
-lib/${MOZILLA}/components/filepicker.xpt
-lib/${MOZILLA}/components/find.xpt
-lib/${MOZILLA}/components/gfx.xpt
-lib/${MOZILLA}/components/history.xpt
-lib/${MOZILLA}/components/htmlparser.xpt
-lib/${MOZILLA}/components/imglib2.xpt
-lib/${MOZILLA}/components/impComm4xMail.xpt
-lib/${MOZILLA}/components/import.xpt
-lib/${MOZILLA}/components/intl.xpt
-lib/${MOZILLA}/components/jar.xpt
-lib/${MOZILLA}/components/jsconsole-clhandler.js
-lib/${MOZILLA}/components/jsconsole.xpt
-lib/${MOZILLA}/components/jsdservice.xpt
-lib/${MOZILLA}/components/layout_base.xpt
-lib/${MOZILLA}/components/layout_printing.xpt
-lib/${MOZILLA}/components/layout_xul.xpt
-lib/${MOZILLA}/components/layout_xul_tree.xpt
-lib/${MOZILLA}/components/locale.xpt
-lib/${MOZILLA}/components/lwbrk.xpt
-lib/${MOZILLA}/components/mailnews.xpt
-lib/${MOZILLA}/components/mailprofilemigration.xpt
-lib/${MOZILLA}/components/mailview.xpt
-lib/${MOZILLA}/components/mdn-service.js
-lib/${MOZILLA}/components/mime.xpt
-lib/${MOZILLA}/components/mimetype.xpt
-lib/${MOZILLA}/components/mozbrwsr.xpt
-lib/${MOZILLA}/components/mozfind.xpt
-lib/${MOZILLA}/components/mozldap.xpt
-lib/${MOZILLA}/components/msgbase.xpt
-lib/${MOZILLA}/components/msgcompose.xpt
-lib/${MOZILLA}/components/msgdb.xpt
-lib/${MOZILLA}/components/msgimap.xpt
-lib/${MOZILLA}/components/msglocal.xpt
-lib/${MOZILLA}/components/msgnews.xpt
-lib/${MOZILLA}/components/msgsearch.xpt
-lib/${MOZILLA}/components/msgsmime.xpt
-lib/${MOZILLA}/components/myspell/en-US.aff
-lib/${MOZILLA}/components/myspell/en-US.dic
-lib/${MOZILLA}/components/necko.xpt
-lib/${MOZILLA}/components/necko_about.xpt
-lib/${MOZILLA}/components/necko_cache.xpt
-lib/${MOZILLA}/components/necko_cookie.xpt
-lib/${MOZILLA}/components/necko_data.xpt
-lib/${MOZILLA}/components/necko_dns.xpt
-lib/${MOZILLA}/components/necko_file.xpt
-lib/${MOZILLA}/components/necko_ftp.xpt
-lib/${MOZILLA}/components/necko_http.xpt
-lib/${MOZILLA}/components/necko_res.xpt
-lib/${MOZILLA}/components/necko_socket.xpt
-lib/${MOZILLA}/components/necko_strconv.xpt
-lib/${MOZILLA}/components/necko_viewsource.xpt
-lib/${MOZILLA}/components/newsblog.js
-lib/${MOZILLA}/components/nsAbLDAPAttributeMap.js
-lib/${MOZILLA}/components/nsCloseAllWindows.js
-lib/${MOZILLA}/components/nsComposerCmdLineHandler.js
-lib/${MOZILLA}/components/nsDefaultCLH.js
-lib/${MOZILLA}/components/nsDownloadProgressListener.js
-lib/${MOZILLA}/components/nsExtensionManager.js
-lib/${MOZILLA}/components/nsFilePicker.js
-lib/${MOZILLA}/components/nsHelperAppDlg.js
-lib/${MOZILLA}/components/nsInterfaceInfoToIDL.js
-lib/${MOZILLA}/components/nsLDAPPrefsService.js
-lib/${MOZILLA}/components/nsMailDefaultHandler.js
-lib/${MOZILLA}/components/nsProgressDialog.js
-lib/${MOZILLA}/components/nsProxyAutoConfig.js
-lib/${MOZILLA}/components/nsUpdateService.js
-lib/${MOZILLA}/components/offlineStartup.js
-lib/${MOZILLA}/components/pipboot.xpt
-lib/${MOZILLA}/components/pipnss.xpt
-lib/${MOZILLA}/components/pippki.xpt
-lib/${MOZILLA}/components/pref.xpt
-lib/${MOZILLA}/components/prefetch.xpt
-lib/${MOZILLA}/components/profile.xpt
-lib/${MOZILLA}/components/progressDlg.xpt
-lib/${MOZILLA}/components/proxyObjInst.xpt
-lib/${MOZILLA}/components/rdf.xpt
-lib/${MOZILLA}/components/shistory.xpt
-lib/${MOZILLA}/components/sidebar.xpt
-lib/${MOZILLA}/components/signonviewer.xpt
-lib/${MOZILLA}/components/smime-service.js
-lib/${MOZILLA}/components/spellchecker.xpt
-lib/${MOZILLA}/components/toolkitprofile.xpt
-lib/${MOZILLA}/components/toolkitremote.xpt
-lib/${MOZILLA}/components/txmgr.xpt
-lib/${MOZILLA}/components/txtsvc.xpt
-lib/${MOZILLA}/components/uconv.xpt
-lib/${MOZILLA}/components/unicharutil.xpt
-lib/${MOZILLA}/components/update.xpt
-lib/${MOZILLA}/components/uriloader.xpt
-lib/${MOZILLA}/components/wallet.xpt
-lib/${MOZILLA}/components/walleteditor.xpt
-lib/${MOZILLA}/components/walletpreview.xpt
-lib/${MOZILLA}/components/webBrowser_core.xpt
-lib/${MOZILLA}/components/webbrowserpersist.xpt
-lib/${MOZILLA}/components/webshell_idls.xpt
-lib/${MOZILLA}/components/websrvcs.xpt
-lib/${MOZILLA}/components/widget.xpt
-lib/${MOZILLA}/components/windowds.xpt
-lib/${MOZILLA}/components/windowwatcher.xpt
-lib/${MOZILLA}/components/xmlextras.xpt
-lib/${MOZILLA}/components/xpcom_base.xpt
-lib/${MOZILLA}/components/xpcom_components.xpt
-lib/${MOZILLA}/components/xpcom_ds.xpt
-lib/${MOZILLA}/components/xpcom_io.xpt
-lib/${MOZILLA}/components/xpcom_obsolete.xpt
-lib/${MOZILLA}/components/xpcom_threads.xpt
-lib/${MOZILLA}/components/xpcom_xpti.xpt
-lib/${MOZILLA}/components/xpconnect.xpt
-lib/${MOZILLA}/components/xpinstall.xpt
-lib/${MOZILLA}/components/xulapp.xpt
-lib/${MOZILLA}/components/xuldoc.xpt
-lib/${MOZILLA}/components/xultmpl.xpt
-lib/${MOZILLA}/defaults/autoconfig/platform.js
-lib/${MOZILLA}/defaults/autoconfig/prefcalls.js
-lib/${MOZILLA}/defaults/isp/US/movemail.rdf
-lib/${MOZILLA}/defaults/isp/US/rss.rdf
-lib/${MOZILLA}/defaults/isp/movemail.rdf
-lib/${MOZILLA}/defaults/isp/rss.rdf
-lib/${MOZILLA}/defaults/messenger/SpamAssassin.sfd
-lib/${MOZILLA}/defaults/messenger/SpamPal.sfd
-lib/${MOZILLA}/defaults/messenger/US/mailViews.dat
-lib/${MOZILLA}/defaults/messenger/mailViews.dat
-lib/${MOZILLA}/defaults/pref/all-l10n.js
-lib/${MOZILLA}/defaults/pref/all-thunderbird.js
-lib/${MOZILLA}/defaults/pref/channel-prefs.js
-lib/${MOZILLA}/defaults/pref/composer.js
-lib/${MOZILLA}/defaults/pref/mailnews.js
-lib/${MOZILLA}/defaults/pref/mdn.js
-lib/${MOZILLA}/defaults/pref/smime.js
-lib/${MOZILLA}/defaults/profile/US/localstore.rdf
-lib/${MOZILLA}/defaults/profile/US/mimeTypes.rdf
-lib/${MOZILLA}/defaults/profile/localstore.rdf
-lib/${MOZILLA}/defaults/profile/mimeTypes.rdf
-lib/${MOZILLA}/defaults/profile/prefs.js
-lib/${MOZILLA}/defaults/wallet/DistinguishedSchema.tbl
-lib/${MOZILLA}/defaults/wallet/FieldSchema.tbl
-lib/${MOZILLA}/defaults/wallet/PositionalSchema.tbl
-lib/${MOZILLA}/defaults/wallet/SchemaConcat.tbl
-lib/${MOZILLA}/defaults/wallet/SchemaStrings.tbl
-lib/${MOZILLA}/defaults/wallet/StateSchema.tbl
-lib/${MOZILLA}/defaults/wallet/VcardSchema.tbl
-lib/${MOZILLA}/dependentlibs.list
-lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
-lib/${MOZILLA}/greprefs/all.js
-lib/${MOZILLA}/greprefs/security-prefs.js
-lib/${MOZILLA}/greprefs/xpinstall.js
-lib/${MOZILLA}/icons/mozicon16.xpm
-lib/${MOZILLA}/icons/mozicon50.xpm
-lib/${MOZILLA}/init.d/README
-@comment libfreebl.chk
-lib/${MOZILLA}/libsoftokn3.chk
-lib/${MOZILLA}/res/EditorOverride.css
-lib/${MOZILLA}/res/arrow.gif
-lib/${MOZILLA}/res/arrowd.gif
-lib/${MOZILLA}/res/bloatcycle.html
-lib/${MOZILLA}/res/broken-image.gif
-lib/${MOZILLA}/res/charsetData.properties
-lib/${MOZILLA}/res/charsetalias.properties
-lib/${MOZILLA}/res/cmessage.txt
-lib/${MOZILLA}/res/dtd/xhtml11.dtd
-lib/${MOZILLA}/res/entityTables/html40Latin1.properties
-lib/${MOZILLA}/res/entityTables/html40Special.properties
-lib/${MOZILLA}/res/entityTables/html40Symbols.properties
-lib/${MOZILLA}/res/entityTables/htmlEntityVersions.properties
-lib/${MOZILLA}/res/entityTables/transliterate.properties
-lib/${MOZILLA}/res/forms.css
-lib/${MOZILLA}/res/grabber.gif
-lib/${MOZILLA}/res/hiddenWindow.html
-lib/${MOZILLA}/res/html.css
-lib/${MOZILLA}/res/html/gopher-audio.gif
-lib/${MOZILLA}/res/html/gopher-binary.gif
-lib/${MOZILLA}/res/html/gopher-find.gif
-lib/${MOZILLA}/res/html/gopher-image.gif
-lib/${MOZILLA}/res/html/gopher-menu.gif
-lib/${MOZILLA}/res/html/gopher-movie.gif
-lib/${MOZILLA}/res/html/gopher-sound.gif
-lib/${MOZILLA}/res/html/gopher-telnet.gif
-lib/${MOZILLA}/res/html/gopher-text.gif
-lib/${MOZILLA}/res/html/gopher-unknown.gif
-lib/${MOZILLA}/res/langGroups.properties
-lib/${MOZILLA}/res/language.properties
-lib/${MOZILLA}/res/loading-image.gif
-lib/${MOZILLA}/res/quirk.css
-lib/${MOZILLA}/res/sample.unixpsfonts.properties
-lib/${MOZILLA}/res/samples/Anieyes.gif
-lib/${MOZILLA}/res/samples/aform.css
-lib/${MOZILLA}/res/samples/beeptest.html
-lib/${MOZILLA}/res/samples/bform.css
-lib/${MOZILLA}/res/samples/bg.jpg
-lib/${MOZILLA}/res/samples/cform.css
-lib/${MOZILLA}/res/samples/checkboxTest.xul
-lib/${MOZILLA}/res/samples/colorpicker.xul
-lib/${MOZILLA}/res/samples/demoform.css
-lib/${MOZILLA}/res/samples/dexopenchrome.xul
-lib/${MOZILLA}/res/samples/dexparamdialog.html
-lib/${MOZILLA}/res/samples/dexparamdialog.xul
-lib/${MOZILLA}/res/samples/find.html
-lib/${MOZILLA}/res/samples/gear1.gif
-lib/${MOZILLA}/res/samples/hidetoolicon.css
-lib/${MOZILLA}/res/samples/hidetoolicon.xul
-lib/${MOZILLA}/res/samples/image_props.html
-lib/${MOZILLA}/res/samples/mozform.css
-lib/${MOZILLA}/res/samples/printsetup.html
-lib/${MOZILLA}/res/samples/raptor.jpg
-lib/${MOZILLA}/res/samples/rock_gra.gif
-lib/${MOZILLA}/res/samples/sampleimages/bongo.gif
-lib/${MOZILLA}/res/samples/sampleimages/down.gif
-lib/${MOZILLA}/res/samples/sampleimages/left.gif
-lib/${MOZILLA}/res/samples/sampleimages/right.gif
-lib/${MOZILLA}/res/samples/sampleimages/up.gif
-lib/${MOZILLA}/res/samples/scrollbarTest1.xul
-lib/${MOZILLA}/res/samples/scrollbarTest2.xul
-lib/${MOZILLA}/res/samples/sliderTest1.xul
-lib/${MOZILLA}/res/samples/soundtest.html
-lib/${MOZILLA}/res/samples/tab.xul
-lib/${MOZILLA}/res/samples/test.wav
-lib/${MOZILLA}/res/samples/test0.html
-lib/${MOZILLA}/res/samples/test1.html
-lib/${MOZILLA}/res/samples/test10.html
-lib/${MOZILLA}/res/samples/test11.html
-lib/${MOZILLA}/res/samples/test12.html
-lib/${MOZILLA}/res/samples/test13.html
-lib/${MOZILLA}/res/samples/test14.html
-lib/${MOZILLA}/res/samples/test15.html
-lib/${MOZILLA}/res/samples/test16.html
-lib/${MOZILLA}/res/samples/test2.html
-lib/${MOZILLA}/res/samples/test3.html
-lib/${MOZILLA}/res/samples/test4.html
-lib/${MOZILLA}/res/samples/test5.html
-lib/${MOZILLA}/res/samples/test6.html
-lib/${MOZILLA}/res/samples/test7.html
-lib/${MOZILLA}/res/samples/test8-1.html
-lib/${MOZILLA}/res/samples/test8.html
-lib/${MOZILLA}/res/samples/test8dom.html
-lib/${MOZILLA}/res/samples/test8sca.html
-lib/${MOZILLA}/res/samples/test8siz.html
-lib/${MOZILLA}/res/samples/test8tab.html
-lib/${MOZILLA}/res/samples/test9.html
-lib/${MOZILLA}/res/samples/test9a.html
-lib/${MOZILLA}/res/samples/test9b.html
-lib/${MOZILLA}/res/samples/test_ed.html
-lib/${MOZILLA}/res/samples/test_form.html
-lib/${MOZILLA}/res/samples/test_gfx.html
-lib/${MOZILLA}/res/samples/test_lbox.html
-lib/${MOZILLA}/res/samples/test_pr.html
-lib/${MOZILLA}/res/samples/test_weight.html
-lib/${MOZILLA}/res/samples/toolbarTest1.xul
-lib/${MOZILLA}/res/samples/treeTest1.css
-lib/${MOZILLA}/res/samples/treeTest1.xul
-lib/${MOZILLA}/res/samples/widgets.xul
-lib/${MOZILLA}/res/samples/xpmenu.xul
-lib/${MOZILLA}/res/samples/xulTest.css
-lib/${MOZILLA}/res/table-add-column-after-active.gif
-lib/${MOZILLA}/res/table-add-column-after-hover.gif
-lib/${MOZILLA}/res/table-add-column-after.gif
-lib/${MOZILLA}/res/table-add-column-before-active.gif
-lib/${MOZILLA}/res/table-add-column-before-hover.gif
-lib/${MOZILLA}/res/table-add-column-before.gif
-lib/${MOZILLA}/res/table-add-row-after-active.gif
-lib/${MOZILLA}/res/table-add-row-after-hover.gif
-lib/${MOZILLA}/res/table-add-row-after.gif
-lib/${MOZILLA}/res/table-add-row-before-active.gif
-lib/${MOZILLA}/res/table-add-row-before-hover.gif
-lib/${MOZILLA}/res/table-add-row-before.gif
-lib/${MOZILLA}/res/table-remove-column-active.gif
-lib/${MOZILLA}/res/table-remove-column-hover.gif
-lib/${MOZILLA}/res/table-remove-column.gif
-lib/${MOZILLA}/res/table-remove-row-active.gif
-lib/${MOZILLA}/res/table-remove-row-hover.gif
-lib/${MOZILLA}/res/table-remove-row.gif
-lib/${MOZILLA}/res/throbber/anim.gif
-lib/${MOZILLA}/res/throbber/anims00.gif
-lib/${MOZILLA}/res/throbber/anims01.gif
-lib/${MOZILLA}/res/throbber/anims02.gif
-lib/${MOZILLA}/res/throbber/anims03.gif
-lib/${MOZILLA}/res/throbber/anims04.gif
-lib/${MOZILLA}/res/throbber/anims05.gif
-lib/${MOZILLA}/res/throbber/anims06.gif
-lib/${MOZILLA}/res/throbber/anims07.gif
-lib/${MOZILLA}/res/throbber/anims08.gif
-lib/${MOZILLA}/res/throbber/anims09.gif
-lib/${MOZILLA}/res/throbber/anims10.gif
-lib/${MOZILLA}/res/throbber/anims11.gif
-lib/${MOZILLA}/res/throbber/anims12.gif
-lib/${MOZILLA}/res/throbber/anims13.gif
-lib/${MOZILLA}/res/throbber/anims14.gif
-lib/${MOZILLA}/res/throbber/anims15.gif
-lib/${MOZILLA}/res/throbber/anims16.gif
-lib/${MOZILLA}/res/throbber/anims17.gif
-lib/${MOZILLA}/res/throbber/anims18.gif
-lib/${MOZILLA}/res/throbber/anims19.gif
-lib/${MOZILLA}/res/throbber/anims20.gif
-lib/${MOZILLA}/res/throbber/anims21.gif
-lib/${MOZILLA}/res/throbber/anims22.gif
-lib/${MOZILLA}/res/throbber/anims23.gif
-lib/${MOZILLA}/res/throbber/anims24.gif
-lib/${MOZILLA}/res/throbber/anims25.gif
-lib/${MOZILLA}/res/throbber/anims26.gif
-lib/${MOZILLA}/res/throbber/anims27.gif
-lib/${MOZILLA}/res/throbber/anims28.gif
-lib/${MOZILLA}/res/throbber/anims29.gif
-lib/${MOZILLA}/res/ua.css
-lib/${MOZILLA}/res/unixcharset.properties
-lib/${MOZILLA}/res/viewer.properties
-lib/${MOZILLA}/res/viewsource.css
-lib/${MOZILLA}/updater
-lib/${MOZILLA}/updater.ini
-@comment end DATA
-@comment begin INCLUDE
-include/${MOZILLA}/accessibility/nsAccessNode.h
-include/${MOZILLA}/accessibility/nsAccessNodeWrap.h
-include/${MOZILLA}/accessibility/nsAccessibleEventData.h
-include/${MOZILLA}/accessibility/nsAccessibleWrap.h
-include/${MOZILLA}/accessibility/nsDocAccessibleWrap.h
-include/${MOZILLA}/accessibility/nsHTMLFormControlAccessibleWrap.h
-include/${MOZILLA}/accessibility/nsIAccessNode.h
-include/${MOZILLA}/accessibility/nsIAccessibilityService.h
-include/${MOZILLA}/accessibility/nsIAccessible.h
-include/${MOZILLA}/accessibility/nsIAccessibleCaret.h
-include/${MOZILLA}/accessibility/nsIAccessibleDocument.h
-include/${MOZILLA}/accessibility/nsIAccessibleEvent.h
-include/${MOZILLA}/accessibility/nsIAccessibleProvider.h
-include/${MOZILLA}/accessibility/nsIAccessibleRetrieval.h
-include/${MOZILLA}/accessibility/nsIAccessibleSelectable.h
-include/${MOZILLA}/accessibility/nsIAccessibleTreeCache.h
-include/${MOZILLA}/accessibility/nsPIAccessNode.h
-include/${MOZILLA}/accessibility/nsPIAccessible.h
-include/${MOZILLA}/accessibility/nsPIAccessibleDocument.h
-include/${MOZILLA}/accessibility/nsRootAccessible.h
-include/${MOZILLA}/accessibility/nsRootAccessibleWrap.h
-include/${MOZILLA}/accessibility/nsTextAccessibleWrap.h
-include/${MOZILLA}/accessibility/nsXULMenuAccessibleWrap.h
-include/${MOZILLA}/accessibility/nsXULTreeAccessibleWrap.h
-include/${MOZILLA}/addrbook/nsAbBaseCID.h
-include/${MOZILLA}/addrbook/nsAbCardProperty.h
-include/${MOZILLA}/addrbook/nsAbMDBCardProperty.h
-include/${MOZILLA}/addrbook/nsDirPrefs.h
-include/${MOZILLA}/addrbook/nsIAbAddressCollecter.h
-include/${MOZILLA}/addrbook/nsIAbAutoCompleteSession.h
-include/${MOZILLA}/addrbook/nsIAbBase.h
-include/${MOZILLA}/addrbook/nsIAbBooleanExpression.h
-include/${MOZILLA}/addrbook/nsIAbCard.h
-include/${MOZILLA}/addrbook/nsIAbDirFactory.h
-include/${MOZILLA}/addrbook/nsIAbDirFactoryService.h
-include/${MOZILLA}/addrbook/nsIAbDirectory.h
-include/${MOZILLA}/addrbook/nsIAbDirectoryQuery.h
-include/${MOZILLA}/addrbook/nsIAbDirectoryQueryProxy.h
-include/${MOZILLA}/addrbook/nsIAbDirectorySearch.h
-include/${MOZILLA}/addrbook/nsIAbLDAPAttributeMap.h
-include/${MOZILLA}/addrbook/nsIAbLDAPAutoCompFormatter.h
-include/${MOZILLA}/addrbook/nsIAbLDAPDirectory.h
-include/${MOZILLA}/addrbook/nsIAbLDAPReplicationData.h
-include/${MOZILLA}/addrbook/nsIAbLDAPReplicationQuery.h
-include/${MOZILLA}/addrbook/nsIAbLDAPReplicationService.h
-include/${MOZILLA}/addrbook/nsIAbLDIFService.h
-include/${MOZILLA}/addrbook/nsIAbListener.h
-include/${MOZILLA}/addrbook/nsIAbMDBCard.h
-include/${MOZILLA}/addrbook/nsIAbMDBDirectory.h
-include/${MOZILLA}/addrbook/nsIAbUpgrader.h
-include/${MOZILLA}/addrbook/nsIAbView.h
-include/${MOZILLA}/addrbook/nsIAddbookUrl.h
-include/${MOZILLA}/addrbook/nsIAddrBookSession.h
-include/${MOZILLA}/addrbook/nsIAddrDBAnnouncer.h
-include/${MOZILLA}/addrbook/nsIAddrDBListener.h
-include/${MOZILLA}/addrbook/nsIAddrDatabase.h
-include/${MOZILLA}/addrbook/nsIAddressBook.h
-include/${MOZILLA}/addrbook/nsILDAPPrefsService.h
-include/${MOZILLA}/addrbook/nsIMsgVCardService.h
-include/${MOZILLA}/addrbook/nsVCardObj.h
-include/${MOZILLA}/alerts/nsIAlertsService.h
-include/${MOZILLA}/appcomps/nsCharsetMenu.h
-include/${MOZILLA}/appcomps/nsFontPackageHandler.h
-include/${MOZILLA}/appcomps/nsIAppStartup.h
-include/${MOZILLA}/appcomps/nsIAutoCompleteListener.h
-include/${MOZILLA}/appcomps/nsIAutoCompleteResults.h
-include/${MOZILLA}/appcomps/nsIAutoCompleteSession.h
-include/${MOZILLA}/appcomps/nsIBookmarksService.h
-include/${MOZILLA}/appcomps/nsICloseAllWindows.h
-include/${MOZILLA}/appcomps/nsIFindService.h
-include/${MOZILLA}/appcomps/nsILDAPAutoCompFormatter.h
-include/${MOZILLA}/appcomps/nsILDAPAutoCompleteSession.h
-include/${MOZILLA}/appcomps/nsISearchContext.h
-include/${MOZILLA}/appcomps/nsIUserInfo.h
-include/${MOZILLA}/appcomps/nsIWindowDataSource.h
-include/${MOZILLA}/appcomps/nsXPFEComponentsCID.h
-include/${MOZILLA}/appshell/nsAppShellCID.h
-include/${MOZILLA}/appshell/nsIAppShellService.h
-include/${MOZILLA}/appshell/nsIPopupWindowManager.h
-include/${MOZILLA}/appshell/nsIWindowMediator.h
-include/${MOZILLA}/appshell/nsIWindowMediatorListener.h
-include/${MOZILLA}/appshell/nsIXULBrowserWindow.h
-include/${MOZILLA}/appshell/nsIXULWindow.h
-include/${MOZILLA}/autoconfig/nsIAutoConfig.h
-include/${MOZILLA}/autoconfig/nsILDAPSyncQuery.h
-include/${MOZILLA}/autoconfig/nsIReadConfig.h
-include/${MOZILLA}/bayesflt/nsBayesianFilter.h
-include/${MOZILLA}/bayesflt/nsBayesianFilterCID.h
-include/${MOZILLA}/browser/nsIBrowserInstance.h
-include/${MOZILLA}/caps/nsICryptoHash.h
-include/${MOZILLA}/caps/nsIPrincipal.h
-include/${MOZILLA}/caps/nsIScriptSecurityManager.h
-include/${MOZILLA}/caps/nsISecurityCheckedComponent.h
-include/${MOZILLA}/caps/nsISignatureVerifier.h
-include/${MOZILLA}/caps/nsJSPrincipals.h
-include/${MOZILLA}/chardet/nsCharsetDetectionAdaptorCID.h
-include/${MOZILLA}/chardet/nsDetectionConfident.h
-include/${MOZILLA}/chardet/nsDocumentCharsetInfoCID.h
-include/${MOZILLA}/chardet/nsICharsetDetectionAdaptor.h
-include/${MOZILLA}/chardet/nsICharsetDetectionObserver.h
-include/${MOZILLA}/chardet/nsICharsetDetector.h
-include/${MOZILLA}/chardet/nsICharsetResolver.h
-include/${MOZILLA}/chardet/nsIDocCharset.h
-include/${MOZILLA}/chardet/nsIDocumentCharsetInfo.h
-include/${MOZILLA}/chardet/nsIMetaCharsetService.h
-include/${MOZILLA}/chardet/nsIStringCharsetDetector.h
-include/${MOZILLA}/chardet/nsIXMLEncodingService.h
-include/${MOZILLA}/chardet/nsMetaCharsetCID.h
-include/${MOZILLA}/chardet/nsXMLEncodingCID.h
-include/${MOZILLA}/chrome/nsIToolkitChromeRegistry.h
-include/${MOZILLA}/commandhandler/nsICommandManager.h
-include/${MOZILLA}/commandhandler/nsICommandParams.h
-include/${MOZILLA}/commandhandler/nsIControllerCommand.h
-include/${MOZILLA}/commandhandler/nsIControllerCommandTable.h
-include/${MOZILLA}/commandhandler/nsIControllerContext.h
-include/${MOZILLA}/commandhandler/nsPICommandUpdater.h
-include/${MOZILLA}/composer/nsIEditingSession.h
-include/${MOZILLA}/content/mozFlushType.h
-include/${MOZILLA}/content/mozISanitizingSerializer.h
-include/${MOZILLA}/content/nsAtomListUtils.h
-include/${MOZILLA}/content/nsContentCID.h
-include/${MOZILLA}/content/nsContentCreatorFunctions.h
-include/${MOZILLA}/content/nsContentErrors.h
-include/${MOZILLA}/content/nsContentList.h
-include/${MOZILLA}/content/nsContentPolicyUtils.h
-include/${MOZILLA}/content/nsContentUtils.h
-include/${MOZILLA}/content/nsCopySupport.h
-include/${MOZILLA}/content/nsHTMLAtomList.h
-include/${MOZILLA}/content/nsHTMLAtoms.h
-include/${MOZILLA}/content/nsIAttribute.h
-include/${MOZILLA}/content/nsIBindingManager.h
-include/${MOZILLA}/content/nsICanvasElement.h
-include/${MOZILLA}/content/nsICanvasRenderingContextInternal.h
-include/${MOZILLA}/content/nsIChromeRegistry.h
-include/${MOZILLA}/content/nsIContent.h
-include/${MOZILLA}/content/nsIContentIterator.h
-include/${MOZILLA}/content/nsIContentPolicy.h
-include/${MOZILLA}/content/nsIContentSerializer.h
-include/${MOZILLA}/content/nsIDocument.h
-include/${MOZILLA}/content/nsIDocumentEncoder.h
-include/${MOZILLA}/content/nsIDocumentObserver.h
-include/${MOZILLA}/content/nsIDocumentTransformer.h
-include/${MOZILLA}/content/nsIDragDropHandler.h
-include/${MOZILLA}/content/nsIEventListenerManager.h
-include/${MOZILLA}/content/nsIEventStateManager.h
-include/${MOZILLA}/content/nsIFIXptr.h
-include/${MOZILLA}/content/nsIFileControlElement.h
-include/${MOZILLA}/content/nsIForm.h
-include/${MOZILLA}/content/nsIFormControl.h
-include/${MOZILLA}/content/nsIFormProcessor.h
-include/${MOZILLA}/content/nsIFormSubmission.h
-include/${MOZILLA}/content/nsIFormSubmitObserver.h
-include/${MOZILLA}/content/nsIFrameLoader.h
-include/${MOZILLA}/content/nsIFrameSetElement.h
-include/${MOZILLA}/content/nsIHTMLDocument.h
-include/${MOZILLA}/content/nsIHTMLToTextSink.h
-include/${MOZILLA}/content/nsIImageDocument.h
-include/${MOZILLA}/content/nsIImageLoadingContent.h
-include/${MOZILLA}/content/nsILink.h
-include/${MOZILLA}/content/nsIModifyableXPointer.h
-include/${MOZILLA}/content/nsINameSpaceManager.h
-include/${MOZILLA}/content/nsINodeInfo.h
-include/${MOZILLA}/content/nsIOptionElement.h
-include/${MOZILLA}/content/nsIPhonetic.h
-include/${MOZILLA}/content/nsIPluginElement.h
-include/${MOZILLA}/content/nsIPrivateCompositionEvent.h
-include/${MOZILLA}/content/nsIPrivateDOMEvent.h
-include/${MOZILLA}/content/nsIPrivateDOMImplementation.h
-include/${MOZILLA}/content/nsIPrivateTextEvent.h
-include/${MOZILLA}/content/nsIPrivateTextRange.h
-include/${MOZILLA}/content/nsIRadioControlElement.h
-include/${MOZILLA}/content/nsIRadioGroupContainer.h
-include/${MOZILLA}/content/nsIRadioVisitor.h
-include/${MOZILLA}/content/nsIRangeUtils.h
-include/${MOZILLA}/content/nsIScriptElement.h
-include/${MOZILLA}/content/nsIScriptEventHandler.h
-include/${MOZILLA}/content/nsIScriptEventManager.h
-include/${MOZILLA}/content/nsIScriptLoader.h
-include/${MOZILLA}/content/nsIScriptLoaderObserver.h
-include/${MOZILLA}/content/nsISelectElement.h
-include/${MOZILLA}/content/nsISelection.h
-include/${MOZILLA}/content/nsISelectionController.h
-include/${MOZILLA}/content/nsISelectionDisplay.h
-include/${MOZILLA}/content/nsISelectionListener.h
-include/${MOZILLA}/content/nsISelectionPrivate.h
-include/${MOZILLA}/content/nsIStyleSheetLinkingElement.h
-include/${MOZILLA}/content/nsIStyledContent.h
-include/${MOZILLA}/content/nsISyncLoadDOMService.h
-include/${MOZILLA}/content/nsITextContent.h
-include/${MOZILLA}/content/nsITextControlElement.h
-include/${MOZILLA}/content/nsIWyciwygChannel.h
-include/${MOZILLA}/content/nsIXBLDocumentInfo.h
-include/${MOZILLA}/content/nsIXBLService.h
-include/${MOZILLA}/content/nsIXMLContent.h
-include/${MOZILLA}/content/nsIXMLContentBuilder.h
-include/${MOZILLA}/content/nsIXMLContentSink.h
-include/${MOZILLA}/content/nsIXPathEvaluatorInternal.h
-include/${MOZILLA}/content/nsIXPointer.h
-include/${MOZILLA}/content/nsIXSLTException.h
-include/${MOZILLA}/content/nsIXSLTProcessor.h
-include/${MOZILLA}/content/nsIXSLTProcessorObsolete.h
-include/${MOZILLA}/content/nsIXTFAttributeHandler.h
-include/${MOZILLA}/content/nsIXTFBindableElement.h
-include/${MOZILLA}/content/nsIXTFBindableElementWrapper.h
-include/${MOZILLA}/content/nsIXTFElement.h
-include/${MOZILLA}/content/nsIXTFElementFactory.h
-include/${MOZILLA}/content/nsIXTFElementWrapper.h
-include/${MOZILLA}/content/nsIXTFElementWrapperPrivate.h
-include/${MOZILLA}/content/nsIXTFGenericElement.h
-include/${MOZILLA}/content/nsIXTFGenericElementWrapper.h
-include/${MOZILLA}/content/nsIXTFPrivate.h
-include/${MOZILLA}/content/nsIXTFService.h
-include/${MOZILLA}/content/nsIXTFStyledElementWrapper.h
-include/${MOZILLA}/content/nsIXTFVisual.h
-include/${MOZILLA}/content/nsIXTFVisualWrapperPrivate.h
-include/${MOZILLA}/content/nsIXTFXMLVisual.h
-include/${MOZILLA}/content/nsIXTFXMLVisualWrapper.h
-include/${MOZILLA}/content/nsIXTFXULVisual.h
-include/${MOZILLA}/content/nsIXTFXULVisualWrapper.h
-include/${MOZILLA}/content/nsImageMapUtils.h
-include/${MOZILLA}/content/nsMutationEvent.h
-include/${MOZILLA}/content/nsNodeInfoManager.h
-include/${MOZILLA}/content/nsPLDOMEvent.h
-include/${MOZILLA}/content/nsPropertyTable.h
-include/${MOZILLA}/content/nsStubDocumentObserver.h
-include/${MOZILLA}/content/nsTextFragment.h
-include/${MOZILLA}/content/nsXBLAtomList.h
-include/${MOZILLA}/content/nsXBLAtoms.h
-include/${MOZILLA}/content/nsXMLNameSpaceMap.h
-include/${MOZILLA}/dbm/cdefs.h
-include/${MOZILLA}/dbm/mcom_db.h
-include/${MOZILLA}/dbm/ncompat.h
-include/${MOZILLA}/dbm/nsres.h
-include/${MOZILLA}/dbm/winfile.h
-include/${MOZILLA}/docshell/nsCDefaultURIFixup.h
-include/${MOZILLA}/docshell/nsCDocShell.h
-include/${MOZILLA}/docshell/nsDocShellCID.h
-include/${MOZILLA}/docshell/nsIContentViewer.h
-include/${MOZILLA}/docshell/nsIContentViewerEdit.h
-include/${MOZILLA}/docshell/nsIContentViewerFile.h
-include/${MOZILLA}/docshell/nsIDocShell.h
-include/${MOZILLA}/docshell/nsIDocShellHistory.h
-include/${MOZILLA}/docshell/nsIDocShellLoadInfo.h
-include/${MOZILLA}/docshell/nsIDocShellTreeItem.h
-include/${MOZILLA}/docshell/nsIDocShellTreeNode.h
-include/${MOZILLA}/docshell/nsIDocShellTreeOwner.h
-include/${MOZILLA}/docshell/nsIEditorDocShell.h
-include/${MOZILLA}/docshell/nsIGlobalHistory.h
-include/${MOZILLA}/docshell/nsIGlobalHistory2.h
-include/${MOZILLA}/docshell/nsIMarkupDocumentViewer.h
-include/${MOZILLA}/docshell/nsIScrollable.h
-include/${MOZILLA}/docshell/nsITextScroll.h
-include/${MOZILLA}/docshell/nsIURIFixup.h
-include/${MOZILLA}/docshell/nsIWebNavigation.h
-include/${MOZILLA}/docshell/nsIWebNavigationInfo.h
-include/${MOZILLA}/docshell/nsIWebPageDescriptor.h
-include/${MOZILLA}/dom/domstubs.h
-include/${MOZILLA}/dom/nsDOMCID.h
-include/${MOZILLA}/dom/nsDOMError.h
-include/${MOZILLA}/dom/nsDOMString.h
-include/${MOZILLA}/dom/nsIBaseDOMException.h
-include/${MOZILLA}/dom/nsIBrowserDOMWindow.h
-include/${MOZILLA}/dom/nsIDOM3Document.h
-include/${MOZILLA}/dom/nsIDOM3DocumentEvent.h
-include/${MOZILLA}/dom/nsIDOM3EventTarget.h
-include/${MOZILLA}/dom/nsIDOM3Node.h
-include/${MOZILLA}/dom/nsIDOMAbstractView.h
-include/${MOZILLA}/dom/nsIDOMAttr.h
-include/${MOZILLA}/dom/nsIDOMBarProp.h
-include/${MOZILLA}/dom/nsIDOMBeforeUnloadEvent.h
-include/${MOZILLA}/dom/nsIDOMCDATASection.h
-include/${MOZILLA}/dom/nsIDOMCRMFObject.h
-include/${MOZILLA}/dom/nsIDOMCSS2Properties.h
-include/${MOZILLA}/dom/nsIDOMCSSCharsetRule.h
-include/${MOZILLA}/dom/nsIDOMCSSFontFaceRule.h
-include/${MOZILLA}/dom/nsIDOMCSSImportRule.h
-include/${MOZILLA}/dom/nsIDOMCSSMediaRule.h
-include/${MOZILLA}/dom/nsIDOMCSSMozDocumentRule.h
-include/${MOZILLA}/dom/nsIDOMCSSPageRule.h
-include/${MOZILLA}/dom/nsIDOMCSSPrimitiveValue.h
-include/${MOZILLA}/dom/nsIDOMCSSRule.h
-include/${MOZILLA}/dom/nsIDOMCSSRuleList.h
-include/${MOZILLA}/dom/nsIDOMCSSStyleDeclaration.h
-include/${MOZILLA}/dom/nsIDOMCSSStyleRule.h
-include/${MOZILLA}/dom/nsIDOMCSSStyleSheet.h
-include/${MOZILLA}/dom/nsIDOMCSSUnknownRule.h
-include/${MOZILLA}/dom/nsIDOMCSSValue.h
-include/${MOZILLA}/dom/nsIDOMCSSValueList.h
-include/${MOZILLA}/dom/nsIDOMCanvasRenderingContext2D.h
-include/${MOZILLA}/dom/nsIDOMCharacterData.h
-include/${MOZILLA}/dom/nsIDOMChromeWindow.h
-include/${MOZILLA}/dom/nsIDOMClassInfo.h
-include/${MOZILLA}/dom/nsIDOMComment.h
-include/${MOZILLA}/dom/nsIDOMCompositionListener.h
-include/${MOZILLA}/dom/nsIDOMConstructor.h
-include/${MOZILLA}/dom/nsIDOMContextMenuListener.h
-include/${MOZILLA}/dom/nsIDOMCounter.h
-include/${MOZILLA}/dom/nsIDOMCrypto.h
-include/${MOZILLA}/dom/nsIDOMCustomEvent.h
-include/${MOZILLA}/dom/nsIDOMDOMConfiguration.h
-include/${MOZILLA}/dom/nsIDOMDOMException.h
-include/${MOZILLA}/dom/nsIDOMDOMImplementation.h
-include/${MOZILLA}/dom/nsIDOMDOMImplementationLS.h
-include/${MOZILLA}/dom/nsIDOMDOMStringList.h
-include/${MOZILLA}/dom/nsIDOMDocument.h
-include/${MOZILLA}/dom/nsIDOMDocumentCSS.h
-include/${MOZILLA}/dom/nsIDOMDocumentEvent.h
-include/${MOZILLA}/dom/nsIDOMDocumentFragment.h
-include/${MOZILLA}/dom/nsIDOMDocumentRange.h
-include/${MOZILLA}/dom/nsIDOMDocumentStyle.h
-include/${MOZILLA}/dom/nsIDOMDocumentTraversal.h
-include/${MOZILLA}/dom/nsIDOMDocumentType.h
-include/${MOZILLA}/dom/nsIDOMDocumentView.h
-include/${MOZILLA}/dom/nsIDOMDocumentXBL.h
-include/${MOZILLA}/dom/nsIDOMDragListener.h
-include/${MOZILLA}/dom/nsIDOMElement.h
-include/${MOZILLA}/dom/nsIDOMElementCSSInlineStyle.h
-include/${MOZILLA}/dom/nsIDOMEntity.h
-include/${MOZILLA}/dom/nsIDOMEntityReference.h
-include/${MOZILLA}/dom/nsIDOMEvent.h
-include/${MOZILLA}/dom/nsIDOMEventGroup.h
-include/${MOZILLA}/dom/nsIDOMEventListener.h
-include/${MOZILLA}/dom/nsIDOMEventReceiver.h
-include/${MOZILLA}/dom/nsIDOMEventTarget.h
-include/${MOZILLA}/dom/nsIDOMFocusListener.h
-include/${MOZILLA}/dom/nsIDOMFormListener.h
-include/${MOZILLA}/dom/nsIDOMHTMLAnchorElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLAppletElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLAreaElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLBRElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLBaseElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLBaseFontElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLBodyElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLButtonElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLCanvasElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLCollection.h
-include/${MOZILLA}/dom/nsIDOMHTMLDListElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLDirectoryElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLDivElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLDocument.h
-include/${MOZILLA}/dom/nsIDOMHTMLElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLEmbedElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLFieldSetElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLFontElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLFormElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLFrameElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLFrameSetElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLHRElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLHeadElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLHeadingElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLHtmlElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLIFrameElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLImageElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLInputElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLIsIndexElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLLIElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLLabelElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLLegendElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLLinkElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLMapElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLMenuElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLMetaElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLModElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLOListElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLObjectElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLOptGroupElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLOptionElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLOptionsCollection.h
-include/${MOZILLA}/dom/nsIDOMHTMLParagraphElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLParamElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLPreElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLQuoteElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLScriptElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLSelectElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLStyleElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLTableCaptionElem.h
-include/${MOZILLA}/dom/nsIDOMHTMLTableCellElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLTableColElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLTableElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLTableRowElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLTableSectionElem.h
-include/${MOZILLA}/dom/nsIDOMHTMLTextAreaElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLTitleElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLUListElement.h
-include/${MOZILLA}/dom/nsIDOMHistory.h
-include/${MOZILLA}/dom/nsIDOMJSWindow.h
-include/${MOZILLA}/dom/nsIDOMKeyEvent.h
-include/${MOZILLA}/dom/nsIDOMKeyListener.h
-include/${MOZILLA}/dom/nsIDOMLSException.h
-include/${MOZILLA}/dom/nsIDOMLSInput.h
-include/${MOZILLA}/dom/nsIDOMLSLoadEvent.h
-include/${MOZILLA}/dom/nsIDOMLSOutput.h
-include/${MOZILLA}/dom/nsIDOMLSParser.h
-include/${MOZILLA}/dom/nsIDOMLSParserFilter.h
-include/${MOZILLA}/dom/nsIDOMLSProgressEvent.h
-include/${MOZILLA}/dom/nsIDOMLSResourceResolver.h
-include/${MOZILLA}/dom/nsIDOMLSSerializer.h
-include/${MOZILLA}/dom/nsIDOMLSSerializerFilter.h
-include/${MOZILLA}/dom/nsIDOMLinkStyle.h
-include/${MOZILLA}/dom/nsIDOMLoadListener.h
-include/${MOZILLA}/dom/nsIDOMLocation.h
-include/${MOZILLA}/dom/nsIDOMMediaList.h
-include/${MOZILLA}/dom/nsIDOMMimeType.h
-include/${MOZILLA}/dom/nsIDOMMimeTypeArray.h
-include/${MOZILLA}/dom/nsIDOMMouseEvent.h
-include/${MOZILLA}/dom/nsIDOMMouseListener.h
-include/${MOZILLA}/dom/nsIDOMMouseMotionListener.h
-include/${MOZILLA}/dom/nsIDOMMutationEvent.h
-include/${MOZILLA}/dom/nsIDOMMutationListener.h
-include/${MOZILLA}/dom/nsIDOMNSDocument.h
-include/${MOZILLA}/dom/nsIDOMNSDocumentStyle.h
-include/${MOZILLA}/dom/nsIDOMNSEditableElement.h
-include/${MOZILLA}/dom/nsIDOMNSEvent.h
-include/${MOZILLA}/dom/nsIDOMNSEventTarget.h
-include/${MOZILLA}/dom/nsIDOMNSFeatureFactory.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLAnchorElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLAreaElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLButtonElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLDocument.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLFormControlList.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLFormElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLFrameElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLHRElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLImageElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLInputElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLOptionCollectn.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLOptionElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLSelectElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLTextAreaElement.h
-include/${MOZILLA}/dom/nsIDOMNSHistory.h
-include/${MOZILLA}/dom/nsIDOMNSLocation.h
-include/${MOZILLA}/dom/nsIDOMNSRange.h
-include/${MOZILLA}/dom/nsIDOMNSUIEvent.h
-include/${MOZILLA}/dom/nsIDOMNSXBLFormControl.h
-include/${MOZILLA}/dom/nsIDOMNSXPathExpression.h
-include/${MOZILLA}/dom/nsIDOMNameList.h
-include/${MOZILLA}/dom/nsIDOMNamedNodeMap.h
-include/${MOZILLA}/dom/nsIDOMNavigator.h
-include/${MOZILLA}/dom/nsIDOMNode.h
-include/${MOZILLA}/dom/nsIDOMNodeFilter.h
-include/${MOZILLA}/dom/nsIDOMNodeIterator.h
-include/${MOZILLA}/dom/nsIDOMNodeList.h
-include/${MOZILLA}/dom/nsIDOMNotation.h
-include/${MOZILLA}/dom/nsIDOMPageTransitionEvent.h
-include/${MOZILLA}/dom/nsIDOMPageTransitionListener.h
-include/${MOZILLA}/dom/nsIDOMPaintListener.h
-include/${MOZILLA}/dom/nsIDOMPkcs11.h
-include/${MOZILLA}/dom/nsIDOMPlugin.h
-include/${MOZILLA}/dom/nsIDOMPluginArray.h
-include/${MOZILLA}/dom/nsIDOMPopupBlockedEvent.h
-include/${MOZILLA}/dom/nsIDOMProcessingInstruction.h
-include/${MOZILLA}/dom/nsIDOMRGBColor.h
-include/${MOZILLA}/dom/nsIDOMRange.h
-include/${MOZILLA}/dom/nsIDOMRangeException.h
-include/${MOZILLA}/dom/nsIDOMRect.h
-include/${MOZILLA}/dom/nsIDOMScreen.h
-include/${MOZILLA}/dom/nsIDOMScriptObjectFactory.h
-include/${MOZILLA}/dom/nsIDOMScrollListener.h
-include/${MOZILLA}/dom/nsIDOMSmartCardEvent.h
-include/${MOZILLA}/dom/nsIDOMStyleSheet.h
-include/${MOZILLA}/dom/nsIDOMStyleSheetList.h
-include/${MOZILLA}/dom/nsIDOMText.h
-include/${MOZILLA}/dom/nsIDOMTextListener.h
-include/${MOZILLA}/dom/nsIDOMTreeWalker.h
-include/${MOZILLA}/dom/nsIDOMUIEvent.h
-include/${MOZILLA}/dom/nsIDOMUIListener.h
-include/${MOZILLA}/dom/nsIDOMUserDataHandler.h
-include/${MOZILLA}/dom/nsIDOMViewCSS.h
-include/${MOZILLA}/dom/nsIDOMWindow.h
-include/${MOZILLA}/dom/nsIDOMWindow2.h
-include/${MOZILLA}/dom/nsIDOMWindowCollection.h
-include/${MOZILLA}/dom/nsIDOMWindowInternal.h
-include/${MOZILLA}/dom/nsIDOMWindowUtils.h
-include/${MOZILLA}/dom/nsIDOMXMLDocument.h
-include/${MOZILLA}/dom/nsIDOMXPathEvaluator.h
-include/${MOZILLA}/dom/nsIDOMXPathException.h
-include/${MOZILLA}/dom/nsIDOMXPathExpression.h
-include/${MOZILLA}/dom/nsIDOMXPathNSResolver.h
-include/${MOZILLA}/dom/nsIDOMXPathNamespace.h
-include/${MOZILLA}/dom/nsIDOMXPathResult.h
-include/${MOZILLA}/dom/nsIDOMXULButtonElement.h
-include/${MOZILLA}/dom/nsIDOMXULCheckboxElement.h
-include/${MOZILLA}/dom/nsIDOMXULCommandDispatcher.h
-include/${MOZILLA}/dom/nsIDOMXULControlElement.h
-include/${MOZILLA}/dom/nsIDOMXULDescriptionElement.h
-include/${MOZILLA}/dom/nsIDOMXULDocument.h
-include/${MOZILLA}/dom/nsIDOMXULElement.h
-include/${MOZILLA}/dom/nsIDOMXULImageElement.h
-include/${MOZILLA}/dom/nsIDOMXULLabelElement.h
-include/${MOZILLA}/dom/nsIDOMXULLabeledControlEl.h
-include/${MOZILLA}/dom/nsIDOMXULListener.h
-include/${MOZILLA}/dom/nsIDOMXULMenuListElement.h
-include/${MOZILLA}/dom/nsIDOMXULMultSelectCntrlEl.h
-include/${MOZILLA}/dom/nsIDOMXULPopupElement.h
-include/${MOZILLA}/dom/nsIDOMXULSelectCntrlEl.h
-include/${MOZILLA}/dom/nsIDOMXULSelectCntrlItemEl.h
-include/${MOZILLA}/dom/nsIDOMXULTextboxElement.h
-include/${MOZILLA}/dom/nsIDOMXULTreeElement.h
-include/${MOZILLA}/dom/nsIEntropyCollector.h
-include/${MOZILLA}/dom/nsIFocusController.h
-include/${MOZILLA}/dom/nsIJSEventListener.h
-include/${MOZILLA}/dom/nsIJSNativeInitializer.h
-include/${MOZILLA}/dom/nsIScriptContext.h
-include/${MOZILLA}/dom/nsIScriptContextOwner.h
-include/${MOZILLA}/dom/nsIScriptExternalNameSet.h
-include/${MOZILLA}/dom/nsIScriptGlobalObject.h
-include/${MOZILLA}/dom/nsIScriptGlobalObjectOwner.h
-include/${MOZILLA}/dom/nsIScriptNameSpaceManager.h
-include/${MOZILLA}/dom/nsIScriptObjectOwner.h
-include/${MOZILLA}/dom/nsIScriptObjectPrincipal.h
-include/${MOZILLA}/dom/nsPIDOMWindow.h
-include/${MOZILLA}/dom/nsPIWindowRoot.h
-include/${MOZILLA}/downloadmanager/nsIDownloadManager.h
-include/${MOZILLA}/downloadmanager/nsIDownloadProgressListener.h
-include/${MOZILLA}/downloads/nsIDownloadManager.h
-include/${MOZILLA}/downloads/nsIDownloadProgressListener.h
-include/${MOZILLA}/downloads/nsIXPInstallManagerUI.h
-include/${MOZILLA}/editor/nsEditorCID.h
-include/${MOZILLA}/editor/nsICiter.h
-include/${MOZILLA}/editor/nsIContentFilter.h
-include/${MOZILLA}/editor/nsIDocumentStateListener.h
-include/${MOZILLA}/editor/nsIEditActionListener.h
-include/${MOZILLA}/editor/nsIEditor.h
-include/${MOZILLA}/editor/nsIEditorIMESupport.h
-include/${MOZILLA}/editor/nsIEditorLogging.h
-include/${MOZILLA}/editor/nsIEditorMailSupport.h
-include/${MOZILLA}/editor/nsIEditorObserver.h
-include/${MOZILLA}/editor/nsIEditorSpellCheck.h
-include/${MOZILLA}/editor/nsIEditorStyleSheets.h
-include/${MOZILLA}/editor/nsIHTMLAbsPosEditor.h
-include/${MOZILLA}/editor/nsIHTMLEditor.h
-include/${MOZILLA}/editor/nsIHTMLInlineTableEditor.h
-include/${MOZILLA}/editor/nsIHTMLObjectResizeListener.h
-include/${MOZILLA}/editor/nsIHTMLObjectResizer.h
-include/${MOZILLA}/editor/nsIPlaintextEditor.h
-include/${MOZILLA}/editor/nsITableEditor.h
-include/${MOZILLA}/editor/nsIURIRefObject.h
-include/${MOZILLA}/editor/nsPIEditorTransaction.h
-include/${MOZILLA}/embed_base/nsEmbedAPI.h
-include/${MOZILLA}/embed_base/nsEmbedCID.h
-include/${MOZILLA}/embed_base/nsIWindowCreator.h
-include/${MOZILLA}/embed_base/nsIWindowCreator2.h
-include/${MOZILLA}/embedcomponents/nsIAppStartupNotifier.h
-include/${MOZILLA}/expat/expat.h
-include/${MOZILLA}/expat/expat_config.h
-include/${MOZILLA}/extensions/nsIExtensionManager.h
-include/${MOZILLA}/exthandler/nsCExternalHandlerService.h
-include/${MOZILLA}/exthandler/nsIExternalHelperAppService.h
-include/${MOZILLA}/exthandler/nsIExternalProtocolService.h
-include/${MOZILLA}/exthandler/nsIHelperAppLauncherDialog.h
-include/${MOZILLA}/exthandler/nsOSHelperAppService.h
-include/${MOZILLA}/filepicker/nsIFileView.h
-include/${MOZILLA}/find/nsIFind.h
-include/${MOZILLA}/find/nsIWebBrowserFind.h
-include/${MOZILLA}/gfx/gfxCore.h
-include/${MOZILLA}/gfx/gfxIFormats.h
-include/${MOZILLA}/gfx/gfxIImageFrame.h
-include/${MOZILLA}/gfx/gfxtypes.h
-include/${MOZILLA}/gfx/nsCUPSShim.h
-include/${MOZILLA}/gfx/nsColor.h
-include/${MOZILLA}/gfx/nsColorNameList.h
-include/${MOZILLA}/gfx/nsColorNames.h
-include/${MOZILLA}/gfx/nsCoord.h
-include/${MOZILLA}/gfx/nsDeviceContext.h
-include/${MOZILLA}/gfx/nsEPSObjectPS.h
-include/${MOZILLA}/gfx/nsFont.h
-include/${MOZILLA}/gfx/nsGfxCIID.h
-include/${MOZILLA}/gfx/nsGfxPSCID.h
-include/${MOZILLA}/gfx/nsGfxXPrintCID.h
-include/${MOZILLA}/gfx/nsIBlender.h
-include/${MOZILLA}/gfx/nsIDeviceContext.h
-include/${MOZILLA}/gfx/nsIDeviceContextPS.h
-include/${MOZILLA}/gfx/nsIDeviceContextSpec.h
-include/${MOZILLA}/gfx/nsIDeviceContextSpecFactory.h
-include/${MOZILLA}/gfx/nsIDeviceContextSpecPS.h
-include/${MOZILLA}/gfx/nsIDeviceContextSpecXPrint.h
-include/${MOZILLA}/gfx/nsIDeviceContextXPrint.h
-include/${MOZILLA}/gfx/nsIDrawingSurface.h
-include/${MOZILLA}/gfx/nsIFontCatalogService.h
-include/${MOZILLA}/gfx/nsIFontEnumerator.h
-include/${MOZILLA}/gfx/nsIFontList.h
-include/${MOZILLA}/gfx/nsIFontMetrics.h
-include/${MOZILLA}/gfx/nsIFreeType2.h
-include/${MOZILLA}/gfx/nsIImage.h
-include/${MOZILLA}/gfx/nsIPrintOptions.h
-include/${MOZILLA}/gfx/nsIPrintSession.h
-include/${MOZILLA}/gfx/nsIPrintSettings.h
-include/${MOZILLA}/gfx/nsIPrintSettingsService.h
-include/${MOZILLA}/gfx/nsIRegion.h
-include/${MOZILLA}/gfx/nsIRenderingContext.h
-include/${MOZILLA}/gfx/nsIScreen.h
-include/${MOZILLA}/gfx/nsIScreenManager.h
-include/${MOZILLA}/gfx/nsIScriptableRegion.h
-include/${MOZILLA}/gfx/nsITheme.h
-include/${MOZILLA}/gfx/nsMargin.h
-include/${MOZILLA}/gfx/nsPSPrinters.h
-include/${MOZILLA}/gfx/nsPaperPS.h
-include/${MOZILLA}/gfx/nsPoint.h
-include/${MOZILLA}/gfx/nsRect.h
-include/${MOZILLA}/gfx/nsRegion.h
-include/${MOZILLA}/gfx/nsSize.h
-include/${MOZILLA}/gfx/nsTempfilePS.h
-include/${MOZILLA}/gfx/nsThemeConstants.h
-include/${MOZILLA}/gfx/nsTransform2D.h
-include/${MOZILLA}/gfx/psSharedCore.h
-include/${MOZILLA}/gtkembedmoz/gtkmozembed.h
-include/${MOZILLA}/gtkembedmoz/gtkmozembed_internal.h
-include/${MOZILLA}/gtkxtbin/gtk2xtbin.h
-include/${MOZILLA}/gtkxtbin/gtkxtbin.h
-include/${MOZILLA}/history/nsIBrowserHistory.h
-include/${MOZILLA}/htmlparser/nsHTMLTagList.h
-include/${MOZILLA}/htmlparser/nsHTMLTags.h
-include/${MOZILLA}/htmlparser/nsHTMLTokens.h
-include/${MOZILLA}/htmlparser/nsIContentSink.h
-include/${MOZILLA}/htmlparser/nsIDTD.h
-include/${MOZILLA}/htmlparser/nsIElementObserver.h
-include/${MOZILLA}/htmlparser/nsIExpatSink.h
-include/${MOZILLA}/htmlparser/nsIFragmentContentSink.h
-include/${MOZILLA}/htmlparser/nsIHTMLContentSink.h
-include/${MOZILLA}/htmlparser/nsIParser.h
-include/${MOZILLA}/htmlparser/nsIParserFilter.h
-include/${MOZILLA}/htmlparser/nsIParserNode.h
-include/${MOZILLA}/htmlparser/nsIParserService.h
-include/${MOZILLA}/htmlparser/nsITokenizer.h
-include/${MOZILLA}/htmlparser/nsParserCIID.h
-include/${MOZILLA}/htmlparser/nsParserDataListener.h
-include/${MOZILLA}/htmlparser/nsScannerString.h
-include/${MOZILLA}/htmlparser/nsToken.h
-include/${MOZILLA}/imglib2/ImageErrors.h
-include/${MOZILLA}/imglib2/ImageLogging.h
-include/${MOZILLA}/imglib2/imgICache.h
-include/${MOZILLA}/imglib2/imgIContainer.h
-include/${MOZILLA}/imglib2/imgIContainerObserver.h
-include/${MOZILLA}/imglib2/imgIDecoder.h
-include/${MOZILLA}/imglib2/imgIDecoderObserver.h
-include/${MOZILLA}/imglib2/imgIEncoder.h
-include/${MOZILLA}/imglib2/imgILoad.h
-include/${MOZILLA}/imglib2/imgILoader.h
-include/${MOZILLA}/imglib2/imgIRequest.h
-include/${MOZILLA}/impComm4xMail/nsComm4xMail.h
-include/${MOZILLA}/impComm4xMail/nsComm4xMailImport.h
-include/${MOZILLA}/impComm4xMail/nsComm4xMailStringBundle.h
-include/${MOZILLA}/impComm4xMail/nsComm4xProfile.h
-include/${MOZILLA}/impComm4xMail/nsIComm4xProfile.h
-include/${MOZILLA}/impText/nsTextImport.h
-include/${MOZILLA}/impText/nsTextStringBundle.h
-include/${MOZILLA}/import/ImportOutFile.h
-include/${MOZILLA}/import/nsIImportABDescriptor.h
-include/${MOZILLA}/import/nsIImportAddressBooks.h
-include/${MOZILLA}/import/nsIImportFieldMap.h
-include/${MOZILLA}/import/nsIImportGeneric.h
-include/${MOZILLA}/import/nsIImportMail.h
-include/${MOZILLA}/import/nsIImportMailboxDescriptor.h
-include/${MOZILLA}/import/nsIImportMimeEncode.h
-include/${MOZILLA}/import/nsIImportModule.h
-include/${MOZILLA}/import/nsIImportService.h
-include/${MOZILLA}/import/nsIImportSettings.h
-include/${MOZILLA}/import/nsImportEncodeScan.h
-include/${MOZILLA}/import/nsImportMimeEncode.h
-include/${MOZILLA}/import/nsImportScanFile.h
-include/${MOZILLA}/import/nsImportService.h
-include/${MOZILLA}/import/nsImportStringBundle.h
-include/${MOZILLA}/import/nsImportTranslator.h
-include/${MOZILLA}/intl/nsIStringBundle.h
-include/${MOZILLA}/intl/nsIStringBundleOverride.h
-include/${MOZILLA}/jar/nsIJAR.h
-include/${MOZILLA}/jar/nsIJARChannel.h
-include/${MOZILLA}/jar/nsIJARProtocolHandler.h
-include/${MOZILLA}/jar/nsIJARURI.h
-include/${MOZILLA}/jar/nsIZipReader.h
-include/${MOZILLA}/jar/zipfile.h
-include/${MOZILLA}/jar/zipstruct.h
-include/${MOZILLA}/jar/zipstub.h
-include/${MOZILLA}/java/bool.h
-include/${MOZILLA}/java/interpreter.h
-include/${MOZILLA}/java/javaString.h
-include/${MOZILLA}/java/javaThreads.h
-include/${MOZILLA}/java/java_lang_String.h
-include/${MOZILLA}/java/jdk_java_lang_String.h
-include/${MOZILLA}/java/jmc.h
-include/${MOZILLA}/java/jni.h
-include/${MOZILLA}/java/jni_md.h
-include/${MOZILLA}/java/jri.h
-include/${MOZILLA}/java/jri_md.h
-include/${MOZILLA}/java/jriext.h
-include/${MOZILLA}/java/jritypes.h
-include/${MOZILLA}/java/nspr_md.h
-include/${MOZILLA}/java/oobj.h
-include/${MOZILLA}/java/sysmacros_md.h
-include/${MOZILLA}/java/tree.h
-include/${MOZILLA}/java/typedefs.h
-include/${MOZILLA}/java/typedefs_md.h
-include/${MOZILLA}/java/zip.h
-include/${MOZILLA}/js/fdlibm.h
-include/${MOZILLA}/js/js.msg
-include/${MOZILLA}/js/jsapi.h
-include/${MOZILLA}/js/jsarena.h
-include/${MOZILLA}/js/jsarray.h
-include/${MOZILLA}/js/jsatom.h
-include/${MOZILLA}/js/jsautocfg.h
-include/${MOZILLA}/js/jsbit.h
-include/${MOZILLA}/js/jsbool.h
-include/${MOZILLA}/js/jsclist.h
-include/${MOZILLA}/js/jscntxt.h
-include/${MOZILLA}/js/jscompat.h
-include/${MOZILLA}/js/jsconfig.h
-include/${MOZILLA}/js/jsdate.h
-include/${MOZILLA}/js/jsdbgapi.h
-include/${MOZILLA}/js/jsdhash.h
-include/${MOZILLA}/js/jsemit.h
-include/${MOZILLA}/js/jsfun.h
-include/${MOZILLA}/js/jsgc.h
-include/${MOZILLA}/js/jshash.h
-include/${MOZILLA}/js/jsinterp.h
-include/${MOZILLA}/js/jslock.h
-include/${MOZILLA}/js/jslong.h
-include/${MOZILLA}/js/jsmath.h
-include/${MOZILLA}/js/jsnum.h
-include/${MOZILLA}/js/jsobj.h
-include/${MOZILLA}/js/jsopcode.h
-include/${MOZILLA}/js/jsopcode.tbl
-include/${MOZILLA}/js/jsosdep.h
-include/${MOZILLA}/js/jsotypes.h
-include/${MOZILLA}/js/jsparse.h
-include/${MOZILLA}/js/jsprf.h
-include/${MOZILLA}/js/jsprvtd.h
-include/${MOZILLA}/js/jspubtd.h
-include/${MOZILLA}/js/jsregexp.h
-include/${MOZILLA}/js/jsscan.h
-include/${MOZILLA}/js/jsscope.h
-include/${MOZILLA}/js/jsscript.h
-include/${MOZILLA}/js/jsstddef.h
-include/${MOZILLA}/js/jsstr.h
-include/${MOZILLA}/js/jstypes.h
-include/${MOZILLA}/js/jsutil.h
-include/${MOZILLA}/js/jsxdrapi.h
-include/${MOZILLA}/js/jsxml.h
-include/${MOZILLA}/jsconsole/nsIJSConsoleService.h
-include/${MOZILLA}/jsdebug/jsdIDebuggerService.h
-include/${MOZILLA}/jsdebug/jsdebug.h
-include/${MOZILLA}/jsurl/nsJSProtocolHandler.h
-include/${MOZILLA}/layout/nsBidi.h
-include/${MOZILLA}/layout/nsBidiFrames.h
-include/${MOZILLA}/layout/nsBidiPresUtils.h
-include/${MOZILLA}/layout/nsBidiUtils.h
-include/${MOZILLA}/layout/nsCSSAnonBoxList.h
-include/${MOZILLA}/layout/nsCSSAnonBoxes.h
-include/${MOZILLA}/layout/nsCSSFrameConstructor.h
-include/${MOZILLA}/layout/nsCSSKeywordList.h
-include/${MOZILLA}/layout/nsCSSKeywords.h
-include/${MOZILLA}/layout/nsCSSPropList.h
-include/${MOZILLA}/layout/nsCSSProperty.h
-include/${MOZILLA}/layout/nsCSSProps.h
-include/${MOZILLA}/layout/nsCSSPseudoClassList.h
-include/${MOZILLA}/layout/nsCSSPseudoClasses.h
-include/${MOZILLA}/layout/nsCSSPseudoElementList.h
-include/${MOZILLA}/layout/nsCSSPseudoElements.h
-include/${MOZILLA}/layout/nsCSSStruct.h
-include/${MOZILLA}/layout/nsCSSValue.h
-include/${MOZILLA}/layout/nsChangeHint.h
-include/${MOZILLA}/layout/nsCompatibility.h
-include/${MOZILLA}/layout/nsContentDLF.h
-include/${MOZILLA}/layout/nsDOMCSSDeclaration.h
-include/${MOZILLA}/layout/nsFrameList.h
-include/${MOZILLA}/layout/nsFrameManager.h
-include/${MOZILLA}/layout/nsFrameManagerBase.h
-include/${MOZILLA}/layout/nsFrameTraversal.h
-include/${MOZILLA}/layout/nsGrid.h
-include/${MOZILLA}/layout/nsGridCell.h
-include/${MOZILLA}/layout/nsGridLayout2.h
-include/${MOZILLA}/layout/nsGridRow.h
-include/${MOZILLA}/layout/nsGridRowGroupLayout.h
-include/${MOZILLA}/layout/nsGridRowLayout.h
-include/${MOZILLA}/layout/nsGridRowLeafFrame.h
-include/${MOZILLA}/layout/nsGridRowLeafLayout.h
-include/${MOZILLA}/layout/nsHTMLParts.h
-include/${MOZILLA}/layout/nsHTMLReflowMetrics.h
-include/${MOZILLA}/layout/nsHTMLReflowState.h
-include/${MOZILLA}/layout/nsIAnonymousContentCreator.h
-include/${MOZILLA}/layout/nsIBoxLayoutManager.h
-include/${MOZILLA}/layout/nsIBoxObject.h
-include/${MOZILLA}/layout/nsIBoxPaintManager.h
-include/${MOZILLA}/layout/nsIBrowserBoxObject.h
-include/${MOZILLA}/layout/nsICSSDeclaration.h
-include/${MOZILLA}/layout/nsICSSGroupRule.h
-include/${MOZILLA}/layout/nsICSSImportRule.h
-include/${MOZILLA}/layout/nsICSSLoader.h
-include/${MOZILLA}/layout/nsICSSLoaderObserver.h
-include/${MOZILLA}/layout/nsICSSNameSpaceRule.h
-include/${MOZILLA}/layout/nsICSSOMFactory.h
-include/${MOZILLA}/layout/nsICSSParser.h
-include/${MOZILLA}/layout/nsICSSPseudoComparator.h
-include/${MOZILLA}/layout/nsICSSRule.h
-include/${MOZILLA}/layout/nsICSSStyleRule.h
-include/${MOZILLA}/layout/nsICSSStyleRuleDOMWrapper.h
-include/${MOZILLA}/layout/nsICSSStyleSheet.h
-include/${MOZILLA}/layout/nsICanvasFrame.h
-include/${MOZILLA}/layout/nsICaret.h
-include/${MOZILLA}/layout/nsICheckboxControlFrame.h
-include/${MOZILLA}/layout/nsIChromeEventHandler.h
-include/${MOZILLA}/layout/nsIComboboxControlFrame.h
-include/${MOZILLA}/layout/nsIComputedDOMStyle.h
-include/${MOZILLA}/layout/nsIDocumentViewer.h
-include/${MOZILLA}/layout/nsIEditorBoxObject.h
-include/${MOZILLA}/layout/nsIFormControlFrame.h
-include/${MOZILLA}/layout/nsIFrame.h
-include/${MOZILLA}/layout/nsIFrameDebug.h
-include/${MOZILLA}/layout/nsIFrameFrame.h
-include/${MOZILLA}/layout/nsIFrameSelection.h
-include/${MOZILLA}/layout/nsIFrameTraversal.h
-include/${MOZILLA}/layout/nsIFrameUtil.h
-include/${MOZILLA}/layout/nsIGridPart.h
-include/${MOZILLA}/layout/nsIHTMLCSSStyleSheet.h
-include/${MOZILLA}/layout/nsIIFrameBoxObject.h
-include/${MOZILLA}/layout/nsIImageControlFrame.h
-include/${MOZILLA}/layout/nsIImageFrame.h
-include/${MOZILLA}/layout/nsIImageMap.h
-include/${MOZILLA}/layout/nsIInspectorCSSUtils.h
-include/${MOZILLA}/layout/nsILayoutDebugger.h
-include/${MOZILLA}/layout/nsILayoutHistoryState.h
-include/${MOZILLA}/layout/nsILineIterator.h
-include/${MOZILLA}/layout/nsIListBoxObject.h
-include/${MOZILLA}/layout/nsIListControlFrame.h
-include/${MOZILLA}/layout/nsIMenuBoxObject.h
-include/${MOZILLA}/layout/nsIMenuFrame.h
-include/${MOZILLA}/layout/nsIMenuParent.h
-include/${MOZILLA}/layout/nsIObjectFrame.h
-include/${MOZILLA}/layout/nsIPageSequenceFrame.h
-include/${MOZILLA}/layout/nsIPercentHeightObserver.h
-include/${MOZILLA}/layout/nsIPopupBoxObject.h
-include/${MOZILLA}/layout/nsIPopupSetFrame.h
-include/${MOZILLA}/layout/nsIPresShell.h
-include/${MOZILLA}/layout/nsIPrintProgress.h
-include/${MOZILLA}/layout/nsIPrintProgressParams.h
-include/${MOZILLA}/layout/nsIPrintStatusFeedback.h
-include/${MOZILLA}/layout/nsIRadioControlFrame.h
-include/${MOZILLA}/layout/nsIReflowCallback.h
-include/${MOZILLA}/layout/nsIScrollBoxObject.h
-include/${MOZILLA}/layout/nsIScrollableFrame.h
-include/${MOZILLA}/layout/nsIScrollableViewProvider.h
-include/${MOZILLA}/layout/nsIScrollbarMediator.h
-include/${MOZILLA}/layout/nsISelectControlFrame.h
-include/${MOZILLA}/layout/nsISelectionImageService.h
-include/${MOZILLA}/layout/nsIStatefulFrame.h
-include/${MOZILLA}/layout/nsIStyleRule.h
-include/${MOZILLA}/layout/nsIStyleRuleProcessor.h
-include/${MOZILLA}/layout/nsIStyleRuleSupplier.h
-include/${MOZILLA}/layout/nsIStyleSheet.h
-include/${MOZILLA}/layout/nsIStyleSheetService.h
-include/${MOZILLA}/layout/nsITableCellLayout.h
-include/${MOZILLA}/layout/nsITableLayout.h
-include/${MOZILLA}/layout/nsITextControlFrame.h
-include/${MOZILLA}/layout/nsITreeBoxObject.h
-include/${MOZILLA}/layout/nsITreeColumns.h
-include/${MOZILLA}/layout/nsITreeContentView.h
-include/${MOZILLA}/layout/nsITreeSelection.h
-include/${MOZILLA}/layout/nsITreeView.h
-include/${MOZILLA}/layout/nsLayoutAtomList.h
-include/${MOZILLA}/layout/nsLayoutAtoms.h
-include/${MOZILLA}/layout/nsLayoutCID.h
-include/${MOZILLA}/layout/nsLayoutErrors.h
-include/${MOZILLA}/layout/nsLayoutStylesheetCache.h
-include/${MOZILLA}/layout/nsLayoutUtils.h
-include/${MOZILLA}/layout/nsPIBoxObject.h
-include/${MOZILLA}/layout/nsPresContext.h
-include/${MOZILLA}/layout/nsPresState.h
-include/${MOZILLA}/layout/nsReflowType.h
-include/${MOZILLA}/layout/nsRuleData.h
-include/${MOZILLA}/layout/nsRuleNode.h
-include/${MOZILLA}/layout/nsRuleWalker.h
-include/${MOZILLA}/layout/nsStyleChangeList.h
-include/${MOZILLA}/layout/nsStyleConsts.h
-include/${MOZILLA}/layout/nsStyleContext.h
-include/${MOZILLA}/layout/nsStyleCoord.h
-include/${MOZILLA}/layout/nsStyleSet.h
-include/${MOZILLA}/layout/nsStyleStruct.h
-include/${MOZILLA}/layout/nsStyleStructList.h
-include/${MOZILLA}/layout/nsStyleUtil.h
-include/${MOZILLA}/layout/nsTextTransformer.h
-include/${MOZILLA}/layout/nsTreeColFrame.h
-include/${MOZILLA}/layout/nsTreeUtils.h
-include/${MOZILLA}/libbz2/bzlib.h
-include/${MOZILLA}/libmar/mar.h
-include/${MOZILLA}/libreg/NSReg.h
-include/${MOZILLA}/libreg/VerReg.h
-include/${MOZILLA}/locale/nsCollation.h
-include/${MOZILLA}/locale/nsCollationCID.h
-include/${MOZILLA}/locale/nsDateTimeFormatCID.h
-include/${MOZILLA}/locale/nsICollation.h
-include/${MOZILLA}/locale/nsIDateTimeFormat.h
-include/${MOZILLA}/locale/nsIFontPackageHandler.h
-include/${MOZILLA}/locale/nsIFontPackageProxy.h
-include/${MOZILLA}/locale/nsIFontPackageService.h
-include/${MOZILLA}/locale/nsILanguageAtomService.h
-include/${MOZILLA}/locale/nsILocale.h
-include/${MOZILLA}/locale/nsILocaleService.h
-include/${MOZILLA}/locale/nsIMacLocale.h
-include/${MOZILLA}/locale/nsIOS2Locale.h
-include/${MOZILLA}/locale/nsIPosixLocale.h
-include/${MOZILLA}/locale/nsIScriptableDateFormat.h
-include/${MOZILLA}/locale/nsIWin32Locale.h
-include/${MOZILLA}/locale/nsLocaleCID.h
-include/${MOZILLA}/lwbrk/nsIBinarySearchIterator.h
-include/${MOZILLA}/lwbrk/nsIBreakState.h
-include/${MOZILLA}/lwbrk/nsILineBreaker.h
-include/${MOZILLA}/lwbrk/nsILineBreakerFactory.h
-include/${MOZILLA}/lwbrk/nsILinearIterator.h
-include/${MOZILLA}/lwbrk/nsISemanticUnitScanner.h
-include/${MOZILLA}/lwbrk/nsIWordBreaker.h
-include/${MOZILLA}/lwbrk/nsIWordBreakerFactory.h
-include/${MOZILLA}/lwbrk/nsLWBrkCIID.h
-include/${MOZILLA}/mailnews/MailNewsTypes.h
-include/${MOZILLA}/mailnews/MailNewsTypes2.h
-include/${MOZILLA}/mailprofilemigration/nsIMailProfileMigrator.h
-include/${MOZILLA}/mailprofilemigration/nsMailMigrationCID.h
-include/${MOZILLA}/mailview/nsIMsgMailView.h
-include/${MOZILLA}/mailview/nsIMsgMailViewList.h
-include/${MOZILLA}/mailview/nsMsgMailViewList.h
-include/${MOZILLA}/mailview/nsMsgMailViewsCID.h
-include/${MOZILLA}/mime/comi18n.h
-include/${MOZILLA}/mime/mimecont.h
-include/${MOZILLA}/mime/mimecth.h
-include/${MOZILLA}/mime/mimehdrs.h
-include/${MOZILLA}/mime/mimei.h
-include/${MOZILLA}/mime/mimeleaf.h
-include/${MOZILLA}/mime/mimemsig.h
-include/${MOZILLA}/mime/mimemult.h
-include/${MOZILLA}/mime/mimeobj.h
-include/${MOZILLA}/mime/mimepbuf.h
-include/${MOZILLA}/mime/mimetext.h
-include/${MOZILLA}/mime/modlmime.h
-include/${MOZILLA}/mime/modmimee.h
-include/${MOZILLA}/mime/nsIMimeContentTypeHandler.h
-include/${MOZILLA}/mime/nsIMimeConverter.h
-include/${MOZILLA}/mime/nsIMimeEmitter.h
-include/${MOZILLA}/mime/nsIMimeHeaders.h
-include/${MOZILLA}/mime/nsIMimeMiscStatus.h
-include/${MOZILLA}/mime/nsIMimeObjectClassAccess.h
-include/${MOZILLA}/mime/nsIMimeStreamConverter.h
-include/${MOZILLA}/mime/nsIMsgHeaderParser.h
-include/${MOZILLA}/mime/nsISimpleMimeConverter.h
-include/${MOZILLA}/mime/nsMailHeaders.h
-include/${MOZILLA}/mime/nsMimeContentTypeHandler.h
-include/${MOZILLA}/mime/nsMimeConverter.h
-include/${MOZILLA}/mime/nsMimeHeaders.h
-include/${MOZILLA}/mime/nsMimeObjectClassAccess.h
-include/${MOZILLA}/mime/nsMimeStringResources.h
-include/${MOZILLA}/mime/nsMsgHeaderParser.h
-include/${MOZILLA}/mime/nsMsgMimeCID.h
-include/${MOZILLA}/mime/nsStreamConverter.h
-include/${MOZILLA}/mimeemitter/nsEmitterUtils.h
-include/${MOZILLA}/mimeemitter/nsMimeBaseEmitter.h
-include/${MOZILLA}/mimeemitter/nsMimeEmitterCID.h
-include/${MOZILLA}/mimeemitter/nsMimeHtmlEmitter.h
-include/${MOZILLA}/mimeemitter/nsMimePlainEmitter.h
-include/${MOZILLA}/mimeemitter/nsMimeRawEmitter.h
-include/${MOZILLA}/mimeemitter/nsMimeRebuffer.h
-include/${MOZILLA}/mimeemitter/nsMimeXmlEmitter.h
-include/${MOZILLA}/mimetype/nsIMIMEHeaderParam.h
-include/${MOZILLA}/mimetype/nsIMIMEInfo.h
-include/${MOZILLA}/mimetype/nsIMIMEService.h
-include/${MOZILLA}/mimetype/nsMimeTypes.h
-include/${MOZILLA}/mork/mdb.h
-include/${MOZILLA}/mork/nsIMdbFactoryFactory.h
-include/${MOZILLA}/mork/nsMorkCID.h
-include/${MOZILLA}/mozilla-config.h
-include/${MOZILLA}/mozldap/nsILDAPBERElement.h
-include/${MOZILLA}/mozldap/nsILDAPBERValue.h
-include/${MOZILLA}/mozldap/nsILDAPConnection.h
-include/${MOZILLA}/mozldap/nsILDAPControl.h
-include/${MOZILLA}/mozldap/nsILDAPErrors.h
-include/${MOZILLA}/mozldap/nsILDAPMessage.h
-include/${MOZILLA}/mozldap/nsILDAPMessageListener.h
-include/${MOZILLA}/mozldap/nsILDAPOperation.h
-include/${MOZILLA}/mozldap/nsILDAPServer.h
-include/${MOZILLA}/mozldap/nsILDAPService.h
-include/${MOZILLA}/mozldap/nsILDAPURL.h
-include/${MOZILLA}/mozldap/nsLDAP.h
-include/${MOZILLA}/msgbase/msgCore.h
-include/${MOZILLA}/msgbase/nsCopyMessageStreamListener.h
-include/${MOZILLA}/msgbase/nsICopyMessageListener.h
-include/${MOZILLA}/msgbase/nsICopyMsgStreamListener.h
-include/${MOZILLA}/msgbase/nsIFolderListener.h
-include/${MOZILLA}/msgbase/nsIIncomingServerListener.h
-include/${MOZILLA}/msgbase/nsIMapiRegistry.h
-include/${MOZILLA}/msgbase/nsIMessenger.h
-include/${MOZILLA}/msgbase/nsIMessengerMigrator.h
-include/${MOZILLA}/msgbase/nsIMessengerOSIntegration.h
-include/${MOZILLA}/msgbase/nsIMessengerWindowService.h
-include/${MOZILLA}/msgbase/nsIMsgAccount.h
-include/${MOZILLA}/msgbase/nsIMsgAccountManager.h
-include/${MOZILLA}/msgbase/nsIMsgBiffManager.h
-include/${MOZILLA}/msgbase/nsIMsgCopyService.h
-include/${MOZILLA}/msgbase/nsIMsgCopyServiceListener.h
-include/${MOZILLA}/msgbase/nsIMsgDBView.h
-include/${MOZILLA}/msgbase/nsIMsgFilter.h
-include/${MOZILLA}/msgbase/nsIMsgFilterHitNotify.h
-include/${MOZILLA}/msgbase/nsIMsgFilterList.h
-include/${MOZILLA}/msgbase/nsIMsgFilterPlugin.h
-include/${MOZILLA}/msgbase/nsIMsgFilterService.h
-include/${MOZILLA}/msgbase/nsIMsgFolder.h
-include/${MOZILLA}/msgbase/nsIMsgFolderCache.h
-include/${MOZILLA}/msgbase/nsIMsgFolderCacheElement.h
-include/${MOZILLA}/msgbase/nsIMsgFolderCompactor.h
-include/${MOZILLA}/msgbase/nsIMsgGroupRecord.h
-include/${MOZILLA}/msgbase/nsIMsgHdr.h
-include/${MOZILLA}/msgbase/nsIMsgHost.h
-include/${MOZILLA}/msgbase/nsIMsgIdentity.h
-include/${MOZILLA}/msgbase/nsIMsgIncomingServer.h
-include/${MOZILLA}/msgbase/nsIMsgMailNewsUrl.h
-include/${MOZILLA}/msgbase/nsIMsgMailSession.h
-include/${MOZILLA}/msgbase/nsIMsgMdnGenerator.h
-include/${MOZILLA}/msgbase/nsIMsgMessageService.h
-include/${MOZILLA}/msgbase/nsIMsgOfflineManager.h
-include/${MOZILLA}/msgbase/nsIMsgPrintEngine.h
-include/${MOZILLA}/msgbase/nsIMsgProgress.h
-include/${MOZILLA}/msgbase/nsIMsgProtocolInfo.h
-include/${MOZILLA}/msgbase/nsIMsgPurgeService.h
-include/${MOZILLA}/msgbase/nsIMsgRDFDataSource.h
-include/${MOZILLA}/msgbase/nsIMsgSearchAdapter.h
-include/${MOZILLA}/msgbase/nsIMsgSearchNotify.h
-include/${MOZILLA}/msgbase/nsIMsgSearchScopeTerm.h
-include/${MOZILLA}/msgbase/nsIMsgSearchSession.h
-include/${MOZILLA}/msgbase/nsIMsgSearchTerm.h
-include/${MOZILLA}/msgbase/nsIMsgSearchValidityManager.h
-include/${MOZILLA}/msgbase/nsIMsgSearchValidityTable.h
-include/${MOZILLA}/msgbase/nsIMsgSearchValue.h
-include/${MOZILLA}/msgbase/nsIMsgSignature.h
-include/${MOZILLA}/msgbase/nsIMsgStatusFeedback.h
-include/${MOZILLA}/msgbase/nsIMsgStringService.h
-include/${MOZILLA}/msgbase/nsIMsgThread.h
-include/${MOZILLA}/msgbase/nsIMsgWindow.h
-include/${MOZILLA}/msgbase/nsISpamSettings.h
-include/${MOZILLA}/msgbase/nsISubscribableServer.h
-include/${MOZILLA}/msgbase/nsIUrlListener.h
-include/${MOZILLA}/msgbase/nsIUrlListenerManager.h
-include/${MOZILLA}/msgbase/nsMessenger.h
-include/${MOZILLA}/msgbase/nsMessengerBootstrap.h
-include/${MOZILLA}/msgbase/nsMessengerContentHandler.h
-include/${MOZILLA}/msgbase/nsMessengerMigrator.h
-include/${MOZILLA}/msgbase/nsMsgAccount.h
-include/${MOZILLA}/msgbase/nsMsgAccountManager.h
-include/${MOZILLA}/msgbase/nsMsgAccountManagerDS.h
-include/${MOZILLA}/msgbase/nsMsgBaseCID.h
-include/${MOZILLA}/msgbase/nsMsgBiffManager.h
-include/${MOZILLA}/msgbase/nsMsgBodyHandler.h
-include/${MOZILLA}/msgbase/nsMsgContentPolicy.h
-include/${MOZILLA}/msgbase/nsMsgCopyService.h
-include/${MOZILLA}/msgbase/nsMsgFilterCore.h
-include/${MOZILLA}/msgbase/nsMsgFilterDataSource.h
-include/${MOZILLA}/msgbase/nsMsgFilterDelegateFactory.h
-include/${MOZILLA}/msgbase/nsMsgFilterService.h
-include/${MOZILLA}/msgbase/nsMsgFolderCache.h
-include/${MOZILLA}/msgbase/nsMsgFolderDataSource.h
-include/${MOZILLA}/msgbase/nsMsgFolderFlags.h
-include/${MOZILLA}/msgbase/nsMsgHeaderMasks.h
-include/${MOZILLA}/msgbase/nsMsgLocalFolderHdrs.h
-include/${MOZILLA}/msgbase/nsMsgMailSession.h
-include/${MOZILLA}/msgbase/nsMsgMessageFlags.h
-include/${MOZILLA}/msgbase/nsMsgPrintEngine.h
-include/${MOZILLA}/msgbase/nsMsgProgress.h
-include/${MOZILLA}/msgbase/nsMsgPurgeService.h
-include/${MOZILLA}/msgbase/nsMsgRDFDataSource.h
-include/${MOZILLA}/msgbase/nsMsgRDFUtils.h
-include/${MOZILLA}/msgbase/nsMsgResultElement.h
-include/${MOZILLA}/msgbase/nsMsgSearchAdapter.h
-include/${MOZILLA}/msgbase/nsMsgSearchArray.h
-include/${MOZILLA}/msgbase/nsMsgSearchBoolExpression.h
-include/${MOZILLA}/msgbase/nsMsgSearchCore.h
-include/${MOZILLA}/msgbase/nsMsgSearchScopeTerm.h
-include/${MOZILLA}/msgbase/nsMsgSearchSession.h
-include/${MOZILLA}/msgbase/nsMsgSearchTerm.h
-include/${MOZILLA}/msgbase/nsMsgServiceProvider.h
-include/${MOZILLA}/msgbase/nsMsgStatusFeedback.h
-include/${MOZILLA}/msgbase/nsMsgWindow.h
-include/${MOZILLA}/msgbase/nsStatusBarBiffManager.h
-include/${MOZILLA}/msgbase/nsSubscribableServer.h
-include/${MOZILLA}/msgbase/nsSubscribeDataSource.h
-include/${MOZILLA}/msgbase/nsUrlListenerManager.h
-include/${MOZILLA}/msgbaseutil/nsAdapterEnumerator.h
-include/${MOZILLA}/msgbaseutil/nsImapMoveCoalescer.h
-include/${MOZILLA}/msgbaseutil/nsLocalFolderSummarySpec.h
-include/${MOZILLA}/msgbaseutil/nsMsgDBFolder.h
-include/${MOZILLA}/msgbaseutil/nsMsgGroupRecord.h
-include/${MOZILLA}/msgbaseutil/nsMsgI18N.h
-include/${MOZILLA}/msgbaseutil/nsMsgIdentity.h
-include/${MOZILLA}/msgbaseutil/nsMsgIncomingServer.h
-include/${MOZILLA}/msgbaseutil/nsMsgKeyArray.h
-include/${MOZILLA}/msgbaseutil/nsMsgKeySet.h
-include/${MOZILLA}/msgbaseutil/nsMsgLineBuffer.h
-include/${MOZILLA}/msgbaseutil/nsMsgMailNewsUrl.h
-include/${MOZILLA}/msgbaseutil/nsMsgProtocol.h
-include/${MOZILLA}/msgbaseutil/nsMsgTxn.h
-include/${MOZILLA}/msgbaseutil/nsMsgUtils.h
-include/${MOZILLA}/msgbaseutil/nsNewsSummarySpec.h
-include/${MOZILLA}/msgbaseutil/nsUInt32Array.h
-include/${MOZILLA}/msgbaseutil/nsUint8Array.h
-include/${MOZILLA}/msgcompose/nsIMsgAttachment.h
-include/${MOZILLA}/msgcompose/nsIMsgCompFields.h
-include/${MOZILLA}/msgcompose/nsIMsgCompUtils.h
-include/${MOZILLA}/msgcompose/nsIMsgCompose.h
-include/${MOZILLA}/msgcompose/nsIMsgComposeParams.h
-include/${MOZILLA}/msgcompose/nsIMsgComposeProgressParams.h
-include/${MOZILLA}/msgcompose/nsIMsgComposeSecure.h
-include/${MOZILLA}/msgcompose/nsIMsgComposeService.h
-include/${MOZILLA}/msgcompose/nsIMsgDraft.h
-include/${MOZILLA}/msgcompose/nsIMsgQuote.h
-include/${MOZILLA}/msgcompose/nsIMsgRecipientArray.h
-include/${MOZILLA}/msgcompose/nsIMsgSend.h
-include/${MOZILLA}/msgcompose/nsIMsgSendLater.h
-include/${MOZILLA}/msgcompose/nsIMsgSendLaterListener.h
-include/${MOZILLA}/msgcompose/nsIMsgSendListener.h
-include/${MOZILLA}/msgcompose/nsIMsgSendReport.h
-include/${MOZILLA}/msgcompose/nsISmtpServer.h
-include/${MOZILLA}/msgcompose/nsISmtpService.h
-include/${MOZILLA}/msgcompose/nsISmtpUrl.h
-include/${MOZILLA}/msgcompose/nsIURLFetcher.h
-include/${MOZILLA}/msgcompose/nsMsgAttachment.h
-include/${MOZILLA}/msgcompose/nsMsgAttachmentHandler.h
-include/${MOZILLA}/msgcompose/nsMsgCompCID.h
-include/${MOZILLA}/msgcompose/nsMsgCompFields.h
-include/${MOZILLA}/msgcompose/nsMsgCompUtils.h
-include/${MOZILLA}/msgcompose/nsMsgCompose.h
-include/${MOZILLA}/msgcompose/nsMsgComposeContentHandler.h
-include/${MOZILLA}/msgcompose/nsMsgComposeParams.h
-include/${MOZILLA}/msgcompose/nsMsgComposeProgressParams.h
-include/${MOZILLA}/msgcompose/nsMsgComposeService.h
-include/${MOZILLA}/msgcompose/nsMsgComposeStringBundle.h
-include/${MOZILLA}/msgcompose/nsMsgCopy.h
-include/${MOZILLA}/msgcompose/nsMsgCreate.h
-include/${MOZILLA}/msgcompose/nsMsgDeliveryListener.h
-include/${MOZILLA}/msgcompose/nsMsgEncoders.h
-include/${MOZILLA}/msgcompose/nsMsgPrompts.h
-include/${MOZILLA}/msgcompose/nsMsgQuote.h
-include/${MOZILLA}/msgcompose/nsMsgRecipientArray.h
-include/${MOZILLA}/msgcompose/nsMsgSend.h
-include/${MOZILLA}/msgcompose/nsMsgSendLater.h
-include/${MOZILLA}/msgcompose/nsMsgSendReport.h
-include/${MOZILLA}/msgcompose/nsMsgSimulateError.h
-include/${MOZILLA}/msgcompose/nsSmtpDataSource.h
-include/${MOZILLA}/msgcompose/nsSmtpDelegateFactory.h
-include/${MOZILLA}/msgcompose/nsSmtpProtocol.h
-include/${MOZILLA}/msgcompose/nsSmtpServer.h
-include/${MOZILLA}/msgcompose/nsSmtpService.h
-include/${MOZILLA}/msgcompose/nsSmtpUrl.h
-include/${MOZILLA}/msgcompose/nsURLFetcher.h
-include/${MOZILLA}/msgdb/nsDBFolderInfo.h
-include/${MOZILLA}/msgdb/nsIDBChangeAnnouncer.h
-include/${MOZILLA}/msgdb/nsIDBChangeListener.h
-include/${MOZILLA}/msgdb/nsIDBFolderInfo.h
-include/${MOZILLA}/msgdb/nsIMsgDatabase.h
-include/${MOZILLA}/msgdb/nsIMsgOfflineImapOperation.h
-include/${MOZILLA}/msgdb/nsINewsDatabase.h
-include/${MOZILLA}/msgdb/nsImapMailDatabase.h
-include/${MOZILLA}/msgdb/nsMailDatabase.h
-include/${MOZILLA}/msgdb/nsMsgDBCID.h
-include/${MOZILLA}/msgdb/nsMsgDatabase.h
-include/${MOZILLA}/msgdb/nsMsgHdr.h
-include/${MOZILLA}/msgdb/nsMsgThread.h
-include/${MOZILLA}/msgdb/nsNewsDatabase.h
-include/${MOZILLA}/msgimap/nsIIMAPHostSessionList.h
-include/${MOZILLA}/msgimap/nsIImapExtensionSink.h
-include/${MOZILLA}/msgimap/nsIImapFlagAndUidState.h
-include/${MOZILLA}/msgimap/nsIImapHeaderXferInfo.h
-include/${MOZILLA}/msgimap/nsIImapIncomingServer.h
-include/${MOZILLA}/msgimap/nsIImapMailFolderSink.h
-include/${MOZILLA}/msgimap/nsIImapMessageSink.h
-include/${MOZILLA}/msgimap/nsIImapMiscellaneousSink.h
-include/${MOZILLA}/msgimap/nsIImapMockChannel.h
-include/${MOZILLA}/msgimap/nsIImapProtocol.h
-include/${MOZILLA}/msgimap/nsIImapServerSink.h
-include/${MOZILLA}/msgimap/nsIImapService.h
-include/${MOZILLA}/msgimap/nsIImapUrl.h
-include/${MOZILLA}/msgimap/nsIMAPBodyShell.h
-include/${MOZILLA}/msgimap/nsIMAPGenericParser.h
-include/${MOZILLA}/msgimap/nsIMAPHostSessionList.h
-include/${MOZILLA}/msgimap/nsIMAPNamespace.h
-include/${MOZILLA}/msgimap/nsIMailboxSpec.h
-include/${MOZILLA}/msgimap/nsIMsgImapMailFolder.h
-include/${MOZILLA}/msgimap/nsIMsgLogonRedirector.h
-include/${MOZILLA}/msgimap/nsImapCore.h
-include/${MOZILLA}/msgimap/nsImapFlagAndUidState.h
-include/${MOZILLA}/msgimap/nsImapIncomingServer.h
-include/${MOZILLA}/msgimap/nsImapMailFolder.h
-include/${MOZILLA}/msgimap/nsImapProtocol.h
-include/${MOZILLA}/msgimap/nsImapProxyEvent.h
-include/${MOZILLA}/msgimap/nsImapSearchResults.h
-include/${MOZILLA}/msgimap/nsImapServerResponseParser.h
-include/${MOZILLA}/msgimap/nsImapService.h
-include/${MOZILLA}/msgimap/nsImapUrl.h
-include/${MOZILLA}/msgimap/nsImapUtils.h
-include/${MOZILLA}/msgimap/nsMsgImapCID.h
-include/${MOZILLA}/msglocal/nsILocalMailIncomingServer.h
-include/${MOZILLA}/msglocal/nsIMailboxService.h
-include/${MOZILLA}/msglocal/nsIMailboxUrl.h
-include/${MOZILLA}/msglocal/nsIMovemailIncomingServer.h
-include/${MOZILLA}/msglocal/nsIMovemailService.h
-include/${MOZILLA}/msglocal/nsIMsgLocalMailFolder.h
-include/${MOZILLA}/msglocal/nsIMsgParseMailMsgState.h
-include/${MOZILLA}/msglocal/nsINewsBlogFeedDownloader.h
-include/${MOZILLA}/msglocal/nsINoIncomingServer.h
-include/${MOZILLA}/msglocal/nsINoneService.h
-include/${MOZILLA}/msglocal/nsIPop3IncomingServer.h
-include/${MOZILLA}/msglocal/nsIPop3Protocol.h
-include/${MOZILLA}/msglocal/nsIPop3Service.h
-include/${MOZILLA}/msglocal/nsIPop3Sink.h
-include/${MOZILLA}/msglocal/nsIPop3URL.h
-include/${MOZILLA}/msglocal/nsIRssIncomingServer.h
-include/${MOZILLA}/msglocal/nsIRssService.h
-include/${MOZILLA}/msglocal/nsLocalMailFolder.h
-include/${MOZILLA}/msglocal/nsLocalStringBundle.h
-include/${MOZILLA}/msglocal/nsMailboxProtocol.h
-include/${MOZILLA}/msglocal/nsMailboxService.h
-include/${MOZILLA}/msglocal/nsMailboxUrl.h
-include/${MOZILLA}/msglocal/nsMovemailIncomingServer.h
-include/${MOZILLA}/msglocal/nsMovemailService.h
-include/${MOZILLA}/msglocal/nsMsgLocalCID.h
-include/${MOZILLA}/msglocal/nsNoIncomingServer.h
-include/${MOZILLA}/msglocal/nsNoneService.h
-include/${MOZILLA}/msglocal/nsParseMailbox.h
-include/${MOZILLA}/msglocal/nsPop3IncomingServer.h
-include/${MOZILLA}/msglocal/nsPop3Protocol.h
-include/${MOZILLA}/msglocal/nsPop3Service.h
-include/${MOZILLA}/msglocal/nsPop3Sink.h
-include/${MOZILLA}/msglocal/nsPop3URL.h
-include/${MOZILLA}/msglocal/nsRssIncomingServer.h
-include/${MOZILLA}/msglocal/nsRssService.h
-include/${MOZILLA}/msgmdn/nsMsgMdnCID.h
-include/${MOZILLA}/msgmdn/nsMsgMdnGenerator.h
-include/${MOZILLA}/msgnews/nntpCore.h
-include/${MOZILLA}/msgnews/nsIMsgNewsFolder.h
-include/${MOZILLA}/msgnews/nsIMsgOfflineNewsState.h
-include/${MOZILLA}/msgnews/nsINNTPArticleList.h
-include/${MOZILLA}/msgnews/nsINNTPNewsgroupList.h
-include/${MOZILLA}/msgnews/nsINNTPNewsgroupPost.h
-include/${MOZILLA}/msgnews/nsINNTPProtocol.h
-include/${MOZILLA}/msgnews/nsINewsDownloadDialogArgs.h
-include/${MOZILLA}/msgnews/nsINntpIncomingServer.h
-include/${MOZILLA}/msgnews/nsINntpService.h
-include/${MOZILLA}/msgnews/nsINntpUrl.h
-include/${MOZILLA}/msgnews/nsMsgNewsCID.h
-include/${MOZILLA}/msgnews/nsNNTPArticleList.h
-include/${MOZILLA}/msgnews/nsNNTPNewsgroupList.h
-include/${MOZILLA}/msgnews/nsNNTPNewsgroupPost.h
-include/${MOZILLA}/msgnews/nsNNTPProtocol.h
-include/${MOZILLA}/msgnews/nsNewsDownloadDialogArgs.h
-include/${MOZILLA}/msgnews/nsNewsFolder.h
-include/${MOZILLA}/msgnews/nsNewsUtils.h
-include/${MOZILLA}/msgnews/nsNntpIncomingServer.h
-include/${MOZILLA}/msgnews/nsNntpService.h
-include/${MOZILLA}/msgnews/nsNntpUrl.h
-include/${MOZILLA}/msgsmime/nsEncryptedSMIMEURIsService.h
-include/${MOZILLA}/msgsmime/nsIEncryptedSMIMEURIsSrvc.h
-include/${MOZILLA}/msgsmime/nsIMsgSMIMECompFields.h
-include/${MOZILLA}/msgsmime/nsIMsgSMIMEHeaderSink.h
-include/${MOZILLA}/msgsmime/nsISMimeJSHelper.h
-include/${MOZILLA}/msgsmime/nsMsgComposeSecure.h
-include/${MOZILLA}/msgsmime/nsMsgSMIMECID.h
-include/${MOZILLA}/msgsmime/nsSMimeJSHelper.h
-include/${MOZILLA}/necko/ftpCore.h
-include/${MOZILLA}/necko/mozITXTToHTMLConv.h
-include/${MOZILLA}/necko/necko-config.h
-include/${MOZILLA}/necko/netCore.h
-include/${MOZILLA}/necko/nsAboutProtocolUtils.h
-include/${MOZILLA}/necko/nsCPasswordManager.h
-include/${MOZILLA}/necko/nsCPasswordManagerInternal.h
-include/${MOZILLA}/necko/nsChannelProperties.h
-include/${MOZILLA}/necko/nsIAboutModule.h
-include/${MOZILLA}/necko/nsIAsyncStreamCopier.h
-include/${MOZILLA}/necko/nsIAuthModule.h
-include/${MOZILLA}/necko/nsIAuthPrompt.h
-include/${MOZILLA}/necko/nsIAuthPromptProvider.h
-include/${MOZILLA}/necko/nsIBufferedStreams.h
-include/${MOZILLA}/necko/nsIByteRangeRequest.h
-include/${MOZILLA}/necko/nsICachingChannel.h
-include/${MOZILLA}/necko/nsICancelable.h
-include/${MOZILLA}/necko/nsIChannel.h
-include/${MOZILLA}/necko/nsIChannelEventSink.h
-include/${MOZILLA}/necko/nsIContentSniffer.h
-include/${MOZILLA}/necko/nsICookie.h
-include/${MOZILLA}/necko/nsICookie2.h
-include/${MOZILLA}/necko/nsICookieConsent.h
-include/${MOZILLA}/necko/nsICookieManager.h
-include/${MOZILLA}/necko/nsICookieManager2.h
-include/${MOZILLA}/necko/nsICookiePermission.h
-include/${MOZILLA}/necko/nsICookieService.h
-include/${MOZILLA}/necko/nsICryptoFIPSInfo.h
-include/${MOZILLA}/necko/nsIDNSListener.h
-include/${MOZILLA}/necko/nsIDNSRecord.h
-include/${MOZILLA}/necko/nsIDNSService.h
-include/${MOZILLA}/necko/nsIDataChannel.h
-include/${MOZILLA}/necko/nsIDirIndex.h
-include/${MOZILLA}/necko/nsIDirIndexListener.h
-include/${MOZILLA}/necko/nsIDownloader.h
-include/${MOZILLA}/necko/nsIEncodedChannel.h
-include/${MOZILLA}/necko/nsIExternalProtocolHandler.h
-include/${MOZILLA}/necko/nsIFTPChannel.h
-include/${MOZILLA}/necko/nsIFileChannel.h
-include/${MOZILLA}/necko/nsIFileProtocolHandler.h
-include/${MOZILLA}/necko/nsIFileStreams.h
-include/${MOZILLA}/necko/nsIFileURL.h
-include/${MOZILLA}/necko/nsIHttpAuthManager.h
-include/${MOZILLA}/necko/nsIHttpAuthenticator.h
-include/${MOZILLA}/necko/nsIHttpChannel.h
-include/${MOZILLA}/necko/nsIHttpChannelInternal.h
-include/${MOZILLA}/necko/nsIHttpEventSink.h
-include/${MOZILLA}/necko/nsIHttpHeaderVisitor.h
-include/${MOZILLA}/necko/nsIHttpProtocolHandler.h
-include/${MOZILLA}/necko/nsIIDNService.h
-include/${MOZILLA}/necko/nsIIOService.h
-include/${MOZILLA}/necko/nsIIncrementalDownload.h
-include/${MOZILLA}/necko/nsIInputStreamChannel.h
-include/${MOZILLA}/necko/nsIInputStreamPump.h
-include/${MOZILLA}/necko/nsILoadGroup.h
-include/${MOZILLA}/necko/nsIMIMEInputStream.h
-include/${MOZILLA}/necko/nsIMultiPartChannel.h
-include/${MOZILLA}/necko/nsINetUtil.h
-include/${MOZILLA}/necko/nsIPasswordManager.h
-include/${MOZILLA}/necko/nsIPasswordManagerInternal.h
-include/${MOZILLA}/necko/nsIPermissionManager.h
-include/${MOZILLA}/necko/nsIProgressEventSink.h
-include/${MOZILLA}/necko/nsIPrompt.h
-include/${MOZILLA}/necko/nsIProtocolHandler.h
-include/${MOZILLA}/necko/nsIProtocolProxyCallback.h
-include/${MOZILLA}/necko/nsIProtocolProxyFilter.h
-include/${MOZILLA}/necko/nsIProtocolProxyService.h
-include/${MOZILLA}/necko/nsIProxiedProtocolHandler.h
-include/${MOZILLA}/necko/nsIProxyAutoConfig.h
-include/${MOZILLA}/necko/nsIProxyInfo.h
-include/${MOZILLA}/necko/nsIRequest.h
-include/${MOZILLA}/necko/nsIRequestObserver.h
-include/${MOZILLA}/necko/nsIRequestObserverProxy.h
-include/${MOZILLA}/necko/nsIResProtocolHandler.h
-include/${MOZILLA}/necko/nsIResumableChannel.h
-include/${MOZILLA}/necko/nsISOCKSSocketInfo.h
-include/${MOZILLA}/necko/nsISSLSocketControl.h
-include/${MOZILLA}/necko/nsISafeOutputStream.h
-include/${MOZILLA}/necko/nsISecretDecoderRing.h
-include/${MOZILLA}/necko/nsISecureBrowserUI.h
-include/${MOZILLA}/necko/nsISecurityEventSink.h
-include/${MOZILLA}/necko/nsIServerSocket.h
-include/${MOZILLA}/necko/nsISimpleStreamListener.h
-include/${MOZILLA}/necko/nsISocketProvider.h
-include/${MOZILLA}/necko/nsISocketProviderService.h
-include/${MOZILLA}/necko/nsISocketTransport.h
-include/${MOZILLA}/necko/nsISocketTransportService.h
-include/${MOZILLA}/necko/nsIStandardURL.h
-include/${MOZILLA}/necko/nsIStreamConverter.h
-include/${MOZILLA}/necko/nsIStreamConverterService.h
-include/${MOZILLA}/necko/nsIStreamListener.h
-include/${MOZILLA}/necko/nsIStreamListenerProxy.h
-include/${MOZILLA}/necko/nsIStreamListenerTee.h
-include/${MOZILLA}/necko/nsIStreamLoader.h
-include/${MOZILLA}/necko/nsIStreamTransportService.h
-include/${MOZILLA}/necko/nsISyncStreamListener.h
-include/${MOZILLA}/necko/nsITXTToHTMLConv.h
-include/${MOZILLA}/necko/nsITransport.h
-include/${MOZILLA}/necko/nsITransportSecurityInfo.h
-include/${MOZILLA}/necko/nsIURI.h
-include/${MOZILLA}/necko/nsIURIChecker.h
-include/${MOZILLA}/necko/nsIURL.h
-include/${MOZILLA}/necko/nsIURLParser.h
-include/${MOZILLA}/necko/nsIUnicharStreamListener.h
-include/${MOZILLA}/necko/nsIUnicharStreamLoader.h
-include/${MOZILLA}/necko/nsIUploadChannel.h
-include/${MOZILLA}/necko/nsNetCID.h
-include/${MOZILLA}/necko/nsNetError.h
-include/${MOZILLA}/necko/nsNetStrings.h
-include/${MOZILLA}/necko/nsNetUtil.h
-include/${MOZILLA}/necko/nsPIDNSService.h
-include/${MOZILLA}/necko/nsPIProtocolProxyService.h
-include/${MOZILLA}/necko/nsPISocketTransportService.h
-include/${MOZILLA}/necko/nsReadLine.h
-include/${MOZILLA}/necko/nsURIHashKey.h
-include/${MOZILLA}/necko2/nsIViewSourceChannel.h
-include/${MOZILLA}/nkcache/nsCacheService.h
-include/${MOZILLA}/nkcache/nsICache.h
-include/${MOZILLA}/nkcache/nsICacheEntryDescriptor.h
-include/${MOZILLA}/nkcache/nsICacheListener.h
-include/${MOZILLA}/nkcache/nsICacheService.h
-include/${MOZILLA}/nkcache/nsICacheSession.h
-include/${MOZILLA}/nkcache/nsICacheVisitor.h
-include/${MOZILLA}/nsBuildID.h
-include/${MOZILLA}/nsStaticComponents.h
-include/${MOZILLA}/nspr/md/_aix.h
-include/${MOZILLA}/nspr/md/_aix32.cfg
-include/${MOZILLA}/nspr/md/_aix64.cfg
-include/${MOZILLA}/nspr/md/_beos.cfg
-include/${MOZILLA}/nspr/md/_beos.h
-include/${MOZILLA}/nspr/md/_bsdi.cfg
-include/${MOZILLA}/nspr/md/_bsdi.h
-include/${MOZILLA}/nspr/md/_darwin.cfg
-include/${MOZILLA}/nspr/md/_darwin.h
-include/${MOZILLA}/nspr/md/_dgux.cfg
-include/${MOZILLA}/nspr/md/_dgux.h
-include/${MOZILLA}/nspr/md/_freebsd.cfg
-include/${MOZILLA}/nspr/md/_freebsd.h
-include/${MOZILLA}/nspr/md/_hpux.h
-include/${MOZILLA}/nspr/md/_hpux32.cfg
-include/${MOZILLA}/nspr/md/_hpux64.cfg
-include/${MOZILLA}/nspr/md/_irix.h
-include/${MOZILLA}/nspr/md/_irix32.cfg
-include/${MOZILLA}/nspr/md/_irix64.cfg
-include/${MOZILLA}/nspr/md/_linux.cfg
-include/${MOZILLA}/nspr/md/_linux.h
-include/${MOZILLA}/nspr/md/_macos.h
-include/${MOZILLA}/nspr/md/_ncr.cfg
-include/${MOZILLA}/nspr/md/_ncr.h
-include/${MOZILLA}/nspr/md/_nec.cfg
-include/${MOZILLA}/nspr/md/_nec.h
-include/${MOZILLA}/nspr/md/_netbsd.cfg
-include/${MOZILLA}/nspr/md/_netbsd.h
-include/${MOZILLA}/nspr/md/_nextstep.cfg
-include/${MOZILLA}/nspr/md/_nextstep.h
-include/${MOZILLA}/nspr/md/_nspr_pthread.h
-include/${MOZILLA}/nspr/md/_nto.cfg
-include/${MOZILLA}/nspr/md/_nto.h
-include/${MOZILLA}/nspr/md/_openbsd.cfg
-include/${MOZILLA}/nspr/md/_openbsd.h
-include/${MOZILLA}/nspr/md/_openvms.cfg
-include/${MOZILLA}/nspr/md/_openvms.h
-include/${MOZILLA}/nspr/md/_os2.cfg
-include/${MOZILLA}/nspr/md/_os2.h
-include/${MOZILLA}/nspr/md/_os2_errors.h
-include/${MOZILLA}/nspr/md/_osf1.cfg
-include/${MOZILLA}/nspr/md/_osf1.h
-include/${MOZILLA}/nspr/md/_pcos.h
-include/${MOZILLA}/nspr/md/_pth.h
-include/${MOZILLA}/nspr/md/_qnx.cfg
-include/${MOZILLA}/nspr/md/_qnx.h
-include/${MOZILLA}/nspr/md/_reliantunix.cfg
-include/${MOZILLA}/nspr/md/_reliantunix.h
-include/${MOZILLA}/nspr/md/_rhapsody.cfg
-include/${MOZILLA}/nspr/md/_rhapsody.h
-include/${MOZILLA}/nspr/md/_riscos.cfg
-include/${MOZILLA}/nspr/md/_riscos.h
-include/${MOZILLA}/nspr/md/_scoos.cfg
-include/${MOZILLA}/nspr/md/_scoos.h
-include/${MOZILLA}/nspr/md/_solaris.cfg
-include/${MOZILLA}/nspr/md/_solaris.h
-include/${MOZILLA}/nspr/md/_sony.cfg
-include/${MOZILLA}/nspr/md/_sony.h
-include/${MOZILLA}/nspr/md/_sunos4.cfg
-include/${MOZILLA}/nspr/md/_sunos4.h
-include/${MOZILLA}/nspr/md/_unix_errors.h
-include/${MOZILLA}/nspr/md/_unixos.h
-include/${MOZILLA}/nspr/md/_unixware.cfg
-include/${MOZILLA}/nspr/md/_unixware.h
-include/${MOZILLA}/nspr/md/_unixware7.cfg
-include/${MOZILLA}/nspr/md/_win16.cfg
-include/${MOZILLA}/nspr/md/_win16.h
-include/${MOZILLA}/nspr/md/_win32_errors.h
-include/${MOZILLA}/nspr/md/_win95.cfg
-include/${MOZILLA}/nspr/md/_win95.h
-include/${MOZILLA}/nspr/md/_winnt.cfg
-include/${MOZILLA}/nspr/md/_winnt.h
-include/${MOZILLA}/nspr/md/prosdep.h
-include/${MOZILLA}/nspr/md/sunos4.h
-include/${MOZILLA}/nspr/nspr.h
-include/${MOZILLA}/nspr/obsolete/pralarm.h
-include/${MOZILLA}/nspr/obsolete/probslet.h
-include/${MOZILLA}/nspr/obsolete/protypes.h
-include/${MOZILLA}/nspr/obsolete/prsem.h
-include/${MOZILLA}/nspr/plarena.h
-include/${MOZILLA}/nspr/plarenas.h
-include/${MOZILLA}/nspr/plbase64.h
-include/${MOZILLA}/nspr/plerror.h
-include/${MOZILLA}/nspr/plgetopt.h
-include/${MOZILLA}/nspr/plhash.h
-include/${MOZILLA}/nspr/plresolv.h
-include/${MOZILLA}/nspr/plstr.h
-include/${MOZILLA}/nspr/pratom.h
-include/${MOZILLA}/nspr/prbit.h
-include/${MOZILLA}/nspr/prclist.h
-include/${MOZILLA}/nspr/prcmon.h
-include/${MOZILLA}/nspr/prcountr.h
-include/${MOZILLA}/nspr/prcpucfg.h
-include/${MOZILLA}/nspr/prcvar.h
-include/${MOZILLA}/nspr/prdtoa.h
-include/${MOZILLA}/nspr/prenv.h
-include/${MOZILLA}/nspr/prerr.h
-include/${MOZILLA}/nspr/prerror.h
-include/${MOZILLA}/nspr/prinet.h
-include/${MOZILLA}/nspr/prinit.h
-include/${MOZILLA}/nspr/prinrval.h
-include/${MOZILLA}/nspr/prio.h
-include/${MOZILLA}/nspr/pripcsem.h
-include/${MOZILLA}/nspr/private/pprio.h
-include/${MOZILLA}/nspr/private/pprthred.h
-include/${MOZILLA}/nspr/private/prpriv.h
-include/${MOZILLA}/nspr/prlink.h
-include/${MOZILLA}/nspr/prlock.h
-include/${MOZILLA}/nspr/prlog.h
-include/${MOZILLA}/nspr/prlong.h
-include/${MOZILLA}/nspr/prmem.h
-include/${MOZILLA}/nspr/prmon.h
-include/${MOZILLA}/nspr/prmwait.h
-include/${MOZILLA}/nspr/prnetdb.h
-include/${MOZILLA}/nspr/prolock.h
-include/${MOZILLA}/nspr/prpdce.h
-include/${MOZILLA}/nspr/prprf.h
-include/${MOZILLA}/nspr/prproces.h
-include/${MOZILLA}/nspr/prrng.h
-include/${MOZILLA}/nspr/prrwlock.h
-include/${MOZILLA}/nspr/prshm.h
-include/${MOZILLA}/nspr/prshma.h
-include/${MOZILLA}/nspr/prsystem.h
-include/${MOZILLA}/nspr/prthread.h
-include/${MOZILLA}/nspr/prtime.h
-include/${MOZILLA}/nspr/prtpool.h
-include/${MOZILLA}/nspr/prtrace.h
-include/${MOZILLA}/nspr/prtypes.h
-include/${MOZILLA}/nspr/prvrsion.h
-include/${MOZILLA}/nspr/prwin16.h
-include/${MOZILLA}/pipboot/nsIBufEntropyCollector.h
-include/${MOZILLA}/pipboot/nsISSLStatusProvider.h
-include/${MOZILLA}/pipboot/nsISecurityWarningDialogs.h
-include/${MOZILLA}/pipnss/nsIASN1Object.h
-include/${MOZILLA}/pipnss/nsIASN1PrintableItem.h
-include/${MOZILLA}/pipnss/nsIASN1Sequence.h
-include/${MOZILLA}/pipnss/nsIBadCertListener.h
-include/${MOZILLA}/pipnss/nsICMSDecoder.h
-include/${MOZILLA}/pipnss/nsICMSEncoder.h
-include/${MOZILLA}/pipnss/nsICMSMessage.h
-include/${MOZILLA}/pipnss/nsICMSMessageErrors.h
-include/${MOZILLA}/pipnss/nsICMSSecureMessage.h
-include/${MOZILLA}/pipnss/nsICRLInfo.h
-include/${MOZILLA}/pipnss/nsICRLManager.h
-include/${MOZILLA}/pipnss/nsICertPickDialogs.h
-include/${MOZILLA}/pipnss/nsICertSelect.h
-include/${MOZILLA}/pipnss/nsICertTree.h
-include/${MOZILLA}/pipnss/nsICertificateDialogs.h
-include/${MOZILLA}/pipnss/nsICipherInfo.h
-include/${MOZILLA}/pipnss/nsIClientAuthDialogs.h
-include/${MOZILLA}/pipnss/nsIDOMCryptoDialogs.h
-include/${MOZILLA}/pipnss/nsIFormSigningDialog.h
-include/${MOZILLA}/pipnss/nsIGenKeypairInfoDlg.h
-include/${MOZILLA}/pipnss/nsIKeygenThread.h
-include/${MOZILLA}/pipnss/nsINSSCertCache.h
-include/${MOZILLA}/pipnss/nsIOCSPResponder.h
-include/${MOZILLA}/pipnss/nsIPK11Token.h
-include/${MOZILLA}/pipnss/nsIPK11TokenDB.h
-include/${MOZILLA}/pipnss/nsIPKCS11Module.h
-include/${MOZILLA}/pipnss/nsIPKCS11ModuleDB.h
-include/${MOZILLA}/pipnss/nsIPKCS11Slot.h
-include/${MOZILLA}/pipnss/nsISMimeCert.h
-include/${MOZILLA}/pipnss/nsISSLStatus.h
-include/${MOZILLA}/pipnss/nsITokenDialogs.h
-include/${MOZILLA}/pipnss/nsITokenPasswordDialogs.h
-include/${MOZILLA}/pipnss/nsIUserCertPicker.h
-include/${MOZILLA}/pipnss/nsIX509Cert.h
-include/${MOZILLA}/pipnss/nsIX509CertDB.h
-include/${MOZILLA}/pipnss/nsIX509CertDB2.h
-include/${MOZILLA}/pipnss/nsIX509CertValidity.h
-include/${MOZILLA}/pippki/nsIASN1Tree.h
-include/${MOZILLA}/pippki/nsIPKIParamBlock.h
-include/${MOZILLA}/plugin/npapi.h
-include/${MOZILLA}/plugin/npruntime.h
-include/${MOZILLA}/plugin/nptypes.h
-include/${MOZILLA}/plugin/npupp.h
-include/${MOZILLA}/plugin/nsDefaultPlugin.h
-include/${MOZILLA}/plugin/nsIClassicPluginFactory.h
-include/${MOZILLA}/plugin/nsICookieStorage.h
-include/${MOZILLA}/plugin/nsIEventHandler.h
-include/${MOZILLA}/plugin/nsIFileUtilities.h
-include/${MOZILLA}/plugin/nsIHTTPHeaderListener.h
-include/${MOZILLA}/plugin/nsIJRILiveConnectPIPeer.h
-include/${MOZILLA}/plugin/nsIJRILiveConnectPlugin.h
-include/${MOZILLA}/plugin/nsIPlugin.h
-include/${MOZILLA}/plugin/nsIPluginDocument.h
-include/${MOZILLA}/plugin/nsIPluginHost.h
-include/${MOZILLA}/plugin/nsIPluginInputStream.h
-include/${MOZILLA}/plugin/nsIPluginInstance.h
-include/${MOZILLA}/plugin/nsIPluginInstanceInternal.h
-include/${MOZILLA}/plugin/nsIPluginInstanceOwner.h
-include/${MOZILLA}/plugin/nsIPluginInstancePeer.h
-include/${MOZILLA}/plugin/nsIPluginInstancePeer2.h
-include/${MOZILLA}/plugin/nsIPluginManager.h
-include/${MOZILLA}/plugin/nsIPluginManager2.h
-include/${MOZILLA}/plugin/nsIPluginStreamInfo.h
-include/${MOZILLA}/plugin/nsIPluginStreamListener.h
-include/${MOZILLA}/plugin/nsIPluginTagInfo.h
-include/${MOZILLA}/plugin/nsIPluginTagInfo2.h
-include/${MOZILLA}/plugin/nsIScriptablePlugin.h
-include/${MOZILLA}/plugin/nsIWindowlessPlugInstPeer.h
-include/${MOZILLA}/plugin/nsPIPluginHost.h
-include/${MOZILLA}/plugin/nsPIPluginInstancePeer.h
-include/${MOZILLA}/plugin/nsPluginError.h
-include/${MOZILLA}/plugin/nsPluginLogging.h
-include/${MOZILLA}/plugin/nsPluginNativeWindow.h
-include/${MOZILLA}/plugin/nsPluginsCID.h
-include/${MOZILLA}/plugin/nsplugin.h
-include/${MOZILLA}/plugin/nsplugindefs.h
-include/${MOZILLA}/plugin/nspluginroot.h
-include/${MOZILLA}/pref/nsIPref.h
-include/${MOZILLA}/pref/nsIPrefBranch.h
-include/${MOZILLA}/pref/nsIPrefBranch2.h
-include/${MOZILLA}/pref/nsIPrefBranchInternal.h
-include/${MOZILLA}/pref/nsIPrefLocalizedString.h
-include/${MOZILLA}/pref/nsIPrefService.h
-include/${MOZILLA}/pref/nsIRelativeFilePref.h
-include/${MOZILLA}/pref/nsISecurityPref.h
-include/${MOZILLA}/pref/nsPrefsCID.h
-include/${MOZILLA}/prefetch/nsCPrefetchService.h
-include/${MOZILLA}/prefetch/nsIPrefetchService.h
-include/${MOZILLA}/profdirserviceprovider/nsProfileDirServiceProvider.h
-include/${MOZILLA}/profile/nsIProfile.h
-include/${MOZILLA}/profile/nsIProfileChangeStatus.h
-include/${MOZILLA}/profile/nsIProfileInternal.h
-include/${MOZILLA}/profile/nsIProfileStartupListener.h
-include/${MOZILLA}/profile/nsIProfileUnlocker.h
-include/${MOZILLA}/profile/nsISessionRoaming.h
-include/${MOZILLA}/progressDlg/nsIProgressDialog.h
-include/${MOZILLA}/rdf/nsILocalStore.h
-include/${MOZILLA}/rdf/nsIRDFCompositeDataSource.h
-include/${MOZILLA}/rdf/nsIRDFContainer.h
-include/${MOZILLA}/rdf/nsIRDFContainerUtils.h
-include/${MOZILLA}/rdf/nsIRDFContentSink.h
-include/${MOZILLA}/rdf/nsIRDFDataSource.h
-include/${MOZILLA}/rdf/nsIRDFDelegateFactory.h
-include/${MOZILLA}/rdf/nsIRDFFileSystem.h
-include/${MOZILLA}/rdf/nsIRDFInMemoryDataSource.h
-include/${MOZILLA}/rdf/nsIRDFInferDataSource.h
-include/${MOZILLA}/rdf/nsIRDFLiteral.h
-include/${MOZILLA}/rdf/nsIRDFNode.h
-include/${MOZILLA}/rdf/nsIRDFObserver.h
-include/${MOZILLA}/rdf/nsIRDFPropagatableDataSource.h
-include/${MOZILLA}/rdf/nsIRDFPurgeableDataSource.h
-include/${MOZILLA}/rdf/nsIRDFRemoteDataSource.h
-include/${MOZILLA}/rdf/nsIRDFResource.h
-include/${MOZILLA}/rdf/nsIRDFService.h
-include/${MOZILLA}/rdf/nsIRDFXMLParser.h
-include/${MOZILLA}/rdf/nsIRDFXMLSerializer.h
-include/${MOZILLA}/rdf/nsIRDFXMLSink.h
-include/${MOZILLA}/rdf/nsIRDFXMLSource.h
-include/${MOZILLA}/rdf/nsRDFCID.h
-include/${MOZILLA}/rdf/rdf.h
-include/${MOZILLA}/rdf/rdfIDataSource.h
-include/${MOZILLA}/rdf/rdfISerializer.h
-include/${MOZILLA}/rdf/rdfITripleVisitor.h
-include/${MOZILLA}/rdfutil/nsRDFResource.h
-include/${MOZILLA}/shistory/nsIHistoryEntry.h
-include/${MOZILLA}/shistory/nsISHContainer.h
-include/${MOZILLA}/shistory/nsISHEntry.h
-include/${MOZILLA}/shistory/nsISHTransaction.h
-include/${MOZILLA}/shistory/nsISHistory.h
-include/${MOZILLA}/shistory/nsISHistoryInternal.h
-include/${MOZILLA}/shistory/nsISHistoryListener.h
-include/${MOZILLA}/sidebar/nsISidebar.h
-include/${MOZILLA}/spellchecker/mozIPersonalDictionary.h
-include/${MOZILLA}/spellchecker/mozISpellCheckingEngine.h
-include/${MOZILLA}/spellchecker/mozISpellI18NManager.h
-include/${MOZILLA}/spellchecker/mozISpellI18NUtil.h
-include/${MOZILLA}/string/nsAString.h
-include/${MOZILLA}/string/nsAlgorithm.h
-include/${MOZILLA}/string/nsCharTraits.h
-include/${MOZILLA}/string/nsDependentString.h
-include/${MOZILLA}/string/nsDependentSubstring.h
-include/${MOZILLA}/string/nsEmbedString.h
-include/${MOZILLA}/string/nsLiteralString.h
-include/${MOZILLA}/string/nsObsoleteAString.h
-include/${MOZILLA}/string/nsPrintfCString.h
-include/${MOZILLA}/string/nsPromiseFlatString.h
-include/${MOZILLA}/string/nsReadableUtils.h
-include/${MOZILLA}/string/nsString.h
-include/${MOZILLA}/string/nsStringAPI.h
-include/${MOZILLA}/string/nsStringBuffer.h
-include/${MOZILLA}/string/nsStringFwd.h
-include/${MOZILLA}/string/nsStringIterator.h
-include/${MOZILLA}/string/nsSubstring.h
-include/${MOZILLA}/string/nsSubstringTuple.h
-include/${MOZILLA}/string/nsTAString.h
-include/${MOZILLA}/string/nsTDependentString.h
-include/${MOZILLA}/string/nsTDependentSubstring.h
-include/${MOZILLA}/string/nsTObsoleteAString.h
-include/${MOZILLA}/string/nsTPromiseFlatString.h
-include/${MOZILLA}/string/nsTString.h
-include/${MOZILLA}/string/nsTSubstring.h
-include/${MOZILLA}/string/nsTSubstringTuple.h
-include/${MOZILLA}/string/nsUTF8Utils.h
-include/${MOZILLA}/string/nsXPIDLString.h
-include/${MOZILLA}/string/string-template-def-char.h
-include/${MOZILLA}/string/string-template-def-unichar.h
-include/${MOZILLA}/string/string-template-undef.h
-include/${MOZILLA}/toolkitcomps/nsICommandLine.h
-include/${MOZILLA}/toolkitcomps/nsICommandLineHandler.h
-include/${MOZILLA}/toolkitcomps/nsICommandLineRunner.h
-include/${MOZILLA}/toolkitcomps/nsIRemoteService.h
-include/${MOZILLA}/toolkitcomps/nsToolkitCompsCID.h
-include/${MOZILLA}/txmgr/nsITransaction.h
-include/${MOZILLA}/txmgr/nsITransactionList.h
-include/${MOZILLA}/txmgr/nsITransactionListener.h
-include/${MOZILLA}/txmgr/nsITransactionManager.h
-include/${MOZILLA}/txmgr/nsTransactionManagerCID.h
-include/${MOZILLA}/txtsvc/nsIInlineSpellChecker.h
-include/${MOZILLA}/txtsvc/nsISpellChecker.h
-include/${MOZILLA}/txtsvc/nsITextService.h
-include/${MOZILLA}/txtsvc/nsITextServicesDocument.h
-include/${MOZILLA}/txtsvc/nsITextServicesFilter.h
-include/${MOZILLA}/txtsvc/nsTextServicesCID.h
-include/${MOZILLA}/uconv/nsEncoderDecoderUtils.h
-include/${MOZILLA}/uconv/nsICharRepresentable.h
-include/${MOZILLA}/uconv/nsICharsetAlias.h
-include/${MOZILLA}/uconv/nsICharsetConverterManager.h
-include/${MOZILLA}/uconv/nsICurrentCharsetListener.h
-include/${MOZILLA}/uconv/nsIMappingCache.h
-include/${MOZILLA}/uconv/nsIPlatformCharset.h
-include/${MOZILLA}/uconv/nsIScriptableUConv.h
-include/${MOZILLA}/uconv/nsITextToSubURI.h
-include/${MOZILLA}/uconv/nsIUTF8ConverterService.h
-include/${MOZILLA}/uconv/nsIUnicodeDecodeHelper.h
-include/${MOZILLA}/uconv/nsIUnicodeDecoder.h
-include/${MOZILLA}/uconv/nsIUnicodeEncodeHelper.h
-include/${MOZILLA}/uconv/nsIUnicodeEncoder.h
-include/${MOZILLA}/uconv/nsUConvCID.h
-include/${MOZILLA}/uconv/uconvutil.h
-include/${MOZILLA}/ucvcn/nsUCvCnCID.h
-include/${MOZILLA}/ucvibm/nsUCvIBMCID.h
-include/${MOZILLA}/ucvja/nsUCVJA2CID.h
-include/${MOZILLA}/ucvja/nsUCVJACID.h
-include/${MOZILLA}/ucvko/nsUCvKOCID.h
-include/${MOZILLA}/ucvlatin/nsUCvLatinCID.h
-include/${MOZILLA}/ucvtw/nsUCvTWCID.h
-include/${MOZILLA}/ucvtw2/nsUCvTW2CID.h
-include/${MOZILLA}/unicharutil/cattable.h
-include/${MOZILLA}/unicharutil/nsCompressedCharMap.h
-include/${MOZILLA}/unicharutil/nsHankakuToZenkakuCID.h
-include/${MOZILLA}/unicharutil/nsICaseConversion.h
-include/${MOZILLA}/unicharutil/nsIEntityConverter.h
-include/${MOZILLA}/unicharutil/nsIOrderIdFormater.h
-include/${MOZILLA}/unicharutil/nsISaveAsCharset.h
-include/${MOZILLA}/unicharutil/nsITextTransform.h
-include/${MOZILLA}/unicharutil/nsIUGenDetailCategory.h
-include/${MOZILLA}/unicharutil/nsIUnicodeNormalizer.h
-include/${MOZILLA}/unicharutil/nsUnicharUtilCIID.h
-include/${MOZILLA}/unicharutil/nsUnicharUtils.h
-include/${MOZILLA}/update/nsIUpdateService.h
-include/${MOZILLA}/uriloader/nsCURILoader.h
-include/${MOZILLA}/uriloader/nsDocLoader.h
-include/${MOZILLA}/uriloader/nsIContentHandler.h
-include/${MOZILLA}/uriloader/nsIDocumentLoader.h
-include/${MOZILLA}/uriloader/nsIDownload.h
-include/${MOZILLA}/uriloader/nsITransfer.h
-include/${MOZILLA}/uriloader/nsIURIContentListener.h
-include/${MOZILLA}/uriloader/nsIURILoader.h
-include/${MOZILLA}/uriloader/nsIWebProgress.h
-include/${MOZILLA}/uriloader/nsIWebProgressListener.h
-include/${MOZILLA}/uriloader/nsIWebProgressListener2.h
-include/${MOZILLA}/uriloader/nsURILoader.h
-include/${MOZILLA}/util/nsTimer.h
-include/${MOZILLA}/util/stopwatch.h
-include/${MOZILLA}/view/nsICompositeListener.h
-include/${MOZILLA}/view/nsIScrollPositionListener.h
-include/${MOZILLA}/view/nsIScrollableView.h
-include/${MOZILLA}/view/nsIView.h
-include/${MOZILLA}/view/nsIViewManager.h
-include/${MOZILLA}/view/nsIViewObserver.h
-include/${MOZILLA}/view/nsViewsCID.h
-include/${MOZILLA}/wallet/nsCPassword.h
-include/${MOZILLA}/wallet/nsIPassword.h
-include/${MOZILLA}/wallet/nsIWalletService.h
-include/${MOZILLA}/walletviewers/nsISignonViewer.h
-include/${MOZILLA}/walletviewers/nsIWalletEditor.h
-include/${MOZILLA}/walletviewers/nsIWalletPreview.h
-include/${MOZILLA}/webbrowserpersist/nsCWebBrowserPersist.h
-include/${MOZILLA}/webbrowserpersist/nsIWebBrowserPersist.h
-include/${MOZILLA}/webbrwsr/nsCTooltipTextProvider.h
-include/${MOZILLA}/webbrwsr/nsCWebBrowser.h
-include/${MOZILLA}/webbrwsr/nsICommandHandler.h
-include/${MOZILLA}/webbrwsr/nsIContextMenuListener.h
-include/${MOZILLA}/webbrwsr/nsIContextMenuListener2.h
-include/${MOZILLA}/webbrwsr/nsIEmbeddingSiteWindow.h
-include/${MOZILLA}/webbrwsr/nsIEmbeddingSiteWindow2.h
-include/${MOZILLA}/webbrwsr/nsIPrintingPrompt.h
-include/${MOZILLA}/webbrwsr/nsIPrintingPromptService.h
-include/${MOZILLA}/webbrwsr/nsITooltipListener.h
-include/${MOZILLA}/webbrwsr/nsITooltipTextProvider.h
-include/${MOZILLA}/webbrwsr/nsIWebBrowser.h
-include/${MOZILLA}/webbrwsr/nsIWebBrowserChrome.h
-include/${MOZILLA}/webbrwsr/nsIWebBrowserChromeFocus.h
-include/${MOZILLA}/webbrwsr/nsIWebBrowserFocus.h
-include/${MOZILLA}/webbrwsr/nsIWebBrowserPrint.h
-include/${MOZILLA}/webbrwsr/nsIWebBrowserSetup.h
-include/${MOZILLA}/webbrwsr/nsIWebBrowserStream.h
-include/${MOZILLA}/webshell/nsIClipboardCommands.h
-include/${MOZILLA}/webshell/nsIContentViewerContainer.h
-include/${MOZILLA}/webshell/nsIDocumentLoaderFactory.h
-include/${MOZILLA}/webshell/nsILinkHandler.h
-include/${MOZILLA}/webshell/nsIRefreshURI.h
-include/${MOZILLA}/webshell/nsIWebShellServices.h
-include/${MOZILLA}/websrvcs/nsIGenericInterfaceInfoSet.h
-include/${MOZILLA}/websrvcs/nsIInterfaceInfoToIDL.h
-include/${MOZILLA}/websrvcs/nsISOAPAttachments.h
-include/${MOZILLA}/websrvcs/nsISOAPBlock.h
-include/${MOZILLA}/websrvcs/nsISOAPCall.h
-include/${MOZILLA}/websrvcs/nsISOAPCallCompletion.h
-include/${MOZILLA}/websrvcs/nsISOAPDecoder.h
-include/${MOZILLA}/websrvcs/nsISOAPEncoder.h
-include/${MOZILLA}/websrvcs/nsISOAPEncoding.h
-include/${MOZILLA}/websrvcs/nsISOAPFault.h
-include/${MOZILLA}/websrvcs/nsISOAPHeaderBlock.h
-include/${MOZILLA}/websrvcs/nsISOAPMessage.h
-include/${MOZILLA}/websrvcs/nsISOAPParameter.h
-include/${MOZILLA}/websrvcs/nsISOAPPropertyBagMutator.h
-include/${MOZILLA}/websrvcs/nsISOAPResponse.h
-include/${MOZILLA}/websrvcs/nsISOAPResponseListener.h
-include/${MOZILLA}/websrvcs/nsISOAPService.h
-include/${MOZILLA}/websrvcs/nsISOAPServiceRegistry.h
-include/${MOZILLA}/websrvcs/nsISOAPTransport.h
-include/${MOZILLA}/websrvcs/nsISOAPTransportListener.h
-include/${MOZILLA}/websrvcs/nsISchema.h
-include/${MOZILLA}/websrvcs/nsISchemaLoader.h
-include/${MOZILLA}/websrvcs/nsIScriptableInterfaceInfo.h
-include/${MOZILLA}/websrvcs/nsIWSDL.h
-include/${MOZILLA}/websrvcs/nsIWSDLLoader.h
-include/${MOZILLA}/websrvcs/nsIWSDLSOAPBinding.h
-include/${MOZILLA}/websrvcs/nsIWSPInterfaceInfoService.h
-include/${MOZILLA}/websrvcs/nsIWebScriptsAccessService.h
-include/${MOZILLA}/websrvcs/nsIWebServiceErrorHandler.h
-include/${MOZILLA}/websrvcs/nsIWebServiceProxy.h
-include/${MOZILLA}/widget/gdksuperwin.h
-include/${MOZILLA}/widget/gtkmozarea.h
-include/${MOZILLA}/widget/gtkmozbox.h
-include/${MOZILLA}/widget/nsEvent.h
-include/${MOZILLA}/widget/nsGUIEvent.h
-include/${MOZILLA}/widget/nsIAppShell.h
-include/${MOZILLA}/widget/nsIBaseWindow.h
-include/${MOZILLA}/widget/nsIBidiKeyboard.h
-include/${MOZILLA}/widget/nsIButton.h
-include/${MOZILLA}/widget/nsICheckButton.h
-include/${MOZILLA}/widget/nsIClipboard.h
-include/${MOZILLA}/widget/nsIClipboardDragDropHookList.h
-include/${MOZILLA}/widget/nsIClipboardDragDropHooks.h
-include/${MOZILLA}/widget/nsIClipboardHelper.h
-include/${MOZILLA}/widget/nsIClipboardOwner.h
-include/${MOZILLA}/widget/nsIDragService.h
-include/${MOZILLA}/widget/nsIDragSession.h
-include/${MOZILLA}/widget/nsIDragSessionBeOS.h
-include/${MOZILLA}/widget/nsIDragSessionGTK.h
-include/${MOZILLA}/widget/nsIDragSessionMac.h
-include/${MOZILLA}/widget/nsIDragSessionOS2.h
-include/${MOZILLA}/widget/nsIDragSessionXlib.h
-include/${MOZILLA}/widget/nsIEventListener.h
-include/${MOZILLA}/widget/nsIFilePicker.h
-include/${MOZILLA}/widget/nsIFormatConverter.h
-include/${MOZILLA}/widget/nsIFullScreen.h
-include/${MOZILLA}/widget/nsIKBStateControl.h
-include/${MOZILLA}/widget/nsILabel.h
-include/${MOZILLA}/widget/nsILookAndFeel.h
-include/${MOZILLA}/widget/nsIMenu.h
-include/${MOZILLA}/widget/nsIMenuBar.h
-include/${MOZILLA}/widget/nsIMenuItem.h
-include/${MOZILLA}/widget/nsIMenuListener.h
-include/${MOZILLA}/widget/nsIMenuRollup.h
-include/${MOZILLA}/widget/nsIMouseListener.h
-include/${MOZILLA}/widget/nsINativeKeyBindings.h
-include/${MOZILLA}/widget/nsINativeScrollbar.h
-include/${MOZILLA}/widget/nsIPluginWidget.h
-include/${MOZILLA}/widget/nsIRollupListener.h
-include/${MOZILLA}/widget/nsISound.h
-include/${MOZILLA}/widget/nsITextWidget.h
-include/${MOZILLA}/widget/nsIToolkit.h
-include/${MOZILLA}/widget/nsITransferable.h
-include/${MOZILLA}/widget/nsIWidget.h
-include/${MOZILLA}/widget/nsStringUtil.h
-include/${MOZILLA}/widget/nsWidgetSupport.h
-include/${MOZILLA}/widget/nsWidgetsCID.h
-include/${MOZILLA}/widget/widgetCore.h
-include/${MOZILLA}/windowwatcher/nsIAuthPromptWrapper.h
-include/${MOZILLA}/windowwatcher/nsIDialogParamBlock.h
-include/${MOZILLA}/windowwatcher/nsINonBlockingAlertService.h
-include/${MOZILLA}/windowwatcher/nsIPromptService.h
-include/${MOZILLA}/windowwatcher/nsIWindowWatcher.h
-include/${MOZILLA}/windowwatcher/nsPIPromptService.h
-include/${MOZILLA}/windowwatcher/nsPIWindowWatcher.h
-include/${MOZILLA}/xlibrgb/xlibrgb.h
-include/${MOZILLA}/xmlextras/nsIDOMParser.h
-include/${MOZILLA}/xmlextras/nsIDOMSerializer.h
-include/${MOZILLA}/xmlextras/nsIXMLHttpRequest.h
-include/${MOZILLA}/xpcom/nsAgg.h
-include/${MOZILLA}/xpcom/nsAppDirectoryServiceDefs.h
-include/${MOZILLA}/xpcom/nsArray.h
-include/${MOZILLA}/xpcom/nsArrayEnumerator.h
-include/${MOZILLA}/xpcom/nsAtomService.h
-include/${MOZILLA}/xpcom/nsAutoBuffer.h
-include/${MOZILLA}/xpcom/nsAutoLock.h
-include/${MOZILLA}/xpcom/nsAutoPtr.h
-include/${MOZILLA}/xpcom/nsBaseHashtable.h
-include/${MOZILLA}/xpcom/nsCOMArray.h
-include/${MOZILLA}/xpcom/nsCOMPtr.h
-include/${MOZILLA}/xpcom/nsCRT.h
-include/${MOZILLA}/xpcom/nsCategoryManagerUtils.h
-include/${MOZILLA}/xpcom/nsCheapSets.h
-include/${MOZILLA}/xpcom/nsClassHashtable.h
-include/${MOZILLA}/xpcom/nsCom.h
-include/${MOZILLA}/xpcom/nsComponentManagerUtils.h
-include/${MOZILLA}/xpcom/nsCppSharedAllocator.h
-include/${MOZILLA}/xpcom/nsDataHashtable.h
-include/${MOZILLA}/xpcom/nsDebug.h
-include/${MOZILLA}/xpcom/nsDebugImpl.h
-include/${MOZILLA}/xpcom/nsDeque.h
-include/${MOZILLA}/xpcom/nsDirectoryService.h
-include/${MOZILLA}/xpcom/nsDirectoryServiceDefs.h
-include/${MOZILLA}/xpcom/nsDirectoryServiceUtils.h
-include/${MOZILLA}/xpcom/nsDoubleHashtable.h
-include/${MOZILLA}/xpcom/nsEnumeratorUtils.h
-include/${MOZILLA}/xpcom/nsError.h
-include/${MOZILLA}/xpcom/nsEscape.h
-include/${MOZILLA}/xpcom/nsEventQueueUtils.h
-include/${MOZILLA}/xpcom/nsFastLoadPtr.h
-include/${MOZILLA}/xpcom/nsFastLoadService.h
-include/${MOZILLA}/xpcom/nsFixedSizeAllocator.h
-include/${MOZILLA}/xpcom/nsGenericFactory.h
-include/${MOZILLA}/xpcom/nsHashKeys.h
-include/${MOZILLA}/xpcom/nsHashPropertyBag.h
-include/${MOZILLA}/xpcom/nsHashSets.h
-include/${MOZILLA}/xpcom/nsHashtable.h
-include/${MOZILLA}/xpcom/nsIAllocator.h
-include/${MOZILLA}/xpcom/nsIArray.h
-include/${MOZILLA}/xpcom/nsIAsyncInputStream.h
-include/${MOZILLA}/xpcom/nsIAsyncOutputStream.h
-include/${MOZILLA}/xpcom/nsIAtom.h
-include/${MOZILLA}/xpcom/nsIAtomService.h
-include/${MOZILLA}/xpcom/nsIBinaryInputStream.h
-include/${MOZILLA}/xpcom/nsIBinaryOutputStream.h
-include/${MOZILLA}/xpcom/nsIByteArrayInputStream.h
-include/${MOZILLA}/xpcom/nsIByteBuffer.h
-include/${MOZILLA}/xpcom/nsICategoryManager.h
-include/${MOZILLA}/xpcom/nsIClassInfo.h
-include/${MOZILLA}/xpcom/nsICollection.h
-include/${MOZILLA}/xpcom/nsIComponentLoader.h
-include/${MOZILLA}/xpcom/nsIComponentLoaderManager.h
-include/${MOZILLA}/xpcom/nsIComponentManager.h
-include/${MOZILLA}/xpcom/nsIComponentManagerObsolete.h
-include/${MOZILLA}/xpcom/nsIComponentRegistrar.h
-include/${MOZILLA}/xpcom/nsIConsoleListener.h
-include/${MOZILLA}/xpcom/nsIConsoleMessage.h
-include/${MOZILLA}/xpcom/nsIConsoleService.h
-include/${MOZILLA}/xpcom/nsIConverterInputStream.h
-include/${MOZILLA}/xpcom/nsIConverterOutputStream.h
-include/${MOZILLA}/xpcom/nsID.h
-include/${MOZILLA}/xpcom/nsIDebug.h
-include/${MOZILLA}/xpcom/nsIDirectoryEnumerator.h
-include/${MOZILLA}/xpcom/nsIDirectoryService.h
-include/${MOZILLA}/xpcom/nsIEnumerator.h
-include/${MOZILLA}/xpcom/nsIEnvironment.h
-include/${MOZILLA}/xpcom/nsIErrorService.h
-include/${MOZILLA}/xpcom/nsIEventQueue.h
-include/${MOZILLA}/xpcom/nsIEventQueueService.h
-include/${MOZILLA}/xpcom/nsIEventTarget.h
-include/${MOZILLA}/xpcom/nsIException.h
-include/${MOZILLA}/xpcom/nsIExceptionService.h
-include/${MOZILLA}/xpcom/nsIFactory.h
-include/${MOZILLA}/xpcom/nsIFastLoadFileControl.h
-include/${MOZILLA}/xpcom/nsIFastLoadService.h
-include/${MOZILLA}/xpcom/nsIFile.h
-include/${MOZILLA}/xpcom/nsIGenericFactory.h
-include/${MOZILLA}/xpcom/nsIID.h
-include/${MOZILLA}/xpcom/nsIInputStream.h
-include/${MOZILLA}/xpcom/nsIInputStreamTee.h
-include/${MOZILLA}/xpcom/nsIInterfaceInfo.h
-include/${MOZILLA}/xpcom/nsIInterfaceInfoManager.h
-include/${MOZILLA}/xpcom/nsIInterfaceRequestor.h
-include/${MOZILLA}/xpcom/nsIInterfaceRequestorUtils.h
-include/${MOZILLA}/xpcom/nsILineInputStream.h
-include/${MOZILLA}/xpcom/nsILocalFile.h
-include/${MOZILLA}/xpcom/nsILocalFileWin.h
-include/${MOZILLA}/xpcom/nsIMemory.h
-include/${MOZILLA}/xpcom/nsIModule.h
-include/${MOZILLA}/xpcom/nsIMultiplexInputStream.h
-include/${MOZILLA}/xpcom/nsINIParser.h
-include/${MOZILLA}/xpcom/nsIObjectInputStream.h
-include/${MOZILLA}/xpcom/nsIObjectOutputStream.h
-include/${MOZILLA}/xpcom/nsIObserver.h
-include/${MOZILLA}/xpcom/nsIObserverService.h
-include/${MOZILLA}/xpcom/nsIOutputStream.h
-include/${MOZILLA}/xpcom/nsIPersistentProperties2.h
-include/${MOZILLA}/xpcom/nsIPipe.h
-include/${MOZILLA}/xpcom/nsIProcess.h
-include/${MOZILLA}/xpcom/nsIProgrammingLanguage.h
-include/${MOZILLA}/xpcom/nsIProperties.h
-include/${MOZILLA}/xpcom/nsIProperty.h
-include/${MOZILLA}/xpcom/nsIPropertyBag.h
-include/${MOZILLA}/xpcom/nsIPropertyBag2.h
-include/${MOZILLA}/xpcom/nsIProxyCreateInstance.h
-include/${MOZILLA}/xpcom/nsIProxyObjectManager.h
-include/${MOZILLA}/xpcom/nsIRecyclingAllocator.h
-include/${MOZILLA}/xpcom/nsIRunnable.h
-include/${MOZILLA}/xpcom/nsIScriptableInputStream.h
-include/${MOZILLA}/xpcom/nsISeekableStream.h
-include/${MOZILLA}/xpcom/nsISerializable.h
-include/${MOZILLA}/xpcom/nsIServiceManager.h
-include/${MOZILLA}/xpcom/nsIServiceManagerObsolete.h
-include/${MOZILLA}/xpcom/nsISimpleEnumerator.h
-include/${MOZILLA}/xpcom/nsIStorageStream.h
-include/${MOZILLA}/xpcom/nsIStreamBufferAccess.h
-include/${MOZILLA}/xpcom/nsIStringEnumerator.h
-include/${MOZILLA}/xpcom/nsIStringStream.h
-include/${MOZILLA}/xpcom/nsISupports.h
-include/${MOZILLA}/xpcom/nsISupportsArray.h
-include/${MOZILLA}/xpcom/nsISupportsBase.h
-include/${MOZILLA}/xpcom/nsISupportsImpl.h
-include/${MOZILLA}/xpcom/nsISupportsIterators.h
-include/${MOZILLA}/xpcom/nsISupportsObsolete.h
-include/${MOZILLA}/xpcom/nsISupportsPrimitives.h
-include/${MOZILLA}/xpcom/nsISupportsPriority.h
-include/${MOZILLA}/xpcom/nsISupportsUtils.h
-include/${MOZILLA}/xpcom/nsIThread.h
-include/${MOZILLA}/xpcom/nsITimelineService.h
-include/${MOZILLA}/xpcom/nsITimer.h
-include/${MOZILLA}/xpcom/nsITimerInternal.h
-include/${MOZILLA}/xpcom/nsITimerManager.h
-include/${MOZILLA}/xpcom/nsITraceRefcnt.h
-include/${MOZILLA}/xpcom/nsIUnicharBuffer.h
-include/${MOZILLA}/xpcom/nsIUnicharInputStream.h
-include/${MOZILLA}/xpcom/nsIUnicharLineInputStream.h
-include/${MOZILLA}/xpcom/nsIUnicharOutputStream.h
-include/${MOZILLA}/xpcom/nsIVariant.h
-include/${MOZILLA}/xpcom/nsIVersionComparator.h
-include/${MOZILLA}/xpcom/nsIWeakReference.h
-include/${MOZILLA}/xpcom/nsIWeakReferenceUtils.h
-include/${MOZILLA}/xpcom/nsIWritablePropertyBag.h
-include/${MOZILLA}/xpcom/nsIWritablePropertyBag2.h
-include/${MOZILLA}/xpcom/nsIXPTLoader.h
-include/${MOZILLA}/xpcom/nsInt64.h
-include/${MOZILLA}/xpcom/nsInterfaceHashtable.h
-include/${MOZILLA}/xpcom/nsInterfaceRequestorAgg.h
-include/${MOZILLA}/xpcom/nsLinebreakConverter.h
-include/${MOZILLA}/xpcom/nsLocalFile.h
-include/${MOZILLA}/xpcom/nsLocalFileUnix.h
-include/${MOZILLA}/xpcom/nsMemory.h
-include/${MOZILLA}/xpcom/nsModule.h
-include/${MOZILLA}/xpcom/nsMultiplexInputStream.h
-include/${MOZILLA}/xpcom/nsNativeCharsetUtils.h
-include/${MOZILLA}/xpcom/nsNativeComponentLoader.h
-include/${MOZILLA}/xpcom/nsObserverService.h
-include/${MOZILLA}/xpcom/nsObsoleteModuleLoading.h
-include/${MOZILLA}/xpcom/nsProcess.h
-include/${MOZILLA}/xpcom/nsProxiedService.h
-include/${MOZILLA}/xpcom/nsProxyEvent.h
-include/${MOZILLA}/xpcom/nsProxyRelease.h
-include/${MOZILLA}/xpcom/nsQuickSort.h
-include/${MOZILLA}/xpcom/nsRecyclingAllocator.h
-include/${MOZILLA}/xpcom/nsRefPtrHashtable.h
-include/${MOZILLA}/xpcom/nsScriptableInputStream.h
-include/${MOZILLA}/xpcom/nsServiceManagerUtils.h
-include/${MOZILLA}/xpcom/nsStaticAtom.h
-include/${MOZILLA}/xpcom/nsStaticNameTable.h
-include/${MOZILLA}/xpcom/nsStorageStream.h
-include/${MOZILLA}/xpcom/nsStreamUtils.h
-include/${MOZILLA}/xpcom/nsStringEnumerator.h
-include/${MOZILLA}/xpcom/nsStringIO.h
-include/${MOZILLA}/xpcom/nsStringStream.h
-include/${MOZILLA}/xpcom/nsSupportsArray.h
-include/${MOZILLA}/xpcom/nsSupportsPrimitives.h
-include/${MOZILLA}/xpcom/nsTHashtable.h
-include/${MOZILLA}/xpcom/nsTextFormatter.h
-include/${MOZILLA}/xpcom/nsTime.h
-include/${MOZILLA}/xpcom/nsTraceRefcnt.h
-include/${MOZILLA}/xpcom/nsTraceRefcntImpl.h
-include/${MOZILLA}/xpcom/nsUnitConversion.h
-include/${MOZILLA}/xpcom/nsValueArray.h
-include/${MOZILLA}/xpcom/nsVariant.h
-include/${MOZILLA}/xpcom/nsVersionComparator.h
-include/${MOZILLA}/xpcom/nsVoidArray.h
-include/${MOZILLA}/xpcom/nsWeakPtr.h
-include/${MOZILLA}/xpcom/nsWeakReference.h
-include/${MOZILLA}/xpcom/nsXPCOM.h
-include/${MOZILLA}/xpcom/nsXPCOMCID.h
-include/${MOZILLA}/xpcom/nsXPCOMGlue.h
-include/${MOZILLA}/xpcom/nscore.h
-include/${MOZILLA}/xpcom/nsrootidl.h
-include/${MOZILLA}/xpcom/pldhash.h
-include/${MOZILLA}/xpcom/plevent.h
-include/${MOZILLA}/xpcom/xcDll.h
-include/${MOZILLA}/xpcom/xpcom-config.h
-include/${MOZILLA}/xpcom/xpt_arena.h
-include/${MOZILLA}/xpcom/xpt_struct.h
-include/${MOZILLA}/xpcom/xpt_xdr.h
-include/${MOZILLA}/xpcom/xptcall.h
-include/${MOZILLA}/xpcom/xptcstubsdecl.inc
-include/${MOZILLA}/xpcom/xptcstubsdef.inc
-include/${MOZILLA}/xpcom/xptinfo.h
-include/${MOZILLA}/xpcom_obsolete/nsFileSpec.h
-include/${MOZILLA}/xpcom_obsolete/nsFileStream.h
-include/${MOZILLA}/xpcom_obsolete/nsIFileSpec.h
-include/${MOZILLA}/xpcom_obsolete/nsIFileStream.h
-include/${MOZILLA}/xpcom_obsolete/nsIRegistry.h
-include/${MOZILLA}/xpcom_obsolete/nsIRegistryUtils.h
-include/${MOZILLA}/xpcom_obsolete/nsSpecialSystemDirectory.h
-include/${MOZILLA}/xpcom_obsolete/xpcomobsolete.h
-include/${MOZILLA}/xpconnect/XPCIDispatch.h
-include/${MOZILLA}/xpconnect/mozIJSSubScriptLoader.h
-include/${MOZILLA}/xpconnect/nsIJSContextStack.h
-include/${MOZILLA}/xpconnect/nsIJSRuntimeService.h
-include/${MOZILLA}/xpconnect/nsIScriptError.h
-include/${MOZILLA}/xpconnect/nsIScriptableInterfaces.h
-include/${MOZILLA}/xpconnect/nsIXPCScriptNotify.h
-include/${MOZILLA}/xpconnect/nsIXPCScriptable.h
-include/${MOZILLA}/xpconnect/nsIXPCSecurityManager.h
-include/${MOZILLA}/xpconnect/nsIXPConnect.h
-include/${MOZILLA}/xpconnect/xpc_map_end.h
-include/${MOZILLA}/xpconnect/xpccomponents.h
-include/${MOZILLA}/xpconnect/xpcexception.h
-include/${MOZILLA}/xpconnect/xpcjsid.h
-include/${MOZILLA}/xpinstall/InstallCleanupDefines.h
-include/${MOZILLA}/xpinstall/nsIDOMInstallTriggerGlobal.h
-include/${MOZILLA}/xpinstall/nsIDOMInstallVersion.h
-include/${MOZILLA}/xpinstall/nsISoftwareUpdate.h
-include/${MOZILLA}/xpinstall/nsIXPIDialogService.h
-include/${MOZILLA}/xpinstall/nsIXPINotifier.h
-include/${MOZILLA}/xpinstall/nsIXPIProgressDialog.h
-include/${MOZILLA}/xpinstall/nsIXPInstallManager.h
-include/${MOZILLA}/xpinstall/nsPICertNotification.h
-include/${MOZILLA}/xpinstall/nsPIXPIProxy.h
-include/${MOZILLA}/xpinstall/nsPIXPIStubHook.h
-include/${MOZILLA}/xpinstall/nsSoftwareUpdateIIDs.h
-include/${MOZILLA}/xpinstall/nsXPITriggerInfo.h
-include/${MOZILLA}/xprintutil/xprintutil.h
-include/${MOZILLA}/xul/nsIXULPopupListener.h
-include/${MOZILLA}/xul/nsXULAtomList.h
-include/${MOZILLA}/xul/nsXULAtoms.h
-include/${MOZILLA}/xulapp/nsINativeAppSupport.h
-include/${MOZILLA}/xulapp/nsIProfileMigrator.h
-include/${MOZILLA}/xulapp/nsIToolkitProfile.h
-include/${MOZILLA}/xulapp/nsIToolkitProfileService.h
-include/${MOZILLA}/xulapp/nsIXULAppInfo.h
-include/${MOZILLA}/xulapp/nsIXULRuntime.h
-include/${MOZILLA}/xulapp/nsXULAppAPI.h
-include/${MOZILLA}/xuldoc/nsIController.h
-include/${MOZILLA}/xuldoc/nsIControllers.h
-include/${MOZILLA}/xuldoc/nsIXULContentSink.h
-include/${MOZILLA}/xuldoc/nsIXULDocument.h
-include/${MOZILLA}/xuldoc/nsIXULOverlayProvider.h
-include/${MOZILLA}/xuldoc/nsIXULPrototypeCache.h
-include/${MOZILLA}/xuldoc/nsIXULPrototypeDocument.h
-include/${MOZILLA}/xultmpl/nsIXULBuilderListener.h
-include/${MOZILLA}/xultmpl/nsIXULSortService.h
-include/${MOZILLA}/xultmpl/nsIXULTemplateBuilder.h
-include/${MOZILLA}/zlib/mozzconf.h
-include/${MOZILLA}/zlib/zconf.h
-include/${MOZILLA}/zlib/zlib.h
-@comment end INCLUDE
-@comment begin INCLUDE-PUBLIC
-include/${MOZILLA}/ldap-private/lber-int.h
-include/${MOZILLA}/ldap-private/ldap-int.h
-include/${MOZILLA}/ldap-private/ldaplog.h
-include/${MOZILLA}/ldap-private/ldaprot.h
-include/${MOZILLA}/ldap-private/portable.h
-include/${MOZILLA}/ldap/disptmpl.h
-include/${MOZILLA}/ldap/iutil.h
-include/${MOZILLA}/ldap/lber.h
-include/${MOZILLA}/ldap/ldap-deprecated.h
-include/${MOZILLA}/ldap/ldap-extension.h
-include/${MOZILLA}/ldap/ldap-platform.h
-include/${MOZILLA}/ldap/ldap-standard.h
-include/${MOZILLA}/ldap/ldap-to-be-deprecated.h
-include/${MOZILLA}/ldap/ldap.h
-include/${MOZILLA}/ldap/ldap_ssl.h
-include/${MOZILLA}/ldap/ldappr.h
-include/${MOZILLA}/ldap/srchpref.h
-include/${MOZILLA}/nss/base64.h
-include/${MOZILLA}/nss/blapit.h
-include/${MOZILLA}/nss/cert.h
-include/${MOZILLA}/nss/certdb.h
-include/${MOZILLA}/nss/certt.h
-include/${MOZILLA}/nss/ciferfam.h
-include/${MOZILLA}/nss/cmmf.h
-include/${MOZILLA}/nss/cmmft.h
-include/${MOZILLA}/nss/cms.h
-include/${MOZILLA}/nss/cmsreclist.h
-include/${MOZILLA}/nss/cmst.h
-include/${MOZILLA}/nss/crmf.h
-include/${MOZILLA}/nss/crmft.h
-include/${MOZILLA}/nss/cryptohi.h
-include/${MOZILLA}/nss/cryptoht.h
-include/${MOZILLA}/nss/ecl-exp.h
-include/${MOZILLA}/nss/hasht.h
-include/${MOZILLA}/nss/jar-ds.h
-include/${MOZILLA}/nss/jar.h
-include/${MOZILLA}/nss/jarfile.h
-include/${MOZILLA}/nss/key.h
-include/${MOZILLA}/nss/keyhi.h
-include/${MOZILLA}/nss/keyt.h
-include/${MOZILLA}/nss/keythi.h
-include/${MOZILLA}/nss/nss.h
-include/${MOZILLA}/nss/nssb64.h
-include/${MOZILLA}/nss/nssb64t.h
-include/${MOZILLA}/nss/nssbase.h
-include/${MOZILLA}/nss/nssbaset.h
-include/${MOZILLA}/nss/nssck.api
-include/${MOZILLA}/nss/nssckbi.h
-include/${MOZILLA}/nss/nssckepv.h
-include/${MOZILLA}/nss/nssckft.h
-include/${MOZILLA}/nss/nssckfw.h
-include/${MOZILLA}/nss/nssckfwc.h
-include/${MOZILLA}/nss/nssckfwt.h
-include/${MOZILLA}/nss/nssckg.h
-include/${MOZILLA}/nss/nssckmdt.h
-include/${MOZILLA}/nss/nssckt.h
-include/${MOZILLA}/nss/nssilckt.h
-include/${MOZILLA}/nss/nssilock.h
-include/${MOZILLA}/nss/nsslocks.h
-include/${MOZILLA}/nss/nssrwlk.h
-include/${MOZILLA}/nss/nssrwlkt.h
-include/${MOZILLA}/nss/ocsp.h
-include/${MOZILLA}/nss/ocspt.h
-include/${MOZILLA}/nss/p12.h
-include/${MOZILLA}/nss/p12plcy.h
-include/${MOZILLA}/nss/p12t.h
-include/${MOZILLA}/nss/pk11func.h
-include/${MOZILLA}/nss/pk11pqg.h
-include/${MOZILLA}/nss/pk11priv.h
-include/${MOZILLA}/nss/pk11pub.h
-include/${MOZILLA}/nss/pk11sdr.h
-include/${MOZILLA}/nss/pkcs11.h
-include/${MOZILLA}/nss/pkcs11f.h
-include/${MOZILLA}/nss/pkcs11n.h
-include/${MOZILLA}/nss/pkcs11p.h
-include/${MOZILLA}/nss/pkcs11t.h
-include/${MOZILLA}/nss/pkcs11u.h
-include/${MOZILLA}/nss/pkcs12.h
-include/${MOZILLA}/nss/pkcs12t.h
-include/${MOZILLA}/nss/pkcs7t.h
-include/${MOZILLA}/nss/portreg.h
-include/${MOZILLA}/nss/preenc.h
-include/${MOZILLA}/nss/secasn1.h
-include/${MOZILLA}/nss/secasn1t.h
-include/${MOZILLA}/nss/seccomon.h
-include/${MOZILLA}/nss/secder.h
-include/${MOZILLA}/nss/secdert.h
-include/${MOZILLA}/nss/secdig.h
-include/${MOZILLA}/nss/secdigt.h
-include/${MOZILLA}/nss/secerr.h
-include/${MOZILLA}/nss/sechash.h
-include/${MOZILLA}/nss/secitem.h
-include/${MOZILLA}/nss/secmime.h
-include/${MOZILLA}/nss/secmod.h
-include/${MOZILLA}/nss/secmodt.h
-include/${MOZILLA}/nss/secoid.h
-include/${MOZILLA}/nss/secoidt.h
-include/${MOZILLA}/nss/secpkcs5.h
-include/${MOZILLA}/nss/secpkcs7.h
-include/${MOZILLA}/nss/secport.h
-include/${MOZILLA}/nss/shsign.h
-include/${MOZILLA}/nss/smime.h
-include/${MOZILLA}/nss/ssl.h
-include/${MOZILLA}/nss/sslerr.h
-include/${MOZILLA}/nss/sslproto.h
-include/${MOZILLA}/nss/sslt.h
-include/${MOZILLA}/nss/watcomfx.h
-@comment end INCLUDE-PUBLIC
-@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
-@unexec ${RM} -f %D/lib/${MOZILLA}/chrome/app-chrome.manifest
-@unexec ${RM} %D/lib/${MOZILLA}/components/compreg.dat
-@unexec ${RM} %D/lib/${MOZILLA}/components/xpti.dat
-@comment begin DIRS
-@dirrm lib/${MOZILLA}/res/throbber
-@dirrm lib/${MOZILLA}/res/samples/sampleimages
-@dirrm lib/${MOZILLA}/res/samples
-@dirrm lib/${MOZILLA}/res/html
-@dirrm lib/${MOZILLA}/res/entityTables
-@dirrm lib/${MOZILLA}/res/dtd
-@dirrm lib/${MOZILLA}/res
-@dirrm lib/${MOZILLA}/init.d
-@dirrm lib/${MOZILLA}/icons
-@dirrm lib/${MOZILLA}/greprefs
-@dirrm lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-@dirrm lib/${MOZILLA}/extensions
-@dirrm lib/${MOZILLA}/defaults/wallet
-@dirrm lib/${MOZILLA}/defaults/profile/US
-@dirrm lib/${MOZILLA}/defaults/profile
-@dirrm lib/${MOZILLA}/defaults/pref
-@dirrm lib/${MOZILLA}/defaults/messenger/US
-@dirrm lib/${MOZILLA}/defaults/messenger
-@dirrm lib/${MOZILLA}/defaults/isp/US
-@dirrm lib/${MOZILLA}/defaults/isp
-@dirrm lib/${MOZILLA}/defaults/autoconfig
-@dirrm lib/${MOZILLA}/defaults
-@dirrm lib/${MOZILLA}/components/myspell
-@dirrm lib/${MOZILLA}/components
-@dirrm lib/${MOZILLA}/chrome/icons/default
-@dirrm lib/${MOZILLA}/chrome/icons
-@dirrm lib/${MOZILLA}/chrome
-@dirrm lib/${MOZILLA}
-@dirrm include/${MOZILLA}/zlib
-@dirrm include/${MOZILLA}/xultmpl
-@dirrm include/${MOZILLA}/xuldoc
-@dirrm include/${MOZILLA}/xulapp
-@dirrm include/${MOZILLA}/xul
-@dirrm include/${MOZILLA}/xprintutil
-@dirrm include/${MOZILLA}/xpinstall
-@dirrm include/${MOZILLA}/xpconnect
-@dirrm include/${MOZILLA}/xpcom_obsolete
-@dirrm include/${MOZILLA}/xpcom
-@dirrm include/${MOZILLA}/xmlextras
-@dirrm include/${MOZILLA}/xlibrgb
-@dirrm include/${MOZILLA}/windowwatcher
-@dirrm include/${MOZILLA}/widget
-@dirrm include/${MOZILLA}/websrvcs
-@dirrm include/${MOZILLA}/webshell
-@dirrm include/${MOZILLA}/webbrwsr
-@dirrm include/${MOZILLA}/webbrowserpersist
-@dirrm include/${MOZILLA}/walletviewers
-@dirrm include/${MOZILLA}/wallet
-@dirrm include/${MOZILLA}/view
-@dirrm include/${MOZILLA}/util
-@dirrm include/${MOZILLA}/uriloader
-@dirrm include/${MOZILLA}/update
-@dirrm include/${MOZILLA}/unicharutil
-@dirrm include/${MOZILLA}/ucvtw2
-@dirrm include/${MOZILLA}/ucvtw
-@dirrm include/${MOZILLA}/ucvlatin
-@dirrm include/${MOZILLA}/ucvko
-@dirrm include/${MOZILLA}/ucvja
-@dirrm include/${MOZILLA}/ucvibm
-@dirrm include/${MOZILLA}/ucvcn
-@dirrm include/${MOZILLA}/uconv
-@dirrm include/${MOZILLA}/txtsvc
-@dirrm include/${MOZILLA}/txmgr
-@dirrm include/${MOZILLA}/toolkitcomps
-@dirrm include/${MOZILLA}/string
-@dirrm include/${MOZILLA}/spellchecker
-@dirrm include/${MOZILLA}/sidebar
-@dirrm include/${MOZILLA}/shistory
-@dirrm include/${MOZILLA}/rdfutil
-@dirrm include/${MOZILLA}/rdf
-@dirrm include/${MOZILLA}/progressDlg
-@dirrm include/${MOZILLA}/profile
-@dirrm include/${MOZILLA}/profdirserviceprovider
-@dirrm include/${MOZILLA}/prefetch
-@dirrm include/${MOZILLA}/pref
-@dirrm include/${MOZILLA}/plugin
-@dirrm include/${MOZILLA}/pippki
-@dirrm include/${MOZILLA}/pipnss
-@dirrm include/${MOZILLA}/pipboot
-@dirrm include/${MOZILLA}/nss
-@dirrm include/${MOZILLA}/nspr/private
-@dirrm include/${MOZILLA}/nspr/obsolete
-@dirrm include/${MOZILLA}/nspr/md
-@dirrm include/${MOZILLA}/nspr
-@dirrm include/${MOZILLA}/nkcache
-@dirrm include/${MOZILLA}/necko2
-@dirrm include/${MOZILLA}/necko
-@dirrm include/${MOZILLA}/msgsmime
-@dirrm include/${MOZILLA}/msgnews
-@dirrm include/${MOZILLA}/msgmdn
-@dirrm include/${MOZILLA}/msglocal
-@dirrm include/${MOZILLA}/msgimap
-@dirrm include/${MOZILLA}/msgdb
-@dirrm include/${MOZILLA}/msgcompose
-@dirrm include/${MOZILLA}/msgbaseutil
-@dirrm include/${MOZILLA}/msgbase
-@dirrm include/${MOZILLA}/mozldap
-@dirrm include/${MOZILLA}/mork
-@dirrm include/${MOZILLA}/mimetype
-@dirrm include/${MOZILLA}/mimeemitter
-@dirrm include/${MOZILLA}/mime
-@dirrm include/${MOZILLA}/mailview
-@dirrm include/${MOZILLA}/mailprofilemigration
-@dirrm include/${MOZILLA}/mailnews
-@dirrm include/${MOZILLA}/lwbrk
-@dirrm include/${MOZILLA}/locale
-@dirrm include/${MOZILLA}/libreg
-@dirrm include/${MOZILLA}/libmar
-@dirrm include/${MOZILLA}/libbz2
-@dirrm include/${MOZILLA}/ldap-private
-@dirrm include/${MOZILLA}/ldap
-@dirrm include/${MOZILLA}/layout
-@dirrm include/${MOZILLA}/jsurl
-@dirrm include/${MOZILLA}/jsdebug
-@dirrm include/${MOZILLA}/jsconsole
-@dirrm include/${MOZILLA}/js
-@dirrm include/${MOZILLA}/java
-@dirrm include/${MOZILLA}/jar
-@dirrm include/${MOZILLA}/intl
-@dirrm include/${MOZILLA}/import
-@dirrm include/${MOZILLA}/impText
-@dirrm include/${MOZILLA}/impComm4xMail
-@dirrm include/${MOZILLA}/imglib2
-@dirrm include/${MOZILLA}/htmlparser
-@dirrm include/${MOZILLA}/history
-@dirrm include/${MOZILLA}/gtkxtbin
-@dirrm include/${MOZILLA}/gtkembedmoz
-@dirrm include/${MOZILLA}/gfx
-@dirrm include/${MOZILLA}/find
-@dirrm include/${MOZILLA}/filepicker
-@dirrm include/${MOZILLA}/exthandler
-@dirrm include/${MOZILLA}/extensions
-@dirrm include/${MOZILLA}/expat
-@dirrm include/${MOZILLA}/embedcomponents
-@dirrm include/${MOZILLA}/embed_base
-@dirrm include/${MOZILLA}/editor
-@dirrm include/${MOZILLA}/downloads
-@dirrm include/${MOZILLA}/downloadmanager
-@dirrm include/${MOZILLA}/dom
-@dirrm include/${MOZILLA}/docshell
-@dirrm include/${MOZILLA}/dbm
-@dirrm include/${MOZILLA}/content
-@dirrm include/${MOZILLA}/composer
-@dirrm include/${MOZILLA}/commandhandler
-@dirrm include/${MOZILLA}/chrome
-@dirrm include/${MOZILLA}/chardet
-@dirrm include/${MOZILLA}/caps
-@dirrm include/${MOZILLA}/browser
-@dirrm include/${MOZILLA}/bayesflt
-@dirrm include/${MOZILLA}/autoconfig
-@dirrm include/${MOZILLA}/appshell
-@dirrm include/${MOZILLA}/appcomps
-@dirrm include/${MOZILLA}/alerts
-@dirrm include/${MOZILLA}/addrbook
-@dirrm include/${MOZILLA}/accessibility
-@dirrm include/${MOZILLA}
-@comment end DIRS
diff --git a/mail/thunderbird/DESCR b/mail/thunderbird/DESCR
deleted file mode 100644
index 1a3ff5120f1..00000000000
--- a/mail/thunderbird/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Mozilla Thunderbird is a redesign of the Mozilla mail component. The
-goal is to produce a cross platform stand alone mail application using
-the XUL user interface language. This version uses the gtk2 toolkit.
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
deleted file mode 100644
index 2cd2eb3ac5e..00000000000
--- a/mail/thunderbird/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2007/03/07 21:32:53 dmcmahill Exp $
-
-MOZILLA= thunderbird
-COMMENT= Mozilla mail client
-PKGREVISION= 1
-
-MOZILLA_USE_GTK2= # yes
-MOZILLA_USE_XFT= YES
-
-.include "../../mail/thunderbird/Makefile-thunderbird.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/thunderbird/Makefile-thunderbird.common b/mail/thunderbird/Makefile-thunderbird.common
deleted file mode 100644
index 1eea9b89c7b..00000000000
--- a/mail/thunderbird/Makefile-thunderbird.common
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile-thunderbird.common,v 1.23 2007/03/02 14:12:24 ghen Exp $
-
-MOZILLA_BIN= thunderbird-bin
-MOZ_VER= 1.5.0.10
-EXTRACT_SUFX= .tar.bz2
-DISTNAME= thunderbird-${MOZ_VER}-source
-CATEGORIES= mail
-MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${MOZ_VER}/source/
-MASTER_SITES+= ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${MOZ_VER}/source/
-
-HOMEPAGE= http://www.mozilla.org/projects/thunderbird/
-
-CONFIGURE_ENV+= MOZ_THUNDERBIRD=1
-MAKE_ENV+= MOZ_THUNDERBIRD=1
-
-DISTINFO_FILE= ${.CURDIR}/../../mail/thunderbird/distinfo
-PATCHDIR= ${.CURDIR}/../../mail/thunderbird/patches
-
-CONFIGURE_ARGS+= --enable-application=mail
-CONFIGURE_ARGS+= --enable-single-profile
-CONFIGURE_ARGS+= --enable-debug=-g
-CONFIGURE_ENV+= ac_cv_visibility_pragma=no ac_cv_visibility_hidden=no
-
-CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/chrome/app-chrome.manifest
-CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/compreg.dat
-CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/xpti.dat
-
-post-install:
- cd ${PREFIX}/lib/${MOZILLA} && \
- ${SETENV} LD_LIBRARY_PATH=.:${PREFIX}/lib MOZILLA_FIVE_HOME=. HOME=${WRKSRC:Q} \
- ./${MOZILLA_BIN} -register
-
-.include "../../www/seamonkey/Makefile.common"
diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
deleted file mode 100644
index 03a57ef58f1..00000000000
--- a/mail/thunderbird/PLIST
+++ /dev/null
@@ -1,2901 +0,0 @@
-@comment $NetBSD: PLIST,v 1.20 2007/03/07 21:32:53 dmcmahill Exp $
-bin/${MOZILLA}
-@comment begin PROGRAMS
-lib/${MOZILLA}/${MOZILLA_BIN}
-lib/${MOZILLA}/dirver
-lib/${MOZILLA}/mangle
-lib/${MOZILLA}/mozilla-xremote-client
-lib/${MOZILLA}/nsinstall
-lib/${MOZILLA}/regxpcom
-lib/${MOZILLA}/shlibsign
-lib/${MOZILLA}/xpcshell
-lib/${MOZILLA}/xpicleanup
-lib/${MOZILLA}/xpidl
-lib/${MOZILLA}/xpt_dump
-lib/${MOZILLA}/xpt_link
-@comment end PROGRAMS
-@comment begin SCRIPTS
-lib/${MOZILLA}/thunderbird-config
-@comment end SCRIPTS
-@comment begin DSO
-lib/${MOZILLA}/components/libaccessibility.${SO_SUFFIX}
-lib/${MOZILLA}/components/libappcomps.${SO_SUFFIX}
-lib/${MOZILLA}/components/libauth.${SO_SUFFIX}
-lib/${MOZILLA}/components/libautoconfig.${SO_SUFFIX}
-lib/${MOZILLA}/components/libcaps.${SO_SUFFIX}
-lib/${MOZILLA}/components/libchrome.${SO_SUFFIX}
-lib/${MOZILLA}/components/libcommandlines.${SO_SUFFIX}
-lib/${MOZILLA}/components/libcomposer.${SO_SUFFIX}
-lib/${MOZILLA}/components/libdocshell.${SO_SUFFIX}
-lib/${MOZILLA}/components/libeditor.${SO_SUFFIX}
-lib/${MOZILLA}/components/libembedcomponents.${SO_SUFFIX}
-lib/${MOZILLA}/components/libfileview.${SO_SUFFIX}
-lib/${MOZILLA}/components/libgfx_gtk.${SO_SUFFIX}
-lib/${MOZILLA}/components/libgfxps.${SO_SUFFIX}
-lib/${MOZILLA}/components/libgklayout.${SO_SUFFIX}
-lib/${MOZILLA}/components/libhtmlpars.${SO_SUFFIX}
-lib/${MOZILLA}/components/libi18n.${SO_SUFFIX}
-lib/${MOZILLA}/components/libimglib2.${SO_SUFFIX}
-lib/${MOZILLA}/components/libimport.${SO_SUFFIX}
-lib/${MOZILLA}/components/libjar50.${SO_SUFFIX}
-lib/${MOZILLA}/components/libjsd.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmail.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmailcomps.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmork.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmozfind.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmozldap.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmsgsmime.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmyspell.${SO_SUFFIX}
-lib/${MOZILLA}/components/libnecko.${SO_SUFFIX}
-lib/${MOZILLA}/components/libnecko2.${SO_SUFFIX}
-lib/${MOZILLA}/components/libnsappshell.${SO_SUFFIX}
-lib/${MOZILLA}/components/libpipboot.${SO_SUFFIX}
-lib/${MOZILLA}/components/libpipnss.${SO_SUFFIX}
-lib/${MOZILLA}/components/libpippki.${SO_SUFFIX}
-lib/${MOZILLA}/components/libpref.${SO_SUFFIX}
-lib/${MOZILLA}/components/librdf.${SO_SUFFIX}
-lib/${MOZILLA}/components/libremoteservice.${SO_SUFFIX}
-lib/${MOZILLA}/components/libspellchecker.${SO_SUFFIX}
-lib/${MOZILLA}/components/libsystem-pref.${SO_SUFFIX}
-lib/${MOZILLA}/components/libtoolkitcomps.${SO_SUFFIX}
-lib/${MOZILLA}/components/libtxmgr.${SO_SUFFIX}
-lib/${MOZILLA}/components/libuconv.${SO_SUFFIX}
-lib/${MOZILLA}/components/libuniversalchardet.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwallet.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwalletviewers.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwebbrwsr.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwebsrvcs.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwidget_gtk2.${SO_SUFFIX}
-lib/${MOZILLA}/components/libxmlextras.${SO_SUFFIX}
-lib/${MOZILLA}/components/libxpcom_compat_c.${SO_SUFFIX}
-lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX}
-lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX}
-@comment libfreebl
-lib/${MOZILLA}/libgfxpsshar.${SO_SUFFIX}
-lib/${MOZILLA}/libgkgfx.${SO_SUFFIX}
-lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX}
-lib/${MOZILLA}/libgtkxtbin.${SO_SUFFIX}
-lib/${MOZILLA}/libldap50.${SO_SUFFIX}
-lib/${MOZILLA}/libmozjs.${SO_SUFFIX}
-lib/${MOZILLA}/libmozz.${SO_SUFFIX}
-lib/${MOZILLA}/libnspr4.${SO_SUFFIX}
-lib/${MOZILLA}/libnss3.${SO_SUFFIX}
-lib/${MOZILLA}/libnssckbi.${SO_SUFFIX}
-lib/${MOZILLA}/libplc4.${SO_SUFFIX}
-lib/${MOZILLA}/libplds4.${SO_SUFFIX}
-lib/${MOZILLA}/libprldap50.${SO_SUFFIX}
-lib/${MOZILLA}/libsmime3.${SO_SUFFIX}
-lib/${MOZILLA}/libsoftokn3.${SO_SUFFIX}
-lib/${MOZILLA}/libssl3.${SO_SUFFIX}
-lib/${MOZILLA}/libxpcom.${SO_SUFFIX}
-lib/${MOZILLA}/libxpcom_compat.${SO_SUFFIX}
-lib/${MOZILLA}/libxpcom_core.${SO_SUFFIX}
-lib/${MOZILLA}/libxpistub.${SO_SUFFIX}
-@comment end DSO
-@comment begin DATA
-lib/${MOZILLA}/LICENSE.txt
-lib/${MOZILLA}/README.txt
-lib/${MOZILLA}/bloaturls.txt
-lib/${MOZILLA}/chrome/US.jar
-lib/${MOZILLA}/chrome/chromelist.txt
-lib/${MOZILLA}/chrome/classic.jar
-lib/${MOZILLA}/chrome/classic.manifest
-lib/${MOZILLA}/chrome/comm.jar
-lib/${MOZILLA}/chrome/comm.manifest
-lib/${MOZILLA}/chrome/en-US.jar
-lib/${MOZILLA}/chrome/en-US.manifest
-lib/${MOZILLA}/chrome/icons/default/abcardWindow.xpm
-lib/${MOZILLA}/chrome/icons/default/abcardWindow16.xpm
-lib/${MOZILLA}/chrome/icons/default/addressbookWindow.xpm
-lib/${MOZILLA}/chrome/icons/default/addressbookWindow16.xpm
-lib/${MOZILLA}/chrome/icons/default/default.xpm
-lib/${MOZILLA}/chrome/icons/default/messengerWindow.xpm
-lib/${MOZILLA}/chrome/icons/default/messengerWindow16.xpm
-lib/${MOZILLA}/chrome/icons/default/msgcomposeWindow.xpm
-lib/${MOZILLA}/chrome/icons/default/msgcomposeWindow16.xpm
-lib/${MOZILLA}/chrome/installed-chrome.txt
-lib/${MOZILLA}/chrome/messenger.jar
-lib/${MOZILLA}/chrome/messenger.manifest
-lib/${MOZILLA}/chrome/newsblog.jar
-lib/${MOZILLA}/chrome/newsblog.manifest
-lib/${MOZILLA}/chrome/offline.jar
-lib/${MOZILLA}/chrome/offline.manifest
-lib/${MOZILLA}/chrome/pippki.jar
-lib/${MOZILLA}/chrome/pippki.manifest
-lib/${MOZILLA}/chrome/toolkit.jar
-lib/${MOZILLA}/chrome/toolkit.manifest
-lib/${MOZILLA}/components/accessibility-atk.xpt
-lib/${MOZILLA}/components/accessibility.xpt
-lib/${MOZILLA}/components/addrbook.xpt
-lib/${MOZILLA}/components/alerts.xpt
-lib/${MOZILLA}/components/appshell.xpt
-lib/${MOZILLA}/components/appstartup.xpt
-lib/${MOZILLA}/components/autocomplete.xpt
-lib/${MOZILLA}/components/autoconfig.xpt
-lib/${MOZILLA}/components/bookmarks.xpt
-lib/${MOZILLA}/components/caps.xpt
-lib/${MOZILLA}/components/chardet.xpt
-lib/${MOZILLA}/components/chrome.xpt
-lib/${MOZILLA}/components/commandhandler.xpt
-lib/${MOZILLA}/components/commandlines.xpt
-lib/${MOZILLA}/components/composer.xpt
-lib/${MOZILLA}/components/content_base.xpt
-lib/${MOZILLA}/components/content_html.xpt
-lib/${MOZILLA}/components/content_htmldoc.xpt
-lib/${MOZILLA}/components/content_xmldoc.xpt
-lib/${MOZILLA}/components/content_xslt.xpt
-lib/${MOZILLA}/components/content_xtf.xpt
-lib/${MOZILLA}/components/docshell.xpt
-lib/${MOZILLA}/components/dom.xpt
-lib/${MOZILLA}/components/dom_base.xpt
-lib/${MOZILLA}/components/dom_canvas.xpt
-lib/${MOZILLA}/components/dom_core.xpt
-lib/${MOZILLA}/components/dom_css.xpt
-lib/${MOZILLA}/components/dom_events.xpt
-lib/${MOZILLA}/components/dom_html.xpt
-lib/${MOZILLA}/components/dom_loadsave.xpt
-lib/${MOZILLA}/components/dom_range.xpt
-lib/${MOZILLA}/components/dom_stylesheets.xpt
-lib/${MOZILLA}/components/dom_traversal.xpt
-lib/${MOZILLA}/components/dom_views.xpt
-lib/${MOZILLA}/components/dom_xbl.xpt
-lib/${MOZILLA}/components/dom_xpath.xpt
-lib/${MOZILLA}/components/dom_xul.xpt
-lib/${MOZILLA}/components/downloadmanager.xpt
-lib/${MOZILLA}/components/downloads.xpt
-lib/${MOZILLA}/components/editor.xpt
-lib/${MOZILLA}/components/embed_base.xpt
-lib/${MOZILLA}/components/extensions.xpt
-lib/${MOZILLA}/components/exthandler.xpt
-lib/${MOZILLA}/components/filepicker.xpt
-lib/${MOZILLA}/components/find.xpt
-lib/${MOZILLA}/components/gfx.xpt
-lib/${MOZILLA}/components/history.xpt
-lib/${MOZILLA}/components/htmlparser.xpt
-lib/${MOZILLA}/components/imglib2.xpt
-lib/${MOZILLA}/components/impComm4xMail.xpt
-lib/${MOZILLA}/components/import.xpt
-lib/${MOZILLA}/components/intl.xpt
-lib/${MOZILLA}/components/jar.xpt
-lib/${MOZILLA}/components/jsconsole-clhandler.js
-lib/${MOZILLA}/components/jsconsole.xpt
-lib/${MOZILLA}/components/jsdservice.xpt
-lib/${MOZILLA}/components/layout_base.xpt
-lib/${MOZILLA}/components/layout_printing.xpt
-lib/${MOZILLA}/components/layout_xul.xpt
-lib/${MOZILLA}/components/layout_xul_tree.xpt
-lib/${MOZILLA}/components/locale.xpt
-lib/${MOZILLA}/components/lwbrk.xpt
-lib/${MOZILLA}/components/mailnews.xpt
-lib/${MOZILLA}/components/mailprofilemigration.xpt
-lib/${MOZILLA}/components/mailview.xpt
-lib/${MOZILLA}/components/mdn-service.js
-lib/${MOZILLA}/components/mime.xpt
-lib/${MOZILLA}/components/mimetype.xpt
-lib/${MOZILLA}/components/mozbrwsr.xpt
-lib/${MOZILLA}/components/mozfind.xpt
-lib/${MOZILLA}/components/mozgnome.xpt
-lib/${MOZILLA}/components/mozldap.xpt
-lib/${MOZILLA}/components/msgbase.xpt
-lib/${MOZILLA}/components/msgcompose.xpt
-lib/${MOZILLA}/components/msgdb.xpt
-lib/${MOZILLA}/components/msgimap.xpt
-lib/${MOZILLA}/components/msglocal.xpt
-lib/${MOZILLA}/components/msgnews.xpt
-lib/${MOZILLA}/components/msgsearch.xpt
-lib/${MOZILLA}/components/msgsmime.xpt
-lib/${MOZILLA}/components/myspell/en-US.aff
-lib/${MOZILLA}/components/myspell/en-US.dic
-lib/${MOZILLA}/components/necko.xpt
-lib/${MOZILLA}/components/necko_about.xpt
-lib/${MOZILLA}/components/necko_cache.xpt
-lib/${MOZILLA}/components/necko_cookie.xpt
-lib/${MOZILLA}/components/necko_data.xpt
-lib/${MOZILLA}/components/necko_dns.xpt
-lib/${MOZILLA}/components/necko_file.xpt
-lib/${MOZILLA}/components/necko_ftp.xpt
-lib/${MOZILLA}/components/necko_http.xpt
-lib/${MOZILLA}/components/necko_res.xpt
-lib/${MOZILLA}/components/necko_socket.xpt
-lib/${MOZILLA}/components/necko_strconv.xpt
-lib/${MOZILLA}/components/necko_viewsource.xpt
-lib/${MOZILLA}/components/newsblog.js
-lib/${MOZILLA}/components/nsAbLDAPAttributeMap.js
-lib/${MOZILLA}/components/nsCloseAllWindows.js
-lib/${MOZILLA}/components/nsComposerCmdLineHandler.js
-lib/${MOZILLA}/components/nsDefaultCLH.js
-lib/${MOZILLA}/components/nsDownloadProgressListener.js
-lib/${MOZILLA}/components/nsExtensionManager.js
-lib/${MOZILLA}/components/nsFilePicker.js
-lib/${MOZILLA}/components/nsHelperAppDlg.js
-lib/${MOZILLA}/components/nsInterfaceInfoToIDL.js
-lib/${MOZILLA}/components/nsLDAPPrefsService.js
-lib/${MOZILLA}/components/nsMailDefaultHandler.js
-lib/${MOZILLA}/components/nsProgressDialog.js
-lib/${MOZILLA}/components/nsProxyAutoConfig.js
-lib/${MOZILLA}/components/nsUpdateService.js
-lib/${MOZILLA}/components/offlineStartup.js
-lib/${MOZILLA}/components/pipboot.xpt
-lib/${MOZILLA}/components/pipnss.xpt
-lib/${MOZILLA}/components/pippki.xpt
-lib/${MOZILLA}/components/pref.xpt
-lib/${MOZILLA}/components/prefetch.xpt
-lib/${MOZILLA}/components/profile.xpt
-lib/${MOZILLA}/components/progressDlg.xpt
-lib/${MOZILLA}/components/proxyObjInst.xpt
-lib/${MOZILLA}/components/rdf.xpt
-lib/${MOZILLA}/components/shistory.xpt
-lib/${MOZILLA}/components/sidebar.xpt
-lib/${MOZILLA}/components/signonviewer.xpt
-lib/${MOZILLA}/components/smime-service.js
-lib/${MOZILLA}/components/spellchecker.xpt
-lib/${MOZILLA}/components/toolkitprofile.xpt
-lib/${MOZILLA}/components/toolkitremote.xpt
-lib/${MOZILLA}/components/txmgr.xpt
-lib/${MOZILLA}/components/txtsvc.xpt
-lib/${MOZILLA}/components/uconv.xpt
-lib/${MOZILLA}/components/unicharutil.xpt
-lib/${MOZILLA}/components/update.xpt
-lib/${MOZILLA}/components/uriloader.xpt
-lib/${MOZILLA}/components/wallet.xpt
-lib/${MOZILLA}/components/walleteditor.xpt
-lib/${MOZILLA}/components/walletpreview.xpt
-lib/${MOZILLA}/components/webBrowser_core.xpt
-lib/${MOZILLA}/components/webbrowserpersist.xpt
-lib/${MOZILLA}/components/webshell_idls.xpt
-lib/${MOZILLA}/components/websrvcs.xpt
-lib/${MOZILLA}/components/widget.xpt
-lib/${MOZILLA}/components/windowds.xpt
-lib/${MOZILLA}/components/windowwatcher.xpt
-lib/${MOZILLA}/components/xmlextras.xpt
-lib/${MOZILLA}/components/xpcom_base.xpt
-lib/${MOZILLA}/components/xpcom_components.xpt
-lib/${MOZILLA}/components/xpcom_ds.xpt
-lib/${MOZILLA}/components/xpcom_io.xpt
-lib/${MOZILLA}/components/xpcom_obsolete.xpt
-lib/${MOZILLA}/components/xpcom_threads.xpt
-lib/${MOZILLA}/components/xpcom_xpti.xpt
-lib/${MOZILLA}/components/xpconnect.xpt
-lib/${MOZILLA}/components/xpinstall.xpt
-lib/${MOZILLA}/components/xulapp.xpt
-lib/${MOZILLA}/components/xuldoc.xpt
-lib/${MOZILLA}/components/xultmpl.xpt
-lib/${MOZILLA}/defaults/autoconfig/platform.js
-lib/${MOZILLA}/defaults/autoconfig/prefcalls.js
-lib/${MOZILLA}/defaults/isp/US/movemail.rdf
-lib/${MOZILLA}/defaults/isp/US/rss.rdf
-lib/${MOZILLA}/defaults/isp/movemail.rdf
-lib/${MOZILLA}/defaults/isp/rss.rdf
-lib/${MOZILLA}/defaults/messenger/SpamAssassin.sfd
-lib/${MOZILLA}/defaults/messenger/SpamPal.sfd
-lib/${MOZILLA}/defaults/messenger/US/mailViews.dat
-lib/${MOZILLA}/defaults/messenger/mailViews.dat
-lib/${MOZILLA}/defaults/pref/all-l10n.js
-lib/${MOZILLA}/defaults/pref/all-thunderbird.js
-lib/${MOZILLA}/defaults/pref/channel-prefs.js
-lib/${MOZILLA}/defaults/pref/composer.js
-lib/${MOZILLA}/defaults/pref/mailnews.js
-lib/${MOZILLA}/defaults/pref/mdn.js
-lib/${MOZILLA}/defaults/pref/smime.js
-lib/${MOZILLA}/defaults/profile/US/localstore.rdf
-lib/${MOZILLA}/defaults/profile/US/mimeTypes.rdf
-lib/${MOZILLA}/defaults/profile/localstore.rdf
-lib/${MOZILLA}/defaults/profile/mimeTypes.rdf
-lib/${MOZILLA}/defaults/profile/prefs.js
-lib/${MOZILLA}/defaults/wallet/DistinguishedSchema.tbl
-lib/${MOZILLA}/defaults/wallet/FieldSchema.tbl
-lib/${MOZILLA}/defaults/wallet/PositionalSchema.tbl
-lib/${MOZILLA}/defaults/wallet/SchemaConcat.tbl
-lib/${MOZILLA}/defaults/wallet/SchemaStrings.tbl
-lib/${MOZILLA}/defaults/wallet/StateSchema.tbl
-lib/${MOZILLA}/defaults/wallet/VcardSchema.tbl
-lib/${MOZILLA}/dependentlibs.list
-lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
-lib/${MOZILLA}/greprefs/all.js
-lib/${MOZILLA}/greprefs/security-prefs.js
-lib/${MOZILLA}/greprefs/xpinstall.js
-lib/${MOZILLA}/icons/mozicon16.xpm
-lib/${MOZILLA}/icons/mozicon50.xpm
-lib/${MOZILLA}/init.d/README
-@comment libfreebl.chk
-lib/${MOZILLA}/libsoftokn3.chk
-lib/${MOZILLA}/res/EditorOverride.css
-lib/${MOZILLA}/res/arrow.gif
-lib/${MOZILLA}/res/arrowd.gif
-lib/${MOZILLA}/res/bloatcycle.html
-lib/${MOZILLA}/res/broken-image.gif
-lib/${MOZILLA}/res/charsetData.properties
-lib/${MOZILLA}/res/charsetalias.properties
-lib/${MOZILLA}/res/cmessage.txt
-lib/${MOZILLA}/res/dtd/xhtml11.dtd
-lib/${MOZILLA}/res/entityTables/html40Latin1.properties
-lib/${MOZILLA}/res/entityTables/html40Special.properties
-lib/${MOZILLA}/res/entityTables/html40Symbols.properties
-lib/${MOZILLA}/res/entityTables/htmlEntityVersions.properties
-lib/${MOZILLA}/res/entityTables/transliterate.properties
-lib/${MOZILLA}/res/fonts/fontEncoding.properties
-lib/${MOZILLA}/res/fonts/pangoFontEncoding.properties
-lib/${MOZILLA}/res/forms.css
-lib/${MOZILLA}/res/grabber.gif
-lib/${MOZILLA}/res/hiddenWindow.html
-lib/${MOZILLA}/res/html.css
-lib/${MOZILLA}/res/html/gopher-audio.gif
-lib/${MOZILLA}/res/html/gopher-binary.gif
-lib/${MOZILLA}/res/html/gopher-find.gif
-lib/${MOZILLA}/res/html/gopher-image.gif
-lib/${MOZILLA}/res/html/gopher-menu.gif
-lib/${MOZILLA}/res/html/gopher-movie.gif
-lib/${MOZILLA}/res/html/gopher-sound.gif
-lib/${MOZILLA}/res/html/gopher-telnet.gif
-lib/${MOZILLA}/res/html/gopher-text.gif
-lib/${MOZILLA}/res/html/gopher-unknown.gif
-lib/${MOZILLA}/res/langGroups.properties
-lib/${MOZILLA}/res/language.properties
-lib/${MOZILLA}/res/loading-image.gif
-lib/${MOZILLA}/res/quirk.css
-lib/${MOZILLA}/res/sample.unixpsfonts.properties
-lib/${MOZILLA}/res/samples/Anieyes.gif
-lib/${MOZILLA}/res/samples/aform.css
-lib/${MOZILLA}/res/samples/beeptest.html
-lib/${MOZILLA}/res/samples/bform.css
-lib/${MOZILLA}/res/samples/bg.jpg
-lib/${MOZILLA}/res/samples/cform.css
-lib/${MOZILLA}/res/samples/checkboxTest.xul
-lib/${MOZILLA}/res/samples/colorpicker.xul
-lib/${MOZILLA}/res/samples/demoform.css
-lib/${MOZILLA}/res/samples/dexopenchrome.xul
-lib/${MOZILLA}/res/samples/dexparamdialog.html
-lib/${MOZILLA}/res/samples/dexparamdialog.xul
-lib/${MOZILLA}/res/samples/find.html
-lib/${MOZILLA}/res/samples/gear1.gif
-lib/${MOZILLA}/res/samples/hidetoolicon.css
-lib/${MOZILLA}/res/samples/hidetoolicon.xul
-lib/${MOZILLA}/res/samples/image_props.html
-lib/${MOZILLA}/res/samples/mozform.css
-lib/${MOZILLA}/res/samples/printsetup.html
-lib/${MOZILLA}/res/samples/raptor.jpg
-lib/${MOZILLA}/res/samples/rock_gra.gif
-lib/${MOZILLA}/res/samples/sampleimages/bongo.gif
-lib/${MOZILLA}/res/samples/sampleimages/down.gif
-lib/${MOZILLA}/res/samples/sampleimages/left.gif
-lib/${MOZILLA}/res/samples/sampleimages/right.gif
-lib/${MOZILLA}/res/samples/sampleimages/up.gif
-lib/${MOZILLA}/res/samples/scrollbarTest1.xul
-lib/${MOZILLA}/res/samples/scrollbarTest2.xul
-lib/${MOZILLA}/res/samples/sliderTest1.xul
-lib/${MOZILLA}/res/samples/soundtest.html
-lib/${MOZILLA}/res/samples/tab.xul
-lib/${MOZILLA}/res/samples/test.wav
-lib/${MOZILLA}/res/samples/test0.html
-lib/${MOZILLA}/res/samples/test1.html
-lib/${MOZILLA}/res/samples/test10.html
-lib/${MOZILLA}/res/samples/test11.html
-lib/${MOZILLA}/res/samples/test12.html
-lib/${MOZILLA}/res/samples/test13.html
-lib/${MOZILLA}/res/samples/test14.html
-lib/${MOZILLA}/res/samples/test15.html
-lib/${MOZILLA}/res/samples/test16.html
-lib/${MOZILLA}/res/samples/test2.html
-lib/${MOZILLA}/res/samples/test3.html
-lib/${MOZILLA}/res/samples/test4.html
-lib/${MOZILLA}/res/samples/test5.html
-lib/${MOZILLA}/res/samples/test6.html
-lib/${MOZILLA}/res/samples/test7.html
-lib/${MOZILLA}/res/samples/test8-1.html
-lib/${MOZILLA}/res/samples/test8.html
-lib/${MOZILLA}/res/samples/test8dom.html
-lib/${MOZILLA}/res/samples/test8sca.html
-lib/${MOZILLA}/res/samples/test8siz.html
-lib/${MOZILLA}/res/samples/test8tab.html
-lib/${MOZILLA}/res/samples/test9.html
-lib/${MOZILLA}/res/samples/test9a.html
-lib/${MOZILLA}/res/samples/test9b.html
-lib/${MOZILLA}/res/samples/test_ed.html
-lib/${MOZILLA}/res/samples/test_form.html
-lib/${MOZILLA}/res/samples/test_gfx.html
-lib/${MOZILLA}/res/samples/test_lbox.html
-lib/${MOZILLA}/res/samples/test_pr.html
-lib/${MOZILLA}/res/samples/test_weight.html
-lib/${MOZILLA}/res/samples/toolbarTest1.xul
-lib/${MOZILLA}/res/samples/treeTest1.css
-lib/${MOZILLA}/res/samples/treeTest1.xul
-lib/${MOZILLA}/res/samples/widgets.xul
-lib/${MOZILLA}/res/samples/xpmenu.xul
-lib/${MOZILLA}/res/samples/xulTest.css
-lib/${MOZILLA}/res/table-add-column-after-active.gif
-lib/${MOZILLA}/res/table-add-column-after-hover.gif
-lib/${MOZILLA}/res/table-add-column-after.gif
-lib/${MOZILLA}/res/table-add-column-before-active.gif
-lib/${MOZILLA}/res/table-add-column-before-hover.gif
-lib/${MOZILLA}/res/table-add-column-before.gif
-lib/${MOZILLA}/res/table-add-row-after-active.gif
-lib/${MOZILLA}/res/table-add-row-after-hover.gif
-lib/${MOZILLA}/res/table-add-row-after.gif
-lib/${MOZILLA}/res/table-add-row-before-active.gif
-lib/${MOZILLA}/res/table-add-row-before-hover.gif
-lib/${MOZILLA}/res/table-add-row-before.gif
-lib/${MOZILLA}/res/table-remove-column-active.gif
-lib/${MOZILLA}/res/table-remove-column-hover.gif
-lib/${MOZILLA}/res/table-remove-column.gif
-lib/${MOZILLA}/res/table-remove-row-active.gif
-lib/${MOZILLA}/res/table-remove-row-hover.gif
-lib/${MOZILLA}/res/table-remove-row.gif
-lib/${MOZILLA}/res/throbber/anim.gif
-lib/${MOZILLA}/res/throbber/anims00.gif
-lib/${MOZILLA}/res/throbber/anims01.gif
-lib/${MOZILLA}/res/throbber/anims02.gif
-lib/${MOZILLA}/res/throbber/anims03.gif
-lib/${MOZILLA}/res/throbber/anims04.gif
-lib/${MOZILLA}/res/throbber/anims05.gif
-lib/${MOZILLA}/res/throbber/anims06.gif
-lib/${MOZILLA}/res/throbber/anims07.gif
-lib/${MOZILLA}/res/throbber/anims08.gif
-lib/${MOZILLA}/res/throbber/anims09.gif
-lib/${MOZILLA}/res/throbber/anims10.gif
-lib/${MOZILLA}/res/throbber/anims11.gif
-lib/${MOZILLA}/res/throbber/anims12.gif
-lib/${MOZILLA}/res/throbber/anims13.gif
-lib/${MOZILLA}/res/throbber/anims14.gif
-lib/${MOZILLA}/res/throbber/anims15.gif
-lib/${MOZILLA}/res/throbber/anims16.gif
-lib/${MOZILLA}/res/throbber/anims17.gif
-lib/${MOZILLA}/res/throbber/anims18.gif
-lib/${MOZILLA}/res/throbber/anims19.gif
-lib/${MOZILLA}/res/throbber/anims20.gif
-lib/${MOZILLA}/res/throbber/anims21.gif
-lib/${MOZILLA}/res/throbber/anims22.gif
-lib/${MOZILLA}/res/throbber/anims23.gif
-lib/${MOZILLA}/res/throbber/anims24.gif
-lib/${MOZILLA}/res/throbber/anims25.gif
-lib/${MOZILLA}/res/throbber/anims26.gif
-lib/${MOZILLA}/res/throbber/anims27.gif
-lib/${MOZILLA}/res/throbber/anims28.gif
-lib/${MOZILLA}/res/throbber/anims29.gif
-lib/${MOZILLA}/res/ua.css
-lib/${MOZILLA}/res/unixcharset.properties
-lib/${MOZILLA}/res/viewer.properties
-lib/${MOZILLA}/res/viewsource.css
-lib/${MOZILLA}/updater
-lib/${MOZILLA}/updater.ini
-@comment end DATA
-@comment begin INCLUDE
-include/${MOZILLA}/accessibility/nsAccessNode.h
-include/${MOZILLA}/accessibility/nsAccessNodeWrap.h
-include/${MOZILLA}/accessibility/nsAccessibleEventData.h
-include/${MOZILLA}/accessibility/nsAccessibleText.h
-include/${MOZILLA}/accessibility/nsAccessibleWrap.h
-include/${MOZILLA}/accessibility/nsDocAccessibleWrap.h
-include/${MOZILLA}/accessibility/nsIAccessNode.h
-include/${MOZILLA}/accessibility/nsIAccessibilityService.h
-include/${MOZILLA}/accessibility/nsIAccessible.h
-include/${MOZILLA}/accessibility/nsIAccessibleAction.h
-include/${MOZILLA}/accessibility/nsIAccessibleCaret.h
-include/${MOZILLA}/accessibility/nsIAccessibleDocument.h
-include/${MOZILLA}/accessibility/nsIAccessibleEditableText.h
-include/${MOZILLA}/accessibility/nsIAccessibleEvent.h
-include/${MOZILLA}/accessibility/nsIAccessibleHyperLink.h
-include/${MOZILLA}/accessibility/nsIAccessibleHyperText.h
-include/${MOZILLA}/accessibility/nsIAccessibleProvider.h
-include/${MOZILLA}/accessibility/nsIAccessibleRetrieval.h
-include/${MOZILLA}/accessibility/nsIAccessibleSelectable.h
-include/${MOZILLA}/accessibility/nsIAccessibleTable.h
-include/${MOZILLA}/accessibility/nsIAccessibleText.h
-include/${MOZILLA}/accessibility/nsIAccessibleTreeCache.h
-include/${MOZILLA}/accessibility/nsIAccessibleValue.h
-include/${MOZILLA}/accessibility/nsPIAccessNode.h
-include/${MOZILLA}/accessibility/nsPIAccessible.h
-include/${MOZILLA}/accessibility/nsPIAccessibleDocument.h
-include/${MOZILLA}/accessibility/nsRootAccessible.h
-include/${MOZILLA}/accessibility/nsRootAccessibleWrap.h
-include/${MOZILLA}/accessibility/nsTextAccessibleWrap.h
-include/${MOZILLA}/accessibility/nsXULMenuAccessibleWrap.h
-include/${MOZILLA}/accessibility/nsXULTreeAccessibleWrap.h
-include/${MOZILLA}/addrbook/nsAbBaseCID.h
-include/${MOZILLA}/addrbook/nsAbCardProperty.h
-include/${MOZILLA}/addrbook/nsAbMDBCardProperty.h
-include/${MOZILLA}/addrbook/nsDirPrefs.h
-include/${MOZILLA}/addrbook/nsIAbAddressCollecter.h
-include/${MOZILLA}/addrbook/nsIAbAutoCompleteSession.h
-include/${MOZILLA}/addrbook/nsIAbBase.h
-include/${MOZILLA}/addrbook/nsIAbBooleanExpression.h
-include/${MOZILLA}/addrbook/nsIAbCard.h
-include/${MOZILLA}/addrbook/nsIAbDirFactory.h
-include/${MOZILLA}/addrbook/nsIAbDirFactoryService.h
-include/${MOZILLA}/addrbook/nsIAbDirectory.h
-include/${MOZILLA}/addrbook/nsIAbDirectoryQuery.h
-include/${MOZILLA}/addrbook/nsIAbDirectoryQueryProxy.h
-include/${MOZILLA}/addrbook/nsIAbDirectorySearch.h
-include/${MOZILLA}/addrbook/nsIAbLDAPAttributeMap.h
-include/${MOZILLA}/addrbook/nsIAbLDAPAutoCompFormatter.h
-include/${MOZILLA}/addrbook/nsIAbLDAPDirectory.h
-include/${MOZILLA}/addrbook/nsIAbLDAPReplicationData.h
-include/${MOZILLA}/addrbook/nsIAbLDAPReplicationQuery.h
-include/${MOZILLA}/addrbook/nsIAbLDAPReplicationService.h
-include/${MOZILLA}/addrbook/nsIAbLDIFService.h
-include/${MOZILLA}/addrbook/nsIAbListener.h
-include/${MOZILLA}/addrbook/nsIAbMDBCard.h
-include/${MOZILLA}/addrbook/nsIAbMDBDirectory.h
-include/${MOZILLA}/addrbook/nsIAbUpgrader.h
-include/${MOZILLA}/addrbook/nsIAbView.h
-include/${MOZILLA}/addrbook/nsIAddbookUrl.h
-include/${MOZILLA}/addrbook/nsIAddrBookSession.h
-include/${MOZILLA}/addrbook/nsIAddrDBAnnouncer.h
-include/${MOZILLA}/addrbook/nsIAddrDBListener.h
-include/${MOZILLA}/addrbook/nsIAddrDatabase.h
-include/${MOZILLA}/addrbook/nsIAddressBook.h
-include/${MOZILLA}/addrbook/nsILDAPPrefsService.h
-include/${MOZILLA}/addrbook/nsIMsgVCardService.h
-include/${MOZILLA}/addrbook/nsVCardObj.h
-include/${MOZILLA}/alerts/nsIAlertsService.h
-include/${MOZILLA}/appcomps/nsCharsetMenu.h
-include/${MOZILLA}/appcomps/nsFontPackageHandler.h
-include/${MOZILLA}/appcomps/nsIAppStartup.h
-include/${MOZILLA}/appcomps/nsIAutoCompleteListener.h
-include/${MOZILLA}/appcomps/nsIAutoCompleteResults.h
-include/${MOZILLA}/appcomps/nsIAutoCompleteSession.h
-include/${MOZILLA}/appcomps/nsIBookmarksService.h
-include/${MOZILLA}/appcomps/nsICloseAllWindows.h
-include/${MOZILLA}/appcomps/nsIFindService.h
-include/${MOZILLA}/appcomps/nsILDAPAutoCompFormatter.h
-include/${MOZILLA}/appcomps/nsILDAPAutoCompleteSession.h
-include/${MOZILLA}/appcomps/nsISearchContext.h
-include/${MOZILLA}/appcomps/nsIUserInfo.h
-include/${MOZILLA}/appcomps/nsIWindowDataSource.h
-include/${MOZILLA}/appcomps/nsXPFEComponentsCID.h
-include/${MOZILLA}/appshell/nsAppShellCID.h
-include/${MOZILLA}/appshell/nsIAppShellService.h
-include/${MOZILLA}/appshell/nsIPopupWindowManager.h
-include/${MOZILLA}/appshell/nsIWindowMediator.h
-include/${MOZILLA}/appshell/nsIWindowMediatorListener.h
-include/${MOZILLA}/appshell/nsIXULBrowserWindow.h
-include/${MOZILLA}/appshell/nsIXULWindow.h
-include/${MOZILLA}/autoconfig/nsIAutoConfig.h
-include/${MOZILLA}/autoconfig/nsILDAPSyncQuery.h
-include/${MOZILLA}/autoconfig/nsIReadConfig.h
-include/${MOZILLA}/bayesflt/nsBayesianFilter.h
-include/${MOZILLA}/bayesflt/nsBayesianFilterCID.h
-include/${MOZILLA}/browser/nsIBrowserInstance.h
-include/${MOZILLA}/caps/nsICryptoHash.h
-include/${MOZILLA}/caps/nsIPrincipal.h
-include/${MOZILLA}/caps/nsIScriptSecurityManager.h
-include/${MOZILLA}/caps/nsISecurityCheckedComponent.h
-include/${MOZILLA}/caps/nsISignatureVerifier.h
-include/${MOZILLA}/caps/nsJSPrincipals.h
-include/${MOZILLA}/chardet/nsCharsetDetectionAdaptorCID.h
-include/${MOZILLA}/chardet/nsDetectionConfident.h
-include/${MOZILLA}/chardet/nsDocumentCharsetInfoCID.h
-include/${MOZILLA}/chardet/nsICharsetDetectionAdaptor.h
-include/${MOZILLA}/chardet/nsICharsetDetectionObserver.h
-include/${MOZILLA}/chardet/nsICharsetDetector.h
-include/${MOZILLA}/chardet/nsICharsetResolver.h
-include/${MOZILLA}/chardet/nsIDocCharset.h
-include/${MOZILLA}/chardet/nsIDocumentCharsetInfo.h
-include/${MOZILLA}/chardet/nsIMetaCharsetService.h
-include/${MOZILLA}/chardet/nsIStringCharsetDetector.h
-include/${MOZILLA}/chardet/nsIXMLEncodingService.h
-include/${MOZILLA}/chardet/nsMetaCharsetCID.h
-include/${MOZILLA}/chardet/nsXMLEncodingCID.h
-include/${MOZILLA}/chrome/nsIToolkitChromeRegistry.h
-include/${MOZILLA}/commandhandler/nsICommandManager.h
-include/${MOZILLA}/commandhandler/nsICommandParams.h
-include/${MOZILLA}/commandhandler/nsIControllerCommand.h
-include/${MOZILLA}/commandhandler/nsIControllerCommandTable.h
-include/${MOZILLA}/commandhandler/nsIControllerContext.h
-include/${MOZILLA}/commandhandler/nsPICommandUpdater.h
-include/${MOZILLA}/composer/nsIEditingSession.h
-include/${MOZILLA}/content/mozFlushType.h
-include/${MOZILLA}/content/mozISanitizingSerializer.h
-include/${MOZILLA}/content/nsAtomListUtils.h
-include/${MOZILLA}/content/nsContentCID.h
-include/${MOZILLA}/content/nsContentCreatorFunctions.h
-include/${MOZILLA}/content/nsContentErrors.h
-include/${MOZILLA}/content/nsContentList.h
-include/${MOZILLA}/content/nsContentPolicyUtils.h
-include/${MOZILLA}/content/nsContentUtils.h
-include/${MOZILLA}/content/nsCopySupport.h
-include/${MOZILLA}/content/nsHTMLAtomList.h
-include/${MOZILLA}/content/nsHTMLAtoms.h
-include/${MOZILLA}/content/nsIAttribute.h
-include/${MOZILLA}/content/nsIBindingManager.h
-include/${MOZILLA}/content/nsICanvasElement.h
-include/${MOZILLA}/content/nsICanvasRenderingContextInternal.h
-include/${MOZILLA}/content/nsIChromeRegistry.h
-include/${MOZILLA}/content/nsIContent.h
-include/${MOZILLA}/content/nsIContentIterator.h
-include/${MOZILLA}/content/nsIContentPolicy.h
-include/${MOZILLA}/content/nsIContentSerializer.h
-include/${MOZILLA}/content/nsIDocument.h
-include/${MOZILLA}/content/nsIDocumentEncoder.h
-include/${MOZILLA}/content/nsIDocumentObserver.h
-include/${MOZILLA}/content/nsIDocumentTransformer.h
-include/${MOZILLA}/content/nsIDragDropHandler.h
-include/${MOZILLA}/content/nsIEventListenerManager.h
-include/${MOZILLA}/content/nsIEventStateManager.h
-include/${MOZILLA}/content/nsIFIXptr.h
-include/${MOZILLA}/content/nsIFileControlElement.h
-include/${MOZILLA}/content/nsIForm.h
-include/${MOZILLA}/content/nsIFormControl.h
-include/${MOZILLA}/content/nsIFormProcessor.h
-include/${MOZILLA}/content/nsIFormSubmission.h
-include/${MOZILLA}/content/nsIFormSubmitObserver.h
-include/${MOZILLA}/content/nsIFrameLoader.h
-include/${MOZILLA}/content/nsIFrameSetElement.h
-include/${MOZILLA}/content/nsIHTMLDocument.h
-include/${MOZILLA}/content/nsIHTMLToTextSink.h
-include/${MOZILLA}/content/nsIImageDocument.h
-include/${MOZILLA}/content/nsIImageLoadingContent.h
-include/${MOZILLA}/content/nsILink.h
-include/${MOZILLA}/content/nsIModifyableXPointer.h
-include/${MOZILLA}/content/nsINameSpaceManager.h
-include/${MOZILLA}/content/nsINodeInfo.h
-include/${MOZILLA}/content/nsIOptionElement.h
-include/${MOZILLA}/content/nsIPhonetic.h
-include/${MOZILLA}/content/nsIPluginElement.h
-include/${MOZILLA}/content/nsIPrivateCompositionEvent.h
-include/${MOZILLA}/content/nsIPrivateDOMEvent.h
-include/${MOZILLA}/content/nsIPrivateDOMImplementation.h
-include/${MOZILLA}/content/nsIPrivateTextEvent.h
-include/${MOZILLA}/content/nsIPrivateTextRange.h
-include/${MOZILLA}/content/nsIRadioControlElement.h
-include/${MOZILLA}/content/nsIRadioGroupContainer.h
-include/${MOZILLA}/content/nsIRadioVisitor.h
-include/${MOZILLA}/content/nsIRangeUtils.h
-include/${MOZILLA}/content/nsIScriptElement.h
-include/${MOZILLA}/content/nsIScriptEventHandler.h
-include/${MOZILLA}/content/nsIScriptEventManager.h
-include/${MOZILLA}/content/nsIScriptLoader.h
-include/${MOZILLA}/content/nsIScriptLoaderObserver.h
-include/${MOZILLA}/content/nsISelectElement.h
-include/${MOZILLA}/content/nsISelection.h
-include/${MOZILLA}/content/nsISelectionController.h
-include/${MOZILLA}/content/nsISelectionDisplay.h
-include/${MOZILLA}/content/nsISelectionListener.h
-include/${MOZILLA}/content/nsISelectionPrivate.h
-include/${MOZILLA}/content/nsIStyleSheetLinkingElement.h
-include/${MOZILLA}/content/nsIStyledContent.h
-include/${MOZILLA}/content/nsISyncLoadDOMService.h
-include/${MOZILLA}/content/nsITextContent.h
-include/${MOZILLA}/content/nsITextControlElement.h
-include/${MOZILLA}/content/nsIWyciwygChannel.h
-include/${MOZILLA}/content/nsIXBLDocumentInfo.h
-include/${MOZILLA}/content/nsIXBLService.h
-include/${MOZILLA}/content/nsIXMLContent.h
-include/${MOZILLA}/content/nsIXMLContentBuilder.h
-include/${MOZILLA}/content/nsIXMLContentSink.h
-include/${MOZILLA}/content/nsIXPathEvaluatorInternal.h
-include/${MOZILLA}/content/nsIXPointer.h
-include/${MOZILLA}/content/nsIXSLTException.h
-include/${MOZILLA}/content/nsIXSLTProcessor.h
-include/${MOZILLA}/content/nsIXSLTProcessorObsolete.h
-include/${MOZILLA}/content/nsIXTFAttributeHandler.h
-include/${MOZILLA}/content/nsIXTFBindableElement.h
-include/${MOZILLA}/content/nsIXTFBindableElementWrapper.h
-include/${MOZILLA}/content/nsIXTFElement.h
-include/${MOZILLA}/content/nsIXTFElementFactory.h
-include/${MOZILLA}/content/nsIXTFElementWrapper.h
-include/${MOZILLA}/content/nsIXTFElementWrapperPrivate.h
-include/${MOZILLA}/content/nsIXTFGenericElement.h
-include/${MOZILLA}/content/nsIXTFGenericElementWrapper.h
-include/${MOZILLA}/content/nsIXTFPrivate.h
-include/${MOZILLA}/content/nsIXTFService.h
-include/${MOZILLA}/content/nsIXTFStyledElementWrapper.h
-include/${MOZILLA}/content/nsIXTFVisual.h
-include/${MOZILLA}/content/nsIXTFVisualWrapperPrivate.h
-include/${MOZILLA}/content/nsIXTFXMLVisual.h
-include/${MOZILLA}/content/nsIXTFXMLVisualWrapper.h
-include/${MOZILLA}/content/nsIXTFXULVisual.h
-include/${MOZILLA}/content/nsIXTFXULVisualWrapper.h
-include/${MOZILLA}/content/nsImageMapUtils.h
-include/${MOZILLA}/content/nsMutationEvent.h
-include/${MOZILLA}/content/nsNodeInfoManager.h
-include/${MOZILLA}/content/nsPLDOMEvent.h
-include/${MOZILLA}/content/nsPropertyTable.h
-include/${MOZILLA}/content/nsStubDocumentObserver.h
-include/${MOZILLA}/content/nsTextFragment.h
-include/${MOZILLA}/content/nsXBLAtomList.h
-include/${MOZILLA}/content/nsXBLAtoms.h
-include/${MOZILLA}/content/nsXMLNameSpaceMap.h
-include/${MOZILLA}/dbm/cdefs.h
-include/${MOZILLA}/dbm/mcom_db.h
-include/${MOZILLA}/dbm/ncompat.h
-include/${MOZILLA}/dbm/nsres.h
-include/${MOZILLA}/dbm/winfile.h
-include/${MOZILLA}/docshell/nsCDefaultURIFixup.h
-include/${MOZILLA}/docshell/nsCDocShell.h
-include/${MOZILLA}/docshell/nsDocShellCID.h
-include/${MOZILLA}/docshell/nsIContentViewer.h
-include/${MOZILLA}/docshell/nsIContentViewerEdit.h
-include/${MOZILLA}/docshell/nsIContentViewerFile.h
-include/${MOZILLA}/docshell/nsIDocShell.h
-include/${MOZILLA}/docshell/nsIDocShellHistory.h
-include/${MOZILLA}/docshell/nsIDocShellLoadInfo.h
-include/${MOZILLA}/docshell/nsIDocShellTreeItem.h
-include/${MOZILLA}/docshell/nsIDocShellTreeNode.h
-include/${MOZILLA}/docshell/nsIDocShellTreeOwner.h
-include/${MOZILLA}/docshell/nsIEditorDocShell.h
-include/${MOZILLA}/docshell/nsIGlobalHistory.h
-include/${MOZILLA}/docshell/nsIGlobalHistory2.h
-include/${MOZILLA}/docshell/nsIMarkupDocumentViewer.h
-include/${MOZILLA}/docshell/nsIScrollable.h
-include/${MOZILLA}/docshell/nsITextScroll.h
-include/${MOZILLA}/docshell/nsIURIFixup.h
-include/${MOZILLA}/docshell/nsIWebNavigation.h
-include/${MOZILLA}/docshell/nsIWebNavigationInfo.h
-include/${MOZILLA}/docshell/nsIWebPageDescriptor.h
-include/${MOZILLA}/dom/domstubs.h
-include/${MOZILLA}/dom/nsDOMCID.h
-include/${MOZILLA}/dom/nsDOMError.h
-include/${MOZILLA}/dom/nsDOMString.h
-include/${MOZILLA}/dom/nsIBaseDOMException.h
-include/${MOZILLA}/dom/nsIBrowserDOMWindow.h
-include/${MOZILLA}/dom/nsIDOM3Document.h
-include/${MOZILLA}/dom/nsIDOM3DocumentEvent.h
-include/${MOZILLA}/dom/nsIDOM3EventTarget.h
-include/${MOZILLA}/dom/nsIDOM3Node.h
-include/${MOZILLA}/dom/nsIDOMAbstractView.h
-include/${MOZILLA}/dom/nsIDOMAttr.h
-include/${MOZILLA}/dom/nsIDOMBarProp.h
-include/${MOZILLA}/dom/nsIDOMBeforeUnloadEvent.h
-include/${MOZILLA}/dom/nsIDOMCDATASection.h
-include/${MOZILLA}/dom/nsIDOMCRMFObject.h
-include/${MOZILLA}/dom/nsIDOMCSS2Properties.h
-include/${MOZILLA}/dom/nsIDOMCSSCharsetRule.h
-include/${MOZILLA}/dom/nsIDOMCSSFontFaceRule.h
-include/${MOZILLA}/dom/nsIDOMCSSImportRule.h
-include/${MOZILLA}/dom/nsIDOMCSSMediaRule.h
-include/${MOZILLA}/dom/nsIDOMCSSMozDocumentRule.h
-include/${MOZILLA}/dom/nsIDOMCSSPageRule.h
-include/${MOZILLA}/dom/nsIDOMCSSPrimitiveValue.h
-include/${MOZILLA}/dom/nsIDOMCSSRule.h
-include/${MOZILLA}/dom/nsIDOMCSSRuleList.h
-include/${MOZILLA}/dom/nsIDOMCSSStyleDeclaration.h
-include/${MOZILLA}/dom/nsIDOMCSSStyleRule.h
-include/${MOZILLA}/dom/nsIDOMCSSStyleSheet.h
-include/${MOZILLA}/dom/nsIDOMCSSUnknownRule.h
-include/${MOZILLA}/dom/nsIDOMCSSValue.h
-include/${MOZILLA}/dom/nsIDOMCSSValueList.h
-include/${MOZILLA}/dom/nsIDOMCanvasRenderingContext2D.h
-include/${MOZILLA}/dom/nsIDOMCharacterData.h
-include/${MOZILLA}/dom/nsIDOMChromeWindow.h
-include/${MOZILLA}/dom/nsIDOMClassInfo.h
-include/${MOZILLA}/dom/nsIDOMComment.h
-include/${MOZILLA}/dom/nsIDOMCompositionListener.h
-include/${MOZILLA}/dom/nsIDOMConstructor.h
-include/${MOZILLA}/dom/nsIDOMContextMenuListener.h
-include/${MOZILLA}/dom/nsIDOMCounter.h
-include/${MOZILLA}/dom/nsIDOMCrypto.h
-include/${MOZILLA}/dom/nsIDOMCustomEvent.h
-include/${MOZILLA}/dom/nsIDOMDOMConfiguration.h
-include/${MOZILLA}/dom/nsIDOMDOMException.h
-include/${MOZILLA}/dom/nsIDOMDOMImplementation.h
-include/${MOZILLA}/dom/nsIDOMDOMImplementationLS.h
-include/${MOZILLA}/dom/nsIDOMDOMStringList.h
-include/${MOZILLA}/dom/nsIDOMDocument.h
-include/${MOZILLA}/dom/nsIDOMDocumentCSS.h
-include/${MOZILLA}/dom/nsIDOMDocumentEvent.h
-include/${MOZILLA}/dom/nsIDOMDocumentFragment.h
-include/${MOZILLA}/dom/nsIDOMDocumentRange.h
-include/${MOZILLA}/dom/nsIDOMDocumentStyle.h
-include/${MOZILLA}/dom/nsIDOMDocumentTraversal.h
-include/${MOZILLA}/dom/nsIDOMDocumentType.h
-include/${MOZILLA}/dom/nsIDOMDocumentView.h
-include/${MOZILLA}/dom/nsIDOMDocumentXBL.h
-include/${MOZILLA}/dom/nsIDOMDragListener.h
-include/${MOZILLA}/dom/nsIDOMElement.h
-include/${MOZILLA}/dom/nsIDOMElementCSSInlineStyle.h
-include/${MOZILLA}/dom/nsIDOMEntity.h
-include/${MOZILLA}/dom/nsIDOMEntityReference.h
-include/${MOZILLA}/dom/nsIDOMEvent.h
-include/${MOZILLA}/dom/nsIDOMEventGroup.h
-include/${MOZILLA}/dom/nsIDOMEventListener.h
-include/${MOZILLA}/dom/nsIDOMEventReceiver.h
-include/${MOZILLA}/dom/nsIDOMEventTarget.h
-include/${MOZILLA}/dom/nsIDOMFocusListener.h
-include/${MOZILLA}/dom/nsIDOMFormListener.h
-include/${MOZILLA}/dom/nsIDOMHTMLAnchorElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLAppletElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLAreaElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLBRElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLBaseElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLBaseFontElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLBodyElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLButtonElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLCanvasElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLCollection.h
-include/${MOZILLA}/dom/nsIDOMHTMLDListElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLDirectoryElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLDivElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLDocument.h
-include/${MOZILLA}/dom/nsIDOMHTMLElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLEmbedElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLFieldSetElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLFontElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLFormElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLFrameElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLFrameSetElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLHRElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLHeadElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLHeadingElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLHtmlElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLIFrameElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLImageElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLInputElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLIsIndexElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLLIElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLLabelElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLLegendElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLLinkElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLMapElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLMenuElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLMetaElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLModElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLOListElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLObjectElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLOptGroupElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLOptionElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLOptionsCollection.h
-include/${MOZILLA}/dom/nsIDOMHTMLParagraphElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLParamElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLPreElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLQuoteElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLScriptElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLSelectElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLStyleElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLTableCaptionElem.h
-include/${MOZILLA}/dom/nsIDOMHTMLTableCellElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLTableColElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLTableElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLTableRowElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLTableSectionElem.h
-include/${MOZILLA}/dom/nsIDOMHTMLTextAreaElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLTitleElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLUListElement.h
-include/${MOZILLA}/dom/nsIDOMHistory.h
-include/${MOZILLA}/dom/nsIDOMJSWindow.h
-include/${MOZILLA}/dom/nsIDOMKeyEvent.h
-include/${MOZILLA}/dom/nsIDOMKeyListener.h
-include/${MOZILLA}/dom/nsIDOMLSException.h
-include/${MOZILLA}/dom/nsIDOMLSInput.h
-include/${MOZILLA}/dom/nsIDOMLSLoadEvent.h
-include/${MOZILLA}/dom/nsIDOMLSOutput.h
-include/${MOZILLA}/dom/nsIDOMLSParser.h
-include/${MOZILLA}/dom/nsIDOMLSParserFilter.h
-include/${MOZILLA}/dom/nsIDOMLSProgressEvent.h
-include/${MOZILLA}/dom/nsIDOMLSResourceResolver.h
-include/${MOZILLA}/dom/nsIDOMLSSerializer.h
-include/${MOZILLA}/dom/nsIDOMLSSerializerFilter.h
-include/${MOZILLA}/dom/nsIDOMLinkStyle.h
-include/${MOZILLA}/dom/nsIDOMLoadListener.h
-include/${MOZILLA}/dom/nsIDOMLocation.h
-include/${MOZILLA}/dom/nsIDOMMediaList.h
-include/${MOZILLA}/dom/nsIDOMMimeType.h
-include/${MOZILLA}/dom/nsIDOMMimeTypeArray.h
-include/${MOZILLA}/dom/nsIDOMMouseEvent.h
-include/${MOZILLA}/dom/nsIDOMMouseListener.h
-include/${MOZILLA}/dom/nsIDOMMouseMotionListener.h
-include/${MOZILLA}/dom/nsIDOMMutationEvent.h
-include/${MOZILLA}/dom/nsIDOMMutationListener.h
-include/${MOZILLA}/dom/nsIDOMNSDocument.h
-include/${MOZILLA}/dom/nsIDOMNSDocumentStyle.h
-include/${MOZILLA}/dom/nsIDOMNSEditableElement.h
-include/${MOZILLA}/dom/nsIDOMNSEvent.h
-include/${MOZILLA}/dom/nsIDOMNSEventTarget.h
-include/${MOZILLA}/dom/nsIDOMNSFeatureFactory.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLAnchorElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLAreaElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLButtonElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLDocument.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLFormControlList.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLFormElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLFrameElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLHRElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLImageElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLInputElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLOptionCollectn.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLOptionElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLSelectElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLTextAreaElement.h
-include/${MOZILLA}/dom/nsIDOMNSHistory.h
-include/${MOZILLA}/dom/nsIDOMNSLocation.h
-include/${MOZILLA}/dom/nsIDOMNSRange.h
-include/${MOZILLA}/dom/nsIDOMNSUIEvent.h
-include/${MOZILLA}/dom/nsIDOMNSXBLFormControl.h
-include/${MOZILLA}/dom/nsIDOMNSXPathExpression.h
-include/${MOZILLA}/dom/nsIDOMNameList.h
-include/${MOZILLA}/dom/nsIDOMNamedNodeMap.h
-include/${MOZILLA}/dom/nsIDOMNavigator.h
-include/${MOZILLA}/dom/nsIDOMNode.h
-include/${MOZILLA}/dom/nsIDOMNodeFilter.h
-include/${MOZILLA}/dom/nsIDOMNodeIterator.h
-include/${MOZILLA}/dom/nsIDOMNodeList.h
-include/${MOZILLA}/dom/nsIDOMNotation.h
-include/${MOZILLA}/dom/nsIDOMPageTransitionEvent.h
-include/${MOZILLA}/dom/nsIDOMPageTransitionListener.h
-include/${MOZILLA}/dom/nsIDOMPaintListener.h
-include/${MOZILLA}/dom/nsIDOMPkcs11.h
-include/${MOZILLA}/dom/nsIDOMPlugin.h
-include/${MOZILLA}/dom/nsIDOMPluginArray.h
-include/${MOZILLA}/dom/nsIDOMPopupBlockedEvent.h
-include/${MOZILLA}/dom/nsIDOMProcessingInstruction.h
-include/${MOZILLA}/dom/nsIDOMRGBColor.h
-include/${MOZILLA}/dom/nsIDOMRange.h
-include/${MOZILLA}/dom/nsIDOMRangeException.h
-include/${MOZILLA}/dom/nsIDOMRect.h
-include/${MOZILLA}/dom/nsIDOMScreen.h
-include/${MOZILLA}/dom/nsIDOMScriptObjectFactory.h
-include/${MOZILLA}/dom/nsIDOMScrollListener.h
-include/${MOZILLA}/dom/nsIDOMSmartCardEvent.h
-include/${MOZILLA}/dom/nsIDOMStyleSheet.h
-include/${MOZILLA}/dom/nsIDOMStyleSheetList.h
-include/${MOZILLA}/dom/nsIDOMText.h
-include/${MOZILLA}/dom/nsIDOMTextListener.h
-include/${MOZILLA}/dom/nsIDOMTreeWalker.h
-include/${MOZILLA}/dom/nsIDOMUIEvent.h
-include/${MOZILLA}/dom/nsIDOMUIListener.h
-include/${MOZILLA}/dom/nsIDOMUserDataHandler.h
-include/${MOZILLA}/dom/nsIDOMViewCSS.h
-include/${MOZILLA}/dom/nsIDOMWindow.h
-include/${MOZILLA}/dom/nsIDOMWindow2.h
-include/${MOZILLA}/dom/nsIDOMWindowCollection.h
-include/${MOZILLA}/dom/nsIDOMWindowInternal.h
-include/${MOZILLA}/dom/nsIDOMWindowUtils.h
-include/${MOZILLA}/dom/nsIDOMXMLDocument.h
-include/${MOZILLA}/dom/nsIDOMXPathEvaluator.h
-include/${MOZILLA}/dom/nsIDOMXPathException.h
-include/${MOZILLA}/dom/nsIDOMXPathExpression.h
-include/${MOZILLA}/dom/nsIDOMXPathNSResolver.h
-include/${MOZILLA}/dom/nsIDOMXPathNamespace.h
-include/${MOZILLA}/dom/nsIDOMXPathResult.h
-include/${MOZILLA}/dom/nsIDOMXULButtonElement.h
-include/${MOZILLA}/dom/nsIDOMXULCheckboxElement.h
-include/${MOZILLA}/dom/nsIDOMXULCommandDispatcher.h
-include/${MOZILLA}/dom/nsIDOMXULControlElement.h
-include/${MOZILLA}/dom/nsIDOMXULDescriptionElement.h
-include/${MOZILLA}/dom/nsIDOMXULDocument.h
-include/${MOZILLA}/dom/nsIDOMXULElement.h
-include/${MOZILLA}/dom/nsIDOMXULImageElement.h
-include/${MOZILLA}/dom/nsIDOMXULLabelElement.h
-include/${MOZILLA}/dom/nsIDOMXULLabeledControlEl.h
-include/${MOZILLA}/dom/nsIDOMXULListener.h
-include/${MOZILLA}/dom/nsIDOMXULMenuListElement.h
-include/${MOZILLA}/dom/nsIDOMXULMultSelectCntrlEl.h
-include/${MOZILLA}/dom/nsIDOMXULPopupElement.h
-include/${MOZILLA}/dom/nsIDOMXULSelectCntrlEl.h
-include/${MOZILLA}/dom/nsIDOMXULSelectCntrlItemEl.h
-include/${MOZILLA}/dom/nsIDOMXULTextboxElement.h
-include/${MOZILLA}/dom/nsIDOMXULTreeElement.h
-include/${MOZILLA}/dom/nsIEntropyCollector.h
-include/${MOZILLA}/dom/nsIFocusController.h
-include/${MOZILLA}/dom/nsIJSEventListener.h
-include/${MOZILLA}/dom/nsIJSNativeInitializer.h
-include/${MOZILLA}/dom/nsIScriptContext.h
-include/${MOZILLA}/dom/nsIScriptContextOwner.h
-include/${MOZILLA}/dom/nsIScriptExternalNameSet.h
-include/${MOZILLA}/dom/nsIScriptGlobalObject.h
-include/${MOZILLA}/dom/nsIScriptGlobalObjectOwner.h
-include/${MOZILLA}/dom/nsIScriptNameSpaceManager.h
-include/${MOZILLA}/dom/nsIScriptObjectOwner.h
-include/${MOZILLA}/dom/nsIScriptObjectPrincipal.h
-include/${MOZILLA}/dom/nsPIDOMWindow.h
-include/${MOZILLA}/dom/nsPIWindowRoot.h
-include/${MOZILLA}/downloadmanager/nsIDownloadManager.h
-include/${MOZILLA}/downloadmanager/nsIDownloadProgressListener.h
-include/${MOZILLA}/downloads/nsIDownloadManager.h
-include/${MOZILLA}/downloads/nsIDownloadProgressListener.h
-include/${MOZILLA}/downloads/nsIXPInstallManagerUI.h
-include/${MOZILLA}/editor/nsEditorCID.h
-include/${MOZILLA}/editor/nsICiter.h
-include/${MOZILLA}/editor/nsIContentFilter.h
-include/${MOZILLA}/editor/nsIDocumentStateListener.h
-include/${MOZILLA}/editor/nsIEditActionListener.h
-include/${MOZILLA}/editor/nsIEditor.h
-include/${MOZILLA}/editor/nsIEditorIMESupport.h
-include/${MOZILLA}/editor/nsIEditorLogging.h
-include/${MOZILLA}/editor/nsIEditorMailSupport.h
-include/${MOZILLA}/editor/nsIEditorObserver.h
-include/${MOZILLA}/editor/nsIEditorSpellCheck.h
-include/${MOZILLA}/editor/nsIEditorStyleSheets.h
-include/${MOZILLA}/editor/nsIHTMLAbsPosEditor.h
-include/${MOZILLA}/editor/nsIHTMLEditor.h
-include/${MOZILLA}/editor/nsIHTMLInlineTableEditor.h
-include/${MOZILLA}/editor/nsIHTMLObjectResizeListener.h
-include/${MOZILLA}/editor/nsIHTMLObjectResizer.h
-include/${MOZILLA}/editor/nsIPlaintextEditor.h
-include/${MOZILLA}/editor/nsITableEditor.h
-include/${MOZILLA}/editor/nsIURIRefObject.h
-include/${MOZILLA}/editor/nsPIEditorTransaction.h
-include/${MOZILLA}/embed_base/nsEmbedAPI.h
-include/${MOZILLA}/embed_base/nsEmbedCID.h
-include/${MOZILLA}/embed_base/nsIWindowCreator.h
-include/${MOZILLA}/embed_base/nsIWindowCreator2.h
-include/${MOZILLA}/embedcomponents/nsIAppStartupNotifier.h
-include/${MOZILLA}/expat/expat.h
-include/${MOZILLA}/expat/expat_config.h
-include/${MOZILLA}/extensions/nsIExtensionManager.h
-include/${MOZILLA}/exthandler/nsCExternalHandlerService.h
-include/${MOZILLA}/exthandler/nsIExternalHelperAppService.h
-include/${MOZILLA}/exthandler/nsIExternalProtocolService.h
-include/${MOZILLA}/exthandler/nsIHelperAppLauncherDialog.h
-include/${MOZILLA}/exthandler/nsOSHelperAppService.h
-include/${MOZILLA}/filepicker/nsIFileView.h
-include/${MOZILLA}/find/nsIFind.h
-include/${MOZILLA}/find/nsIWebBrowserFind.h
-include/${MOZILLA}/gfx/gfxCore.h
-include/${MOZILLA}/gfx/gfxIFormats.h
-include/${MOZILLA}/gfx/gfxIImageFrame.h
-include/${MOZILLA}/gfx/gfxtypes.h
-include/${MOZILLA}/gfx/nsCUPSShim.h
-include/${MOZILLA}/gfx/nsColor.h
-include/${MOZILLA}/gfx/nsColorNameList.h
-include/${MOZILLA}/gfx/nsColorNames.h
-include/${MOZILLA}/gfx/nsCoord.h
-include/${MOZILLA}/gfx/nsDeviceContext.h
-include/${MOZILLA}/gfx/nsEPSObjectPS.h
-include/${MOZILLA}/gfx/nsFont.h
-include/${MOZILLA}/gfx/nsGfxCIID.h
-include/${MOZILLA}/gfx/nsGfxPSCID.h
-include/${MOZILLA}/gfx/nsIBlender.h
-include/${MOZILLA}/gfx/nsIDeviceContext.h
-include/${MOZILLA}/gfx/nsIDeviceContextPS.h
-include/${MOZILLA}/gfx/nsIDeviceContextSpec.h
-include/${MOZILLA}/gfx/nsIDeviceContextSpecFactory.h
-include/${MOZILLA}/gfx/nsIDeviceContextSpecPS.h
-include/${MOZILLA}/gfx/nsIDrawingSurface.h
-include/${MOZILLA}/gfx/nsIFontEnumerator.h
-include/${MOZILLA}/gfx/nsIFontList.h
-include/${MOZILLA}/gfx/nsIFontMetrics.h
-include/${MOZILLA}/gfx/nsIImage.h
-include/${MOZILLA}/gfx/nsIPrintOptions.h
-include/${MOZILLA}/gfx/nsIPrintSession.h
-include/${MOZILLA}/gfx/nsIPrintSettings.h
-include/${MOZILLA}/gfx/nsIPrintSettingsService.h
-include/${MOZILLA}/gfx/nsIRegion.h
-include/${MOZILLA}/gfx/nsIRenderingContext.h
-include/${MOZILLA}/gfx/nsIScreen.h
-include/${MOZILLA}/gfx/nsIScreenManager.h
-include/${MOZILLA}/gfx/nsIScriptableRegion.h
-include/${MOZILLA}/gfx/nsITheme.h
-include/${MOZILLA}/gfx/nsMargin.h
-include/${MOZILLA}/gfx/nsPSPrinters.h
-include/${MOZILLA}/gfx/nsPaperPS.h
-include/${MOZILLA}/gfx/nsPoint.h
-include/${MOZILLA}/gfx/nsRect.h
-include/${MOZILLA}/gfx/nsRegion.h
-include/${MOZILLA}/gfx/nsSize.h
-include/${MOZILLA}/gfx/nsTempfilePS.h
-include/${MOZILLA}/gfx/nsThemeConstants.h
-include/${MOZILLA}/gfx/nsTransform2D.h
-include/${MOZILLA}/gfx/psSharedCore.h
-include/${MOZILLA}/gtkembedmoz/gtkmozembed.h
-include/${MOZILLA}/gtkembedmoz/gtkmozembed_internal.h
-include/${MOZILLA}/gtkxtbin/gtk2xtbin.h
-include/${MOZILLA}/gtkxtbin/gtkxtbin.h
-include/${MOZILLA}/history/nsIBrowserHistory.h
-include/${MOZILLA}/htmlparser/nsHTMLTagList.h
-include/${MOZILLA}/htmlparser/nsHTMLTags.h
-include/${MOZILLA}/htmlparser/nsHTMLTokens.h
-include/${MOZILLA}/htmlparser/nsIContentSink.h
-include/${MOZILLA}/htmlparser/nsIDTD.h
-include/${MOZILLA}/htmlparser/nsIElementObserver.h
-include/${MOZILLA}/htmlparser/nsIExpatSink.h
-include/${MOZILLA}/htmlparser/nsIFragmentContentSink.h
-include/${MOZILLA}/htmlparser/nsIHTMLContentSink.h
-include/${MOZILLA}/htmlparser/nsIParser.h
-include/${MOZILLA}/htmlparser/nsIParserFilter.h
-include/${MOZILLA}/htmlparser/nsIParserNode.h
-include/${MOZILLA}/htmlparser/nsIParserService.h
-include/${MOZILLA}/htmlparser/nsITokenizer.h
-include/${MOZILLA}/htmlparser/nsParserCIID.h
-include/${MOZILLA}/htmlparser/nsParserDataListener.h
-include/${MOZILLA}/htmlparser/nsScannerString.h
-include/${MOZILLA}/htmlparser/nsToken.h
-include/${MOZILLA}/imglib2/ImageErrors.h
-include/${MOZILLA}/imglib2/ImageLogging.h
-include/${MOZILLA}/imglib2/imgICache.h
-include/${MOZILLA}/imglib2/imgIContainer.h
-include/${MOZILLA}/imglib2/imgIContainerObserver.h
-include/${MOZILLA}/imglib2/imgIDecoder.h
-include/${MOZILLA}/imglib2/imgIDecoderObserver.h
-include/${MOZILLA}/imglib2/imgIEncoder.h
-include/${MOZILLA}/imglib2/imgILoad.h
-include/${MOZILLA}/imglib2/imgILoader.h
-include/${MOZILLA}/imglib2/imgIRequest.h
-include/${MOZILLA}/impComm4xMail/nsComm4xMail.h
-include/${MOZILLA}/impComm4xMail/nsComm4xMailImport.h
-include/${MOZILLA}/impComm4xMail/nsComm4xMailStringBundle.h
-include/${MOZILLA}/impComm4xMail/nsComm4xProfile.h
-include/${MOZILLA}/impComm4xMail/nsIComm4xProfile.h
-include/${MOZILLA}/impText/nsTextImport.h
-include/${MOZILLA}/impText/nsTextStringBundle.h
-include/${MOZILLA}/import/ImportOutFile.h
-include/${MOZILLA}/import/nsIImportABDescriptor.h
-include/${MOZILLA}/import/nsIImportAddressBooks.h
-include/${MOZILLA}/import/nsIImportFieldMap.h
-include/${MOZILLA}/import/nsIImportGeneric.h
-include/${MOZILLA}/import/nsIImportMail.h
-include/${MOZILLA}/import/nsIImportMailboxDescriptor.h
-include/${MOZILLA}/import/nsIImportMimeEncode.h
-include/${MOZILLA}/import/nsIImportModule.h
-include/${MOZILLA}/import/nsIImportService.h
-include/${MOZILLA}/import/nsIImportSettings.h
-include/${MOZILLA}/import/nsImportEncodeScan.h
-include/${MOZILLA}/import/nsImportMimeEncode.h
-include/${MOZILLA}/import/nsImportScanFile.h
-include/${MOZILLA}/import/nsImportService.h
-include/${MOZILLA}/import/nsImportStringBundle.h
-include/${MOZILLA}/import/nsImportTranslator.h
-include/${MOZILLA}/intl/nsIStringBundle.h
-include/${MOZILLA}/intl/nsIStringBundleOverride.h
-include/${MOZILLA}/jar/nsIJAR.h
-include/${MOZILLA}/jar/nsIJARChannel.h
-include/${MOZILLA}/jar/nsIJARProtocolHandler.h
-include/${MOZILLA}/jar/nsIJARURI.h
-include/${MOZILLA}/jar/nsIZipReader.h
-include/${MOZILLA}/jar/zipfile.h
-include/${MOZILLA}/jar/zipstruct.h
-include/${MOZILLA}/jar/zipstub.h
-include/${MOZILLA}/java/bool.h
-include/${MOZILLA}/java/interpreter.h
-include/${MOZILLA}/java/javaString.h
-include/${MOZILLA}/java/javaThreads.h
-include/${MOZILLA}/java/java_lang_String.h
-include/${MOZILLA}/java/jdk_java_lang_String.h
-include/${MOZILLA}/java/jmc.h
-include/${MOZILLA}/java/jni.h
-include/${MOZILLA}/java/jni_md.h
-include/${MOZILLA}/java/jri.h
-include/${MOZILLA}/java/jri_md.h
-include/${MOZILLA}/java/jriext.h
-include/${MOZILLA}/java/jritypes.h
-include/${MOZILLA}/java/nspr_md.h
-include/${MOZILLA}/java/oobj.h
-include/${MOZILLA}/java/sysmacros_md.h
-include/${MOZILLA}/java/tree.h
-include/${MOZILLA}/java/typedefs.h
-include/${MOZILLA}/java/typedefs_md.h
-include/${MOZILLA}/java/zip.h
-include/${MOZILLA}/js/fdlibm.h
-include/${MOZILLA}/js/js.msg
-include/${MOZILLA}/js/jsapi.h
-include/${MOZILLA}/js/jsarena.h
-include/${MOZILLA}/js/jsarray.h
-include/${MOZILLA}/js/jsatom.h
-include/${MOZILLA}/js/jsautocfg.h
-include/${MOZILLA}/js/jsbit.h
-include/${MOZILLA}/js/jsbool.h
-include/${MOZILLA}/js/jsclist.h
-include/${MOZILLA}/js/jscntxt.h
-include/${MOZILLA}/js/jscompat.h
-include/${MOZILLA}/js/jsconfig.h
-include/${MOZILLA}/js/jsdate.h
-include/${MOZILLA}/js/jsdbgapi.h
-include/${MOZILLA}/js/jsdhash.h
-include/${MOZILLA}/js/jsemit.h
-include/${MOZILLA}/js/jsfun.h
-include/${MOZILLA}/js/jsgc.h
-include/${MOZILLA}/js/jshash.h
-include/${MOZILLA}/js/jsinterp.h
-include/${MOZILLA}/js/jslock.h
-include/${MOZILLA}/js/jslong.h
-include/${MOZILLA}/js/jsmath.h
-include/${MOZILLA}/js/jsnum.h
-include/${MOZILLA}/js/jsobj.h
-include/${MOZILLA}/js/jsopcode.h
-include/${MOZILLA}/js/jsopcode.tbl
-include/${MOZILLA}/js/jsosdep.h
-include/${MOZILLA}/js/jsotypes.h
-include/${MOZILLA}/js/jsparse.h
-include/${MOZILLA}/js/jsprf.h
-include/${MOZILLA}/js/jsprvtd.h
-include/${MOZILLA}/js/jspubtd.h
-include/${MOZILLA}/js/jsregexp.h
-include/${MOZILLA}/js/jsscan.h
-include/${MOZILLA}/js/jsscope.h
-include/${MOZILLA}/js/jsscript.h
-include/${MOZILLA}/js/jsstddef.h
-include/${MOZILLA}/js/jsstr.h
-include/${MOZILLA}/js/jstypes.h
-include/${MOZILLA}/js/jsutil.h
-include/${MOZILLA}/js/jsxdrapi.h
-include/${MOZILLA}/js/jsxml.h
-include/${MOZILLA}/jsconsole/nsIJSConsoleService.h
-include/${MOZILLA}/jsdebug/jsdIDebuggerService.h
-include/${MOZILLA}/jsdebug/jsdebug.h
-include/${MOZILLA}/jsurl/nsJSProtocolHandler.h
-include/${MOZILLA}/layout/nsBidi.h
-include/${MOZILLA}/layout/nsBidiFrames.h
-include/${MOZILLA}/layout/nsBidiPresUtils.h
-include/${MOZILLA}/layout/nsBidiUtils.h
-include/${MOZILLA}/layout/nsCSSAnonBoxList.h
-include/${MOZILLA}/layout/nsCSSAnonBoxes.h
-include/${MOZILLA}/layout/nsCSSFrameConstructor.h
-include/${MOZILLA}/layout/nsCSSKeywordList.h
-include/${MOZILLA}/layout/nsCSSKeywords.h
-include/${MOZILLA}/layout/nsCSSPropList.h
-include/${MOZILLA}/layout/nsCSSProperty.h
-include/${MOZILLA}/layout/nsCSSProps.h
-include/${MOZILLA}/layout/nsCSSPseudoClassList.h
-include/${MOZILLA}/layout/nsCSSPseudoClasses.h
-include/${MOZILLA}/layout/nsCSSPseudoElementList.h
-include/${MOZILLA}/layout/nsCSSPseudoElements.h
-include/${MOZILLA}/layout/nsCSSStruct.h
-include/${MOZILLA}/layout/nsCSSValue.h
-include/${MOZILLA}/layout/nsChangeHint.h
-include/${MOZILLA}/layout/nsCompatibility.h
-include/${MOZILLA}/layout/nsContentDLF.h
-include/${MOZILLA}/layout/nsDOMCSSDeclaration.h
-include/${MOZILLA}/layout/nsFrameList.h
-include/${MOZILLA}/layout/nsFrameManager.h
-include/${MOZILLA}/layout/nsFrameManagerBase.h
-include/${MOZILLA}/layout/nsFrameTraversal.h
-include/${MOZILLA}/layout/nsGrid.h
-include/${MOZILLA}/layout/nsGridCell.h
-include/${MOZILLA}/layout/nsGridLayout2.h
-include/${MOZILLA}/layout/nsGridRow.h
-include/${MOZILLA}/layout/nsGridRowGroupLayout.h
-include/${MOZILLA}/layout/nsGridRowLayout.h
-include/${MOZILLA}/layout/nsGridRowLeafFrame.h
-include/${MOZILLA}/layout/nsGridRowLeafLayout.h
-include/${MOZILLA}/layout/nsHTMLParts.h
-include/${MOZILLA}/layout/nsHTMLReflowMetrics.h
-include/${MOZILLA}/layout/nsHTMLReflowState.h
-include/${MOZILLA}/layout/nsIAnonymousContentCreator.h
-include/${MOZILLA}/layout/nsIBoxLayoutManager.h
-include/${MOZILLA}/layout/nsIBoxObject.h
-include/${MOZILLA}/layout/nsIBoxPaintManager.h
-include/${MOZILLA}/layout/nsIBrowserBoxObject.h
-include/${MOZILLA}/layout/nsICSSDeclaration.h
-include/${MOZILLA}/layout/nsICSSGroupRule.h
-include/${MOZILLA}/layout/nsICSSImportRule.h
-include/${MOZILLA}/layout/nsICSSLoader.h
-include/${MOZILLA}/layout/nsICSSLoaderObserver.h
-include/${MOZILLA}/layout/nsICSSNameSpaceRule.h
-include/${MOZILLA}/layout/nsICSSOMFactory.h
-include/${MOZILLA}/layout/nsICSSParser.h
-include/${MOZILLA}/layout/nsICSSPseudoComparator.h
-include/${MOZILLA}/layout/nsICSSRule.h
-include/${MOZILLA}/layout/nsICSSStyleRule.h
-include/${MOZILLA}/layout/nsICSSStyleRuleDOMWrapper.h
-include/${MOZILLA}/layout/nsICSSStyleSheet.h
-include/${MOZILLA}/layout/nsICanvasFrame.h
-include/${MOZILLA}/layout/nsICaret.h
-include/${MOZILLA}/layout/nsICheckboxControlFrame.h
-include/${MOZILLA}/layout/nsIChromeEventHandler.h
-include/${MOZILLA}/layout/nsIComboboxControlFrame.h
-include/${MOZILLA}/layout/nsIComputedDOMStyle.h
-include/${MOZILLA}/layout/nsIDocumentViewer.h
-include/${MOZILLA}/layout/nsIEditorBoxObject.h
-include/${MOZILLA}/layout/nsIFormControlFrame.h
-include/${MOZILLA}/layout/nsIFrame.h
-include/${MOZILLA}/layout/nsIFrameDebug.h
-include/${MOZILLA}/layout/nsIFrameFrame.h
-include/${MOZILLA}/layout/nsIFrameSelection.h
-include/${MOZILLA}/layout/nsIFrameTraversal.h
-include/${MOZILLA}/layout/nsIFrameUtil.h
-include/${MOZILLA}/layout/nsIGridPart.h
-include/${MOZILLA}/layout/nsIHTMLCSSStyleSheet.h
-include/${MOZILLA}/layout/nsIIFrameBoxObject.h
-include/${MOZILLA}/layout/nsIImageControlFrame.h
-include/${MOZILLA}/layout/nsIImageFrame.h
-include/${MOZILLA}/layout/nsIImageMap.h
-include/${MOZILLA}/layout/nsIInspectorCSSUtils.h
-include/${MOZILLA}/layout/nsILayoutDebugger.h
-include/${MOZILLA}/layout/nsILayoutHistoryState.h
-include/${MOZILLA}/layout/nsILineIterator.h
-include/${MOZILLA}/layout/nsIListBoxObject.h
-include/${MOZILLA}/layout/nsIListControlFrame.h
-include/${MOZILLA}/layout/nsIMenuBoxObject.h
-include/${MOZILLA}/layout/nsIMenuFrame.h
-include/${MOZILLA}/layout/nsIMenuParent.h
-include/${MOZILLA}/layout/nsIObjectFrame.h
-include/${MOZILLA}/layout/nsIPageSequenceFrame.h
-include/${MOZILLA}/layout/nsIPercentHeightObserver.h
-include/${MOZILLA}/layout/nsIPopupBoxObject.h
-include/${MOZILLA}/layout/nsIPopupSetFrame.h
-include/${MOZILLA}/layout/nsIPresShell.h
-include/${MOZILLA}/layout/nsIPrintProgress.h
-include/${MOZILLA}/layout/nsIPrintProgressParams.h
-include/${MOZILLA}/layout/nsIPrintStatusFeedback.h
-include/${MOZILLA}/layout/nsIRadioControlFrame.h
-include/${MOZILLA}/layout/nsIReflowCallback.h
-include/${MOZILLA}/layout/nsIScrollBoxObject.h
-include/${MOZILLA}/layout/nsIScrollableFrame.h
-include/${MOZILLA}/layout/nsIScrollableViewProvider.h
-include/${MOZILLA}/layout/nsIScrollbarMediator.h
-include/${MOZILLA}/layout/nsISelectControlFrame.h
-include/${MOZILLA}/layout/nsISelectionImageService.h
-include/${MOZILLA}/layout/nsIStatefulFrame.h
-include/${MOZILLA}/layout/nsIStyleRule.h
-include/${MOZILLA}/layout/nsIStyleRuleProcessor.h
-include/${MOZILLA}/layout/nsIStyleRuleSupplier.h
-include/${MOZILLA}/layout/nsIStyleSheet.h
-include/${MOZILLA}/layout/nsIStyleSheetService.h
-include/${MOZILLA}/layout/nsITableCellLayout.h
-include/${MOZILLA}/layout/nsITableLayout.h
-include/${MOZILLA}/layout/nsITextControlFrame.h
-include/${MOZILLA}/layout/nsITreeBoxObject.h
-include/${MOZILLA}/layout/nsITreeColumns.h
-include/${MOZILLA}/layout/nsITreeContentView.h
-include/${MOZILLA}/layout/nsITreeSelection.h
-include/${MOZILLA}/layout/nsITreeView.h
-include/${MOZILLA}/layout/nsLayoutAtomList.h
-include/${MOZILLA}/layout/nsLayoutAtoms.h
-include/${MOZILLA}/layout/nsLayoutCID.h
-include/${MOZILLA}/layout/nsLayoutErrors.h
-include/${MOZILLA}/layout/nsLayoutStylesheetCache.h
-include/${MOZILLA}/layout/nsLayoutUtils.h
-include/${MOZILLA}/layout/nsPIBoxObject.h
-include/${MOZILLA}/layout/nsPresContext.h
-include/${MOZILLA}/layout/nsPresState.h
-include/${MOZILLA}/layout/nsReflowType.h
-include/${MOZILLA}/layout/nsRuleData.h
-include/${MOZILLA}/layout/nsRuleNode.h
-include/${MOZILLA}/layout/nsRuleWalker.h
-include/${MOZILLA}/layout/nsStyleChangeList.h
-include/${MOZILLA}/layout/nsStyleConsts.h
-include/${MOZILLA}/layout/nsStyleContext.h
-include/${MOZILLA}/layout/nsStyleCoord.h
-include/${MOZILLA}/layout/nsStyleSet.h
-include/${MOZILLA}/layout/nsStyleStruct.h
-include/${MOZILLA}/layout/nsStyleStructList.h
-include/${MOZILLA}/layout/nsStyleUtil.h
-include/${MOZILLA}/layout/nsTextTransformer.h
-include/${MOZILLA}/layout/nsTreeColFrame.h
-include/${MOZILLA}/layout/nsTreeUtils.h
-include/${MOZILLA}/libbz2/bzlib.h
-include/${MOZILLA}/libmar/mar.h
-include/${MOZILLA}/libreg/NSReg.h
-include/${MOZILLA}/libreg/VerReg.h
-include/${MOZILLA}/locale/nsCollation.h
-include/${MOZILLA}/locale/nsCollationCID.h
-include/${MOZILLA}/locale/nsDateTimeFormatCID.h
-include/${MOZILLA}/locale/nsICollation.h
-include/${MOZILLA}/locale/nsIDateTimeFormat.h
-include/${MOZILLA}/locale/nsIFontPackageHandler.h
-include/${MOZILLA}/locale/nsIFontPackageProxy.h
-include/${MOZILLA}/locale/nsIFontPackageService.h
-include/${MOZILLA}/locale/nsILanguageAtomService.h
-include/${MOZILLA}/locale/nsILocale.h
-include/${MOZILLA}/locale/nsILocaleService.h
-include/${MOZILLA}/locale/nsIMacLocale.h
-include/${MOZILLA}/locale/nsIOS2Locale.h
-include/${MOZILLA}/locale/nsIPosixLocale.h
-include/${MOZILLA}/locale/nsIScriptableDateFormat.h
-include/${MOZILLA}/locale/nsIWin32Locale.h
-include/${MOZILLA}/locale/nsLocaleCID.h
-include/${MOZILLA}/lwbrk/nsIBinarySearchIterator.h
-include/${MOZILLA}/lwbrk/nsIBreakState.h
-include/${MOZILLA}/lwbrk/nsILineBreaker.h
-include/${MOZILLA}/lwbrk/nsILineBreakerFactory.h
-include/${MOZILLA}/lwbrk/nsILinearIterator.h
-include/${MOZILLA}/lwbrk/nsISemanticUnitScanner.h
-include/${MOZILLA}/lwbrk/nsIWordBreaker.h
-include/${MOZILLA}/lwbrk/nsIWordBreakerFactory.h
-include/${MOZILLA}/lwbrk/nsLWBrkCIID.h
-include/${MOZILLA}/mailnews/MailNewsTypes.h
-include/${MOZILLA}/mailnews/MailNewsTypes2.h
-include/${MOZILLA}/mailprofilemigration/nsIMailProfileMigrator.h
-include/${MOZILLA}/mailprofilemigration/nsMailMigrationCID.h
-include/${MOZILLA}/mailview/nsIMsgMailView.h
-include/${MOZILLA}/mailview/nsIMsgMailViewList.h
-include/${MOZILLA}/mailview/nsMsgMailViewList.h
-include/${MOZILLA}/mailview/nsMsgMailViewsCID.h
-include/${MOZILLA}/mime/comi18n.h
-include/${MOZILLA}/mime/mimecont.h
-include/${MOZILLA}/mime/mimecth.h
-include/${MOZILLA}/mime/mimehdrs.h
-include/${MOZILLA}/mime/mimei.h
-include/${MOZILLA}/mime/mimeleaf.h
-include/${MOZILLA}/mime/mimemsig.h
-include/${MOZILLA}/mime/mimemult.h
-include/${MOZILLA}/mime/mimeobj.h
-include/${MOZILLA}/mime/mimepbuf.h
-include/${MOZILLA}/mime/mimetext.h
-include/${MOZILLA}/mime/modlmime.h
-include/${MOZILLA}/mime/modmimee.h
-include/${MOZILLA}/mime/nsIMimeContentTypeHandler.h
-include/${MOZILLA}/mime/nsIMimeConverter.h
-include/${MOZILLA}/mime/nsIMimeEmitter.h
-include/${MOZILLA}/mime/nsIMimeHeaders.h
-include/${MOZILLA}/mime/nsIMimeMiscStatus.h
-include/${MOZILLA}/mime/nsIMimeObjectClassAccess.h
-include/${MOZILLA}/mime/nsIMimeStreamConverter.h
-include/${MOZILLA}/mime/nsIMsgHeaderParser.h
-include/${MOZILLA}/mime/nsISimpleMimeConverter.h
-include/${MOZILLA}/mime/nsMailHeaders.h
-include/${MOZILLA}/mime/nsMimeContentTypeHandler.h
-include/${MOZILLA}/mime/nsMimeConverter.h
-include/${MOZILLA}/mime/nsMimeHeaders.h
-include/${MOZILLA}/mime/nsMimeObjectClassAccess.h
-include/${MOZILLA}/mime/nsMimeStringResources.h
-include/${MOZILLA}/mime/nsMsgHeaderParser.h
-include/${MOZILLA}/mime/nsMsgMimeCID.h
-include/${MOZILLA}/mime/nsStreamConverter.h
-include/${MOZILLA}/mimeemitter/nsEmitterUtils.h
-include/${MOZILLA}/mimeemitter/nsMimeBaseEmitter.h
-include/${MOZILLA}/mimeemitter/nsMimeEmitterCID.h
-include/${MOZILLA}/mimeemitter/nsMimeHtmlEmitter.h
-include/${MOZILLA}/mimeemitter/nsMimePlainEmitter.h
-include/${MOZILLA}/mimeemitter/nsMimeRawEmitter.h
-include/${MOZILLA}/mimeemitter/nsMimeRebuffer.h
-include/${MOZILLA}/mimeemitter/nsMimeXmlEmitter.h
-include/${MOZILLA}/mimetype/nsIMIMEHeaderParam.h
-include/${MOZILLA}/mimetype/nsIMIMEInfo.h
-include/${MOZILLA}/mimetype/nsIMIMEService.h
-include/${MOZILLA}/mimetype/nsMimeTypes.h
-include/${MOZILLA}/mork/mdb.h
-include/${MOZILLA}/mork/nsIMdbFactoryFactory.h
-include/${MOZILLA}/mork/nsMorkCID.h
-include/${MOZILLA}/mozgnome/nsIGConfService.h
-include/${MOZILLA}/mozgnome/nsIGnomeVFSService.h
-include/${MOZILLA}/mozilla-config.h
-include/${MOZILLA}/mozldap/nsILDAPBERElement.h
-include/${MOZILLA}/mozldap/nsILDAPBERValue.h
-include/${MOZILLA}/mozldap/nsILDAPConnection.h
-include/${MOZILLA}/mozldap/nsILDAPControl.h
-include/${MOZILLA}/mozldap/nsILDAPErrors.h
-include/${MOZILLA}/mozldap/nsILDAPMessage.h
-include/${MOZILLA}/mozldap/nsILDAPMessageListener.h
-include/${MOZILLA}/mozldap/nsILDAPOperation.h
-include/${MOZILLA}/mozldap/nsILDAPServer.h
-include/${MOZILLA}/mozldap/nsILDAPService.h
-include/${MOZILLA}/mozldap/nsILDAPURL.h
-include/${MOZILLA}/mozldap/nsLDAP.h
-include/${MOZILLA}/msgbase/msgCore.h
-include/${MOZILLA}/msgbase/nsCopyMessageStreamListener.h
-include/${MOZILLA}/msgbase/nsICopyMessageListener.h
-include/${MOZILLA}/msgbase/nsICopyMsgStreamListener.h
-include/${MOZILLA}/msgbase/nsIFolderListener.h
-include/${MOZILLA}/msgbase/nsIIncomingServerListener.h
-include/${MOZILLA}/msgbase/nsIMapiRegistry.h
-include/${MOZILLA}/msgbase/nsIMessenger.h
-include/${MOZILLA}/msgbase/nsIMessengerMigrator.h
-include/${MOZILLA}/msgbase/nsIMessengerOSIntegration.h
-include/${MOZILLA}/msgbase/nsIMessengerWindowService.h
-include/${MOZILLA}/msgbase/nsIMsgAccount.h
-include/${MOZILLA}/msgbase/nsIMsgAccountManager.h
-include/${MOZILLA}/msgbase/nsIMsgBiffManager.h
-include/${MOZILLA}/msgbase/nsIMsgCopyService.h
-include/${MOZILLA}/msgbase/nsIMsgCopyServiceListener.h
-include/${MOZILLA}/msgbase/nsIMsgDBView.h
-include/${MOZILLA}/msgbase/nsIMsgFilter.h
-include/${MOZILLA}/msgbase/nsIMsgFilterHitNotify.h
-include/${MOZILLA}/msgbase/nsIMsgFilterList.h
-include/${MOZILLA}/msgbase/nsIMsgFilterPlugin.h
-include/${MOZILLA}/msgbase/nsIMsgFilterService.h
-include/${MOZILLA}/msgbase/nsIMsgFolder.h
-include/${MOZILLA}/msgbase/nsIMsgFolderCache.h
-include/${MOZILLA}/msgbase/nsIMsgFolderCacheElement.h
-include/${MOZILLA}/msgbase/nsIMsgFolderCompactor.h
-include/${MOZILLA}/msgbase/nsIMsgGroupRecord.h
-include/${MOZILLA}/msgbase/nsIMsgHdr.h
-include/${MOZILLA}/msgbase/nsIMsgHost.h
-include/${MOZILLA}/msgbase/nsIMsgIdentity.h
-include/${MOZILLA}/msgbase/nsIMsgIncomingServer.h
-include/${MOZILLA}/msgbase/nsIMsgMailNewsUrl.h
-include/${MOZILLA}/msgbase/nsIMsgMailSession.h
-include/${MOZILLA}/msgbase/nsIMsgMdnGenerator.h
-include/${MOZILLA}/msgbase/nsIMsgMessageService.h
-include/${MOZILLA}/msgbase/nsIMsgOfflineManager.h
-include/${MOZILLA}/msgbase/nsIMsgPrintEngine.h
-include/${MOZILLA}/msgbase/nsIMsgProgress.h
-include/${MOZILLA}/msgbase/nsIMsgProtocolInfo.h
-include/${MOZILLA}/msgbase/nsIMsgPurgeService.h
-include/${MOZILLA}/msgbase/nsIMsgRDFDataSource.h
-include/${MOZILLA}/msgbase/nsIMsgSearchAdapter.h
-include/${MOZILLA}/msgbase/nsIMsgSearchNotify.h
-include/${MOZILLA}/msgbase/nsIMsgSearchScopeTerm.h
-include/${MOZILLA}/msgbase/nsIMsgSearchSession.h
-include/${MOZILLA}/msgbase/nsIMsgSearchTerm.h
-include/${MOZILLA}/msgbase/nsIMsgSearchValidityManager.h
-include/${MOZILLA}/msgbase/nsIMsgSearchValidityTable.h
-include/${MOZILLA}/msgbase/nsIMsgSearchValue.h
-include/${MOZILLA}/msgbase/nsIMsgSignature.h
-include/${MOZILLA}/msgbase/nsIMsgStatusFeedback.h
-include/${MOZILLA}/msgbase/nsIMsgStringService.h
-include/${MOZILLA}/msgbase/nsIMsgThread.h
-include/${MOZILLA}/msgbase/nsIMsgWindow.h
-include/${MOZILLA}/msgbase/nsISpamSettings.h
-include/${MOZILLA}/msgbase/nsISubscribableServer.h
-include/${MOZILLA}/msgbase/nsIUrlListener.h
-include/${MOZILLA}/msgbase/nsIUrlListenerManager.h
-include/${MOZILLA}/msgbase/nsMessenger.h
-include/${MOZILLA}/msgbase/nsMessengerBootstrap.h
-include/${MOZILLA}/msgbase/nsMessengerContentHandler.h
-include/${MOZILLA}/msgbase/nsMessengerMigrator.h
-include/${MOZILLA}/msgbase/nsMsgAccount.h
-include/${MOZILLA}/msgbase/nsMsgAccountManager.h
-include/${MOZILLA}/msgbase/nsMsgAccountManagerDS.h
-include/${MOZILLA}/msgbase/nsMsgBaseCID.h
-include/${MOZILLA}/msgbase/nsMsgBiffManager.h
-include/${MOZILLA}/msgbase/nsMsgBodyHandler.h
-include/${MOZILLA}/msgbase/nsMsgContentPolicy.h
-include/${MOZILLA}/msgbase/nsMsgCopyService.h
-include/${MOZILLA}/msgbase/nsMsgFilterCore.h
-include/${MOZILLA}/msgbase/nsMsgFilterDataSource.h
-include/${MOZILLA}/msgbase/nsMsgFilterDelegateFactory.h
-include/${MOZILLA}/msgbase/nsMsgFilterService.h
-include/${MOZILLA}/msgbase/nsMsgFolderCache.h
-include/${MOZILLA}/msgbase/nsMsgFolderDataSource.h
-include/${MOZILLA}/msgbase/nsMsgFolderFlags.h
-include/${MOZILLA}/msgbase/nsMsgHeaderMasks.h
-include/${MOZILLA}/msgbase/nsMsgLocalFolderHdrs.h
-include/${MOZILLA}/msgbase/nsMsgMailSession.h
-include/${MOZILLA}/msgbase/nsMsgMessageFlags.h
-include/${MOZILLA}/msgbase/nsMsgPrintEngine.h
-include/${MOZILLA}/msgbase/nsMsgProgress.h
-include/${MOZILLA}/msgbase/nsMsgPurgeService.h
-include/${MOZILLA}/msgbase/nsMsgRDFDataSource.h
-include/${MOZILLA}/msgbase/nsMsgRDFUtils.h
-include/${MOZILLA}/msgbase/nsMsgResultElement.h
-include/${MOZILLA}/msgbase/nsMsgSearchAdapter.h
-include/${MOZILLA}/msgbase/nsMsgSearchArray.h
-include/${MOZILLA}/msgbase/nsMsgSearchBoolExpression.h
-include/${MOZILLA}/msgbase/nsMsgSearchCore.h
-include/${MOZILLA}/msgbase/nsMsgSearchScopeTerm.h
-include/${MOZILLA}/msgbase/nsMsgSearchSession.h
-include/${MOZILLA}/msgbase/nsMsgSearchTerm.h
-include/${MOZILLA}/msgbase/nsMsgServiceProvider.h
-include/${MOZILLA}/msgbase/nsMsgStatusFeedback.h
-include/${MOZILLA}/msgbase/nsMsgWindow.h
-include/${MOZILLA}/msgbase/nsStatusBarBiffManager.h
-include/${MOZILLA}/msgbase/nsSubscribableServer.h
-include/${MOZILLA}/msgbase/nsSubscribeDataSource.h
-include/${MOZILLA}/msgbase/nsUrlListenerManager.h
-include/${MOZILLA}/msgbaseutil/nsAdapterEnumerator.h
-include/${MOZILLA}/msgbaseutil/nsImapMoveCoalescer.h
-include/${MOZILLA}/msgbaseutil/nsLocalFolderSummarySpec.h
-include/${MOZILLA}/msgbaseutil/nsMsgDBFolder.h
-include/${MOZILLA}/msgbaseutil/nsMsgGroupRecord.h
-include/${MOZILLA}/msgbaseutil/nsMsgI18N.h
-include/${MOZILLA}/msgbaseutil/nsMsgIdentity.h
-include/${MOZILLA}/msgbaseutil/nsMsgIncomingServer.h
-include/${MOZILLA}/msgbaseutil/nsMsgKeyArray.h
-include/${MOZILLA}/msgbaseutil/nsMsgKeySet.h
-include/${MOZILLA}/msgbaseutil/nsMsgLineBuffer.h
-include/${MOZILLA}/msgbaseutil/nsMsgMailNewsUrl.h
-include/${MOZILLA}/msgbaseutil/nsMsgProtocol.h
-include/${MOZILLA}/msgbaseutil/nsMsgTxn.h
-include/${MOZILLA}/msgbaseutil/nsMsgUtils.h
-include/${MOZILLA}/msgbaseutil/nsNewsSummarySpec.h
-include/${MOZILLA}/msgbaseutil/nsUInt32Array.h
-include/${MOZILLA}/msgbaseutil/nsUint8Array.h
-include/${MOZILLA}/msgcompose/nsIMsgAttachment.h
-include/${MOZILLA}/msgcompose/nsIMsgCompFields.h
-include/${MOZILLA}/msgcompose/nsIMsgCompUtils.h
-include/${MOZILLA}/msgcompose/nsIMsgCompose.h
-include/${MOZILLA}/msgcompose/nsIMsgComposeParams.h
-include/${MOZILLA}/msgcompose/nsIMsgComposeProgressParams.h
-include/${MOZILLA}/msgcompose/nsIMsgComposeSecure.h
-include/${MOZILLA}/msgcompose/nsIMsgComposeService.h
-include/${MOZILLA}/msgcompose/nsIMsgDraft.h
-include/${MOZILLA}/msgcompose/nsIMsgQuote.h
-include/${MOZILLA}/msgcompose/nsIMsgRecipientArray.h
-include/${MOZILLA}/msgcompose/nsIMsgSend.h
-include/${MOZILLA}/msgcompose/nsIMsgSendLater.h
-include/${MOZILLA}/msgcompose/nsIMsgSendLaterListener.h
-include/${MOZILLA}/msgcompose/nsIMsgSendListener.h
-include/${MOZILLA}/msgcompose/nsIMsgSendReport.h
-include/${MOZILLA}/msgcompose/nsISmtpServer.h
-include/${MOZILLA}/msgcompose/nsISmtpService.h
-include/${MOZILLA}/msgcompose/nsISmtpUrl.h
-include/${MOZILLA}/msgcompose/nsIURLFetcher.h
-include/${MOZILLA}/msgcompose/nsMsgAttachment.h
-include/${MOZILLA}/msgcompose/nsMsgAttachmentHandler.h
-include/${MOZILLA}/msgcompose/nsMsgCompCID.h
-include/${MOZILLA}/msgcompose/nsMsgCompFields.h
-include/${MOZILLA}/msgcompose/nsMsgCompUtils.h
-include/${MOZILLA}/msgcompose/nsMsgCompose.h
-include/${MOZILLA}/msgcompose/nsMsgComposeContentHandler.h
-include/${MOZILLA}/msgcompose/nsMsgComposeParams.h
-include/${MOZILLA}/msgcompose/nsMsgComposeProgressParams.h
-include/${MOZILLA}/msgcompose/nsMsgComposeService.h
-include/${MOZILLA}/msgcompose/nsMsgComposeStringBundle.h
-include/${MOZILLA}/msgcompose/nsMsgCopy.h
-include/${MOZILLA}/msgcompose/nsMsgCreate.h
-include/${MOZILLA}/msgcompose/nsMsgDeliveryListener.h
-include/${MOZILLA}/msgcompose/nsMsgEncoders.h
-include/${MOZILLA}/msgcompose/nsMsgPrompts.h
-include/${MOZILLA}/msgcompose/nsMsgQuote.h
-include/${MOZILLA}/msgcompose/nsMsgRecipientArray.h
-include/${MOZILLA}/msgcompose/nsMsgSend.h
-include/${MOZILLA}/msgcompose/nsMsgSendLater.h
-include/${MOZILLA}/msgcompose/nsMsgSendReport.h
-include/${MOZILLA}/msgcompose/nsMsgSimulateError.h
-include/${MOZILLA}/msgcompose/nsSmtpDataSource.h
-include/${MOZILLA}/msgcompose/nsSmtpDelegateFactory.h
-include/${MOZILLA}/msgcompose/nsSmtpProtocol.h
-include/${MOZILLA}/msgcompose/nsSmtpServer.h
-include/${MOZILLA}/msgcompose/nsSmtpService.h
-include/${MOZILLA}/msgcompose/nsSmtpUrl.h
-include/${MOZILLA}/msgcompose/nsURLFetcher.h
-include/${MOZILLA}/msgdb/nsDBFolderInfo.h
-include/${MOZILLA}/msgdb/nsIDBChangeAnnouncer.h
-include/${MOZILLA}/msgdb/nsIDBChangeListener.h
-include/${MOZILLA}/msgdb/nsIDBFolderInfo.h
-include/${MOZILLA}/msgdb/nsIMsgDatabase.h
-include/${MOZILLA}/msgdb/nsIMsgOfflineImapOperation.h
-include/${MOZILLA}/msgdb/nsINewsDatabase.h
-include/${MOZILLA}/msgdb/nsImapMailDatabase.h
-include/${MOZILLA}/msgdb/nsMailDatabase.h
-include/${MOZILLA}/msgdb/nsMsgDBCID.h
-include/${MOZILLA}/msgdb/nsMsgDatabase.h
-include/${MOZILLA}/msgdb/nsMsgHdr.h
-include/${MOZILLA}/msgdb/nsMsgThread.h
-include/${MOZILLA}/msgdb/nsNewsDatabase.h
-include/${MOZILLA}/msgimap/nsIIMAPHostSessionList.h
-include/${MOZILLA}/msgimap/nsIImapExtensionSink.h
-include/${MOZILLA}/msgimap/nsIImapFlagAndUidState.h
-include/${MOZILLA}/msgimap/nsIImapHeaderXferInfo.h
-include/${MOZILLA}/msgimap/nsIImapIncomingServer.h
-include/${MOZILLA}/msgimap/nsIImapMailFolderSink.h
-include/${MOZILLA}/msgimap/nsIImapMessageSink.h
-include/${MOZILLA}/msgimap/nsIImapMiscellaneousSink.h
-include/${MOZILLA}/msgimap/nsIImapMockChannel.h
-include/${MOZILLA}/msgimap/nsIImapProtocol.h
-include/${MOZILLA}/msgimap/nsIImapServerSink.h
-include/${MOZILLA}/msgimap/nsIImapService.h
-include/${MOZILLA}/msgimap/nsIImapUrl.h
-include/${MOZILLA}/msgimap/nsIMAPBodyShell.h
-include/${MOZILLA}/msgimap/nsIMAPGenericParser.h
-include/${MOZILLA}/msgimap/nsIMAPHostSessionList.h
-include/${MOZILLA}/msgimap/nsIMAPNamespace.h
-include/${MOZILLA}/msgimap/nsIMailboxSpec.h
-include/${MOZILLA}/msgimap/nsIMsgImapMailFolder.h
-include/${MOZILLA}/msgimap/nsIMsgLogonRedirector.h
-include/${MOZILLA}/msgimap/nsImapCore.h
-include/${MOZILLA}/msgimap/nsImapFlagAndUidState.h
-include/${MOZILLA}/msgimap/nsImapIncomingServer.h
-include/${MOZILLA}/msgimap/nsImapMailFolder.h
-include/${MOZILLA}/msgimap/nsImapProtocol.h
-include/${MOZILLA}/msgimap/nsImapProxyEvent.h
-include/${MOZILLA}/msgimap/nsImapSearchResults.h
-include/${MOZILLA}/msgimap/nsImapServerResponseParser.h
-include/${MOZILLA}/msgimap/nsImapService.h
-include/${MOZILLA}/msgimap/nsImapUrl.h
-include/${MOZILLA}/msgimap/nsImapUtils.h
-include/${MOZILLA}/msgimap/nsMsgImapCID.h
-include/${MOZILLA}/msglocal/nsILocalMailIncomingServer.h
-include/${MOZILLA}/msglocal/nsIMailboxService.h
-include/${MOZILLA}/msglocal/nsIMailboxUrl.h
-include/${MOZILLA}/msglocal/nsIMovemailIncomingServer.h
-include/${MOZILLA}/msglocal/nsIMovemailService.h
-include/${MOZILLA}/msglocal/nsIMsgLocalMailFolder.h
-include/${MOZILLA}/msglocal/nsIMsgParseMailMsgState.h
-include/${MOZILLA}/msglocal/nsINewsBlogFeedDownloader.h
-include/${MOZILLA}/msglocal/nsINoIncomingServer.h
-include/${MOZILLA}/msglocal/nsINoneService.h
-include/${MOZILLA}/msglocal/nsIPop3IncomingServer.h
-include/${MOZILLA}/msglocal/nsIPop3Protocol.h
-include/${MOZILLA}/msglocal/nsIPop3Service.h
-include/${MOZILLA}/msglocal/nsIPop3Sink.h
-include/${MOZILLA}/msglocal/nsIPop3URL.h
-include/${MOZILLA}/msglocal/nsIRssIncomingServer.h
-include/${MOZILLA}/msglocal/nsIRssService.h
-include/${MOZILLA}/msglocal/nsLocalMailFolder.h
-include/${MOZILLA}/msglocal/nsLocalStringBundle.h
-include/${MOZILLA}/msglocal/nsMailboxProtocol.h
-include/${MOZILLA}/msglocal/nsMailboxService.h
-include/${MOZILLA}/msglocal/nsMailboxUrl.h
-include/${MOZILLA}/msglocal/nsMovemailIncomingServer.h
-include/${MOZILLA}/msglocal/nsMovemailService.h
-include/${MOZILLA}/msglocal/nsMsgLocalCID.h
-include/${MOZILLA}/msglocal/nsNoIncomingServer.h
-include/${MOZILLA}/msglocal/nsNoneService.h
-include/${MOZILLA}/msglocal/nsParseMailbox.h
-include/${MOZILLA}/msglocal/nsPop3IncomingServer.h
-include/${MOZILLA}/msglocal/nsPop3Protocol.h
-include/${MOZILLA}/msglocal/nsPop3Service.h
-include/${MOZILLA}/msglocal/nsPop3Sink.h
-include/${MOZILLA}/msglocal/nsPop3URL.h
-include/${MOZILLA}/msglocal/nsRssIncomingServer.h
-include/${MOZILLA}/msglocal/nsRssService.h
-include/${MOZILLA}/msgmdn/nsMsgMdnCID.h
-include/${MOZILLA}/msgmdn/nsMsgMdnGenerator.h
-include/${MOZILLA}/msgnews/nntpCore.h
-include/${MOZILLA}/msgnews/nsIMsgNewsFolder.h
-include/${MOZILLA}/msgnews/nsIMsgOfflineNewsState.h
-include/${MOZILLA}/msgnews/nsINNTPArticleList.h
-include/${MOZILLA}/msgnews/nsINNTPNewsgroupList.h
-include/${MOZILLA}/msgnews/nsINNTPNewsgroupPost.h
-include/${MOZILLA}/msgnews/nsINNTPProtocol.h
-include/${MOZILLA}/msgnews/nsINewsDownloadDialogArgs.h
-include/${MOZILLA}/msgnews/nsINntpIncomingServer.h
-include/${MOZILLA}/msgnews/nsINntpService.h
-include/${MOZILLA}/msgnews/nsINntpUrl.h
-include/${MOZILLA}/msgnews/nsMsgNewsCID.h
-include/${MOZILLA}/msgnews/nsNNTPArticleList.h
-include/${MOZILLA}/msgnews/nsNNTPNewsgroupList.h
-include/${MOZILLA}/msgnews/nsNNTPNewsgroupPost.h
-include/${MOZILLA}/msgnews/nsNNTPProtocol.h
-include/${MOZILLA}/msgnews/nsNewsDownloadDialogArgs.h
-include/${MOZILLA}/msgnews/nsNewsFolder.h
-include/${MOZILLA}/msgnews/nsNewsUtils.h
-include/${MOZILLA}/msgnews/nsNntpIncomingServer.h
-include/${MOZILLA}/msgnews/nsNntpService.h
-include/${MOZILLA}/msgnews/nsNntpUrl.h
-include/${MOZILLA}/msgsmime/nsEncryptedSMIMEURIsService.h
-include/${MOZILLA}/msgsmime/nsIEncryptedSMIMEURIsSrvc.h
-include/${MOZILLA}/msgsmime/nsIMsgSMIMECompFields.h
-include/${MOZILLA}/msgsmime/nsIMsgSMIMEHeaderSink.h
-include/${MOZILLA}/msgsmime/nsISMimeJSHelper.h
-include/${MOZILLA}/msgsmime/nsMsgComposeSecure.h
-include/${MOZILLA}/msgsmime/nsMsgSMIMECID.h
-include/${MOZILLA}/msgsmime/nsSMimeJSHelper.h
-include/${MOZILLA}/necko/ftpCore.h
-include/${MOZILLA}/necko/mozITXTToHTMLConv.h
-include/${MOZILLA}/necko/necko-config.h
-include/${MOZILLA}/necko/netCore.h
-include/${MOZILLA}/necko/nsAboutProtocolUtils.h
-include/${MOZILLA}/necko/nsCPasswordManager.h
-include/${MOZILLA}/necko/nsCPasswordManagerInternal.h
-include/${MOZILLA}/necko/nsChannelProperties.h
-include/${MOZILLA}/necko/nsIAboutModule.h
-include/${MOZILLA}/necko/nsIAsyncStreamCopier.h
-include/${MOZILLA}/necko/nsIAuthModule.h
-include/${MOZILLA}/necko/nsIAuthPrompt.h
-include/${MOZILLA}/necko/nsIAuthPromptProvider.h
-include/${MOZILLA}/necko/nsIBufferedStreams.h
-include/${MOZILLA}/necko/nsIByteRangeRequest.h
-include/${MOZILLA}/necko/nsICachingChannel.h
-include/${MOZILLA}/necko/nsICancelable.h
-include/${MOZILLA}/necko/nsIChannel.h
-include/${MOZILLA}/necko/nsIChannelEventSink.h
-include/${MOZILLA}/necko/nsIContentSniffer.h
-include/${MOZILLA}/necko/nsICookie.h
-include/${MOZILLA}/necko/nsICookie2.h
-include/${MOZILLA}/necko/nsICookieConsent.h
-include/${MOZILLA}/necko/nsICookieManager.h
-include/${MOZILLA}/necko/nsICookieManager2.h
-include/${MOZILLA}/necko/nsICookiePermission.h
-include/${MOZILLA}/necko/nsICookieService.h
-include/${MOZILLA}/necko/nsICryptoFIPSInfo.h
-include/${MOZILLA}/necko/nsIDNSListener.h
-include/${MOZILLA}/necko/nsIDNSRecord.h
-include/${MOZILLA}/necko/nsIDNSService.h
-include/${MOZILLA}/necko/nsIDataChannel.h
-include/${MOZILLA}/necko/nsIDirIndex.h
-include/${MOZILLA}/necko/nsIDirIndexListener.h
-include/${MOZILLA}/necko/nsIDownloader.h
-include/${MOZILLA}/necko/nsIEncodedChannel.h
-include/${MOZILLA}/necko/nsIExternalProtocolHandler.h
-include/${MOZILLA}/necko/nsIFTPChannel.h
-include/${MOZILLA}/necko/nsIFileChannel.h
-include/${MOZILLA}/necko/nsIFileProtocolHandler.h
-include/${MOZILLA}/necko/nsIFileStreams.h
-include/${MOZILLA}/necko/nsIFileURL.h
-include/${MOZILLA}/necko/nsIHttpAuthManager.h
-include/${MOZILLA}/necko/nsIHttpAuthenticator.h
-include/${MOZILLA}/necko/nsIHttpChannel.h
-include/${MOZILLA}/necko/nsIHttpChannelInternal.h
-include/${MOZILLA}/necko/nsIHttpEventSink.h
-include/${MOZILLA}/necko/nsIHttpHeaderVisitor.h
-include/${MOZILLA}/necko/nsIHttpProtocolHandler.h
-include/${MOZILLA}/necko/nsIIDNService.h
-include/${MOZILLA}/necko/nsIIOService.h
-include/${MOZILLA}/necko/nsIIncrementalDownload.h
-include/${MOZILLA}/necko/nsIInputStreamChannel.h
-include/${MOZILLA}/necko/nsIInputStreamPump.h
-include/${MOZILLA}/necko/nsILoadGroup.h
-include/${MOZILLA}/necko/nsIMIMEInputStream.h
-include/${MOZILLA}/necko/nsIMultiPartChannel.h
-include/${MOZILLA}/necko/nsINetUtil.h
-include/${MOZILLA}/necko/nsIPasswordManager.h
-include/${MOZILLA}/necko/nsIPasswordManagerInternal.h
-include/${MOZILLA}/necko/nsIPermissionManager.h
-include/${MOZILLA}/necko/nsIProgressEventSink.h
-include/${MOZILLA}/necko/nsIPrompt.h
-include/${MOZILLA}/necko/nsIProtocolHandler.h
-include/${MOZILLA}/necko/nsIProtocolProxyCallback.h
-include/${MOZILLA}/necko/nsIProtocolProxyFilter.h
-include/${MOZILLA}/necko/nsIProtocolProxyService.h
-include/${MOZILLA}/necko/nsIProxiedProtocolHandler.h
-include/${MOZILLA}/necko/nsIProxyAutoConfig.h
-include/${MOZILLA}/necko/nsIProxyInfo.h
-include/${MOZILLA}/necko/nsIRequest.h
-include/${MOZILLA}/necko/nsIRequestObserver.h
-include/${MOZILLA}/necko/nsIRequestObserverProxy.h
-include/${MOZILLA}/necko/nsIResProtocolHandler.h
-include/${MOZILLA}/necko/nsIResumableChannel.h
-include/${MOZILLA}/necko/nsISOCKSSocketInfo.h
-include/${MOZILLA}/necko/nsISSLSocketControl.h
-include/${MOZILLA}/necko/nsISafeOutputStream.h
-include/${MOZILLA}/necko/nsISecretDecoderRing.h
-include/${MOZILLA}/necko/nsISecureBrowserUI.h
-include/${MOZILLA}/necko/nsISecurityEventSink.h
-include/${MOZILLA}/necko/nsIServerSocket.h
-include/${MOZILLA}/necko/nsISimpleStreamListener.h
-include/${MOZILLA}/necko/nsISocketProvider.h
-include/${MOZILLA}/necko/nsISocketProviderService.h
-include/${MOZILLA}/necko/nsISocketTransport.h
-include/${MOZILLA}/necko/nsISocketTransportService.h
-include/${MOZILLA}/necko/nsIStandardURL.h
-include/${MOZILLA}/necko/nsIStreamConverter.h
-include/${MOZILLA}/necko/nsIStreamConverterService.h
-include/${MOZILLA}/necko/nsIStreamListener.h
-include/${MOZILLA}/necko/nsIStreamListenerProxy.h
-include/${MOZILLA}/necko/nsIStreamListenerTee.h
-include/${MOZILLA}/necko/nsIStreamLoader.h
-include/${MOZILLA}/necko/nsIStreamTransportService.h
-include/${MOZILLA}/necko/nsISyncStreamListener.h
-include/${MOZILLA}/necko/nsITXTToHTMLConv.h
-include/${MOZILLA}/necko/nsITransport.h
-include/${MOZILLA}/necko/nsITransportSecurityInfo.h
-include/${MOZILLA}/necko/nsIURI.h
-include/${MOZILLA}/necko/nsIURIChecker.h
-include/${MOZILLA}/necko/nsIURL.h
-include/${MOZILLA}/necko/nsIURLParser.h
-include/${MOZILLA}/necko/nsIUnicharStreamListener.h
-include/${MOZILLA}/necko/nsIUnicharStreamLoader.h
-include/${MOZILLA}/necko/nsIUploadChannel.h
-include/${MOZILLA}/necko/nsNetCID.h
-include/${MOZILLA}/necko/nsNetError.h
-include/${MOZILLA}/necko/nsNetStrings.h
-include/${MOZILLA}/necko/nsNetUtil.h
-include/${MOZILLA}/necko/nsPIDNSService.h
-include/${MOZILLA}/necko/nsPIProtocolProxyService.h
-include/${MOZILLA}/necko/nsPISocketTransportService.h
-include/${MOZILLA}/necko/nsReadLine.h
-include/${MOZILLA}/necko/nsURIHashKey.h
-include/${MOZILLA}/necko2/nsIViewSourceChannel.h
-include/${MOZILLA}/nkcache/nsCacheService.h
-include/${MOZILLA}/nkcache/nsICache.h
-include/${MOZILLA}/nkcache/nsICacheEntryDescriptor.h
-include/${MOZILLA}/nkcache/nsICacheListener.h
-include/${MOZILLA}/nkcache/nsICacheService.h
-include/${MOZILLA}/nkcache/nsICacheSession.h
-include/${MOZILLA}/nkcache/nsICacheVisitor.h
-include/${MOZILLA}/nsBuildID.h
-include/${MOZILLA}/nsStaticComponents.h
-include/${MOZILLA}/nspr/md/_aix.h
-include/${MOZILLA}/nspr/md/_aix32.cfg
-include/${MOZILLA}/nspr/md/_aix64.cfg
-include/${MOZILLA}/nspr/md/_beos.cfg
-include/${MOZILLA}/nspr/md/_beos.h
-include/${MOZILLA}/nspr/md/_bsdi.cfg
-include/${MOZILLA}/nspr/md/_bsdi.h
-include/${MOZILLA}/nspr/md/_darwin.cfg
-include/${MOZILLA}/nspr/md/_darwin.h
-include/${MOZILLA}/nspr/md/_dgux.cfg
-include/${MOZILLA}/nspr/md/_dgux.h
-include/${MOZILLA}/nspr/md/_freebsd.cfg
-include/${MOZILLA}/nspr/md/_freebsd.h
-include/${MOZILLA}/nspr/md/_hpux.h
-include/${MOZILLA}/nspr/md/_hpux32.cfg
-include/${MOZILLA}/nspr/md/_hpux64.cfg
-include/${MOZILLA}/nspr/md/_irix.h
-include/${MOZILLA}/nspr/md/_irix32.cfg
-include/${MOZILLA}/nspr/md/_irix64.cfg
-include/${MOZILLA}/nspr/md/_linux.cfg
-include/${MOZILLA}/nspr/md/_linux.h
-include/${MOZILLA}/nspr/md/_macos.h
-include/${MOZILLA}/nspr/md/_ncr.cfg
-include/${MOZILLA}/nspr/md/_ncr.h
-include/${MOZILLA}/nspr/md/_nec.cfg
-include/${MOZILLA}/nspr/md/_nec.h
-include/${MOZILLA}/nspr/md/_netbsd.cfg
-include/${MOZILLA}/nspr/md/_netbsd.h
-include/${MOZILLA}/nspr/md/_nextstep.cfg
-include/${MOZILLA}/nspr/md/_nextstep.h
-include/${MOZILLA}/nspr/md/_nspr_pthread.h
-include/${MOZILLA}/nspr/md/_nto.cfg
-include/${MOZILLA}/nspr/md/_nto.h
-include/${MOZILLA}/nspr/md/_openbsd.cfg
-include/${MOZILLA}/nspr/md/_openbsd.h
-include/${MOZILLA}/nspr/md/_openvms.cfg
-include/${MOZILLA}/nspr/md/_openvms.h
-include/${MOZILLA}/nspr/md/_os2.cfg
-include/${MOZILLA}/nspr/md/_os2.h
-include/${MOZILLA}/nspr/md/_os2_errors.h
-include/${MOZILLA}/nspr/md/_osf1.cfg
-include/${MOZILLA}/nspr/md/_osf1.h
-include/${MOZILLA}/nspr/md/_pcos.h
-include/${MOZILLA}/nspr/md/_pth.h
-include/${MOZILLA}/nspr/md/_qnx.cfg
-include/${MOZILLA}/nspr/md/_qnx.h
-include/${MOZILLA}/nspr/md/_reliantunix.cfg
-include/${MOZILLA}/nspr/md/_reliantunix.h
-include/${MOZILLA}/nspr/md/_rhapsody.cfg
-include/${MOZILLA}/nspr/md/_rhapsody.h
-include/${MOZILLA}/nspr/md/_riscos.cfg
-include/${MOZILLA}/nspr/md/_riscos.h
-include/${MOZILLA}/nspr/md/_scoos.cfg
-include/${MOZILLA}/nspr/md/_scoos.h
-include/${MOZILLA}/nspr/md/_solaris.cfg
-include/${MOZILLA}/nspr/md/_solaris.h
-include/${MOZILLA}/nspr/md/_sony.cfg
-include/${MOZILLA}/nspr/md/_sony.h
-include/${MOZILLA}/nspr/md/_sunos4.cfg
-include/${MOZILLA}/nspr/md/_sunos4.h
-include/${MOZILLA}/nspr/md/_unix_errors.h
-include/${MOZILLA}/nspr/md/_unixos.h
-include/${MOZILLA}/nspr/md/_unixware.cfg
-include/${MOZILLA}/nspr/md/_unixware.h
-include/${MOZILLA}/nspr/md/_unixware7.cfg
-include/${MOZILLA}/nspr/md/_win16.cfg
-include/${MOZILLA}/nspr/md/_win16.h
-include/${MOZILLA}/nspr/md/_win32_errors.h
-include/${MOZILLA}/nspr/md/_win95.cfg
-include/${MOZILLA}/nspr/md/_win95.h
-include/${MOZILLA}/nspr/md/_winnt.cfg
-include/${MOZILLA}/nspr/md/_winnt.h
-include/${MOZILLA}/nspr/md/prosdep.h
-include/${MOZILLA}/nspr/md/sunos4.h
-include/${MOZILLA}/nspr/nspr.h
-include/${MOZILLA}/nspr/obsolete/pralarm.h
-include/${MOZILLA}/nspr/obsolete/probslet.h
-include/${MOZILLA}/nspr/obsolete/protypes.h
-include/${MOZILLA}/nspr/obsolete/prsem.h
-include/${MOZILLA}/nspr/plarena.h
-include/${MOZILLA}/nspr/plarenas.h
-include/${MOZILLA}/nspr/plbase64.h
-include/${MOZILLA}/nspr/plerror.h
-include/${MOZILLA}/nspr/plgetopt.h
-include/${MOZILLA}/nspr/plhash.h
-include/${MOZILLA}/nspr/plresolv.h
-include/${MOZILLA}/nspr/plstr.h
-include/${MOZILLA}/nspr/pratom.h
-include/${MOZILLA}/nspr/prbit.h
-include/${MOZILLA}/nspr/prclist.h
-include/${MOZILLA}/nspr/prcmon.h
-include/${MOZILLA}/nspr/prcountr.h
-include/${MOZILLA}/nspr/prcpucfg.h
-include/${MOZILLA}/nspr/prcvar.h
-include/${MOZILLA}/nspr/prdtoa.h
-include/${MOZILLA}/nspr/prenv.h
-include/${MOZILLA}/nspr/prerr.h
-include/${MOZILLA}/nspr/prerror.h
-include/${MOZILLA}/nspr/prinet.h
-include/${MOZILLA}/nspr/prinit.h
-include/${MOZILLA}/nspr/prinrval.h
-include/${MOZILLA}/nspr/prio.h
-include/${MOZILLA}/nspr/pripcsem.h
-include/${MOZILLA}/nspr/private/pprio.h
-include/${MOZILLA}/nspr/private/pprthred.h
-include/${MOZILLA}/nspr/private/prpriv.h
-include/${MOZILLA}/nspr/prlink.h
-include/${MOZILLA}/nspr/prlock.h
-include/${MOZILLA}/nspr/prlog.h
-include/${MOZILLA}/nspr/prlong.h
-include/${MOZILLA}/nspr/prmem.h
-include/${MOZILLA}/nspr/prmon.h
-include/${MOZILLA}/nspr/prmwait.h
-include/${MOZILLA}/nspr/prnetdb.h
-include/${MOZILLA}/nspr/prolock.h
-include/${MOZILLA}/nspr/prpdce.h
-include/${MOZILLA}/nspr/prprf.h
-include/${MOZILLA}/nspr/prproces.h
-include/${MOZILLA}/nspr/prrng.h
-include/${MOZILLA}/nspr/prrwlock.h
-include/${MOZILLA}/nspr/prshm.h
-include/${MOZILLA}/nspr/prshma.h
-include/${MOZILLA}/nspr/prsystem.h
-include/${MOZILLA}/nspr/prthread.h
-include/${MOZILLA}/nspr/prtime.h
-include/${MOZILLA}/nspr/prtpool.h
-include/${MOZILLA}/nspr/prtrace.h
-include/${MOZILLA}/nspr/prtypes.h
-include/${MOZILLA}/nspr/prvrsion.h
-include/${MOZILLA}/nspr/prwin16.h
-include/${MOZILLA}/pipboot/nsIBufEntropyCollector.h
-include/${MOZILLA}/pipboot/nsISSLStatusProvider.h
-include/${MOZILLA}/pipboot/nsISecurityWarningDialogs.h
-include/${MOZILLA}/pipnss/nsIASN1Object.h
-include/${MOZILLA}/pipnss/nsIASN1PrintableItem.h
-include/${MOZILLA}/pipnss/nsIASN1Sequence.h
-include/${MOZILLA}/pipnss/nsIBadCertListener.h
-include/${MOZILLA}/pipnss/nsICMSDecoder.h
-include/${MOZILLA}/pipnss/nsICMSEncoder.h
-include/${MOZILLA}/pipnss/nsICMSMessage.h
-include/${MOZILLA}/pipnss/nsICMSMessageErrors.h
-include/${MOZILLA}/pipnss/nsICMSSecureMessage.h
-include/${MOZILLA}/pipnss/nsICRLInfo.h
-include/${MOZILLA}/pipnss/nsICRLManager.h
-include/${MOZILLA}/pipnss/nsICertPickDialogs.h
-include/${MOZILLA}/pipnss/nsICertSelect.h
-include/${MOZILLA}/pipnss/nsICertTree.h
-include/${MOZILLA}/pipnss/nsICertificateDialogs.h
-include/${MOZILLA}/pipnss/nsICipherInfo.h
-include/${MOZILLA}/pipnss/nsIClientAuthDialogs.h
-include/${MOZILLA}/pipnss/nsIDOMCryptoDialogs.h
-include/${MOZILLA}/pipnss/nsIFormSigningDialog.h
-include/${MOZILLA}/pipnss/nsIGenKeypairInfoDlg.h
-include/${MOZILLA}/pipnss/nsIKeygenThread.h
-include/${MOZILLA}/pipnss/nsINSSCertCache.h
-include/${MOZILLA}/pipnss/nsIOCSPResponder.h
-include/${MOZILLA}/pipnss/nsIPK11Token.h
-include/${MOZILLA}/pipnss/nsIPK11TokenDB.h
-include/${MOZILLA}/pipnss/nsIPKCS11Module.h
-include/${MOZILLA}/pipnss/nsIPKCS11ModuleDB.h
-include/${MOZILLA}/pipnss/nsIPKCS11Slot.h
-include/${MOZILLA}/pipnss/nsISMimeCert.h
-include/${MOZILLA}/pipnss/nsISSLStatus.h
-include/${MOZILLA}/pipnss/nsITokenDialogs.h
-include/${MOZILLA}/pipnss/nsITokenPasswordDialogs.h
-include/${MOZILLA}/pipnss/nsIUserCertPicker.h
-include/${MOZILLA}/pipnss/nsIX509Cert.h
-include/${MOZILLA}/pipnss/nsIX509CertDB.h
-include/${MOZILLA}/pipnss/nsIX509CertDB2.h
-include/${MOZILLA}/pipnss/nsIX509CertValidity.h
-include/${MOZILLA}/pippki/nsIASN1Tree.h
-include/${MOZILLA}/pippki/nsIPKIParamBlock.h
-include/${MOZILLA}/plugin/npapi.h
-include/${MOZILLA}/plugin/npruntime.h
-include/${MOZILLA}/plugin/nptypes.h
-include/${MOZILLA}/plugin/npupp.h
-include/${MOZILLA}/plugin/nsDefaultPlugin.h
-include/${MOZILLA}/plugin/nsIClassicPluginFactory.h
-include/${MOZILLA}/plugin/nsICookieStorage.h
-include/${MOZILLA}/plugin/nsIEventHandler.h
-include/${MOZILLA}/plugin/nsIFileUtilities.h
-include/${MOZILLA}/plugin/nsIHTTPHeaderListener.h
-include/${MOZILLA}/plugin/nsIJRILiveConnectPIPeer.h
-include/${MOZILLA}/plugin/nsIJRILiveConnectPlugin.h
-include/${MOZILLA}/plugin/nsIPlugin.h
-include/${MOZILLA}/plugin/nsIPluginDocument.h
-include/${MOZILLA}/plugin/nsIPluginHost.h
-include/${MOZILLA}/plugin/nsIPluginInputStream.h
-include/${MOZILLA}/plugin/nsIPluginInstance.h
-include/${MOZILLA}/plugin/nsIPluginInstanceInternal.h
-include/${MOZILLA}/plugin/nsIPluginInstanceOwner.h
-include/${MOZILLA}/plugin/nsIPluginInstancePeer.h
-include/${MOZILLA}/plugin/nsIPluginInstancePeer2.h
-include/${MOZILLA}/plugin/nsIPluginManager.h
-include/${MOZILLA}/plugin/nsIPluginManager2.h
-include/${MOZILLA}/plugin/nsIPluginStreamInfo.h
-include/${MOZILLA}/plugin/nsIPluginStreamListener.h
-include/${MOZILLA}/plugin/nsIPluginTagInfo.h
-include/${MOZILLA}/plugin/nsIPluginTagInfo2.h
-include/${MOZILLA}/plugin/nsIScriptablePlugin.h
-include/${MOZILLA}/plugin/nsIWindowlessPlugInstPeer.h
-include/${MOZILLA}/plugin/nsPIPluginHost.h
-include/${MOZILLA}/plugin/nsPIPluginInstancePeer.h
-include/${MOZILLA}/plugin/nsPluginError.h
-include/${MOZILLA}/plugin/nsPluginLogging.h
-include/${MOZILLA}/plugin/nsPluginNativeWindow.h
-include/${MOZILLA}/plugin/nsPluginsCID.h
-include/${MOZILLA}/plugin/nsplugin.h
-include/${MOZILLA}/plugin/nsplugindefs.h
-include/${MOZILLA}/plugin/nspluginroot.h
-include/${MOZILLA}/pref/nsIPref.h
-include/${MOZILLA}/pref/nsIPrefBranch.h
-include/${MOZILLA}/pref/nsIPrefBranch2.h
-include/${MOZILLA}/pref/nsIPrefBranchInternal.h
-include/${MOZILLA}/pref/nsIPrefLocalizedString.h
-include/${MOZILLA}/pref/nsIPrefService.h
-include/${MOZILLA}/pref/nsIRelativeFilePref.h
-include/${MOZILLA}/pref/nsISecurityPref.h
-include/${MOZILLA}/pref/nsPrefsCID.h
-include/${MOZILLA}/prefetch/nsCPrefetchService.h
-include/${MOZILLA}/prefetch/nsIPrefetchService.h
-include/${MOZILLA}/profdirserviceprovider/nsProfileDirServiceProvider.h
-include/${MOZILLA}/profile/nsIProfile.h
-include/${MOZILLA}/profile/nsIProfileChangeStatus.h
-include/${MOZILLA}/profile/nsIProfileInternal.h
-include/${MOZILLA}/profile/nsIProfileStartupListener.h
-include/${MOZILLA}/profile/nsIProfileUnlocker.h
-include/${MOZILLA}/profile/nsISessionRoaming.h
-include/${MOZILLA}/progressDlg/nsIProgressDialog.h
-include/${MOZILLA}/rdf/nsILocalStore.h
-include/${MOZILLA}/rdf/nsIRDFCompositeDataSource.h
-include/${MOZILLA}/rdf/nsIRDFContainer.h
-include/${MOZILLA}/rdf/nsIRDFContainerUtils.h
-include/${MOZILLA}/rdf/nsIRDFContentSink.h
-include/${MOZILLA}/rdf/nsIRDFDataSource.h
-include/${MOZILLA}/rdf/nsIRDFDelegateFactory.h
-include/${MOZILLA}/rdf/nsIRDFFileSystem.h
-include/${MOZILLA}/rdf/nsIRDFInMemoryDataSource.h
-include/${MOZILLA}/rdf/nsIRDFInferDataSource.h
-include/${MOZILLA}/rdf/nsIRDFLiteral.h
-include/${MOZILLA}/rdf/nsIRDFNode.h
-include/${MOZILLA}/rdf/nsIRDFObserver.h
-include/${MOZILLA}/rdf/nsIRDFPropagatableDataSource.h
-include/${MOZILLA}/rdf/nsIRDFPurgeableDataSource.h
-include/${MOZILLA}/rdf/nsIRDFRemoteDataSource.h
-include/${MOZILLA}/rdf/nsIRDFResource.h
-include/${MOZILLA}/rdf/nsIRDFService.h
-include/${MOZILLA}/rdf/nsIRDFXMLParser.h
-include/${MOZILLA}/rdf/nsIRDFXMLSerializer.h
-include/${MOZILLA}/rdf/nsIRDFXMLSink.h
-include/${MOZILLA}/rdf/nsIRDFXMLSource.h
-include/${MOZILLA}/rdf/nsRDFCID.h
-include/${MOZILLA}/rdf/rdf.h
-include/${MOZILLA}/rdf/rdfIDataSource.h
-include/${MOZILLA}/rdf/rdfISerializer.h
-include/${MOZILLA}/rdf/rdfITripleVisitor.h
-include/${MOZILLA}/rdfutil/nsRDFResource.h
-include/${MOZILLA}/shistory/nsIHistoryEntry.h
-include/${MOZILLA}/shistory/nsISHContainer.h
-include/${MOZILLA}/shistory/nsISHEntry.h
-include/${MOZILLA}/shistory/nsISHTransaction.h
-include/${MOZILLA}/shistory/nsISHistory.h
-include/${MOZILLA}/shistory/nsISHistoryInternal.h
-include/${MOZILLA}/shistory/nsISHistoryListener.h
-include/${MOZILLA}/sidebar/nsISidebar.h
-include/${MOZILLA}/spellchecker/mozIPersonalDictionary.h
-include/${MOZILLA}/spellchecker/mozISpellCheckingEngine.h
-include/${MOZILLA}/spellchecker/mozISpellI18NManager.h
-include/${MOZILLA}/spellchecker/mozISpellI18NUtil.h
-include/${MOZILLA}/string/nsAString.h
-include/${MOZILLA}/string/nsAlgorithm.h
-include/${MOZILLA}/string/nsCharTraits.h
-include/${MOZILLA}/string/nsDependentString.h
-include/${MOZILLA}/string/nsDependentSubstring.h
-include/${MOZILLA}/string/nsEmbedString.h
-include/${MOZILLA}/string/nsLiteralString.h
-include/${MOZILLA}/string/nsObsoleteAString.h
-include/${MOZILLA}/string/nsPrintfCString.h
-include/${MOZILLA}/string/nsPromiseFlatString.h
-include/${MOZILLA}/string/nsReadableUtils.h
-include/${MOZILLA}/string/nsString.h
-include/${MOZILLA}/string/nsStringAPI.h
-include/${MOZILLA}/string/nsStringBuffer.h
-include/${MOZILLA}/string/nsStringFwd.h
-include/${MOZILLA}/string/nsStringIterator.h
-include/${MOZILLA}/string/nsSubstring.h
-include/${MOZILLA}/string/nsSubstringTuple.h
-include/${MOZILLA}/string/nsTAString.h
-include/${MOZILLA}/string/nsTDependentString.h
-include/${MOZILLA}/string/nsTDependentSubstring.h
-include/${MOZILLA}/string/nsTObsoleteAString.h
-include/${MOZILLA}/string/nsTPromiseFlatString.h
-include/${MOZILLA}/string/nsTString.h
-include/${MOZILLA}/string/nsTSubstring.h
-include/${MOZILLA}/string/nsTSubstringTuple.h
-include/${MOZILLA}/string/nsUTF8Utils.h
-include/${MOZILLA}/string/nsXPIDLString.h
-include/${MOZILLA}/string/string-template-def-char.h
-include/${MOZILLA}/string/string-template-def-unichar.h
-include/${MOZILLA}/string/string-template-undef.h
-include/${MOZILLA}/system-pref/nsSystemPrefLog.h
-include/${MOZILLA}/system-pref/nsSystemPrefService.h
-include/${MOZILLA}/toolkitcomps/nsICommandLine.h
-include/${MOZILLA}/toolkitcomps/nsICommandLineHandler.h
-include/${MOZILLA}/toolkitcomps/nsICommandLineRunner.h
-include/${MOZILLA}/toolkitcomps/nsIRemoteService.h
-include/${MOZILLA}/toolkitcomps/nsToolkitCompsCID.h
-include/${MOZILLA}/txmgr/nsITransaction.h
-include/${MOZILLA}/txmgr/nsITransactionList.h
-include/${MOZILLA}/txmgr/nsITransactionListener.h
-include/${MOZILLA}/txmgr/nsITransactionManager.h
-include/${MOZILLA}/txmgr/nsTransactionManagerCID.h
-include/${MOZILLA}/txtsvc/nsIInlineSpellChecker.h
-include/${MOZILLA}/txtsvc/nsISpellChecker.h
-include/${MOZILLA}/txtsvc/nsITextService.h
-include/${MOZILLA}/txtsvc/nsITextServicesDocument.h
-include/${MOZILLA}/txtsvc/nsITextServicesFilter.h
-include/${MOZILLA}/txtsvc/nsTextServicesCID.h
-include/${MOZILLA}/uconv/nsEncoderDecoderUtils.h
-include/${MOZILLA}/uconv/nsICharRepresentable.h
-include/${MOZILLA}/uconv/nsICharsetAlias.h
-include/${MOZILLA}/uconv/nsICharsetConverterManager.h
-include/${MOZILLA}/uconv/nsICurrentCharsetListener.h
-include/${MOZILLA}/uconv/nsIMappingCache.h
-include/${MOZILLA}/uconv/nsIPlatformCharset.h
-include/${MOZILLA}/uconv/nsIScriptableUConv.h
-include/${MOZILLA}/uconv/nsITextToSubURI.h
-include/${MOZILLA}/uconv/nsIUTF8ConverterService.h
-include/${MOZILLA}/uconv/nsIUnicodeDecodeHelper.h
-include/${MOZILLA}/uconv/nsIUnicodeDecoder.h
-include/${MOZILLA}/uconv/nsIUnicodeEncodeHelper.h
-include/${MOZILLA}/uconv/nsIUnicodeEncoder.h
-include/${MOZILLA}/uconv/nsUConvCID.h
-include/${MOZILLA}/uconv/uconvutil.h
-include/${MOZILLA}/ucvcn/nsUCvCnCID.h
-include/${MOZILLA}/ucvibm/nsUCvIBMCID.h
-include/${MOZILLA}/ucvja/nsUCVJA2CID.h
-include/${MOZILLA}/ucvja/nsUCVJACID.h
-include/${MOZILLA}/ucvko/nsUCvKOCID.h
-include/${MOZILLA}/ucvlatin/nsUCvLatinCID.h
-include/${MOZILLA}/ucvtw/nsUCvTWCID.h
-include/${MOZILLA}/ucvtw2/nsUCvTW2CID.h
-include/${MOZILLA}/unicharutil/cattable.h
-include/${MOZILLA}/unicharutil/nsCompressedCharMap.h
-include/${MOZILLA}/unicharutil/nsHankakuToZenkakuCID.h
-include/${MOZILLA}/unicharutil/nsICaseConversion.h
-include/${MOZILLA}/unicharutil/nsIEntityConverter.h
-include/${MOZILLA}/unicharutil/nsIOrderIdFormater.h
-include/${MOZILLA}/unicharutil/nsISaveAsCharset.h
-include/${MOZILLA}/unicharutil/nsITextTransform.h
-include/${MOZILLA}/unicharutil/nsIUGenDetailCategory.h
-include/${MOZILLA}/unicharutil/nsIUnicodeNormalizer.h
-include/${MOZILLA}/unicharutil/nsUnicharUtilCIID.h
-include/${MOZILLA}/unicharutil/nsUnicharUtils.h
-include/${MOZILLA}/update/nsIUpdateService.h
-include/${MOZILLA}/uriloader/nsCURILoader.h
-include/${MOZILLA}/uriloader/nsDocLoader.h
-include/${MOZILLA}/uriloader/nsIContentHandler.h
-include/${MOZILLA}/uriloader/nsIDocumentLoader.h
-include/${MOZILLA}/uriloader/nsIDownload.h
-include/${MOZILLA}/uriloader/nsITransfer.h
-include/${MOZILLA}/uriloader/nsIURIContentListener.h
-include/${MOZILLA}/uriloader/nsIURILoader.h
-include/${MOZILLA}/uriloader/nsIWebProgress.h
-include/${MOZILLA}/uriloader/nsIWebProgressListener.h
-include/${MOZILLA}/uriloader/nsIWebProgressListener2.h
-include/${MOZILLA}/uriloader/nsURILoader.h
-include/${MOZILLA}/util/nsTimer.h
-include/${MOZILLA}/util/stopwatch.h
-include/${MOZILLA}/view/nsICompositeListener.h
-include/${MOZILLA}/view/nsIScrollPositionListener.h
-include/${MOZILLA}/view/nsIScrollableView.h
-include/${MOZILLA}/view/nsIView.h
-include/${MOZILLA}/view/nsIViewManager.h
-include/${MOZILLA}/view/nsIViewObserver.h
-include/${MOZILLA}/view/nsViewsCID.h
-include/${MOZILLA}/wallet/nsCPassword.h
-include/${MOZILLA}/wallet/nsIPassword.h
-include/${MOZILLA}/wallet/nsIWalletService.h
-include/${MOZILLA}/walletviewers/nsISignonViewer.h
-include/${MOZILLA}/walletviewers/nsIWalletEditor.h
-include/${MOZILLA}/walletviewers/nsIWalletPreview.h
-include/${MOZILLA}/webbrowserpersist/nsCWebBrowserPersist.h
-include/${MOZILLA}/webbrowserpersist/nsIWebBrowserPersist.h
-include/${MOZILLA}/webbrwsr/nsCTooltipTextProvider.h
-include/${MOZILLA}/webbrwsr/nsCWebBrowser.h
-include/${MOZILLA}/webbrwsr/nsICommandHandler.h
-include/${MOZILLA}/webbrwsr/nsIContextMenuListener.h
-include/${MOZILLA}/webbrwsr/nsIContextMenuListener2.h
-include/${MOZILLA}/webbrwsr/nsIEmbeddingSiteWindow.h
-include/${MOZILLA}/webbrwsr/nsIEmbeddingSiteWindow2.h
-include/${MOZILLA}/webbrwsr/nsIPrintingPrompt.h
-include/${MOZILLA}/webbrwsr/nsIPrintingPromptService.h
-include/${MOZILLA}/webbrwsr/nsITooltipListener.h
-include/${MOZILLA}/webbrwsr/nsITooltipTextProvider.h
-include/${MOZILLA}/webbrwsr/nsIWebBrowser.h
-include/${MOZILLA}/webbrwsr/nsIWebBrowserChrome.h
-include/${MOZILLA}/webbrwsr/nsIWebBrowserChromeFocus.h
-include/${MOZILLA}/webbrwsr/nsIWebBrowserFocus.h
-include/${MOZILLA}/webbrwsr/nsIWebBrowserPrint.h
-include/${MOZILLA}/webbrwsr/nsIWebBrowserSetup.h
-include/${MOZILLA}/webbrwsr/nsIWebBrowserStream.h
-include/${MOZILLA}/webshell/nsIClipboardCommands.h
-include/${MOZILLA}/webshell/nsIContentViewerContainer.h
-include/${MOZILLA}/webshell/nsIDocumentLoaderFactory.h
-include/${MOZILLA}/webshell/nsILinkHandler.h
-include/${MOZILLA}/webshell/nsIRefreshURI.h
-include/${MOZILLA}/webshell/nsIWebShellServices.h
-include/${MOZILLA}/websrvcs/nsIGenericInterfaceInfoSet.h
-include/${MOZILLA}/websrvcs/nsIInterfaceInfoToIDL.h
-include/${MOZILLA}/websrvcs/nsISOAPAttachments.h
-include/${MOZILLA}/websrvcs/nsISOAPBlock.h
-include/${MOZILLA}/websrvcs/nsISOAPCall.h
-include/${MOZILLA}/websrvcs/nsISOAPCallCompletion.h
-include/${MOZILLA}/websrvcs/nsISOAPDecoder.h
-include/${MOZILLA}/websrvcs/nsISOAPEncoder.h
-include/${MOZILLA}/websrvcs/nsISOAPEncoding.h
-include/${MOZILLA}/websrvcs/nsISOAPFault.h
-include/${MOZILLA}/websrvcs/nsISOAPHeaderBlock.h
-include/${MOZILLA}/websrvcs/nsISOAPMessage.h
-include/${MOZILLA}/websrvcs/nsISOAPParameter.h
-include/${MOZILLA}/websrvcs/nsISOAPPropertyBagMutator.h
-include/${MOZILLA}/websrvcs/nsISOAPResponse.h
-include/${MOZILLA}/websrvcs/nsISOAPResponseListener.h
-include/${MOZILLA}/websrvcs/nsISOAPService.h
-include/${MOZILLA}/websrvcs/nsISOAPServiceRegistry.h
-include/${MOZILLA}/websrvcs/nsISOAPTransport.h
-include/${MOZILLA}/websrvcs/nsISOAPTransportListener.h
-include/${MOZILLA}/websrvcs/nsISchema.h
-include/${MOZILLA}/websrvcs/nsISchemaLoader.h
-include/${MOZILLA}/websrvcs/nsIScriptableInterfaceInfo.h
-include/${MOZILLA}/websrvcs/nsIWSDL.h
-include/${MOZILLA}/websrvcs/nsIWSDLLoader.h
-include/${MOZILLA}/websrvcs/nsIWSDLSOAPBinding.h
-include/${MOZILLA}/websrvcs/nsIWSPInterfaceInfoService.h
-include/${MOZILLA}/websrvcs/nsIWebScriptsAccessService.h
-include/${MOZILLA}/websrvcs/nsIWebServiceErrorHandler.h
-include/${MOZILLA}/websrvcs/nsIWebServiceProxy.h
-include/${MOZILLA}/widget/mozcontainer.h
-include/${MOZILLA}/widget/mozdrawingarea.h
-include/${MOZILLA}/widget/nsEvent.h
-include/${MOZILLA}/widget/nsGUIEvent.h
-include/${MOZILLA}/widget/nsIAppShell.h
-include/${MOZILLA}/widget/nsIBaseWindow.h
-include/${MOZILLA}/widget/nsIBidiKeyboard.h
-include/${MOZILLA}/widget/nsIButton.h
-include/${MOZILLA}/widget/nsICheckButton.h
-include/${MOZILLA}/widget/nsIClipboard.h
-include/${MOZILLA}/widget/nsIClipboardDragDropHookList.h
-include/${MOZILLA}/widget/nsIClipboardDragDropHooks.h
-include/${MOZILLA}/widget/nsIClipboardHelper.h
-include/${MOZILLA}/widget/nsIClipboardOwner.h
-include/${MOZILLA}/widget/nsIDragService.h
-include/${MOZILLA}/widget/nsIDragSession.h
-include/${MOZILLA}/widget/nsIDragSessionBeOS.h
-include/${MOZILLA}/widget/nsIDragSessionGTK.h
-include/${MOZILLA}/widget/nsIDragSessionMac.h
-include/${MOZILLA}/widget/nsIDragSessionOS2.h
-include/${MOZILLA}/widget/nsIDragSessionXlib.h
-include/${MOZILLA}/widget/nsIEventListener.h
-include/${MOZILLA}/widget/nsIFilePicker.h
-include/${MOZILLA}/widget/nsIFormatConverter.h
-include/${MOZILLA}/widget/nsIFullScreen.h
-include/${MOZILLA}/widget/nsIGdkPixbufImage.h
-include/${MOZILLA}/widget/nsIKBStateControl.h
-include/${MOZILLA}/widget/nsILabel.h
-include/${MOZILLA}/widget/nsILookAndFeel.h
-include/${MOZILLA}/widget/nsIMenu.h
-include/${MOZILLA}/widget/nsIMenuBar.h
-include/${MOZILLA}/widget/nsIMenuItem.h
-include/${MOZILLA}/widget/nsIMenuListener.h
-include/${MOZILLA}/widget/nsIMenuRollup.h
-include/${MOZILLA}/widget/nsIMouseListener.h
-include/${MOZILLA}/widget/nsINativeKeyBindings.h
-include/${MOZILLA}/widget/nsINativeScrollbar.h
-include/${MOZILLA}/widget/nsIPluginWidget.h
-include/${MOZILLA}/widget/nsIRollupListener.h
-include/${MOZILLA}/widget/nsISound.h
-include/${MOZILLA}/widget/nsITextWidget.h
-include/${MOZILLA}/widget/nsIToolkit.h
-include/${MOZILLA}/widget/nsITransferable.h
-include/${MOZILLA}/widget/nsIWidget.h
-include/${MOZILLA}/widget/nsStringUtil.h
-include/${MOZILLA}/widget/nsWidgetSupport.h
-include/${MOZILLA}/widget/nsWidgetsCID.h
-include/${MOZILLA}/widget/widgetCore.h
-include/${MOZILLA}/windowwatcher/nsIAuthPromptWrapper.h
-include/${MOZILLA}/windowwatcher/nsIDialogParamBlock.h
-include/${MOZILLA}/windowwatcher/nsINonBlockingAlertService.h
-include/${MOZILLA}/windowwatcher/nsIPromptService.h
-include/${MOZILLA}/windowwatcher/nsIWindowWatcher.h
-include/${MOZILLA}/windowwatcher/nsPIPromptService.h
-include/${MOZILLA}/windowwatcher/nsPIWindowWatcher.h
-include/${MOZILLA}/xmlextras/nsIDOMParser.h
-include/${MOZILLA}/xmlextras/nsIDOMSerializer.h
-include/${MOZILLA}/xmlextras/nsIXMLHttpRequest.h
-include/${MOZILLA}/xpcom/nsAgg.h
-include/${MOZILLA}/xpcom/nsAppDirectoryServiceDefs.h
-include/${MOZILLA}/xpcom/nsArray.h
-include/${MOZILLA}/xpcom/nsArrayEnumerator.h
-include/${MOZILLA}/xpcom/nsAtomService.h
-include/${MOZILLA}/xpcom/nsAutoBuffer.h
-include/${MOZILLA}/xpcom/nsAutoLock.h
-include/${MOZILLA}/xpcom/nsAutoPtr.h
-include/${MOZILLA}/xpcom/nsBaseHashtable.h
-include/${MOZILLA}/xpcom/nsCOMArray.h
-include/${MOZILLA}/xpcom/nsCOMPtr.h
-include/${MOZILLA}/xpcom/nsCRT.h
-include/${MOZILLA}/xpcom/nsCategoryManagerUtils.h
-include/${MOZILLA}/xpcom/nsCheapSets.h
-include/${MOZILLA}/xpcom/nsClassHashtable.h
-include/${MOZILLA}/xpcom/nsCom.h
-include/${MOZILLA}/xpcom/nsComponentManagerUtils.h
-include/${MOZILLA}/xpcom/nsCppSharedAllocator.h
-include/${MOZILLA}/xpcom/nsDataHashtable.h
-include/${MOZILLA}/xpcom/nsDebug.h
-include/${MOZILLA}/xpcom/nsDebugImpl.h
-include/${MOZILLA}/xpcom/nsDeque.h
-include/${MOZILLA}/xpcom/nsDirectoryService.h
-include/${MOZILLA}/xpcom/nsDirectoryServiceDefs.h
-include/${MOZILLA}/xpcom/nsDirectoryServiceUtils.h
-include/${MOZILLA}/xpcom/nsDoubleHashtable.h
-include/${MOZILLA}/xpcom/nsEnumeratorUtils.h
-include/${MOZILLA}/xpcom/nsError.h
-include/${MOZILLA}/xpcom/nsEscape.h
-include/${MOZILLA}/xpcom/nsEventQueueUtils.h
-include/${MOZILLA}/xpcom/nsFastLoadPtr.h
-include/${MOZILLA}/xpcom/nsFastLoadService.h
-include/${MOZILLA}/xpcom/nsFixedSizeAllocator.h
-include/${MOZILLA}/xpcom/nsGenericFactory.h
-include/${MOZILLA}/xpcom/nsHashKeys.h
-include/${MOZILLA}/xpcom/nsHashPropertyBag.h
-include/${MOZILLA}/xpcom/nsHashSets.h
-include/${MOZILLA}/xpcom/nsHashtable.h
-include/${MOZILLA}/xpcom/nsIAllocator.h
-include/${MOZILLA}/xpcom/nsIArray.h
-include/${MOZILLA}/xpcom/nsIAsyncInputStream.h
-include/${MOZILLA}/xpcom/nsIAsyncOutputStream.h
-include/${MOZILLA}/xpcom/nsIAtom.h
-include/${MOZILLA}/xpcom/nsIAtomService.h
-include/${MOZILLA}/xpcom/nsIBinaryInputStream.h
-include/${MOZILLA}/xpcom/nsIBinaryOutputStream.h
-include/${MOZILLA}/xpcom/nsIByteArrayInputStream.h
-include/${MOZILLA}/xpcom/nsIByteBuffer.h
-include/${MOZILLA}/xpcom/nsICategoryManager.h
-include/${MOZILLA}/xpcom/nsIClassInfo.h
-include/${MOZILLA}/xpcom/nsICollection.h
-include/${MOZILLA}/xpcom/nsIComponentLoader.h
-include/${MOZILLA}/xpcom/nsIComponentLoaderManager.h
-include/${MOZILLA}/xpcom/nsIComponentManager.h
-include/${MOZILLA}/xpcom/nsIComponentManagerObsolete.h
-include/${MOZILLA}/xpcom/nsIComponentRegistrar.h
-include/${MOZILLA}/xpcom/nsIConsoleListener.h
-include/${MOZILLA}/xpcom/nsIConsoleMessage.h
-include/${MOZILLA}/xpcom/nsIConsoleService.h
-include/${MOZILLA}/xpcom/nsIConverterInputStream.h
-include/${MOZILLA}/xpcom/nsIConverterOutputStream.h
-include/${MOZILLA}/xpcom/nsID.h
-include/${MOZILLA}/xpcom/nsIDebug.h
-include/${MOZILLA}/xpcom/nsIDirectoryEnumerator.h
-include/${MOZILLA}/xpcom/nsIDirectoryService.h
-include/${MOZILLA}/xpcom/nsIEnumerator.h
-include/${MOZILLA}/xpcom/nsIEnvironment.h
-include/${MOZILLA}/xpcom/nsIErrorService.h
-include/${MOZILLA}/xpcom/nsIEventQueue.h
-include/${MOZILLA}/xpcom/nsIEventQueueService.h
-include/${MOZILLA}/xpcom/nsIEventTarget.h
-include/${MOZILLA}/xpcom/nsIException.h
-include/${MOZILLA}/xpcom/nsIExceptionService.h
-include/${MOZILLA}/xpcom/nsIFactory.h
-include/${MOZILLA}/xpcom/nsIFastLoadFileControl.h
-include/${MOZILLA}/xpcom/nsIFastLoadService.h
-include/${MOZILLA}/xpcom/nsIFile.h
-include/${MOZILLA}/xpcom/nsIGenericFactory.h
-include/${MOZILLA}/xpcom/nsIID.h
-include/${MOZILLA}/xpcom/nsIInputStream.h
-include/${MOZILLA}/xpcom/nsIInputStreamTee.h
-include/${MOZILLA}/xpcom/nsIInterfaceInfo.h
-include/${MOZILLA}/xpcom/nsIInterfaceInfoManager.h
-include/${MOZILLA}/xpcom/nsIInterfaceRequestor.h
-include/${MOZILLA}/xpcom/nsIInterfaceRequestorUtils.h
-include/${MOZILLA}/xpcom/nsILineInputStream.h
-include/${MOZILLA}/xpcom/nsILocalFile.h
-include/${MOZILLA}/xpcom/nsILocalFileWin.h
-include/${MOZILLA}/xpcom/nsIMemory.h
-include/${MOZILLA}/xpcom/nsIModule.h
-include/${MOZILLA}/xpcom/nsIMultiplexInputStream.h
-include/${MOZILLA}/xpcom/nsINIParser.h
-include/${MOZILLA}/xpcom/nsIObjectInputStream.h
-include/${MOZILLA}/xpcom/nsIObjectOutputStream.h
-include/${MOZILLA}/xpcom/nsIObserver.h
-include/${MOZILLA}/xpcom/nsIObserverService.h
-include/${MOZILLA}/xpcom/nsIOutputStream.h
-include/${MOZILLA}/xpcom/nsIPersistentProperties2.h
-include/${MOZILLA}/xpcom/nsIPipe.h
-include/${MOZILLA}/xpcom/nsIProcess.h
-include/${MOZILLA}/xpcom/nsIProgrammingLanguage.h
-include/${MOZILLA}/xpcom/nsIProperties.h
-include/${MOZILLA}/xpcom/nsIProperty.h
-include/${MOZILLA}/xpcom/nsIPropertyBag.h
-include/${MOZILLA}/xpcom/nsIPropertyBag2.h
-include/${MOZILLA}/xpcom/nsIProxyCreateInstance.h
-include/${MOZILLA}/xpcom/nsIProxyObjectManager.h
-include/${MOZILLA}/xpcom/nsIRecyclingAllocator.h
-include/${MOZILLA}/xpcom/nsIRunnable.h
-include/${MOZILLA}/xpcom/nsIScriptableInputStream.h
-include/${MOZILLA}/xpcom/nsISeekableStream.h
-include/${MOZILLA}/xpcom/nsISerializable.h
-include/${MOZILLA}/xpcom/nsIServiceManager.h
-include/${MOZILLA}/xpcom/nsIServiceManagerObsolete.h
-include/${MOZILLA}/xpcom/nsISimpleEnumerator.h
-include/${MOZILLA}/xpcom/nsIStorageStream.h
-include/${MOZILLA}/xpcom/nsIStreamBufferAccess.h
-include/${MOZILLA}/xpcom/nsIStringEnumerator.h
-include/${MOZILLA}/xpcom/nsIStringStream.h
-include/${MOZILLA}/xpcom/nsISupports.h
-include/${MOZILLA}/xpcom/nsISupportsArray.h
-include/${MOZILLA}/xpcom/nsISupportsBase.h
-include/${MOZILLA}/xpcom/nsISupportsImpl.h
-include/${MOZILLA}/xpcom/nsISupportsIterators.h
-include/${MOZILLA}/xpcom/nsISupportsObsolete.h
-include/${MOZILLA}/xpcom/nsISupportsPrimitives.h
-include/${MOZILLA}/xpcom/nsISupportsPriority.h
-include/${MOZILLA}/xpcom/nsISupportsUtils.h
-include/${MOZILLA}/xpcom/nsIThread.h
-include/${MOZILLA}/xpcom/nsITimelineService.h
-include/${MOZILLA}/xpcom/nsITimer.h
-include/${MOZILLA}/xpcom/nsITimerInternal.h
-include/${MOZILLA}/xpcom/nsITimerManager.h
-include/${MOZILLA}/xpcom/nsITraceRefcnt.h
-include/${MOZILLA}/xpcom/nsIUnicharBuffer.h
-include/${MOZILLA}/xpcom/nsIUnicharInputStream.h
-include/${MOZILLA}/xpcom/nsIUnicharLineInputStream.h
-include/${MOZILLA}/xpcom/nsIUnicharOutputStream.h
-include/${MOZILLA}/xpcom/nsIVariant.h
-include/${MOZILLA}/xpcom/nsIVersionComparator.h
-include/${MOZILLA}/xpcom/nsIWeakReference.h
-include/${MOZILLA}/xpcom/nsIWeakReferenceUtils.h
-include/${MOZILLA}/xpcom/nsIWritablePropertyBag.h
-include/${MOZILLA}/xpcom/nsIWritablePropertyBag2.h
-include/${MOZILLA}/xpcom/nsIXPTLoader.h
-include/${MOZILLA}/xpcom/nsInt64.h
-include/${MOZILLA}/xpcom/nsInterfaceHashtable.h
-include/${MOZILLA}/xpcom/nsInterfaceRequestorAgg.h
-include/${MOZILLA}/xpcom/nsLinebreakConverter.h
-include/${MOZILLA}/xpcom/nsLocalFile.h
-include/${MOZILLA}/xpcom/nsLocalFileUnix.h
-include/${MOZILLA}/xpcom/nsMemory.h
-include/${MOZILLA}/xpcom/nsModule.h
-include/${MOZILLA}/xpcom/nsMultiplexInputStream.h
-include/${MOZILLA}/xpcom/nsNativeCharsetUtils.h
-include/${MOZILLA}/xpcom/nsNativeComponentLoader.h
-include/${MOZILLA}/xpcom/nsObserverService.h
-include/${MOZILLA}/xpcom/nsObsoleteModuleLoading.h
-include/${MOZILLA}/xpcom/nsProcess.h
-include/${MOZILLA}/xpcom/nsProxiedService.h
-include/${MOZILLA}/xpcom/nsProxyEvent.h
-include/${MOZILLA}/xpcom/nsProxyRelease.h
-include/${MOZILLA}/xpcom/nsQuickSort.h
-include/${MOZILLA}/xpcom/nsRecyclingAllocator.h
-include/${MOZILLA}/xpcom/nsRefPtrHashtable.h
-include/${MOZILLA}/xpcom/nsScriptableInputStream.h
-include/${MOZILLA}/xpcom/nsServiceManagerUtils.h
-include/${MOZILLA}/xpcom/nsStaticAtom.h
-include/${MOZILLA}/xpcom/nsStaticNameTable.h
-include/${MOZILLA}/xpcom/nsStorageStream.h
-include/${MOZILLA}/xpcom/nsStreamUtils.h
-include/${MOZILLA}/xpcom/nsStringEnumerator.h
-include/${MOZILLA}/xpcom/nsStringIO.h
-include/${MOZILLA}/xpcom/nsStringStream.h
-include/${MOZILLA}/xpcom/nsSupportsArray.h
-include/${MOZILLA}/xpcom/nsSupportsPrimitives.h
-include/${MOZILLA}/xpcom/nsTHashtable.h
-include/${MOZILLA}/xpcom/nsTextFormatter.h
-include/${MOZILLA}/xpcom/nsTime.h
-include/${MOZILLA}/xpcom/nsTraceRefcnt.h
-include/${MOZILLA}/xpcom/nsTraceRefcntImpl.h
-include/${MOZILLA}/xpcom/nsUnitConversion.h
-include/${MOZILLA}/xpcom/nsValueArray.h
-include/${MOZILLA}/xpcom/nsVariant.h
-include/${MOZILLA}/xpcom/nsVersionComparator.h
-include/${MOZILLA}/xpcom/nsVoidArray.h
-include/${MOZILLA}/xpcom/nsWeakPtr.h
-include/${MOZILLA}/xpcom/nsWeakReference.h
-include/${MOZILLA}/xpcom/nsXPCOM.h
-include/${MOZILLA}/xpcom/nsXPCOMCID.h
-include/${MOZILLA}/xpcom/nsXPCOMGlue.h
-include/${MOZILLA}/xpcom/nscore.h
-include/${MOZILLA}/xpcom/nsrootidl.h
-include/${MOZILLA}/xpcom/pldhash.h
-include/${MOZILLA}/xpcom/plevent.h
-include/${MOZILLA}/xpcom/xcDll.h
-include/${MOZILLA}/xpcom/xpcom-config.h
-include/${MOZILLA}/xpcom/xpt_arena.h
-include/${MOZILLA}/xpcom/xpt_struct.h
-include/${MOZILLA}/xpcom/xpt_xdr.h
-include/${MOZILLA}/xpcom/xptcall.h
-include/${MOZILLA}/xpcom/xptcstubsdecl.inc
-include/${MOZILLA}/xpcom/xptcstubsdef.inc
-include/${MOZILLA}/xpcom/xptinfo.h
-include/${MOZILLA}/xpcom_obsolete/nsFileSpec.h
-include/${MOZILLA}/xpcom_obsolete/nsFileStream.h
-include/${MOZILLA}/xpcom_obsolete/nsIFileSpec.h
-include/${MOZILLA}/xpcom_obsolete/nsIFileStream.h
-include/${MOZILLA}/xpcom_obsolete/nsIRegistry.h
-include/${MOZILLA}/xpcom_obsolete/nsIRegistryUtils.h
-include/${MOZILLA}/xpcom_obsolete/nsSpecialSystemDirectory.h
-include/${MOZILLA}/xpcom_obsolete/xpcomobsolete.h
-include/${MOZILLA}/xpconnect/XPCIDispatch.h
-include/${MOZILLA}/xpconnect/mozIJSSubScriptLoader.h
-include/${MOZILLA}/xpconnect/nsIJSContextStack.h
-include/${MOZILLA}/xpconnect/nsIJSRuntimeService.h
-include/${MOZILLA}/xpconnect/nsIScriptError.h
-include/${MOZILLA}/xpconnect/nsIScriptableInterfaces.h
-include/${MOZILLA}/xpconnect/nsIXPCScriptNotify.h
-include/${MOZILLA}/xpconnect/nsIXPCScriptable.h
-include/${MOZILLA}/xpconnect/nsIXPCSecurityManager.h
-include/${MOZILLA}/xpconnect/nsIXPConnect.h
-include/${MOZILLA}/xpconnect/xpc_map_end.h
-include/${MOZILLA}/xpconnect/xpccomponents.h
-include/${MOZILLA}/xpconnect/xpcexception.h
-include/${MOZILLA}/xpconnect/xpcjsid.h
-include/${MOZILLA}/xpinstall/InstallCleanupDefines.h
-include/${MOZILLA}/xpinstall/nsIDOMInstallTriggerGlobal.h
-include/${MOZILLA}/xpinstall/nsIDOMInstallVersion.h
-include/${MOZILLA}/xpinstall/nsISoftwareUpdate.h
-include/${MOZILLA}/xpinstall/nsIXPIDialogService.h
-include/${MOZILLA}/xpinstall/nsIXPINotifier.h
-include/${MOZILLA}/xpinstall/nsIXPIProgressDialog.h
-include/${MOZILLA}/xpinstall/nsIXPInstallManager.h
-include/${MOZILLA}/xpinstall/nsPICertNotification.h
-include/${MOZILLA}/xpinstall/nsPIXPIProxy.h
-include/${MOZILLA}/xpinstall/nsPIXPIStubHook.h
-include/${MOZILLA}/xpinstall/nsSoftwareUpdateIIDs.h
-include/${MOZILLA}/xpinstall/nsXPITriggerInfo.h
-include/${MOZILLA}/xul/nsIXULPopupListener.h
-include/${MOZILLA}/xul/nsXULAtomList.h
-include/${MOZILLA}/xul/nsXULAtoms.h
-include/${MOZILLA}/xulapp/nsINativeAppSupport.h
-include/${MOZILLA}/xulapp/nsIProfileMigrator.h
-include/${MOZILLA}/xulapp/nsIToolkitProfile.h
-include/${MOZILLA}/xulapp/nsIToolkitProfileService.h
-include/${MOZILLA}/xulapp/nsIXULAppInfo.h
-include/${MOZILLA}/xulapp/nsIXULRuntime.h
-include/${MOZILLA}/xulapp/nsXULAppAPI.h
-include/${MOZILLA}/xuldoc/nsIController.h
-include/${MOZILLA}/xuldoc/nsIControllers.h
-include/${MOZILLA}/xuldoc/nsIXULContentSink.h
-include/${MOZILLA}/xuldoc/nsIXULDocument.h
-include/${MOZILLA}/xuldoc/nsIXULOverlayProvider.h
-include/${MOZILLA}/xuldoc/nsIXULPrototypeCache.h
-include/${MOZILLA}/xuldoc/nsIXULPrototypeDocument.h
-include/${MOZILLA}/xultmpl/nsIXULBuilderListener.h
-include/${MOZILLA}/xultmpl/nsIXULSortService.h
-include/${MOZILLA}/xultmpl/nsIXULTemplateBuilder.h
-include/${MOZILLA}/zlib/mozzconf.h
-include/${MOZILLA}/zlib/zconf.h
-include/${MOZILLA}/zlib/zlib.h
-@comment end INCLUDE
-@comment begin INCLUDE-PUBLIC
-include/${MOZILLA}/ldap-private/lber-int.h
-include/${MOZILLA}/ldap-private/ldap-int.h
-include/${MOZILLA}/ldap-private/ldaplog.h
-include/${MOZILLA}/ldap-private/ldaprot.h
-include/${MOZILLA}/ldap-private/portable.h
-include/${MOZILLA}/ldap/disptmpl.h
-include/${MOZILLA}/ldap/iutil.h
-include/${MOZILLA}/ldap/lber.h
-include/${MOZILLA}/ldap/ldap-deprecated.h
-include/${MOZILLA}/ldap/ldap-extension.h
-include/${MOZILLA}/ldap/ldap-platform.h
-include/${MOZILLA}/ldap/ldap-standard.h
-include/${MOZILLA}/ldap/ldap-to-be-deprecated.h
-include/${MOZILLA}/ldap/ldap.h
-include/${MOZILLA}/ldap/ldap_ssl.h
-include/${MOZILLA}/ldap/ldappr.h
-include/${MOZILLA}/ldap/srchpref.h
-include/${MOZILLA}/nss/base64.h
-include/${MOZILLA}/nss/blapit.h
-include/${MOZILLA}/nss/cert.h
-include/${MOZILLA}/nss/certdb.h
-include/${MOZILLA}/nss/certt.h
-include/${MOZILLA}/nss/ciferfam.h
-include/${MOZILLA}/nss/cmmf.h
-include/${MOZILLA}/nss/cmmft.h
-include/${MOZILLA}/nss/cms.h
-include/${MOZILLA}/nss/cmsreclist.h
-include/${MOZILLA}/nss/cmst.h
-include/${MOZILLA}/nss/crmf.h
-include/${MOZILLA}/nss/crmft.h
-include/${MOZILLA}/nss/cryptohi.h
-include/${MOZILLA}/nss/cryptoht.h
-include/${MOZILLA}/nss/ecl-exp.h
-include/${MOZILLA}/nss/hasht.h
-include/${MOZILLA}/nss/jar-ds.h
-include/${MOZILLA}/nss/jar.h
-include/${MOZILLA}/nss/jarfile.h
-include/${MOZILLA}/nss/key.h
-include/${MOZILLA}/nss/keyhi.h
-include/${MOZILLA}/nss/keyt.h
-include/${MOZILLA}/nss/keythi.h
-include/${MOZILLA}/nss/nss.h
-include/${MOZILLA}/nss/nssb64.h
-include/${MOZILLA}/nss/nssb64t.h
-include/${MOZILLA}/nss/nssbase.h
-include/${MOZILLA}/nss/nssbaset.h
-include/${MOZILLA}/nss/nssck.api
-include/${MOZILLA}/nss/nssckbi.h
-include/${MOZILLA}/nss/nssckepv.h
-include/${MOZILLA}/nss/nssckft.h
-include/${MOZILLA}/nss/nssckfw.h
-include/${MOZILLA}/nss/nssckfwc.h
-include/${MOZILLA}/nss/nssckfwt.h
-include/${MOZILLA}/nss/nssckg.h
-include/${MOZILLA}/nss/nssckmdt.h
-include/${MOZILLA}/nss/nssckt.h
-include/${MOZILLA}/nss/nssilckt.h
-include/${MOZILLA}/nss/nssilock.h
-include/${MOZILLA}/nss/nsslocks.h
-include/${MOZILLA}/nss/nssrwlk.h
-include/${MOZILLA}/nss/nssrwlkt.h
-include/${MOZILLA}/nss/ocsp.h
-include/${MOZILLA}/nss/ocspt.h
-include/${MOZILLA}/nss/p12.h
-include/${MOZILLA}/nss/p12plcy.h
-include/${MOZILLA}/nss/p12t.h
-include/${MOZILLA}/nss/pk11func.h
-include/${MOZILLA}/nss/pk11pqg.h
-include/${MOZILLA}/nss/pk11priv.h
-include/${MOZILLA}/nss/pk11pub.h
-include/${MOZILLA}/nss/pk11sdr.h
-include/${MOZILLA}/nss/pkcs11.h
-include/${MOZILLA}/nss/pkcs11f.h
-include/${MOZILLA}/nss/pkcs11n.h
-include/${MOZILLA}/nss/pkcs11p.h
-include/${MOZILLA}/nss/pkcs11t.h
-include/${MOZILLA}/nss/pkcs11u.h
-include/${MOZILLA}/nss/pkcs12.h
-include/${MOZILLA}/nss/pkcs12t.h
-include/${MOZILLA}/nss/pkcs7t.h
-include/${MOZILLA}/nss/portreg.h
-include/${MOZILLA}/nss/preenc.h
-include/${MOZILLA}/nss/secasn1.h
-include/${MOZILLA}/nss/secasn1t.h
-include/${MOZILLA}/nss/seccomon.h
-include/${MOZILLA}/nss/secder.h
-include/${MOZILLA}/nss/secdert.h
-include/${MOZILLA}/nss/secdig.h
-include/${MOZILLA}/nss/secdigt.h
-include/${MOZILLA}/nss/secerr.h
-include/${MOZILLA}/nss/sechash.h
-include/${MOZILLA}/nss/secitem.h
-include/${MOZILLA}/nss/secmime.h
-include/${MOZILLA}/nss/secmod.h
-include/${MOZILLA}/nss/secmodt.h
-include/${MOZILLA}/nss/secoid.h
-include/${MOZILLA}/nss/secoidt.h
-include/${MOZILLA}/nss/secpkcs5.h
-include/${MOZILLA}/nss/secpkcs7.h
-include/${MOZILLA}/nss/secport.h
-include/${MOZILLA}/nss/shsign.h
-include/${MOZILLA}/nss/smime.h
-include/${MOZILLA}/nss/ssl.h
-include/${MOZILLA}/nss/sslerr.h
-include/${MOZILLA}/nss/sslproto.h
-include/${MOZILLA}/nss/sslt.h
-include/${MOZILLA}/nss/watcomfx.h
-@comment end INCLUDE-PUBLIC
-@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA}:%D/lib MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
-@unexec ${RM} -f %D/lib/${MOZILLA}/chrome/app-chrome.manifest
-@unexec ${RM} %D/lib/${MOZILLA}/components/compreg.dat
-@unexec ${RM} %D/lib/${MOZILLA}/components/xpti.dat
-@comment begin DIRS
-@dirrm lib/${MOZILLA}/res/throbber
-@dirrm lib/${MOZILLA}/res/samples/sampleimages
-@dirrm lib/${MOZILLA}/res/samples
-@dirrm lib/${MOZILLA}/res/html
-@dirrm lib/${MOZILLA}/res/fonts
-@dirrm lib/${MOZILLA}/res/entityTables
-@dirrm lib/${MOZILLA}/res/dtd
-@dirrm lib/${MOZILLA}/res
-@dirrm lib/${MOZILLA}/init.d
-@dirrm lib/${MOZILLA}/icons
-@dirrm lib/${MOZILLA}/greprefs
-@dirrm lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-@dirrm lib/${MOZILLA}/extensions
-@dirrm lib/${MOZILLA}/defaults/wallet
-@dirrm lib/${MOZILLA}/defaults/profile/US
-@dirrm lib/${MOZILLA}/defaults/profile
-@dirrm lib/${MOZILLA}/defaults/pref
-@dirrm lib/${MOZILLA}/defaults/messenger/US
-@dirrm lib/${MOZILLA}/defaults/messenger
-@dirrm lib/${MOZILLA}/defaults/isp/US
-@dirrm lib/${MOZILLA}/defaults/isp
-@dirrm lib/${MOZILLA}/defaults/autoconfig
-@dirrm lib/${MOZILLA}/defaults
-@dirrm lib/${MOZILLA}/components/myspell
-@dirrm lib/${MOZILLA}/components
-@dirrm lib/${MOZILLA}/chrome/icons/default
-@dirrm lib/${MOZILLA}/chrome/icons
-@dirrm lib/${MOZILLA}/chrome
-@dirrm lib/${MOZILLA}
-@dirrm include/${MOZILLA}/zlib
-@dirrm include/${MOZILLA}/xultmpl
-@dirrm include/${MOZILLA}/xuldoc
-@dirrm include/${MOZILLA}/xulapp
-@dirrm include/${MOZILLA}/xul
-@dirrm include/${MOZILLA}/xpinstall
-@dirrm include/${MOZILLA}/xpconnect
-@dirrm include/${MOZILLA}/xpcom_obsolete
-@dirrm include/${MOZILLA}/xpcom
-@dirrm include/${MOZILLA}/xmlextras
-@dirrm include/${MOZILLA}/windowwatcher
-@dirrm include/${MOZILLA}/widget
-@dirrm include/${MOZILLA}/websrvcs
-@dirrm include/${MOZILLA}/webshell
-@dirrm include/${MOZILLA}/webbrwsr
-@dirrm include/${MOZILLA}/webbrowserpersist
-@dirrm include/${MOZILLA}/walletviewers
-@dirrm include/${MOZILLA}/wallet
-@dirrm include/${MOZILLA}/view
-@dirrm include/${MOZILLA}/util
-@dirrm include/${MOZILLA}/uriloader
-@dirrm include/${MOZILLA}/update
-@dirrm include/${MOZILLA}/unicharutil
-@dirrm include/${MOZILLA}/ucvtw2
-@dirrm include/${MOZILLA}/ucvtw
-@dirrm include/${MOZILLA}/ucvlatin
-@dirrm include/${MOZILLA}/ucvko
-@dirrm include/${MOZILLA}/ucvja
-@dirrm include/${MOZILLA}/ucvibm
-@dirrm include/${MOZILLA}/ucvcn
-@dirrm include/${MOZILLA}/uconv
-@dirrm include/${MOZILLA}/txtsvc
-@dirrm include/${MOZILLA}/txmgr
-@dirrm include/${MOZILLA}/toolkitcomps
-@dirrm include/${MOZILLA}/system-pref
-@dirrm include/${MOZILLA}/string
-@dirrm include/${MOZILLA}/spellchecker
-@dirrm include/${MOZILLA}/sidebar
-@dirrm include/${MOZILLA}/shistory
-@dirrm include/${MOZILLA}/rdfutil
-@dirrm include/${MOZILLA}/rdf
-@dirrm include/${MOZILLA}/progressDlg
-@dirrm include/${MOZILLA}/profile
-@dirrm include/${MOZILLA}/profdirserviceprovider
-@dirrm include/${MOZILLA}/prefetch
-@dirrm include/${MOZILLA}/pref
-@dirrm include/${MOZILLA}/plugin
-@dirrm include/${MOZILLA}/pippki
-@dirrm include/${MOZILLA}/pipnss
-@dirrm include/${MOZILLA}/pipboot
-@dirrm include/${MOZILLA}/nss
-@dirrm include/${MOZILLA}/nspr/private
-@dirrm include/${MOZILLA}/nspr/obsolete
-@dirrm include/${MOZILLA}/nspr/md
-@dirrm include/${MOZILLA}/nspr
-@dirrm include/${MOZILLA}/nkcache
-@dirrm include/${MOZILLA}/necko2
-@dirrm include/${MOZILLA}/necko
-@dirrm include/${MOZILLA}/msgsmime
-@dirrm include/${MOZILLA}/msgnews
-@dirrm include/${MOZILLA}/msgmdn
-@dirrm include/${MOZILLA}/msglocal
-@dirrm include/${MOZILLA}/msgimap
-@dirrm include/${MOZILLA}/msgdb
-@dirrm include/${MOZILLA}/msgcompose
-@dirrm include/${MOZILLA}/msgbaseutil
-@dirrm include/${MOZILLA}/msgbase
-@dirrm include/${MOZILLA}/mozldap
-@dirrm include/${MOZILLA}/mozgnome
-@dirrm include/${MOZILLA}/mork
-@dirrm include/${MOZILLA}/mimetype
-@dirrm include/${MOZILLA}/mimeemitter
-@dirrm include/${MOZILLA}/mime
-@dirrm include/${MOZILLA}/mailview
-@dirrm include/${MOZILLA}/mailprofilemigration
-@dirrm include/${MOZILLA}/mailnews
-@dirrm include/${MOZILLA}/lwbrk
-@dirrm include/${MOZILLA}/locale
-@dirrm include/${MOZILLA}/libreg
-@dirrm include/${MOZILLA}/libmar
-@dirrm include/${MOZILLA}/libbz2
-@dirrm include/${MOZILLA}/ldap-private
-@dirrm include/${MOZILLA}/ldap
-@dirrm include/${MOZILLA}/layout
-@dirrm include/${MOZILLA}/jsurl
-@dirrm include/${MOZILLA}/jsdebug
-@dirrm include/${MOZILLA}/jsconsole
-@dirrm include/${MOZILLA}/js
-@dirrm include/${MOZILLA}/java
-@dirrm include/${MOZILLA}/jar
-@dirrm include/${MOZILLA}/intl
-@dirrm include/${MOZILLA}/import
-@dirrm include/${MOZILLA}/impText
-@dirrm include/${MOZILLA}/impComm4xMail
-@dirrm include/${MOZILLA}/imglib2
-@dirrm include/${MOZILLA}/htmlparser
-@dirrm include/${MOZILLA}/history
-@dirrm include/${MOZILLA}/gtkxtbin
-@dirrm include/${MOZILLA}/gtkembedmoz
-@dirrm include/${MOZILLA}/gfx
-@dirrm include/${MOZILLA}/find
-@dirrm include/${MOZILLA}/filepicker
-@dirrm include/${MOZILLA}/exthandler
-@dirrm include/${MOZILLA}/extensions
-@dirrm include/${MOZILLA}/expat
-@dirrm include/${MOZILLA}/embedcomponents
-@dirrm include/${MOZILLA}/embed_base
-@dirrm include/${MOZILLA}/editor
-@dirrm include/${MOZILLA}/downloads
-@dirrm include/${MOZILLA}/downloadmanager
-@dirrm include/${MOZILLA}/dom
-@dirrm include/${MOZILLA}/docshell
-@dirrm include/${MOZILLA}/dbm
-@dirrm include/${MOZILLA}/content
-@dirrm include/${MOZILLA}/composer
-@dirrm include/${MOZILLA}/commandhandler
-@dirrm include/${MOZILLA}/chrome
-@dirrm include/${MOZILLA}/chardet
-@dirrm include/${MOZILLA}/caps
-@dirrm include/${MOZILLA}/browser
-@dirrm include/${MOZILLA}/bayesflt
-@dirrm include/${MOZILLA}/autoconfig
-@dirrm include/${MOZILLA}/appshell
-@dirrm include/${MOZILLA}/appcomps
-@dirrm include/${MOZILLA}/alerts
-@dirrm include/${MOZILLA}/addrbook
-@dirrm include/${MOZILLA}/accessibility
-@dirrm include/${MOZILLA}
-@comment end DIRS
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
deleted file mode 100644
index 2644fcee2a8..00000000000
--- a/mail/thunderbird/distinfo
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: distinfo,v 1.36 2007/03/07 22:02:25 joerg Exp $
-
-SHA1 (thunderbird-1.5.0.10-source.tar.bz2) = a6467c946f9e668bcf7b3a06dcaeceb601b98fce
-RMD160 (thunderbird-1.5.0.10-source.tar.bz2) = 926484cd1880e7921bf10ba0774064e43acc9283
-Size (thunderbird-1.5.0.10-source.tar.bz2) = 36159990 bytes
-SHA1 (patch-aa) = ff3586c00ff8d3fa6a1bda639116778169ad4466
-SHA1 (patch-ab) = 824a3ce1f608e8fff16e2366c7962f23a4321b10
-SHA1 (patch-ac) = 02804b8276b4b9552ea4587e6c020b87ddb59cf0
-SHA1 (patch-ad) = 19afc8dfaf9f14439d747e42ee2f64a9c1a9dc3d
-SHA1 (patch-ae) = 364b91f0bf51e49bb140e13dfb775a89ea38bb28
-SHA1 (patch-af) = 1306065f359a4acc2c2c4a0865d8401baacb7a15
-SHA1 (patch-ag) = bc08dcb0f7acc4eace112c28241a31b0b6a492e3
-SHA1 (patch-ah) = 4cd8e37475af19bcfe4530f910990f86c89ed916
-SHA1 (patch-ai) = 189aa46f116e424c23368e1c7fbc6c56dd389954
-SHA1 (patch-aj) = 36e80c573457bb38f0bd0cb87d9aa7aed4506a0b
-SHA1 (patch-ak) = 6fb6ed901990efbb1a25ca5666470f8f2467fa8a
-SHA1 (patch-al) = 46e7986f0c803701ce9eec38620cf22a2a96ba86
-SHA1 (patch-an) = 47bb24afbb0def95d30d466700c1983f18a14641
-SHA1 (patch-ao) = 4162763cc7af61deb1795f85fdbd96e3ef930d4d
-SHA1 (patch-ap) = 791b30d5b2468a94b356205b22f1dcef0e51fc68
-SHA1 (patch-aq) = e8389d53e0d490b3cc1078f646749abfe54225ff
-SHA1 (patch-ar) = ce81dd6b747ba882434cb23343c5e89aac70ea81
-SHA1 (patch-as) = 56effdf9aa488fa2b3c8abcb4b7273841a4b59c1
-SHA1 (patch-at) = 1b541df50b9ed94613524d1d48ff98970d8f21dd
-SHA1 (patch-aw) = 0df1163297eb1ea48ae8b98d146f715462c0a2e7
-SHA1 (patch-ax) = 320b29cb9b6addc21c82480c400746deed8522cb
-SHA1 (patch-ba) = 5e64f23ec426f9baef29f397084dba7158279071
-SHA1 (patch-bb) = 3f53a7358e881528cf8bec6933af7cbfcffb08ed
-SHA1 (patch-bm) = 6bd7bf1262cec43b0324693d43929497c3fb3991
-SHA1 (patch-bo) = 7ed3756e2eb4ff9967d126452506429c2346ae84
-SHA1 (patch-bq) = 8818e9cbcc2c0a48c1488a5b8e92dd1350e76bb1
-SHA1 (patch-br) = ba2eadaef2fda9bd38832e43c265bab9224bdae3
-SHA1 (patch-bs) = 79cb84a5ed67780e124e7c595ee4ae6ffc7617a6
-SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee
-SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860
-SHA1 (patch-bx) = 046e19c9c4b431369411658373b14c1822841d85
-SHA1 (patch-by) = 643185af7a0df7030b2b96447ee4031dc9c82f88
-SHA1 (patch-bz) = 6f854d74a9d1d1174ce8eff7d65f8024a7da4711
-SHA1 (patch-ca) = 479ef14631ae019ae5ca1c08a2f786294f3e972b
-SHA1 (patch-cb) = fd0f033d63be066ce5c47057d72c48a085718908
-SHA1 (patch-da) = 936f8617f9423dbc90dd556956111caf70f28986
-SHA1 (patch-db) = 9e63cc592429682cf3d23ed255e287cca0073822
-SHA1 (patch-dc) = ba7b06f04460d4966e115a9ffdeafc1ebf555972
-SHA1 (patch-de) = 24f030cdf22c1ace2fbc68cdb04c2d5ebfa96620
-SHA1 (patch-df) = f639028cc604ea13c0a230d0fbedfa26dfc9e9f3
-SHA1 (patch-dg) = 17912d183f754ab6661d2be8092e6a07d142632b
-SHA1 (patch-dh) = 7592a6238acd5ef6e802d32103c897acb576825a
-SHA1 (patch-dj) = 70360dffb20dd1029866d2e81899d003c9e17473
-SHA1 (patch-dk) = 183fa0d6a9040f53d9988fcc8868bdf83229803b
-SHA1 (patch-dl) = cba07cba5717a75c89f007aba36295dccc1c25ab
-SHA1 (patch-dm) = eb86aee54fd213eb64a89e5bc2754971db9648f4
-SHA1 (patch-do) = bdb018e157dcb5ef706b69184d8b739cfd32d8c3
-SHA1 (patch-ds) = 1e2e371b9ff7ab9049a947d8e0a63483a1fd244e
-SHA1 (patch-dt) = 9eef43663de12721ecc38124d5bd4a90a825eefc
-SHA1 (patch-dw) = eb4acb8c6c59ef3c73a7ba7e6d6956e325de9d85
diff --git a/mail/thunderbird/patches/patch-aa b/mail/thunderbird/patches/patch-aa
deleted file mode 100644
index 8231ec23486..00000000000
--- a/mail/thunderbird/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/02/05 14:49:05 ghen Exp $
-
---- config/autoconf.mk.in.orig 2006-02-02 13:20:06.000000000 +0100
-+++ config/autoconf.mk.in
-@@ -54,13 +54,13 @@ MOZ_APP_VERSION = @MOZ_APP_VERSION@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
--includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir = @includedir@/$(MOZILLA_PKG_NAME)
- libdir = @libdir@
- datadir = @datadir@
- mandir = @mandir@
--idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir = @datadir@/idl/$(MOZILLA_PKG_NAME)
-
--mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir = $(libdir)/$(MOZILLA_PKG_NAME)
- mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir = $(mredir)/lib
-
diff --git a/mail/thunderbird/patches/patch-ab b/mail/thunderbird/patches/patch-ab
deleted file mode 100644
index bfc5f1d36e9..00000000000
--- a/mail/thunderbird/patches/patch-ab
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2006/04/23 14:14:07 ghen Exp $
-
---- configure.in.orig 2006-04-19 18:33:30.000000000 +0200
-+++ configure.in
-@@ -1399,7 +1399,6 @@ case "$target" in
- DSO_LDOPTS=''
- STRIP="$STRIP -x -S"
- _PLATFORM_DEFAULT_TOOLKIT='mac'
-- MOZ_ENABLE_POSTSCRIPT=
- TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
- # set MACOSX to generate lib/mac/MoreFiles/Makefile
- MACOSX=1
-@@ -1418,7 +1417,7 @@ case "$target" in
- LDFLAGS=$_SAVE_LDFLAGS
- ;;
-
--*-freebsd*)
-+*-freebsd* | *-dragonfly*)
- if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
- DLL_SUFFIX=".so.1.0"
- DSO_LDOPTS="-shared"
-@@ -1432,6 +1431,9 @@ case "$target" in
- # MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
- # MKSHLIB_UNFORCE_ALL=''
- # fi
-+ if test "$LIBRUNPATH"; then
-+ DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
-+ fi
- ;;
-
- *-hpux*)
-@@ -1826,6 +1828,13 @@ case "$target" in
- if test "$LIBRUNPATH"; then
- DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
- fi
-+
-+ case "${target_cpu}" in
-+ alpha*)
-+ CFLAGS="$CFLAGS -mieee"
-+ CXXFLAGS="$CXXFLAGS -mieee"
-+ ;;
-+ esac
- ;;
-
- *-nto*)
-@@ -2051,7 +2060,7 @@ dnl the qsort routine under solaris is f
- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
- MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
- MKSHLIB_UNFORCE_ALL=''
-- DSO_LDOPTS='-G -Qoption ld -z,muldefs -h $@'
-+ DSO_LDOPTS='-G -z muldefs -h $@'
- AR_LIST="$AR t"
- AR_EXTRACT="$AR x"
- AR_DELETE="$AR d"
-@@ -2711,7 +2720,7 @@ then
- fi
-
- case "$target" in
-- *-*-freebsd*)
-+ *-*-freebsd* | *-*-dragonfly*)
- AC_DEFINE(_REENTRANT)
- AC_DEFINE(_THREAD_SAFE)
- dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -5279,7 +5288,7 @@ dnl ====================================
- dnl = Enable code optimization. ON by default.
- dnl ========================================================
- if test -z "$MOZ_OPTIMIZE_FLAGS"; then
-- MOZ_OPTIMIZE_FLAGS="-O"
-+ MOZ_OPTIMIZE_FLAGS=""
- fi
-
- MOZ_ARG_ENABLE_STRING(optimize,
diff --git a/mail/thunderbird/patches/patch-ac b/mail/thunderbird/patches/patch-ac
deleted file mode 100644
index 0540c13b3f1..00000000000
--- a/mail/thunderbird/patches/patch-ac
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2006/06/10 12:50:04 ghen Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2006-02-02 13:20:12.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -61,10 +61,13 @@ include $(topsrcdir)/config/config.mk
- #
- # Lots of Unixish x86 flavors
- #
--ifneq (,$(filter FreeBSD NetBSD OpenBSD BSD_OS Darwin,$(OS_ARCH)))
-+ifneq (,$(filter FreeBSD NetBSD OpenBSD BSD_OS Darwin DragonFly,$(OS_ARCH)))
- ifeq (86,$(findstring 86,$(OS_TEST)))
- CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
- endif
-+ifeq (amd64,$(OS_TEST))
-+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+endif
- endif
- #
- # New code for Linux, et. al., with gcc
-@@ -157,7 +160,7 @@ endif
- # NetBSD/ARM
- #
- ifeq ($(OS_ARCH),NetBSD)
--ifneq (,$(filter arm% sa110,$(OS_TEST)))
-+ifneq (,$(filter arm%,$(TARGET_CPU)))
- CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
- endif
- endif
-@@ -191,7 +194,7 @@ endif
- # NetBSD/m68k
- #
- ifeq ($(OS_ARCH),NetBSD)
--ifneq (,$(filter amiga atari hp300 mac68k mvme68k next68k sun3 sun3x x68k,$(OS_TEST)))
-+ifneq (,$(filter m68k,$(TARGET_CPU)))
- CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
- endif
- endif
-@@ -274,6 +277,7 @@ endif
- ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp
- ASFILES := xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s
-+AS := $(CC) -c -x assembler-with-cpp
- endif
-
- #
-@@ -322,6 +326,13 @@ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
- CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
- ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
- endif
-+#
-+# NetBSD/SPARC64
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc64)
-+CPPSRCS := xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp
-+ASFILES := xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
-+endif
- #
- # Solaris/SPARC
- #
diff --git a/mail/thunderbird/patches/patch-ad b/mail/thunderbird/patches/patch-ad
deleted file mode 100644
index 93be816469f..00000000000
--- a/mail/thunderbird/patches/patch-ad
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2004/06/24 23:09:55 taya Exp $
-
-diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp 2001-09-29 05:12:51.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp 2004-06-15 23:55:46.000000000 +0900
-@@ -132,6 +132,15 @@
- }
- }
-
-+/*
-+ * SYMBOL PREFIX must be "_" for aout symbols and "" for ELF
-+ */
-+#ifndef __ELF__
-+#define SYMBOLPREFIX "_"
-+#else
-+#define SYMBOLPREFIX
-+#endif
-+
- XPTC_PUBLIC_API(nsresult)
- XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
- PRUint32 paramCount, nsXPTCVariant* params)
-@@ -139,30 +148,30 @@
- PRUint32 result;
-
- __asm__ __volatile__(
-- "movl %4, sp@-\n\t"
-- "movl %3, sp@-\n\t"
-- "jbsr _invoke_count_words\n\t" /* count words */
-- "addql #8, sp\n\t"
-- "lsll #2, d0\n\t" /* *= 4 */
-- "movl sp, a2\n\t" /* save original sp */
-- "subl d0, sp\n\t" /* make room for params */
-- "movl sp, a0\n\t"
-- "movl %4, sp@-\n\t"
-- "movl %3, sp@-\n\t"
-- "movl a0, sp@-\n\t"
-- "jbsr _invoke_copy_to_stack\n\t" /* copy params */
-- "addl #12, sp\n\t"
-- "movl %1, a0\n\t"
-- "movl a0@, a1\n\t"
-- "movl %2, d0\n\t" /* function index */
-- "movl a0, d1\n\t"
-- "movw a1@(8,d0:l:8), a0\n\t"
-- "addl a0, d1\n\t"
-- "movl a1@(12,d0:l:8), a1\n\t"
-- "movl d1, sp@-\n\t"
-- "jbsr a1@\n\t"
-- "movl a2, sp\n\t" /* restore original sp */
-- "movl d0, %0\n\t"
-+ "movl %4, %%sp@-\n\t"
-+ "movl %3, %%sp@-\n\t"
-+ "jbsr "SYMBOLPREFIX"invoke_count_words\n\t" /* count words */
-+ "addql #8, %%sp\n\t"
-+ "lsll #2, %%d0\n\t" /* *= 4 */
-+ "movl %%sp, %%a2\n\t" /* save original sp */
-+ "subl %%d0, %%sp\n\t" /* make room for params */
-+ "movl %%sp, %%a0\n\t"
-+ "movl %4, %%sp@-\n\t"
-+ "movl %3, %%sp@-\n\t"
-+ "movl %%a0, %%sp@-\n\t"
-+ "jbsr "SYMBOLPREFIX"invoke_copy_to_stack\n\t" /* copy params */
-+ "addl #12, %%sp\n\t"
-+ "movl %1, %%a0\n\t"
-+ "movl %%a0@, %%a1\n\t"
-+ "movl %2, %%d0\n\t" /* function index */
-+ "movl %%a0, %%d1\n\t"
-+ "movw %%a1@(8,%%d0:l:8), %%a0\n\t"
-+ "addl %%a0, %%d1\n\t"
-+ "movl %%a1@(12,%%d0:l:8), %%a1\n\t"
-+ "movl %%d1, %%sp@-\n\t"
-+ "jbsr %%a1@\n\t"
-+ "movl %%a2, %%sp\n\t" /* restore original sp */
-+ "movl %%d0, %0\n\t"
- : "=g" (result) /* %0 */
- : "g" (that), /* %1 */
- "g" (methodIndex), /* %2 */
diff --git a/mail/thunderbird/patches/patch-ae b/mail/thunderbird/patches/patch-ae
deleted file mode 100644
index 8757c8a1100..00000000000
--- a/mail/thunderbird/patches/patch-ae
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/06/24 23:09:55 taya Exp $
-
-diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp 2001-09-29 05:12:52.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp 2004-06-15 23:55:47.000000000 +0900
-@@ -123,17 +123,27 @@
- }
- }
-
-+/*
-+ * Beware: use % instead of %% for register identifiers in a preprocessor macro
-+ * SYMBOL PREFIX must be "_" for aout and "" for ELF
-+ */
-+#ifndef __ELF__
-+#define SYMBOLPREFIX "_"
-+#else
-+#define SYMBOLPREFIX
-+#endif
-+
- #define STUB_ENTRY(n) \
- __asm__( \
-- ".global _Stub"#n"__14nsXPTCStubBase\n\t" \
--"_Stub"#n"__14nsXPTCStubBase:\n\t" \
-- "link a6,#0 \n\t" \
-- "lea a6@(12), a0 \n\t" /* pointer to args */ \
-- "movl a0, sp@- \n\t" \
-- "movl #"#n", sp@- \n\t" /* method index */ \
-- "movl a6@(8), sp@- \n\t" /* this */ \
-- "jbsr _PrepareAndDispatch \n\t" \
-- "unlk a6 \n\t" \
-+ ".global "SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase\n\t" \
-+SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase:\n\t" \
-+ "link %a6,#0 \n\t" \
-+ "lea %a6@(12), %a0 \n\t" /* pointer to args */ \
-+ "movl %a0, %sp@- \n\t" \
-+ "movl #"#n", %sp@- \n\t" /* method index */ \
-+ "movl %a6@(8), %sp@- \n\t" /* this */ \
-+ "jbsr "SYMBOLPREFIX"PrepareAndDispatch\n\t" \
-+ "unlk %a6 \n\t" \
- "rts \n\t" \
- );
-
diff --git a/mail/thunderbird/patches/patch-af b/mail/thunderbird/patches/patch-af
deleted file mode 100644
index 0820c371e66..00000000000
--- a/mail/thunderbird/patches/patch-af
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-af,v 1.4 2006/02/05 14:49:05 ghen Exp $
-
---- security/nss/lib/freebl/unix_rand.c.orig 2006-02-02 13:19:58.000000000 +0100
-+++ security/nss/lib/freebl/unix_rand.c
-@@ -35,6 +35,7 @@
- * ***** END LICENSE BLOCK ***** */
-
- #include <stdio.h>
-+#include <fcntl.h>
- #include <string.h>
- #include <signal.h>
- #include <unistd.h>
-@@ -694,7 +695,11 @@ safe_popen(char *cmd)
- /* dup write-side of pipe to stderr and stdout */
- if (p[1] != 1) dup2(p[1], 1);
- if (p[1] != 2) dup2(p[1], 2);
-- close(0);
-+ fd = open("/dev/null", O_RDONLY);
-+ if (fd != 0) {
-+ dup2(fd, 0);
-+ close(fd);
-+ }
- {
- int ndesc = getdtablesize();
- for (fd = PR_MIN(65536, ndesc); --fd > 2; close(fd));
diff --git a/mail/thunderbird/patches/patch-ag b/mail/thunderbird/patches/patch-ag
deleted file mode 100644
index 7d5a80e5467..00000000000
--- a/mail/thunderbird/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2006/02/05 14:49:05 ghen Exp $
-
---- extensions/transformiix/source/base/ErrorObserver.h.orig 2006-02-02 13:20:05.000000000 +0100
-+++ extensions/transformiix/source/base/ErrorObserver.h
-@@ -41,7 +41,8 @@
-
- #include "txCore.h"
- #ifdef TX_EXE
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
- #endif
-
- /**
diff --git a/mail/thunderbird/patches/patch-ah b/mail/thunderbird/patches/patch-ah
deleted file mode 100644
index 5f63d954921..00000000000
--- a/mail/thunderbird/patches/patch-ah
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2004/06/24 23:09:55 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
---- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl 2004-04-16 10:09:33.000000000 +0900
-+++ ./gfx/idl/nsIFreeType2.idl 2004-06-15 23:55:52.000000000 +0900
-@@ -76,10 +76,11 @@
- native FT_Sfnt_Tag(FT_Sfnt_Tag);
- native FT_Size(FT_Size);
-
--[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
-+[ptr] native FTC_ImageType_p(FTC_ImageType);
- native FTC_Face_Requester(FTC_Face_Requester);
- native FTC_Font(FTC_Font);
--native FTC_Image_Cache(FTC_Image_Cache);
-+native FTC_FaceID(FTC_FaceID);
-+native FTC_ImageCache(FTC_ImageCache);
- native FTC_Manager(FTC_Manager);
-
- // #ifdef MOZ_SVG
-@@ -99,7 +100,7 @@
-
- readonly attribute FT_Library library;
- readonly attribute FTC_Manager FTCacheManager;
-- readonly attribute FTC_Image_Cache ImageCache;
-+ readonly attribute FTC_ImageCache ImageCache;
-
- void doneFace(in FT_Face face);
- void doneFreeType(in FT_Library lib);
-@@ -115,16 +116,16 @@
- void outlineDecompose(in FT_Outline_p outline,
- in const_FT_Outline_Funcs_p funcs, in voidPtr p);
- void setCharmap(in FT_Face face, in FT_CharMap charmap);
-- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
-+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
- in FT_UInt gindex, out FT_Glyph glyph);
-- void managerLookupSize(in FTC_Manager manager, in FTC_Font font,
-- out FT_Face face, out FT_Size size);
-+ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
-+ out FT_Face face);
- void managerDone(in FTC_Manager manager);
- void managerNew(in FT_Library lib, in FT_UInt max_faces,
- in FT_UInt max_sizes, in FT_ULong max_bytes,
- in FTC_Face_Requester requester, in FT_Pointer req_data,
- out FTC_Manager manager);
-- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
-+ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
- /* #ifdef MOZ_SVG */
- void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
- in FT_Vector_p delta);
diff --git a/mail/thunderbird/patches/patch-ai b/mail/thunderbird/patches/patch-ai
deleted file mode 100644
index bd97e8a5567..00000000000
--- a/mail/thunderbird/patches/patch-ai
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2006/10/19 10:26:14 markd Exp $
-
---- gfx/src/ps/nsFontMetricsPS.cpp.orig 2006-05-07 14:01:25.000000000 +1200
-+++ gfx/src/ps/nsFontMetricsPS.cpp
-@@ -993,7 +993,7 @@ nsFontPSXft::FindFont(PRUnichar aChar, c
-
- fontps *fps = new fontps;
- fps->entry = xftEntry;
-- fps->charset = fc_charset;
-+ fps->charset = FcCharSetCopy (fc_charset);
- fps->fontps = nsnull;
- fpi.fontps->AppendElement(fps);
- }
-@@ -1868,10 +1868,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
-
- mPixelSize = NSToIntRound(app2dev * mFont->size);
-
-- mImageDesc.font.face_id = (void*)mEntry;
-- mImageDesc.font.pix_width = mPixelSize;
-- mImageDesc.font.pix_height = mPixelSize;
-- mImageDesc.image_type = 0;
-+ mImageDesc->face_id = (FTC_FaceID)&mEntry;
-+ mImageDesc->width = mPixelSize;
-+ mImageDesc->height = mPixelSize;
-+ mImageDesc->flags = 0;
-
- nsresult rv;
- mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1905,7 +1905,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
- if (!face)
- return 0;
-
-- FTC_Image_Cache iCache;
-+ FTC_ImageCache iCache;
- nsresult rv = mFt2->GetImageCache(&iCache);
- if (NS_FAILED(rv)) {
- NS_ERROR("Failed to get Image Cache");
-@@ -1943,8 +1943,8 @@ nsFontPSFreeType::getFTFace()
-
- FTC_Manager cManager;
- mFt2->GetFTCacheManager(&cManager);
-- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
-- &face, nsnull);
-+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+ &face);
- NS_ASSERTION(rv==0, "failed to get face/size");
- if (rv)
- return nsnull;
-@@ -2388,16 +2388,16 @@ void nsFT2Type1Generator::GeneratePSFont
- mEntry->GetFamilyName(fontName);
- mEntry->GetStyleName(styleName);
-
-- mImageDesc.font.face_id = (void*)mEntry;
-+ mImageDesc->face_id = (FTC_FaceID)&mEntry;
- // TT glyph has no relation to size
-- mImageDesc.font.pix_width = 16;
-- mImageDesc.font.pix_height = 16;
-- mImageDesc.image_type = 0;
-+ mImageDesc->width = 16;
-+ mImageDesc->height = 16;
-+ mImageDesc->flags = 0;
- FT_Face face = nsnull;
- FTC_Manager cManager;
- mFt2->GetFTCacheManager(&cManager);
-- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
-- &face, nsnull);
-+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+ &face);
- if (NS_FAILED(rv))
- return;
-
diff --git a/mail/thunderbird/patches/patch-aj b/mail/thunderbird/patches/patch-aj
deleted file mode 100644
index 01d4b13b76b..00000000000
--- a/mail/thunderbird/patches/patch-aj
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2006/02/05 14:49:05 ghen Exp $
-
---- gfx/src/freetype/nsFreeType.h.orig 2006-02-02 13:20:15.000000000 +0100
-+++ gfx/src/freetype/nsFreeType.h
-@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_
- typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
- typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap);
- typedef FT_Error (*FTC_Image_Cache_Lookup_t)
-- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
--typedef FT_Error (*FTC_Manager_Lookup_Size_t)
-- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
-+ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
-+typedef FT_Error (*FTC_Manager_LookupFace_t)
-+ (FTC_Manager, FTC_FaceID, FT_Face*);
- typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
- typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
- FTC_Face_Requester, FT_Pointer, FTC_Manager*);
--typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
-+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
- // #ifdef MOZ_SVG
- typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
- typedef FT_Error (*FT_Get_Kerning_t)
-@@ -181,7 +181,7 @@ protected:
- FT_Outline_Decompose_t nsFT_Outline_Decompose;
- FT_Set_Charmap_t nsFT_Set_Charmap;
- FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup;
-- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
-+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace;
- FTC_Manager_Done_t nsFTC_Manager_Done;
- FTC_Manager_New_t nsFTC_Manager_New;
- FTC_Image_Cache_New_t nsFTC_Image_Cache_New;
-@@ -229,7 +229,7 @@ protected:
- PRLibrary *mSharedLib;
- FT_Library mFreeTypeLibrary;
- FTC_Manager mFTCacheManager;
-- FTC_Image_Cache mImageCache;
-+ FTC_ImageCache mImageCache;
-
- static nsHashtable *sFontFamilies;
- static nsHashtable *sRange1CharSetNames;
diff --git a/mail/thunderbird/patches/patch-ak b/mail/thunderbird/patches/patch-ak
deleted file mode 100644
index 31deac54564..00000000000
--- a/mail/thunderbird/patches/patch-ak
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2004/06/24 23:09:55 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp
---- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp 2004-02-08 00:22:30.000000000 +0900
-+++ ./gfx/src/freetype/nsFreeType.cpp 2004-06-15 23:56:01.000000000 +0900
-@@ -110,11 +110,11 @@
- {"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE},
- {"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE},
- {"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE},
-- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
-- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
-+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
-+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE},
- {"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE},
- {"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE},
-- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
-+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
- // #ifdef MOZ_SVG
- {"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE},
- {"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE},
-@@ -282,7 +282,7 @@
- }
-
- NS_IMETHODIMP
--nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
-+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
- FT_UInt glyphID, FT_Glyph *glyph)
- {
- // call the FreeType2 function via the function pointer
-@@ -291,11 +291,11 @@
- }
-
- NS_IMETHODIMP
--nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
-- FT_Face *face, FT_Size *size)
-+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
-+ FT_Face *face)
- {
- // call the FreeType2 function via the function pointer
-- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
-+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
- return error ? NS_ERROR_FAILURE : NS_OK;
- }
-
-@@ -320,7 +320,7 @@
- }
-
- NS_IMETHODIMP
--nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
-+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
- {
- // call the FreeType2 function via the function pointer
- FT_Error error = nsFTC_Image_Cache_New(manager, cache);
-@@ -389,7 +389,7 @@
- }
-
- NS_IMETHODIMP
--nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
-+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
- {
- *aCache = mImageCache;
- return NS_OK;
diff --git a/mail/thunderbird/patches/patch-al b/mail/thunderbird/patches/patch-al
deleted file mode 100644
index 68d4529d6bb..00000000000
--- a/mail/thunderbird/patches/patch-al
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-al,v 1.3 2006/02/05 14:49:05 ghen Exp $
-
---- gfx/src/ps/nsFontMetricsPS.h.orig 2006-02-02 13:20:15.000000000 +0100
-+++ gfx/src/ps/nsFontMetricsPS.h
-@@ -424,7 +424,7 @@ protected:
- nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
- nsCOMPtr<nsIFreeType2> mFt2;
- PRUint16 mPixelSize;
-- FTC_Image_Desc mImageDesc;
-+ FTC_ImageType mImageDesc;
- nsCString mFontNameBase; // the base name of type 1 (sub) fonts
- nscoord mHeight;
-
-@@ -493,7 +493,7 @@ public:
- protected:
- nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
- nsCOMPtr<nsIFreeType2> mFt2;
-- FTC_Image_Desc mImageDesc;
-+ FTC_ImageType mImageDesc;
- };
- #endif // MOZ_ENABLE_FREETYPE2
- #endif // MOZ_ENABLE_XFT
diff --git a/mail/thunderbird/patches/patch-an b/mail/thunderbird/patches/patch-an
deleted file mode 100644
index bc60ea7d557..00000000000
--- a/mail/thunderbird/patches/patch-an
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-an,v 1.2 2004/06/24 23:09:55 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h
---- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h 2003-04-23 01:25:13.000000000 +0900
-+++ ./gfx/src/x11shared/nsFontFreeType.h 2004-06-15 23:56:10.000000000 +0900
-@@ -110,7 +110,7 @@
- XImage *GetXImage(PRUint32 width, PRUint32 height);
- nsITrueTypeFontCatalogEntry *mFaceID;
- PRUint16 mPixelSize;
-- FTC_Image_Desc mImageDesc;
-+ FTC_ImageType mImageDesc;
- nsCOMPtr<nsIFreeType2> mFt2;
- };
-
diff --git a/mail/thunderbird/patches/patch-ao b/mail/thunderbird/patches/patch-ao
deleted file mode 100644
index 6506fa3d1e1..00000000000
--- a/mail/thunderbird/patches/patch-ao
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2004/06/24 23:09:56 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp
---- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp 2003-12-25 17:24:52.000000000 +0900
-+++ ./gfx/src/x11shared/nsFontFreeType.cpp 2004-06-15 23:56:14.000000000 +0900
-@@ -177,7 +177,7 @@
- FTC_Manager mgr;
- nsresult rv;
- mFt2->GetFTCacheManager(&mgr);
-- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
-+ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
- NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
- if (NS_FAILED(rv))
- return nsnull;
-@@ -191,22 +191,15 @@
- PRBool embedded_bimap = PR_FALSE;
- mFaceID = aFaceID;
- mPixelSize = aPixelSize;
-- mImageDesc.font.face_id = (void*)mFaceID;
-- mImageDesc.font.pix_width = aPixelSize;
-- mImageDesc.font.pix_height = aPixelSize;
-- mImageDesc.image_type = 0;
-+ mImageDesc->face_id = (FTC_FaceID)&mFaceID;
-+ mImageDesc->width = aPixelSize;
-+ mImageDesc->height = aPixelSize;
-+ mImageDesc->flags = 0;
-
- if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
-- mImageDesc.image_type |= ftc_image_mono;
- anti_alias = PR_FALSE;
- }
-
-- if (nsFreeType2::gFreeType2Autohinted)
-- mImageDesc.image_type |= ftc_image_flag_autohinted;
--
-- if (nsFreeType2::gFreeType2Unhinted)
-- mImageDesc.image_type |= ftc_image_flag_unhinted;
--
- PRUint32 num_embedded_bitmaps, i;
- PRInt32* embedded_bitmapheights;
- mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
-@@ -218,7 +211,6 @@
- if (embedded_bitmapheights[i] == aPixelSize) {
- embedded_bimap = PR_TRUE;
- // unhinted must be set for embedded bitmaps to be used
-- mImageDesc.image_type |= ftc_image_flag_unhinted;
- break;
- }
- }
-@@ -312,7 +304,7 @@
- if (!face)
- return NS_ERROR_FAILURE;
-
-- FTC_Image_Cache icache;
-+ FTC_ImageCache icache;
- mFt2->GetImageCache(&icache);
- if (!icache)
- return NS_ERROR_FAILURE;
-@@ -401,7 +393,7 @@
- if (!face)
- return 0;
-
-- FTC_Image_Cache icache;
-+ FTC_ImageCache icache;
- mFt2->GetImageCache(&icache);
- if (!icache)
- return 0;
-@@ -723,7 +715,7 @@
- if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
- #endif
-
-- FTC_Image_Cache icache;
-+ FTC_ImageCache icache;
- mFt2->GetImageCache(&icache);
- if (!icache)
- return 0;
diff --git a/mail/thunderbird/patches/patch-ap b/mail/thunderbird/patches/patch-ap
deleted file mode 100644
index 7c8de789b12..00000000000
--- a/mail/thunderbird/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.4 2007/03/02 14:12:25 ghen Exp $
-
---- security/coreconf/command.mk.orig 2005-10-11 01:46:12.000000000 +0200
-+++ security/coreconf/command.mk
-@@ -45,7 +45,7 @@ ASFLAGS += $(CFLAGS)
- CCF = $(CC) $(CFLAGS)
- LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
- LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS)
--CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
-+CFLAGS = $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
- $(XCFLAGS)
- RANLIB = echo
- TAR = /bin/tar
diff --git a/mail/thunderbird/patches/patch-aq b/mail/thunderbird/patches/patch-aq
deleted file mode 100644
index 313277101f3..00000000000
--- a/mail/thunderbird/patches/patch-aq
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aq,v 1.3 2006/02/05 14:49:05 ghen Exp $
-
---- directory/c-sdk/configure.in.orig 2006-02-02 13:29:07.000000000 +0100
-+++ directory/c-sdk/configure.in
-@@ -54,7 +54,7 @@ USE_64=
- USE_CPLUS=
- USE_IPV6=
- USE_MDUPDATE=
--_OPTIMIZE_FLAGS=-O
-+_OPTIMIZE_FLAGS=
- _DEBUG_FLAGS=-g
- MOZ_DEBUG=1
- MOZ_OPTIMIZE=
-@@ -907,7 +907,7 @@ case "$target" in
- PR_MD_CSRCS=dgux.c
- ;;
-
--*-freebsd*)
-+*-freebsd*|*-dragonfly*)
- if test -z "$USE_NSPR_THREADS"; then
- USE_PTHREADS=1
- fi
-@@ -2061,7 +2061,7 @@ if test -n "$USE_PTHREADS"; then
- _PTHREAD_LDFLAGS=
- fi
- ;;
-- *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
-+ *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*|*-dragonfly*)
- AC_DEFINE(_THREAD_SAFE)
- dnl -pthread links in -lc_r, so don't specify it explicitly.
- if test "$ac_cv_have_dash_pthread" = "yes"; then
-@@ -2114,7 +2114,7 @@ case "$target" in
- AC_DEFINE(_PR_NEED_PTHREAD_INIT)
- fi
- ;;
--*-freebsd*)
-+*-freebsd*|*-dragonfly*)
- if test -n "$USE_NSPR_THREADS"; then
- AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
- fi
diff --git a/mail/thunderbird/patches/patch-ar b/mail/thunderbird/patches/patch-ar
deleted file mode 100644
index 26f29ddc330..00000000000
--- a/mail/thunderbird/patches/patch-ar
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
---- mailnews/movemail/src/movemail.c.orig 2005-12-29 17:00:05.000000000 +0000
-+++ mailnews/movemail/src/movemail.c
-@@ -51,8 +51,8 @@ typedef int XP_Bool;
-
- #define LINUX_GLIBC_2
-
--#include <sys/errno.h>
--#if !defined(__FreeBSD__) && !defined(MACLINUX) && !defined(LINUX_GLIBC_2)
-+#include <errno.h>
-+#if !defined(__FreeBSD__) && !defined(MACLINUX) && !defined(LINUX_GLIBC_2) && !defined(__DragonFly__)
- extern char *sys_errlist[];
- extern int sys_nerr;
- #endif
diff --git a/mail/thunderbird/patches/patch-as b/mail/thunderbird/patches/patch-as
deleted file mode 100644
index 992a23f2a5f..00000000000
--- a/mail/thunderbird/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.3 2006/10/20 12:45:13 tron Exp $
-
---- build/autoconf/mozconfig2configure.orig 2006-02-22 16:41:28.000000000 +0000
-+++ build/autoconf/mozconfig2configure 2006-10-20 12:26:11.000000000 +0100
-@@ -79,7 +79,7 @@
- ac_add_app_options() {
- APP=$1
- shift;
-- if [ "$APP" == "$MOZ_BUILD_APP" ]; then
-+ if [ "$APP" = "$MOZ_BUILD_APP" ]; then
- ac_add_options "$*";
- fi
- }
diff --git a/mail/thunderbird/patches/patch-at b/mail/thunderbird/patches/patch-at
deleted file mode 100644
index 864d6b219dd..00000000000
--- a/mail/thunderbird/patches/patch-at
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-at,v 1.1 2006/10/23 10:49:34 markd Exp $
-
---- directory/c-sdk/ldap/libraries/libprldap/ldappr-io.c.orig 2006-05-25 11:38:04.000000000 +1200
-+++ directory/c-sdk/ldap/libraries/libprldap/ldappr-io.c
-@@ -292,12 +292,12 @@ prldap_try_one_address( struct lextiof_s
- * Set up address and open a TCP socket:
- */
- if ( PR_SUCCESS != PR_SetNetAddr( PR_IpAddrNull, /* don't touch IP addr. */
-- PRLDAP_DEFAULT_ADDRESS_FAMILY, (PRUint16)port, addrp )) {
-+ PR_NetAddrFamily( addrp ), (PRUint16)port, addrp )) {
- return( -1 );
- }
-
- if (( prsockp->prsock_prfd = PR_OpenTCPSocket(
-- PRLDAP_DEFAULT_ADDRESS_FAMILY )) == NULL ) {
-+ PR_NetAddrFamily( addrp ))) == NULL ) {
- return( -1 );
- }
-
-@@ -390,14 +390,14 @@ prldap_connect( const char *hostlist, in
-
- if ( PR_SUCCESS == PR_StringToNetAddr( host, &addr )) {
-
-- if ( PRLDAP_DEFAULT_ADDRESS_FAMILY == PR_AF_INET6 &&
-+ /*if ( PRLDAP_DEFAULT_ADDRESS_FAMILY == PR_AF_INET6 &&
- PR_AF_INET == PR_NetAddrFamily( &addr )) {
- PRUint32 ipv4ip = addr.inet.ip;
- memset( &addr, 0, sizeof(addr));
- PR_ConvertIPv4AddrToIPv6( ipv4ip, &addr.ipv6.ip );
- addr.ipv6.family = PR_AF_INET6;
-
-- }
-+ }*/
- rc = prldap_try_one_address( prsockp, &addr, port,
- timeout, options );
- } else {
diff --git a/mail/thunderbird/patches/patch-aw b/mail/thunderbird/patches/patch-aw
deleted file mode 100644
index 18c172c7eaa..00000000000
--- a/mail/thunderbird/patches/patch-aw
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aw,v 1.4 2006/02/05 14:49:05 ghen Exp $
-
---- widget/src/gtksuperwin/Makefile.in.orig 2006-02-02 13:31:00.000000000 +0100
-+++ widget/src/gtksuperwin/Makefile.in
-@@ -46,6 +46,7 @@ MODULE = widget
- LIBRARY_NAME = gtksuperwin
- EXPORT_LIBRARY = 1
- LIBXUL_LIBRARY = 1
-+MKSHLIB = $(MKCSHLIB)
-
- PACKAGE_FILE = gtksuperwin.pkg
-
diff --git a/mail/thunderbird/patches/patch-ax b/mail/thunderbird/patches/patch-ax
deleted file mode 100644
index 4cac14e05ea..00000000000
--- a/mail/thunderbird/patches/patch-ax
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ax,v 1.4 2007/03/02 14:12:25 ghen Exp $
-
---- security/coreconf/SunOS5.mk.orig 2006-04-25 03:32:16.000000000 +0200
-+++ security/coreconf/SunOS5.mk
-@@ -176,6 +176,10 @@ endif
- endif
- DSO_LDOPTS += -z combreloc -z defs -z ignore
-
-+ifdef LIBRUNPATH
-+DSO_LDOPTS += -R$(LIBRUNPATH)
-+endif
-+
- # -KPIC generates position independent code for use in shared libraries.
- # (Similarly for -fPIC in case of gcc.)
- ifdef NS_USE_GCC
diff --git a/mail/thunderbird/patches/patch-ba b/mail/thunderbird/patches/patch-ba
deleted file mode 100644
index 4b9735a0416..00000000000
--- a/mail/thunderbird/patches/patch-ba
+++ /dev/null
@@ -1,126 +0,0 @@
-$NetBSD: patch-ba,v 1.4 2005/12/30 21:35:58 joerg Exp $
-
-diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg
---- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg 2004-04-28 09:33:44.000000000 +0900
-+++ ./nsprpub/pr/include/md/_netbsd.cfg 2005-12-04 19:09:16.000000000 +0900
-@@ -48,7 +48,8 @@
-
- #define PR_AF_INET6 24 /* same as AF_INET6 */
-
--#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
-+#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \
-+ defined(__MIPSEL__)
-
- #define IS_LITTLE_ENDIAN 1
- #undef IS_BIG_ENDIAN
-@@ -94,7 +95,53 @@
- #define PR_ALIGN_OF_DOUBLE 4
- #define PR_ALIGN_OF_POINTER 4
-
--#elif defined(__sparc__) || defined(__MIPSEB__)
-+#elif defined(__sparc_v9__)
-+
-+#undef IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN 1
-+#define HAVE_LONG_LONG
-+#define HAVE_ALIGNED_DOUBLES
-+#define HAVE_ALIGNED_LONGLONGS
-+
-+#define PR_BYTES_PER_BYTE 1
-+#define PR_BYTES_PER_SHORT 2
-+#define PR_BYTES_PER_INT 4
-+#define PR_BYTES_PER_INT64 8
-+#define PR_BYTES_PER_LONG 8
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD 8
-+#define PR_BYTES_PER_DWORD 8
-+#define PR_BYTES_PER_WORD_LOG2 3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#define PR_BITS_PER_BYTE 8
-+#define PR_BITS_PER_SHORT 16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64 64
-+#define PR_BITS_PER_LONG 64
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#define PR_BITS_PER_WORD 64
-+
-+#define PR_BITS_PER_BYTE_LOG2 3
-+#define PR_BITS_PER_SHORT_LOG2 4
-+#define PR_BITS_PER_INT_LOG2 5
-+#define PR_BITS_PER_INT64_LOG2 6
-+#define PR_BITS_PER_LONG_LOG2 6
-+#define PR_BITS_PER_FLOAT_LOG2 5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2 6
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG 8
-+#define PR_ALIGN_OF_INT64 8
-+#define PR_ALIGN_OF_FLOAT 4
-+#define PR_ALIGN_OF_DOUBLE 8
-+#define PR_ALIGN_OF_POINTER 8
-+
-+#elif defined(__sparc__) || defined(__MIPSEB__) || defined(__ARMEB__)
-
- #undef IS_LITTLE_ENDIAN
- #define IS_BIG_ENDIAN 1
-@@ -187,6 +234,55 @@
- #define PR_BYTES_PER_WORD_LOG2 3
- #define PR_BYTES_PER_DWORD_LOG2 3
-
-+#elif defined(__amd64__)
-+#define IS_LITTLE_ENDIAN 1
-+#undef IS_BIG_ENDIAN
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE 1
-+#define PR_BYTES_PER_SHORT 2
-+#define PR_BYTES_PER_INT 4
-+#define PR_BYTES_PER_INT64 8
-+#define PR_BYTES_PER_LONG 8
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD 8
-+#define PR_BYTES_PER_DWORD 8
-+
-+#define PR_BITS_PER_BYTE 8
-+#define PR_BITS_PER_SHORT 16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64 64
-+#define PR_BITS_PER_LONG 64
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#define PR_BITS_PER_WORD 64
-+
-+#define PR_BITS_PER_BYTE_LOG2 3
-+#define PR_BITS_PER_SHORT_LOG2 4
-+#define PR_BITS_PER_INT_LOG2 5
-+#define PR_BITS_PER_INT64_LOG2 6
-+#define PR_BITS_PER_LONG_LOG2 6
-+#define PR_BITS_PER_FLOAT_LOG2 5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2 6
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG 8
-+#define PR_ALIGN_OF_INT64 8
-+#define PR_ALIGN_OF_FLOAT 4
-+#define PR_ALIGN_OF_DOUBLE 8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD 8
-+
-+#define PR_BYTES_PER_WORD_LOG2 3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#define HAVE_LONG_LONG
-+#define HAVE_ALIGNED_DOUBLES
-+#define HAVE_ALIGNED_LONGLONGS
-+
- #elif defined(__powerpc__) || defined(__m68k__)
-
- #undef IS_LITTLE_ENDIAN
diff --git a/mail/thunderbird/patches/patch-bb b/mail/thunderbird/patches/patch-bb
deleted file mode 100644
index 901616b49ee..00000000000
--- a/mail/thunderbird/patches/patch-bb
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-bb,v 1.4 2006/02/05 14:49:05 ghen Exp $
-
---- nsprpub/pr/include/md/_netbsd.h.orig 2006-02-02 13:52:50.000000000 +0100
-+++ nsprpub/pr/include/md/_netbsd.h
-@@ -44,6 +44,8 @@
- #define _PR_SI_ARCHITECTURE "x86"
- #elif defined(__alpha__)
- #define _PR_SI_ARCHITECTURE "alpha"
-+#elif defined(__amd64__)
-+#define _PR_SI_ARCHITECTURE "amd64"
- #elif defined(__m68k__)
- #define _PR_SI_ARCHITECTURE "m68k"
- #elif defined(__powerpc__)
-@@ -95,6 +97,12 @@
- #define _PR_HAVE_GETPROTO_R_INT
- #endif
-
-+#if __NetBSD_Version__ >= 106370000
-+/* NetBSD 1.6ZK */
-+#define _PR_HAVE_GETPROTO_R
-+#define _PR_HAVE_GETPROTO_R_INT
-+#endif
-+
- #define USE_SETJMP
-
- #ifndef _PR_PTHREADS
diff --git a/mail/thunderbird/patches/patch-bm b/mail/thunderbird/patches/patch-bm
deleted file mode 100644
index a83c43f5b9b..00000000000
--- a/mail/thunderbird/patches/patch-bm
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-bm,v 1.3 2004/06/24 23:09:56 taya Exp $
-
-diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp
---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp 2001-09-29 05:12:52.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp 2004-06-15 23:56:36.000000000 +0900
-@@ -118,18 +118,23 @@
- * so they are contiguous with values passed on the stack, and then calls
- * PrepareAndDispatch() to do the dirty work.
- */
-+#ifndef __ELF__
-+#define SYMBOLPREFIX "_"
-+#else
-+#define SYMBOLPREFIX
-+#endif
-
- #define STUB_ENTRY(n) \
- __asm__( \
-- ".global _Stub"#n"__14nsXPTCStubBase\n\t" \
--"_Stub"#n"__14nsXPTCStubBase:\n\t" \
-+ ".global "SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase\n\t" \
-+SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase:\n\t" \
- "stmfd sp!, {r1, r2, r3} \n\t" \
- "mov ip, sp \n\t" \
- "stmfd sp!, {fp, ip, lr, pc} \n\t" \
- "sub fp, ip, #4 \n\t" \
- "mov r1, #"#n" \n\t" /* = methodIndex */ \
- "add r2, sp, #16 \n\t" \
-- "bl _PrepareAndDispatch__FP14nsXPTCStubBaseUiPUi \n\t" \
-+ "bl "SYMBOLPREFIX"PrepareAndDispatch__FP14nsXPTCStubBaseUiPUi \n\t" \
- "ldmea fp, {fp, sp, lr} \n\t" \
- "add sp, sp, #12 \n\t" \
- "mov pc, lr \n\t" \
diff --git a/mail/thunderbird/patches/patch-bo b/mail/thunderbird/patches/patch-bo
deleted file mode 100644
index 5cd7aa5f4c2..00000000000
--- a/mail/thunderbird/patches/patch-bo
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-bo,v 1.6 2006/02/05 14:49:05 ghen Exp $
-
---- nsprpub/configure.in.orig 2006-02-02 13:38:48.000000000 +0100
-+++ nsprpub/configure.in
-@@ -1045,6 +1045,34 @@ case "$target" in
- DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
- MDCPUCFG_H=_freebsd.cfg
- PR_MD_CSRCS=freebsd.c
-+ if test "$LIBRUNPATH"; then
-+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
-+ fi
-+ ;;
-+
-+*-dragonfly*)
-+ if test -z "$USE_NSPR_THREADS"; then
-+ USE_PTHREADS=1
-+ fi
-+ AC_DEFINE(XP_UNIX)
-+ AC_DEFINE(FREEBSD)
-+ AC_DEFINE(HAVE_BSD_FLOCK)
-+ AC_DEFINE(HAVE_SOCKLEN_T)
-+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+ MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ if test "$MOZ_OBJFORMAT" = "elf"; then
-+ DLL_SUFFIX=so
-+ else
-+ DLL_SUFFIX=so.1.0
-+ fi
-+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-+ DSO_CFLAGS=-fPIC
-+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-+ MDCPUCFG_H=_freebsd.cfg
-+ PR_MD_CSRCS=freebsd.c
-+ if test "$LIBRUNPATH"; then
-+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
-+ fi
- ;;
-
- *-hpux*)
-@@ -1544,6 +1572,7 @@ mips-nec-sysv*)
- AC_DEFINE(XP_UNIX)
- AC_DEFINE(NETBSD)
- AC_DEFINE(HAVE_BSD_FLOCK)
-+ AC_DEFINE(HAVE_SOCKLEN_T)
- USE_NSPR_THREADS=1
- MDCPUCFG_H=_netbsd.cfg
- PR_MD_CSRCS=netbsd.c
-@@ -2307,7 +2336,7 @@ if test -n "$USE_PTHREADS"; then
- if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
- ac_cv_have_dash_pthread=yes
- case "$target_os" in
-- freebsd*)
-+ freebsd* | dragonfly*)
- # Freebsd doesn't use -pthread for compiles, it uses them for linking
- ;;
- *)
-@@ -2345,7 +2374,7 @@ if test -n "$USE_PTHREADS"; then
- _PTHREAD_LDFLAGS=
- fi
- ;;
-- *-freebsd*)
-+ *-freebsd* | *-dragonfly*)
- AC_DEFINE(_REENTRANT)
- AC_DEFINE(_THREAD_SAFE)
- dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -2426,7 +2455,7 @@ case "$target" in
- AC_DEFINE(_PR_NEED_PTHREAD_INIT)
- fi
- ;;
--*-freebsd*)
-+*-freebsd* | *-dragonfly*)
- if test -n "$USE_NSPR_THREADS"; then
- AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
- fi
diff --git a/mail/thunderbird/patches/patch-bq b/mail/thunderbird/patches/patch-bq
deleted file mode 100644
index 1a855738d18..00000000000
--- a/mail/thunderbird/patches/patch-bq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bq,v 1.5 2006/02/05 14:49:05 ghen Exp $
-
---- xpcom/io/nsLocalFileUnix.h.orig 2006-02-02 13:20:12.000000000 +0100
-+++ xpcom/io/nsLocalFileUnix.h
-@@ -73,7 +73,7 @@
- #endif
-
- // so we can statfs on freebsd
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || (defined(__NetBSD__) && !defined(HAVE_STATVFS))
- #define HAVE_SYS_STATFS_H
- #define STATFS statfs
- #include <sys/param.h>
diff --git a/mail/thunderbird/patches/patch-br b/mail/thunderbird/patches/patch-br
deleted file mode 100644
index b06423f12a3..00000000000
--- a/mail/thunderbird/patches/patch-br
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-br,v 1.6 2006/02/05 14:49:05 ghen Exp $
-
---- nsprpub/pr/src/misc/prnetdb.c.orig 2006-02-02 13:19:56.000000000 +0100
-+++ nsprpub/pr/src/misc/prnetdb.c
-@@ -2110,7 +2110,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
- */
- hints.ai_socktype = SOCK_STREAM;
-
-+/* NetBSD >= 2.99.9 has a thread-safe resolver */
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 299000900
-+ LOCK_DNS();
-+#endif
-+
- rv = GETADDRINFO(hostname, NULL, &hints, &res);
-+
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 299000900
-+ UNLOCK_DNS();
-+#endif
-+
- if (rv == 0)
- return (PRAddrInfo *) res;
-
diff --git a/mail/thunderbird/patches/patch-bs b/mail/thunderbird/patches/patch-bs
deleted file mode 100644
index 793120f8f09..00000000000
--- a/mail/thunderbird/patches/patch-bs
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-bs,v 1.4 2005/12/30 21:35:58 joerg Exp $
-
-diff -ruN ../Orig/mozilla/config/mkdepend/imakemdep.h ./config/mkdepend/imakemdep.h
---- ../Orig/mozilla/config/mkdepend/imakemdep.h 2004-04-21 06:38:14.000000000 +0900
-+++ ./config/mkdepend/imakemdep.h 2005-12-04 19:21:01.000000000 +0900
-@@ -235,7 +235,7 @@
- #ifdef _CRAY
- #define DEFAULT_CPP "/lib/pcpp"
- #endif
--#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #define DEFAULT_CPP "/usr/libexec/cpp"
- #endif
- #ifdef MACH
-@@ -273,7 +273,7 @@
- #ifdef unix
- "-Uunix", /* remove unix symbol so that filename unix.c okay */
- #endif
--#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH)
-+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH) || defined(__DragonFly__)
- # ifdef __i386__
- "-D__i386__",
- # endif
-@@ -713,6 +713,9 @@
- #ifdef __sgi
- {"__sgi", "1"},
- #endif
-+#ifdef __DragonFly__
-+ {"__DragonFly__", "1"},
-+#endif
- #ifdef __FreeBSD__
- {"__FreeBSD__", "1"},
- #endif
diff --git a/mail/thunderbird/patches/patch-bu b/mail/thunderbird/patches/patch-bu
deleted file mode 100644
index af417dfe118..00000000000
--- a/mail/thunderbird/patches/patch-bu
+++ /dev/null
@@ -1,179 +0,0 @@
-$NetBSD: patch-bu,v 1.1 2004/06/24 23:09:56 taya Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp.orig 2004-05-30 21:38:13.000000000 +0900
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp 2004-05-30 21:37:22.000000000 +0900
-@@ -0,0 +1,174 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+// Platform specific code to invoke XPCOM methods on native objects
-+
-+#include "xptcprivate.h"
-+
-+// 6 integral parameters are passed in registers
-+const PRUint32 GPR_COUNT = 6;
-+
-+// 8 floating point parameters are passed in SSE registers
-+const PRUint32 FPR_COUNT = 8;
-+
-+// Remember that these 'words' are 64-bit long
-+static inline void
-+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s,
-+ PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack)
-+{
-+ nr_gpr = 1; // skip one GP register for 'that'
-+ nr_fpr = 0;
-+ nr_stack = 0;
-+
-+ /* Compute number of eightbytes of class MEMORY. */
-+ for (uint32 i = 0; i < paramCount; i++, s++) {
-+ if (!s->IsPtrData()
-+ && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) {
-+ if (nr_fpr < FPR_COUNT)
-+ nr_fpr++;
-+ else
-+ nr_stack++;
-+ }
-+ else {
-+ if (nr_gpr < GPR_COUNT)
-+ nr_gpr++;
-+ else
-+ nr_stack++;
-+ }
-+ }
-+}
-+
-+static void
-+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s,
-+ PRUint64 * gpregs, double * fpregs)
-+{
-+ PRUint32 nr_gpr = 1; // skip one GP register for 'that'
-+ PRUint32 nr_fpr = 0;
-+ PRUint64 value;
-+
-+ for (uint32 i = 0; i < paramCount; i++, s++) {
-+ if (s->IsPtrData())
-+ value = (PRUint64) s->ptr;
-+ else {
-+ switch (s->type) {
-+ case nsXPTType::T_FLOAT: break;
-+ case nsXPTType::T_DOUBLE: break;
-+ case nsXPTType::T_I8: value = s->val.i8; break;
-+ case nsXPTType::T_I16: value = s->val.i16; break;
-+ case nsXPTType::T_I32: value = s->val.i32; break;
-+ case nsXPTType::T_I64: value = s->val.i64; break;
-+ case nsXPTType::T_U8: value = s->val.u8; break;
-+ case nsXPTType::T_U16: value = s->val.u16; break;
-+ case nsXPTType::T_U32: value = s->val.u32; break;
-+ case nsXPTType::T_U64: value = s->val.u64; break;
-+ case nsXPTType::T_BOOL: value = s->val.b; break;
-+ case nsXPTType::T_CHAR: value = s->val.c; break;
-+ case nsXPTType::T_WCHAR: value = s->val.wc; break;
-+ default: value = (PRUint64) s->val.p; break;
-+ }
-+ }
-+
-+ if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
-+ if (nr_fpr < FPR_COUNT)
-+ fpregs[nr_fpr++] = s->val.d;
-+ else {
-+ *((double *)d) = s->val.d;
-+ d++;
-+ }
-+ }
-+ else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-+ if (nr_fpr < FPR_COUNT)
-+ // The value in %xmm register is already prepared to
-+ // be retrieved as a float. Therefore, we pass the
-+ // value verbatim, as a double without conversion.
-+ fpregs[nr_fpr++] = s->val.d;
-+ else {
-+ *((float *)d) = s->val.f;
-+ d++;
-+ }
-+ }
-+ else {
-+ if (nr_gpr < GPR_COUNT)
-+ gpregs[nr_gpr++] = value;
-+ else
-+ *d++ = value;
-+ }
-+ }
-+}
-+
-+extern "C"
-+XPTC_PUBLIC_API(nsresult)
-+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex,
-+ PRUint32 paramCount, nsXPTCVariant * params)
-+{
-+ PRUint32 nr_gpr, nr_fpr, nr_stack;
-+ invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack);
-+
-+ // Stack, if used, must be 16-bytes aligned
-+ if (nr_stack)
-+ nr_stack = (nr_stack + 1) & ~1;
-+
-+ // Load parameters to stack, if necessary
-+ PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8);
-+ PRUint64 gpregs[GPR_COUNT];
-+ double fpregs[FPR_COUNT];
-+ invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs);
-+
-+ // Load FPR registers from fpregs[]
-+ register double d0 asm("xmm0");
-+ register double d1 asm("xmm1");
-+ register double d2 asm("xmm2");
-+ register double d3 asm("xmm3");
-+ register double d4 asm("xmm4");
-+ register double d5 asm("xmm5");
-+ register double d6 asm("xmm6");
-+ register double d7 asm("xmm7");
-+
-+ switch (nr_fpr) {
-+#define ARG_FPR(N) \
-+ case N+1: d##N = fpregs[N];
-+ ARG_FPR(7);
-+ ARG_FPR(6);
-+ ARG_FPR(5);
-+ ARG_FPR(4);
-+ ARG_FPR(3);
-+ ARG_FPR(2);
-+ ARG_FPR(1);
-+ ARG_FPR(0);
-+ case 0:;
-+#undef ARG_FPR
-+ }
-+
-+ // Load GPR registers from gpregs[]
-+ register PRUint64 a0 asm("rdi");
-+ register PRUint64 a1 asm("rsi");
-+ register PRUint64 a2 asm("rdx");
-+ register PRUint64 a3 asm("rcx");
-+ register PRUint64 a4 asm("r8");
-+ register PRUint64 a5 asm("r9");
-+
-+ switch (nr_gpr) {
-+#define ARG_GPR(N) \
-+ case N+1: a##N = gpregs[N];
-+ ARG_GPR(5);
-+ ARG_GPR(4);
-+ ARG_GPR(3);
-+ ARG_GPR(2);
-+ ARG_GPR(1);
-+ case 1: a0 = (PRUint64) that;
-+ case 0:;
-+#undef ARG_GPR
-+ }
-+
-+ // Ensure that assignments to SSE registers won't be optimized away
-+ asm("" ::
-+ "x" (d0), "x" (d1), "x" (d2), "x" (d3),
-+ "x" (d4), "x" (d5), "x" (d6), "x" (d7));
-+
-+ // Get pointer to method
-+ PRUint64 methodAddress = *((PRUint64 *)that);
-+ methodAddress += 8 * methodIndex;
-+ methodAddress = *((PRUint64 *)methodAddress);
-+
-+ typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64);
-+ PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5);
-+ return result;
-+}
diff --git a/mail/thunderbird/patches/patch-bv b/mail/thunderbird/patches/patch-bv
deleted file mode 100644
index de1dd0dcf20..00000000000
--- a/mail/thunderbird/patches/patch-bv
+++ /dev/null
@@ -1,211 +0,0 @@
-$NetBSD: patch-bv,v 1.1 2004/06/24 23:09:56 taya Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp.orig 2004-05-30 21:38:22.000000000 +0900
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp 2004-05-30 21:37:22.000000000 +0900
-@@ -0,0 +1,206 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+
-+// Implement shared vtbl methods.
-+
-+#include "xptcprivate.h"
-+
-+// The Linux/x86-64 ABI passes the first 6 integral parameters and the
-+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx,
-+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the
-+// caller. The rest of the parameters are passed in the callers stack
-+// area.
-+
-+const PRUint32 PARAM_BUFFER_COUNT = 16;
-+const PRUint32 GPR_COUNT = 6;
-+const PRUint32 FPR_COUNT = 8;
-+
-+// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
-+//
-+// - 'args[]' contains the arguments passed on stack
-+// - 'gpregs[]' contains the arguments passed in integer registers
-+// - 'fpregs[]' contains the arguments passed in floating point registers
-+//
-+// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
-+// and then the method gets called.
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex,
-+ PRUint64 * args, PRUint64 * gpregs, double *fpregs)
-+{
-+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+ nsXPTCMiniVariant* dispatchParams = NULL;
-+ nsIInterfaceInfo* iface_info = NULL;
-+ const nsXPTMethodInfo* info;
-+ PRUint32 paramCount;
-+ PRUint32 i;
-+ nsresult result = NS_ERROR_FAILURE;
-+
-+ NS_ASSERTION(self,"no self");
-+
-+ self->GetInterfaceInfo(&iface_info);
-+ NS_ASSERTION(iface_info,"no interface info");
-+ if (! iface_info)
-+ return NS_ERROR_UNEXPECTED;
-+
-+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+ NS_ASSERTION(info,"no method info");
-+ if (! info)
-+ return NS_ERROR_UNEXPECTED;
-+
-+ paramCount = info->GetParamCount();
-+
-+ // setup variant array pointer
-+ if(paramCount > PARAM_BUFFER_COUNT)
-+ dispatchParams = new nsXPTCMiniVariant[paramCount];
-+ else
-+ dispatchParams = paramBuffer;
-+
-+ NS_ASSERTION(dispatchParams,"no place for params");
-+ if (! dispatchParams)
-+ return NS_ERROR_OUT_OF_MEMORY;
-+
-+ PRUint64* ap = args;
-+ PRUint32 nr_gpr = 1; // skip one GPR register for 'that'
-+ PRUint32 nr_fpr = 0;
-+ PRUint64 value;
-+
-+ for(i = 0; i < paramCount; i++) {
-+ const nsXPTParamInfo& param = info->GetParam(i);
-+ const nsXPTType& type = param.GetType();
-+ nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+ if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
-+ if (nr_fpr < FPR_COUNT)
-+ dp->val.d = fpregs[nr_fpr++];
-+ else
-+ dp->val.d = *(double*) ap++;
-+ continue;
-+ }
-+ else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
-+ if (nr_fpr < FPR_COUNT)
-+ // The value in %xmm register is already prepared to
-+ // be retrieved as a float. Therefore, we pass the
-+ // value verbatim, as a double without conversion.
-+ dp->val.d = *(double*) ap++;
-+ else
-+ dp->val.f = *(float*) ap++;
-+ continue;
-+ }
-+ else {
-+ if (nr_gpr < GPR_COUNT)
-+ value = gpregs[nr_gpr++];
-+ else
-+ value = *ap++;
-+ }
-+
-+ if (param.IsOut() || !type.IsArithmetic()) {
-+ dp->val.p = (void*) value;
-+ continue;
-+ }
-+
-+ switch (type) {
-+ case nsXPTType::T_I8: dp->val.i8 = (PRInt8) value; break;
-+ case nsXPTType::T_I16: dp->val.i16 = (PRInt16) value; break;
-+ case nsXPTType::T_I32: dp->val.i32 = (PRInt32) value; break;
-+ case nsXPTType::T_I64: dp->val.i64 = (PRInt64) value; break;
-+ case nsXPTType::T_U8: dp->val.u8 = (PRUint8) value; break;
-+ case nsXPTType::T_U16: dp->val.u16 = (PRUint16) value; break;
-+ case nsXPTType::T_U32: dp->val.u32 = (PRUint32) value; break;
-+ case nsXPTType::T_U64: dp->val.u64 = (PRUint64) value; break;
-+ case nsXPTType::T_BOOL: dp->val.b = (PRBool) value; break;
-+ case nsXPTType::T_CHAR: dp->val.c = (char) value; break;
-+ case nsXPTType::T_WCHAR: dp->val.wc = (wchar_t) value; break;
-+
-+ default:
-+ NS_ASSERTION(0, "bad type");
-+ break;
-+ }
-+ }
-+
-+ result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams);
-+
-+ NS_RELEASE(iface_info);
-+
-+ if (dispatchParams != paramBuffer)
-+ delete [] dispatchParams;
-+
-+ return result;
-+}
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+// Linux/x86-64 uses gcc >= 3.1
-+#define STUB_ENTRY(n) \
-+asm(".section \".text\"\n\t" \
-+ ".align 2\n\t" \
-+ ".if " #n " < 10\n\t" \
-+ ".globl _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-+ ".type _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \
-+ "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \
-+ ".elseif " #n " < 100\n\t" \
-+ ".globl _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-+ ".type _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \
-+ "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \
-+ ".elseif " #n " < 1000\n\t" \
-+ ".globl _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-+ ".type _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \
-+ "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \
-+ ".else\n\t" \
-+ ".err \"stub number " #n " >= 1000 not yet supported\"\n\t" \
-+ ".endif\n\t" \
-+ "movl $" #n ", %eax\n\t" \
-+ "jmp SharedStub\n\t" \
-+ ".if " #n " < 10\n\t" \
-+ ".size _ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-+ ".elseif " #n " < 100\n\t" \
-+ ".size _ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-+ ".else\n\t" \
-+ ".size _ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-+ ".endif");
-+
-+// static nsresult SharedStub(PRUint32 methodIndex)
-+asm(".section \".text\"\n\t"
-+ ".align 2\n\t"
-+ ".type SharedStub,@function\n\t"
-+ "SharedStub:\n\t"
-+ // make room for gpregs (48), fpregs (64)
-+ "pushq %rbp\n\t"
-+ "movq %rsp,%rbp\n\t"
-+ "subq $112,%rsp\n\t"
-+ // save GP registers
-+ "movq %rdi,-112(%rbp)\n\t"
-+ "movq %rsi,-104(%rbp)\n\t"
-+ "movq %rdx, -96(%rbp)\n\t"
-+ "movq %rcx, -88(%rbp)\n\t"
-+ "movq %r8 , -80(%rbp)\n\t"
-+ "movq %r9 , -72(%rbp)\n\t"
-+ "leaq -112(%rbp),%rcx\n\t"
-+ // save FP registers
-+ "movsd %xmm0,-64(%rbp)\n\t"
-+ "movsd %xmm1,-56(%rbp)\n\t"
-+ "movsd %xmm2,-48(%rbp)\n\t"
-+ "movsd %xmm3,-40(%rbp)\n\t"
-+ "movsd %xmm4,-32(%rbp)\n\t"
-+ "movsd %xmm5,-24(%rbp)\n\t"
-+ "movsd %xmm6,-16(%rbp)\n\t"
-+ "movsd %xmm7, -8(%rbp)\n\t"
-+ "leaq -64(%rbp),%r8\n\t"
-+ // rdi has the 'self' pointer already
-+ "movl %eax,%esi\n\t"
-+ "leaq 16(%rbp),%rdx\n\t"
-+ "call PrepareAndDispatch\n\t"
-+ "leave\n\t"
-+ "ret\n\t"
-+ ".size SharedStub,.-SharedStub");
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+ return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#else
-+#error "can't find a compiler to use"
-+#endif /* __GNUC__ */
diff --git a/mail/thunderbird/patches/patch-bx b/mail/thunderbird/patches/patch-bx
deleted file mode 100644
index 33599cd0713..00000000000
--- a/mail/thunderbird/patches/patch-bx
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-bx,v 1.2 2004/12/04 02:16:03 taya Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig 2001-09-28 22:12:53.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
-@@ -119,8 +119,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
- if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack
- dp->val.d = *(double*) ap;
- ap += 2;
-+#if __GXX_ABI_VERSION < 100
- if (gpr < GPR_COUNT)
- gpr += 2;
-+#endif
- }
- continue;
- }
-@@ -130,8 +132,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
- else {
- dp->val.f = *(float*) ap;
- ap += 1;
-+#if __GXX_ABI_VERSION < 100
- if (gpr < GPR_COUNT)
- gpr += 1;
-+#endif
- }
- continue;
- }
-@@ -195,7 +199,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
- // however, it's quick, dirty, and'll break when the ABI changes on
- // us, which is what we want ;-).
-
--#define STUB_ENTRY(n) \
-+#if __GXX_ABI_VERSION < 100
-+// gcc-2 version
-+# define STUB_ENTRY(n) \
- __asm__ ( \
- ".section \".text\" \n\t" \
- ".align 2 \n\t" \
-@@ -206,6 +212,46 @@ __asm__ (
- "li 11,"#n" \n\t" \
- "b SharedStub@local \n" \
- );
-+#else
-+// gcc-3 version
-+//
-+// As G++3 ABI contains the length of the functionname in the mangled
-+// name, it is difficult to get a generic assembler mechanism like
-+// in the G++ 2.95 case.
-+// Create names would be like:
-+// _ZN14nsXPTCStubBase5Stub1Ev
-+// _ZN14nsXPTCStubBase6Stub12Ev
-+// _ZN14nsXPTCStubBase7Stub123Ev
-+// _ZN14nsXPTCStubBase8Stub1234Ev
-+// etc.
-+// Use assembler directives to get the names right...
-+
-+# define STUB_ENTRY(n) \
-+__asm__ ( \
-+ ".align 2 \n\t" \
-+ ".if "#n" < 10 \n\t" \
-+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \
-+ ".type _ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n" \
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t" \
-+ \
-+ ".elseif "#n" < 100 \n\t" \
-+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \
-+ ".type _ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n" \
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t" \
-+ \
-+ ".elseif "#n" < 1000 \n\t" \
-+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \
-+ ".type _ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n" \
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t" \
-+ \
-+ ".else \n\t" \
-+ ".err \"stub number "#n" >= 1000 not yet supported\"\n" \
-+ ".endif \n\t" \
-+ \
-+ "li 11,"#n" \n\t" \
-+ "b SharedStub@local \n" \
-+);
-+#endif
-
- #define SENTINEL_ENTRY(n) \
- nsresult nsXPTCStubBase::Sentinel##n() \
diff --git a/mail/thunderbird/patches/patch-by b/mail/thunderbird/patches/patch-by
deleted file mode 100644
index 65e7d988bcb..00000000000
--- a/mail/thunderbird/patches/patch-by
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-by,v 1.2 2004/07/06 13:40:57 taya Exp $
-
-diff -ru ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp
---- ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2004-03-19 10:36:16.000000000 +0900
-+++ ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2004-07-04 22:59:19.000000000 +0900
-@@ -155,15 +155,15 @@
-
- static NS_NAMED_LITERAL_STRING(arial, "arial");
- nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"),
-- &arial);
-+ (nsDependentString *)&arial);
-
- static NS_NAMED_LITERAL_STRING(courier, "courier new");
- nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"),
-- &courier);
-+ (nsDependentString *)&courier);
-
- static NS_NAMED_LITERAL_STRING(times, "times new roman");
- nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"),
-- &times);
-+ (nsDependentString *)&times);
- }
-
- void NS_FreeSVGLibartGlyphMetricsFTGlobals()
-@@ -440,19 +440,19 @@
- return;
- }
-
-- FTC_Image_Desc imageDesc;
-- imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref?
-+ FTC_ImageType imageDesc;
-+ imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref?
- float twipstopixel = GetTwipsToPixels();
- float scale = GetPixelScale();
-- imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale);
-- imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale);
-- imageDesc.image_type |= ftc_image_grays;
-+ imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale);
-+ imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale);
-+ imageDesc->flags = 0;
-
- // get the face
- nsresult rv;
- FTC_Manager mgr;
- nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr);
-- rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull);
-+ rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace);
- NS_ASSERTION(mFace, "failed to get face/size");
- }
-
diff --git a/mail/thunderbird/patches/patch-bz b/mail/thunderbird/patches/patch-bz
deleted file mode 100644
index 40091b2f76e..00000000000
--- a/mail/thunderbird/patches/patch-bz
+++ /dev/null
@@ -1,122 +0,0 @@
-$NetBSD: patch-bz,v 1.1 2004/12/04 02:16:03 taya Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig 2001-03-11 18:22:22.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s
-@@ -1,27 +1,27 @@
--# -*- Mode: Asm -*-
--#
--# The contents of this file are subject to the Netscape Public
--# License Version 1.1 (the "License"); you may not use this file
--# except in compliance with the License. You may obtain a copy of
--# the License at http://www.mozilla.org/NPL/
--#
--# Software distributed under the License is distributed on an "AS
--# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
--# implied. See the License for the specific language governing
--# rights and limitations under the License.
--#
--# The Original Code is mozilla.org code.
--#
--# The Initial Developer of the Original Code is Netscape
--# Communications Corporation. Portions created by Netscape are
--# Copyright (C) 1999 Netscape Communications Corporation. All
--# Rights Reserved.
--#
--# Contributor(s):
--# Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
--# beard@netscape.com (Patrick Beard)
--# waterson@netscape.com (Chris Waterson)
--#
-+// -*- Mode: Asm -*-
-+//
-+// The contents of this file are subject to the Netscape Public
-+// License Version 1.1 (the "License"); you may not use this file
-+// except in compliance with the License. You may obtain a copy of
-+// the License at http://www.mozilla.org/NPL/
-+//
-+// Software distributed under the License is distributed on an "AS
-+// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+// implied. See the License for the specific language governing
-+// rights and limitations under the License.
-+//
-+// The Original Code is mozilla.org code.
-+//
-+// The Initial Developer of the Original Code is Netscape
-+// Communications Corporation. Portions created by Netscape are
-+// Copyright (C) 1999 Netscape Communications Corporation. All
-+// Rights Reserved.
-+//
-+// Contributor(s):
-+// Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+// beard@netscape.com (Patrick Beard)
-+// waterson@netscape.com (Chris Waterson)
-+//
-
- .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
- .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
-@@ -44,23 +44,23 @@
- .type SharedStub,@function
-
- SharedStub:
-- stwu sp,-112(sp) # room for
-- # linkage (8),
-- # gprData (32),
-- # fprData (64),
-- # stack alignment(8)
-+ stwu sp,-112(sp) // room for
-+ // linkage (8),
-+ // gprData (32),
-+ // fprData (64),
-+ // stack alignment(8)
- mflr r0
-- stw r0,116(sp) # save LR backchain
-+ stw r0,116(sp) // save LR backchain
-
-- stw r4,12(sp) # save GP registers
-- stw r5,16(sp) # (n.b. that we don't save r3
-- stw r6,20(sp) # because PrepareAndDispatch() is savvy)
-+ stw r4,12(sp) // save GP registers
-+ stw r5,16(sp) // (n.b. that we don't save r3
-+ stw r6,20(sp) // because PrepareAndDispatch() is savvy)
- stw r7,24(sp)
- stw r8,28(sp)
- stw r9,32(sp)
- stw r10,36(sp)
-
-- stfd f1,40(sp) # save FP registers
-+ stfd f1,40(sp) // save FP registers
- stfd f2,48(sp)
- stfd f3,56(sp)
- stfd f4,64(sp)
-@@ -69,21 +69,20 @@ SharedStub:
- stfd f7,88(sp)
- stfd f8,96(sp)
-
-- # r3 has the 'self' pointer already
-+ // r3 has the 'self' pointer already
-
-- mr r4,r11 # r4 <= methodIndex selector, passed
-- # via r11 in the nsXPTCStubBase::StubXX() call
-+ mr r4,r11 // r4 <= methodIndex selector, passed
-+ // via r11 in the nsXPTCStubBase::StubXX() call
-
-- addi r5,sp,120 # r5 <= pointer to callers args area,
-- # beyond r3-r10/f1-f8 mapped range
-+ addi r5,sp,120 // r5 <= pointer to callers args area,
-+ // beyond r3-r10/f1-f8 mapped range
-
-- addi r6,sp,8 # r6 <= gprData
-- addi r7,sp,40 # r7 <= fprData
-+ addi r6,sp,8 // r6 <= gprData
-+ addi r7,sp,40 // r7 <= fprData
-
-- bl PrepareAndDispatch@local # Go!
-+ bl PrepareAndDispatch@local // Go!
-
-- lwz r0,116(sp) # restore LR
-+ lwz r0,116(sp) // restore LR
- mtlr r0
-- la sp,112(sp) # clean up the stack
-+ la sp,112(sp) // clean up the stack
- blr
--
diff --git a/mail/thunderbird/patches/patch-ca b/mail/thunderbird/patches/patch-ca
deleted file mode 100644
index 89e433dc1b8..00000000000
--- a/mail/thunderbird/patches/patch-ca
+++ /dev/null
@@ -1,166 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2004/12/04 02:16:03 taya Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig 2001-03-11 18:22:17.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s
-@@ -1,27 +1,28 @@
--# -*- Mode: Asm -*-
--#
--# The contents of this file are subject to the Netscape Public
--# License Version 1.1 (the "License"); you may not use this file
--# except in compliance with the License. You may obtain a copy of
--# the License at http://www.mozilla.org/NPL/
--#
--# Software distributed under the License is distributed on an "AS
--# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
--# implied. See the License for the specific language governing
--# rights and limitations under the License.
--#
--# The Original Code is mozilla.org code.
--#
--# The Initial Developer of the Original Code is Netscape
--# Communications Corporation. Portions created by Netscape are
--# Copyright (C) 1999 Netscape Communications Corporation. All
--# Rights Reserved.
--#
--# Contributor(s):
--# Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
--# beard@netscape.com (Patrick Beard)
--# waterson@netscape.com (Chris Waterson)
--#
-+// -*- Mode: Asm -*-
-+//
-+// The contents of this file are subject to the Netscape Public
-+// License Version 1.1 (the "License"); you may not use this file
-+// except in compliance with the License. You may obtain a copy of
-+// the License at http://www.mozilla.org/NPL/
-+//
-+// Software distributed under the License is distributed on an "AS
-+// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+// implied. See the License for the specific language governing
-+// rights and limitations under the License.
-+//
-+// The Original Code is mozilla.org code.
-+//
-+// The Initial Developer of the Original Code is Netscape
-+// Communications Corporation. Portions created by Netscape are
-+// Copyright (C) 1999 Netscape Communications Corporation. All
-+// Rights Reserved.
-+//
-+// Contributor(s):
-+// Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+// beard@netscape.com (Patrick Beard)
-+// waterson@netscape.com (Chris Waterson)
-+//
-+
- .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
- .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
- .set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
-@@ -42,38 +43,38 @@
- .globl XPTC_InvokeByIndex
- .type XPTC_InvokeByIndex,@function
-
--#
--# XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
--# PRUint32 paramCount, nsXPTCVariant* params)
--#
-+//
-+// XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+// PRUint32 paramCount, nsXPTCVariant* params)
-+//
-
- XPTC_InvokeByIndex:
-- stwu sp,-32(sp) # setup standard stack frame
-- mflr r0 # save LR
-- stw r3,8(sp) # r3 <= that
-- stw r4,12(sp) # r4 <= methodIndex
-+ stwu sp,-32(sp) // setup standard stack frame
-+ mflr r0 // save LR
-+ stw r3,8(sp) // r3 <= that
-+ stw r4,12(sp) // r4 <= methodIndex
- stw r30,16(sp)
- stw r31,20(sp)
-
-- stw r0,36(sp) # store LR backchain
-+ stw r0,36(sp) // store LR backchain
- mr r31,sp
-
-- rlwinm r10,r5,3,0,27 # r10 = (ParamCount * 2 * 4) & ~0x0f
-- addi r0,r10,96 # reserve stack for GPR and FPR register save area r0 = r10 + 96
-- lwz r9,0(sp) # r9 = backchain
-+ rlwinm r10,r5,3,0,27 // r10 = (ParamCount * 2 * 4) & ~0x0f
-+ addi r0,r10,96 // reserve stack for GPR and FPR register save area r0 = r10 + 96
-+ lwz r9,0(sp) // r9 = backchain
- neg r0,r0
-- stwux r9,sp,r0 # reserve stack sapce and save SP backchain
--
-- addi r3,sp,8 # r3 <= args
-- mr r4,r5 # r4 <= paramCount
-- mr r5,r6 # r5 <= params
-- add r6,r3,r10 # r6 <= gpregs ( == args + r10 )
-- mr r30,r6 # store in r30 for use later...
-- addi r7,r6,32 # r7 <= fpregs ( == gpregs + 32 )
-+ stwux r9,sp,r0 // reserve stack space and save SP backchain
-+
-+ addi r3,sp,8 // r3 <= args
-+ mr r4,r5 // r4 <= paramCount
-+ mr r5,r6 // r5 <= params
-+ add r6,r3,r10 // r6 <= gpregs ( == args + r10 )
-+ mr r30,r6 // store in r30 for use later...
-+ addi r7,r6,32 // r7 <= fpregs ( == gpregs + 32 )
-
-- bl invoke_copy_to_stack@local # (args, paramCount, params, gpregs, fpregs)
-+ bl invoke_copy_to_stack@local // (args, paramCount, params, gpregs, fpregs)
-
-- lfd f1,32(r30) # load FP registers with method parameters
-+ lfd f1,32(r30) // load FP registers with method parameters
- lfd f2,40(r30)
- lfd f3,48(r30)
- lfd f4,56(r30)
-@@ -82,18 +83,18 @@ XPTC_InvokeByIndex:
- lfd f7,80(r30)
- lfd f8,88(r30)
-
-- lwz r3,8(r31) # r3 <= that
-- lwz r4,12(r31) # r4 <= methodIndex
-- lwz r5,0(r3) # r5 <= vtable ( == *that )
-- slwi r4,r4,3 # convert to offset ( *= 8 )
-- addi r4,r4,8 # skip first two vtable entries
-- add r4,r4,r5
-- lhz r0,0(r4) # virtual base offset
-- extsh r0,r0
-- add r3,r3,r0
-- lwz r0,4(r4) # r0 <= methodpointer ( == vtable + offset )
-+ lwz r3,8(r31) // r3 <= that
-+ lwz r4,12(r31) // r4 <= methodIndex
-+ lwz r5,0(r3) // r5 <= vtable ( == *that )
-+#if !((__GNUC__ == 3 && __GNUC_MINOR__ < 2) || __GXX_ABI_VERSION >= 100) // G++ pre-V3 ABI is like that of AIX under NetBSD
-+ slwi r4,r4,3 // convert to offset ( *= 8 )
-+ addi r4,r4,8 // skip garbage before vtable
-+#else
-+ slwi r4,r4,2 // convert to offset ( *= 4 )
-+#endif
-+ lwzx r0,r5,r4 // r0 <= methodpointer ( == vtable + offset )
-
-- lwz r4,4(r30) # load GP regs with method parameters
-+ lwz r4,4(r30) // load GP regs with method parameters
- lwz r5,8(r30)
- lwz r6,12(r30)
- lwz r7,16(r30)
-@@ -101,13 +102,13 @@ XPTC_InvokeByIndex:
- lwz r9,24(r30)
- lwz r10,28(r30)
-
-- mtlr r0 # copy methodpointer to LR
-- blrl # call method
-+ mtlr r0 // copy methodpointer to LR
-+ blrl // call method
-
-- lwz r30,16(r31) # restore r30 & r31
-+ lwz r30,16(r31) // restore r30 & r31
- lwz r31,20(r31)
-
-- lwz r11,0(sp) # clean up the stack
-+ lwz r11,0(sp) // clean up the stack
- lwz r0,4(r11)
- mtlr r0
- mr sp,r11
diff --git a/mail/thunderbird/patches/patch-cb b/mail/thunderbird/patches/patch-cb
deleted file mode 100644
index 78e1f5f9b57..00000000000
--- a/mail/thunderbird/patches/patch-cb
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2004/12/04 02:16:03 taya Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig 2001-09-28 22:12:52.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
-@@ -104,8 +104,10 @@ invoke_copy_to_stack(PRUint32* d,
- if ((PRUint32) d & 4) d++; // doubles are 8-byte aligned on stack
- *((double*) d) = s->val.d;
- d += 2;
-+#if __GXX_ABI_VERSION < 100
- if (gpr < GPR_COUNT)
- gpr += 2;
-+#endif
- }
- }
- else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-@@ -114,8 +116,10 @@ invoke_copy_to_stack(PRUint32* d,
- else {
- *((float*) d) = s->val.f;
- d += 1;
-+#if __GXX_ABI_VERSION < 100
- if (gpr < GPR_COUNT)
- gpr += 1;
-+#endif
- }
- }
- else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64
diff --git a/mail/thunderbird/patches/patch-da b/mail/thunderbird/patches/patch-da
deleted file mode 100644
index cbb854f8809..00000000000
--- a/mail/thunderbird/patches/patch-da
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-da,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
---- xpcom/build/malloc.c.orig 2005-12-29 17:03:39.000000000 +0000
-+++ xpcom/build/malloc.c
-@@ -918,7 +918,7 @@ struct mallinfo {
-
-
- #ifdef LACKS_UNISTD_H
--#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
-+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
- #if __STD_C
- extern Void_t* sbrk(ptrdiff_t);
- #else
diff --git a/mail/thunderbird/patches/patch-db b/mail/thunderbird/patches/patch-db
deleted file mode 100644
index 83147bdd954..00000000000
--- a/mail/thunderbird/patches/patch-db
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-db,v 1.2 2006/02/05 14:49:05 ghen Exp $
-
---- js/src/Makefile.in.orig 2006-02-02 13:20:09.000000000 +0100
-+++ js/src/Makefile.in
-@@ -256,6 +256,9 @@ endif # WINNT
- ifeq ($(OS_ARCH),FreeBSD)
- LDFLAGS += -pthread
- endif
-+ifeq ($(OS_ARCH),DragonFly)
-+LDFLAGS += -pthread
-+endif
- ifeq ($(OS_ARCH),IRIX)
- ifdef USE_N32
- DASH_R += -n32
diff --git a/mail/thunderbird/patches/patch-dc b/mail/thunderbird/patches/patch-dc
deleted file mode 100644
index a4e363ac4af..00000000000
--- a/mail/thunderbird/patches/patch-dc
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-dc,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
-diff -ruN ../Orig/mozilla/gc/boehm/mach_dep.c ./gc/boehm/mach_dep.c
---- ../Orig/mozilla/gc/boehm/mach_dep.c 1999-09-30 11:25:45.000000000 +0900
-+++ ./gc/boehm/mach_dep.c 2005-12-04 19:44:28.000000000 +0900
-@@ -206,7 +206,7 @@
- && !defined(SCO) && !defined(SCO_ELF) \
- && !(defined(LINUX) && defined(__ELF__)) \
- && !(defined(__FreeBSD__) && defined(__ELF__)) \
-- && !defined(DOS4GW)
-+ && !defined(DOS4GW) && !(defined(__DragonFly__) && defined(__ELF__))
- /* I386 code, generic code does not appear to work */
- /* It does appear to work under OS2, and asms dont */
- /* This is used for some 38g UNIX variants and for CYGWIN32 */
-@@ -220,7 +220,7 @@
- # endif
-
- # if ( defined(I386) && defined(LINUX) && defined(__ELF__) ) \
-- || ( defined(I386) && defined(__FreeBSD__) && defined(__ELF__) )
-+ || ( defined(I386) && (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(__ELF__) )
-
- /* This is modified for Linux with ELF (Note: _ELF_ only) */
- /* This section handles FreeBSD with ELF. */
diff --git a/mail/thunderbird/patches/patch-de b/mail/thunderbird/patches/patch-de
deleted file mode 100644
index eea2a7cb226..00000000000
--- a/mail/thunderbird/patches/patch-de
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-de,v 1.2 2006/02/05 14:49:05 ghen Exp $
-
---- config/rules.mk.orig 2006-02-02 13:20:06.000000000 +0100
-+++ config/rules.mk
-@@ -447,6 +447,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
- endif
- endif
-
-+ifeq ($(OS_ARCH),DragonFly)
-+ifdef IS_COMPONENT
-+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-+endif
-+endif
-+
- ifeq ($(OS_ARCH),NetBSD)
- ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST)))
- ifeq ($(MODULE),layout)
diff --git a/mail/thunderbird/patches/patch-df b/mail/thunderbird/patches/patch-df
deleted file mode 100644
index 02deebbd9d6..00000000000
--- a/mail/thunderbird/patches/patch-df
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-df,v 1.2 2006/02/05 14:49:05 ghen Exp $
-
---- config/config.mk.orig 2006-02-02 13:20:06.000000000 +0100
-+++ config/config.mk
-@@ -121,7 +121,7 @@ endif
- # but save the version to allow multiple versions of the same base
- # platform to be built in the same tree.
- #
--ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
-+ifneq (,$(filter DragonFly FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
- OS_RELEASE := $(basename $(OS_RELEASE))
-
- # Allow the user to ignore the OS_VERSION, which is usually irrelevant.
diff --git a/mail/thunderbird/patches/patch-dg b/mail/thunderbird/patches/patch-dg
deleted file mode 100644
index dbeb21542c9..00000000000
--- a/mail/thunderbird/patches/patch-dg
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-dg,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
-diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_freebsd.h ./nsprpub/pr/include/md/_freebsd.h
---- ../Orig/mozilla/nsprpub/pr/include/md/_freebsd.h 2004-11-24 06:22:35.000000000 +0900
-+++ ./nsprpub/pr/include/md/_freebsd.h 2005-12-04 19:44:37.000000000 +0900
-@@ -79,7 +79,7 @@
- #define _PR_NO_LARGE_FILES
-
- #if defined(_PR_PTHREADS)
--#if __FreeBSD_version >= 400008
-+#if defined(__DragonFly__) || __FreeBSD_version >= 400008
- /*
- * libc_r before this version of FreeBSD doesn't have poll().
- * Although libc has poll(), it is not thread-safe so we can't
-@@ -88,7 +88,7 @@
- #define _PR_POLL_AVAILABLE
- #endif
- #else
--#if __FreeBSD_version >= 300000
-+#if defined(__DragonFly__) || __FreeBSD_version >= 300000
- #define _PR_POLL_AVAILABLE
- #define _PR_USE_POLL
- #endif
-@@ -97,7 +97,7 @@
- #define _PR_HAVE_SYSV_SEMAPHORES
- #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
-
--#if __FreeBSD_version >= 400014
-+#if defined(__DragonFly__) || __FreeBSD_version >= 400014
- #define _PR_INET6
- #define _PR_HAVE_INET_NTOP
- #define _PR_HAVE_GETHOSTBYNAME2
diff --git a/mail/thunderbird/patches/patch-dh b/mail/thunderbird/patches/patch-dh
deleted file mode 100644
index 2b48aec5cd2..00000000000
--- a/mail/thunderbird/patches/patch-dh
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-dh,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
-diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h ./xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2004-04-18 23:18:18.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2005-12-04 19:44:41.000000000 +0900
-@@ -77,6 +77,13 @@
- #define THUNK_BASED_THIS_ADJUST
- #endif
-
-+#elif defined(__DragonFly__)
-+# if defined(__FreeBSD_cc_version)
-+# define CFRONT_STYLE_THIS_ADJUST
-+# else
-+# define THUNK_BASED_THIS_ADJUST
-+# endif
-+
- #elif defined(__FreeBSD__)
- /* System versions of gcc on FreeBSD don't use thunks. On 3.x, the system
- * compiler is gcc 2.7.2.3, which doesn't use thunks by default. On 4.x and
diff --git a/mail/thunderbird/patches/patch-dj b/mail/thunderbird/patches/patch-dj
deleted file mode 100644
index af9a8a8a2ad..00000000000
--- a/mail/thunderbird/patches/patch-dj
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-dj,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
-diff -ruN ../Orig/mozilla/dbm/src/mktemp.c ./dbm/src/mktemp.c
---- ../Orig/mozilla/dbm/src/mktemp.c 2003-01-21 08:13:37.000000000 +0900
-+++ ./dbm/src/mktemp.c 2005-12-04 19:44:43.000000000 +0900
-@@ -98,7 +98,7 @@
- static int
- _gettemp(char *path, register int *doopen, int extraFlags)
- {
--#if !defined(_WINDOWS) || defined(_WIN32)
-+#if (!defined(_WINDOWS) || defined(_WIN32)) && !defined(errno)
- extern int errno;
- #endif
- register char *start, *trv;
diff --git a/mail/thunderbird/patches/patch-dk b/mail/thunderbird/patches/patch-dk
deleted file mode 100644
index bed031c0e1a..00000000000
--- a/mail/thunderbird/patches/patch-dk
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-dk,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
-diff -ruN ../Orig/mozilla/security/coreconf/config.mk ./security/coreconf/config.mk
---- ../Orig/mozilla/security/coreconf/config.mk 2004-04-26 00:02:17.000000000 +0900
-+++ ./security/coreconf/config.mk 2005-12-04 19:44:47.000000000 +0900
-@@ -63,7 +63,7 @@
- #######################################################################
-
- TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
-- OpenVMS AIX
-+ OpenVMS AIX DragonFly
-
- ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
- include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
diff --git a/mail/thunderbird/patches/patch-dl b/mail/thunderbird/patches/patch-dl
deleted file mode 100644
index 38f85082cf7..00000000000
--- a/mail/thunderbird/patches/patch-dl
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-dl,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
-diff -ruN ../Orig/mozilla/security/coreconf/DragonFly.mk ./security/coreconf/DragonFly.mk
---- ../Orig/mozilla/security/coreconf/DragonFly.mk 1970-01-01 09:00:00.000000000 +0900
-+++ ./security/coreconf/DragonFly.mk 2005-12-04 19:44:48.000000000 +0900
-@@ -0,0 +1,83 @@
-+#
-+# The contents of this file are subject to the Mozilla Public
-+# License Version 1.1 (the "License"); you may not use this file
-+# except in compliance with the License. You may obtain a copy of
-+# the License at http://www.mozilla.org/MPL/
-+#
-+# Software distributed under the License is distributed on an "AS
-+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+# implied. See the License for the specific language governing
-+# rights and limitations under the License.
-+#
-+# The Original Code is the Netscape security libraries.
-+#
-+# The Initial Developer of the Original Code is Netscape
-+# Communications Corporation. Portions created by Netscape are
-+# Copyright (C) 1994-2000 Netscape Communications Corporation. All
-+# Rights Reserved.
-+#
-+# Contributor(s):
-+#
-+# Alternatively, the contents of this file may be used under the
-+# terms of the GNU General Public License Version 2 or later (the
-+# "GPL"), in which case the provisions of the GPL are applicable
-+# instead of those above. If you wish to allow use of your
-+# version of this file only under the terms of the GPL and not to
-+# allow others to use your version of this file under the MPL,
-+# indicate your decision by deleting the provisions above and
-+# replace them with the notice and other provisions required by
-+# the GPL. If you do not delete the provisions above, a recipient
-+# may use your version of this file under either the MPL or the
-+# GPL.
-+#
-+# Config stuff for DragonFly
-+#
-+
-+include $(CORE_DEPTH)/coreconf/UNIX.mk
-+
-+DEFAULT_COMPILER = gcc
-+CC = gcc
-+CCC = g++
-+RANLIB = ranlib
-+
-+ifeq ($(OS_TEST),alpha)
-+CPU_ARCH = alpha
-+else
-+CPU_ARCH = x86
-+endif
-+
-+OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+
-+DSO_CFLAGS = -fPIC
-+DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
-+
-+#
-+# The default implementation strategy for FreeBSD is pthreads.
-+#
-+ifndef CLASSIC_NSPR
-+USE_PTHREADS = 1
-+DEFINES += -D_THREAD_SAFE -D_REENTRANT
-+OS_LIBS += -pthread
-+DSO_LDOPTS += -pthread
-+endif
-+
-+ARCH = freebsd
-+
-+MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+
-+DLL_SUFFIX = so
-+
-+ifdef LIBRUNPATH
-+DSO_LDOPTS += -Wl,-R$(LIBRUNPATH)
-+endif
-+
-+MKSHLIB = $(CC) $(DSO_LDOPTS)
-+ifdef MAPFILE
-+# Add LD options to restrict exported symbols to those in the map file
-+endif
-+# Change PROCESS to put the mapfile in the correct format for this platform
-+PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-+
-+G++INCLUDES = -I/usr/include/g++
-+
-+INCLUDES += -I/usr/X11R6/include
diff --git a/mail/thunderbird/patches/patch-dm b/mail/thunderbird/patches/patch-dm
deleted file mode 100644
index 1bf57a9fcf4..00000000000
--- a/mail/thunderbird/patches/patch-dm
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-dm,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
-diff -ruN ../Orig/mozilla/security/nss/cmd/platlibs.mk ./security/nss/cmd/platlibs.mk
---- ../Orig/mozilla/security/nss/cmd/platlibs.mk 2005-04-07 06:35:41.000000000 +0900
-+++ ./security/nss/cmd/platlibs.mk 2005-12-04 19:44:52.000000000 +0900
-@@ -186,8 +186,8 @@
- # If GNU ld is used, we must use the -rpath-link option to tell
- # the linker where to find libsoftokn3.so, an implicit dependency
- # of libnss3.so.
--ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_ARCH)))
--EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib
-+ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD DragonFly, $(OS_ARCH)))
-+EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib -R/usr/pkg/lib/firefox
- endif
-
- ifeq ($(OS_ARCH), SunOS)
diff --git a/mail/thunderbird/patches/patch-do b/mail/thunderbird/patches/patch-do
deleted file mode 100644
index 7f65bf3ba70..00000000000
--- a/mail/thunderbird/patches/patch-do
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD: patch-do,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
-diff -ruN ../Orig/mozilla/directory/c-sdk/config/DragonFly.mk ./directory/c-sdk/config/DragonFly.mk
---- ../Orig/mozilla/directory/c-sdk/config/DragonFly.mk 1970-01-01 09:00:00.000000000 +0900
-+++ ./directory/c-sdk/config/DragonFly.mk 2005-12-04 19:44:55.000000000 +0900
-@@ -0,0 +1,82 @@
-+#
-+# The contents of this file are subject to the Mozilla Public
-+# License Version 1.1 (the "License"); you may not use this file
-+# except in compliance with the License. You may obtain a copy of
-+# the License at http://www.mozilla.org/MPL/
-+#
-+# Software distributed under the License is distributed on an "AS
-+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+# implied. See the License for the specific language governing
-+# rights and limitations under the License.
-+#
-+# The Original Code is the Netscape Portable Runtime (NSPR).
-+#
-+# The Initial Developer of the Original Code is Netscape
-+# Communications Corporation. Portions created by Netscape are
-+# Copyright (C) 1998-2000 Netscape Communications Corporation. All
-+# Rights Reserved.
-+#
-+# Contributor(s):
-+#
-+# Alternatively, the contents of this file may be used under the
-+# terms of the GNU General Public License Version 2 or later (the
-+# "GPL"), in which case the provisions of the GPL are applicable
-+# instead of those above. If you wish to allow use of your
-+# version of this file only under the terms of the GPL and not to
-+# allow others to use your version of this file under the MPL,
-+# indicate your decision by deleting the provisions above and
-+# replace them with the notice and other provisions required by
-+# the GPL. If you do not delete the provisions above, a recipient
-+# may use your version of this file under either the MPL or the
-+# GPL.
-+#
-+
-+#
-+# Config stuff for DragonFly
-+#
-+
-+include $(MOD_DEPTH)/config/UNIX.mk
-+
-+CC = gcc
-+CCC = g++
-+RANLIB = ranlib
-+
-+OS_REL_CFLAGS = -Di386
-+CPU_ARCH = x86
-+CPU_ARCH_TAG = _$(CPU_ARCH)
-+
-+OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+
-+#
-+# The default implementation strategy for FreeBSD is pthreads.
-+#
-+ifeq ($(CLASSIC_NSPR),1)
-+IMPL_STRATEGY = _EMU
-+DEFINES += -D_PR_LOCAL_THREADS_ONLY
-+else
-+USE_PTHREADS = 1
-+IMPL_STRATEGY = _PTH
-+DEFINES += -D_THREAD_SAFE
-+THREAD_FLAG += -pthread
-+endif
-+
-+ARCH = freebsd
-+
-+MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+
-+ifeq ($(MOZ_OBJFORMAT),elf)
-+DLL_SUFFIX = so
-+else
-+DLL_SUFFIX = so.1.0
-+endif
-+
-+DSO_CFLAGS = -fPIC
-+DSO_LDOPTS = -Bshareable
-+
-+ifdef LIBRUNPATH
-+DSO_LDOPTS += -Wl,-R$(LIBRUNPATH)
-+endif
-+
-+MKSHLIB = $(LD) $(DSO_LDOPTS)
-+
-+G++INCLUDES = -I/usr/include/g++
diff --git a/mail/thunderbird/patches/patch-ds b/mail/thunderbird/patches/patch-ds
deleted file mode 100644
index 2aeae0ac402..00000000000
--- a/mail/thunderbird/patches/patch-ds
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ds,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
-diff -ruN ../Orig/mozilla/security/coreconf/arch.mk ./security/coreconf/arch.mk
---- ../Orig/mozilla/security/coreconf/arch.mk 2005-10-11 08:30:12.000000000 +0900
-+++ ./security/coreconf/arch.mk 2005-12-04 19:45:28.000000000 +0900
-@@ -145,7 +145,7 @@
- # IRIX 6.5-ALPHA-1289139620.
- #
-
--ifeq (,$(filter-out Linux FreeBSD IRIX,$(OS_ARCH)))
-+ifeq (,$(filter-out Linux DragonFly FreeBSD IRIX,$(OS_ARCH)))
- OS_RELEASE := $(shell echo $(OS_RELEASE) | sed 's/-.*//')
- endif
-
diff --git a/mail/thunderbird/patches/patch-dt b/mail/thunderbird/patches/patch-dt
deleted file mode 100644
index 53d9a24a1c8..00000000000
--- a/mail/thunderbird/patches/patch-dt
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-dt,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
-diff -ruN ../Orig/mozilla/directory/c-sdk/config/arch.mk ./directory/c-sdk/config/arch.mk
---- ../Orig/mozilla/directory/c-sdk/config/arch.mk 2002-03-27 06:51:57.000000000 +0900
-+++ ./directory/c-sdk/config/arch.mk 2005-12-04 19:45:29.000000000 +0900
-@@ -138,7 +138,7 @@
- # Handle FreeBSD 2.2-STABLE and Linux 2.0.30-osfmach3
- #
-
--ifeq (,$(filter-out Linux FreeBSD,$(OS_ARCH)))
-+ifeq (,$(filter-out Linux DragonFly FreeBSD,$(OS_ARCH)))
- OS_RELEASE := $(shell echo "$(OS_RELEASE)" | sed 's/-.*//')
- endif
-
diff --git a/mail/thunderbird/patches/patch-dw b/mail/thunderbird/patches/patch-dw
deleted file mode 100644
index 2db0ca1ead2..00000000000
--- a/mail/thunderbird/patches/patch-dw
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dw,v 1.1 2007/03/07 22:02:26 joerg Exp $
-
---- security/nss/lib/freebl/Makefile.orig 2007-03-07 20:19:17.000000000 +0000
-+++ security/nss/lib/freebl/Makefile
-@@ -192,7 +192,7 @@ endif
- # to bind the blapi function references in FREEBLVector vector
- # (ldvector.c) to the blapi functions defined in the freebl
- # shared libraries.
--ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_TARGET)))
-+ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD DragonFly, $(OS_TARGET)))
- MKSHLIB += -Wl,-Bsymbolic
- endif
-
diff --git a/mail/tmda/DESCR b/mail/tmda/DESCR
deleted file mode 100644
index 2e0f23cacba..00000000000
--- a/mail/tmda/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Tagged Message Delivery Agent (TMDA).
-
-TMDA is an OSI certified software application designed to
-significantly reduce the amount of SPAM/UCE (junk-mail) you receive.
-TMDA combines a "whitelist" (for known/trusted senders), a "blacklist"
-(for undesired senders), and a cryptographically enhanced confirmation
-system (for unknown, but legitimate senders).
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
deleted file mode 100644
index 72c8e54c4d7..00000000000
--- a/mail/tmda/Makefile
+++ /dev/null
@@ -1,94 +0,0 @@
-# $NetBSD: Makefile,v 1.38 2007/02/27 00:18:46 schmonz Exp $
-#
-
-DISTNAME= tmda-1.1.11
-PKGREVISION= 1
-CATEGORIES= mail python
-MASTER_SITES= http://tmda.sourceforge.net/ftp/releases/
-MASTER_SITES+= ftp://tmda.net/pub/tmda/releases/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://tmda.net/
-COMMENT= Python-based SPAM reduction system
-
-PY_PATCHPLIST= yes
-PYTHON_PATCH_SCRIPTS= ${TMDA_PROGRAMS}
-
-PKG_SYSCONFSUBDIR= ${PKGBASE}
-
-PYTHON_VERSIONS_ACCEPTED= 24 23
-
-PKG_GROUPS= tofmipd
-PKG_USERS= tofmipd:tofmipd
-PKG_GECOS.tofmipd= TMDA ofmipd User
-
-RCD_SCRIPTS= tofmipd
-FILES_SUBST+= PYTHONBIN=${PYTHONBIN:Q}
-
-SHAREDIR= share/${PKGBASE}
-DOCDIR= share/doc/${PKGBASE}
-EGDIR= share/examples/${PKGBASE}
-HTMLDIR= share/doc/html/${PKGBASE}
-PLIST_SUBST+= SHAREDIR=${SHAREDIR:Q}
-PLIST_SUBST+= DOCDIR=${DOCDIR:Q}
-PLIST_SUBST+= EGDIR=${EGDIR:Q}
-PLIST_SUBST+= HTMLDIR=${HTMLDIR:Q}
-
-TMDA_PROGRAMS= bin/tmda-*
-TMDA_DOCS= CODENAMES COPYING CRYPTO ChangeLog INSTALL
-TMDA_DOCS+= NEWS README THANKS UPGRADE
-TMDA_CONTRIB= contrib/*
-
-SUBST_CLASSES+= etc
-SUBST_STAGE.etc= do-configure
-SUBST_FILES.etc= bin/tmda-ofmipd TMDA/Auth.py TMDA/Defaults.py
-SUBST_SED.etc= -e 's|/etc|${PKG_SYSCONFDIR}|g'
-
-INSTALLATION_DIRS= bin ${SHAREDIR} ${DOCDIR} ${HTMLDIR}
-INSTALLATION_DIRS+= ${PYSITELIB}/TMDA/pythonlib/email/mime ${EGDIR}
-
-post-extract:
- rm ${WRKSRC}/doc/html/error.log
-
-do-build:
- cd ${WRKSRC} && ${PYTHONBIN} ./compileall
-
-pre-install:
- find ${WRKSRC} -name "*.orig" -print | xargs rm -f
-
-do-install:
- for f in ${TMDA_PROGRAMS}; do \
- ${INSTALL_SCRIPT} ${WRKSRC}/$${f} ${PREFIX}/bin; \
- done
-
- ${INSTALL_SCRIPT} ${WRKSRC}/TMDA/*.py* ${PREFIX}/${PYSITELIB}/TMDA
-
- ${INSTALL_SCRIPT} ${WRKSRC}/TMDA/pythonlib/email/*.py* \
- ${PREFIX}/${PYSITELIB}/TMDA/pythonlib/email
- ${INSTALL_SCRIPT} ${WRKSRC}/TMDA/pythonlib/email/mime/*.py* \
- ${PREFIX}/${PYSITELIB}/TMDA/pythonlib/email/mime
-
- ${INSTALL_DATA} ${WRKSRC}/templates/*.txt ${PREFIX}/${SHAREDIR}
-
- for f in ${TMDA_DOCS}; do \
- ${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/${DOCDIR}; \
- done
-
- for f in ${TMDA_CONTRIB}; do \
- if [ -f $${f} ]; then \
- ${INSTALL_DATA} ${WRKSRC}/$${f} \
- ${PREFIX}/${EGDIR}; \
- else \
- cp -Rp ${WRKSRC}/$${f} ${PREFIX}/${EGDIR}; \
- fi; \
- done
-
- cp -Rp ${WRKSRC}/doc/html/* ${PREFIX}/${HTMLDIR}
-
-post-install:
- ${PREFIX}/bin/tmda-ofmipd -V >/dev/null 2>&1
-
-.include "../../lang/python/extension.mk"
-.include "../../lang/python/application.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/tmda/PLIST b/mail/tmda/PLIST
deleted file mode 100644
index 56d268b9576..00000000000
--- a/mail/tmda/PLIST
+++ /dev/null
@@ -1,391 +0,0 @@
-@comment $NetBSD: PLIST,v 1.13 2007/02/26 03:44:21 schmonz Exp $
-bin/tmda-address
-bin/tmda-check-address
-bin/tmda-filter
-bin/tmda-inject
-bin/tmda-keygen
-bin/tmda-ofmipd
-bin/tmda-pending
-bin/tmda-rfilter
-bin/tmda-sendmail
-${PYSITELIB}/TMDA/Address.py
-${PYSITELIB}/TMDA/Address.pyc
-${PYSITELIB}/TMDA/Auth.py
-${PYSITELIB}/TMDA/Auth.pyc
-${PYSITELIB}/TMDA/AutoResponse.py
-${PYSITELIB}/TMDA/AutoResponse.pyc
-${PYSITELIB}/TMDA/Cookie.py
-${PYSITELIB}/TMDA/Cookie.pyc
-${PYSITELIB}/TMDA/Defaults.py
-${PYSITELIB}/TMDA/Defaults.pyc
-${PYSITELIB}/TMDA/Deliver.py
-${PYSITELIB}/TMDA/Deliver.pyc
-${PYSITELIB}/TMDA/Errors.py
-${PYSITELIB}/TMDA/Errors.pyc
-${PYSITELIB}/TMDA/FilterParser.py
-${PYSITELIB}/TMDA/FilterParser.pyc
-${PYSITELIB}/TMDA/HMAC.py
-${PYSITELIB}/TMDA/HMAC.pyc
-${PYSITELIB}/TMDA/MTA.py
-${PYSITELIB}/TMDA/MTA.pyc
-${PYSITELIB}/TMDA/MessageLogger.py
-${PYSITELIB}/TMDA/MessageLogger.pyc
-${PYSITELIB}/TMDA/Pending.py
-${PYSITELIB}/TMDA/Pending.pyc
-${PYSITELIB}/TMDA/SMTP.py
-${PYSITELIB}/TMDA/SMTP.pyc
-${PYSITELIB}/TMDA/Util.py
-${PYSITELIB}/TMDA/Util.pyc
-${PYSITELIB}/TMDA/Version.py
-${PYSITELIB}/TMDA/Version.pyc
-${PYSITELIB}/TMDA/__init__.py
-${PYSITELIB}/TMDA/__init__.pyc
-${PYSITELIB}/TMDA/pythonlib/email/__init__.py
-${PYSITELIB}/TMDA/pythonlib/email/__init__.pyc
-${PYSITELIB}/TMDA/pythonlib/email/_parseaddr.py
-${PYSITELIB}/TMDA/pythonlib/email/_parseaddr.pyc
-${PYSITELIB}/TMDA/pythonlib/email/base64mime.py
-${PYSITELIB}/TMDA/pythonlib/email/base64mime.pyc
-${PYSITELIB}/TMDA/pythonlib/email/charset.py
-${PYSITELIB}/TMDA/pythonlib/email/charset.pyc
-${PYSITELIB}/TMDA/pythonlib/email/encoders.py
-${PYSITELIB}/TMDA/pythonlib/email/encoders.pyc
-${PYSITELIB}/TMDA/pythonlib/email/errors.py
-${PYSITELIB}/TMDA/pythonlib/email/errors.pyc
-${PYSITELIB}/TMDA/pythonlib/email/feedparser.py
-${PYSITELIB}/TMDA/pythonlib/email/feedparser.pyc
-${PYSITELIB}/TMDA/pythonlib/email/generator.py
-${PYSITELIB}/TMDA/pythonlib/email/generator.pyc
-${PYSITELIB}/TMDA/pythonlib/email/header.py
-${PYSITELIB}/TMDA/pythonlib/email/header.pyc
-${PYSITELIB}/TMDA/pythonlib/email/iterators.py
-${PYSITELIB}/TMDA/pythonlib/email/iterators.pyc
-${PYSITELIB}/TMDA/pythonlib/email/message.py
-${PYSITELIB}/TMDA/pythonlib/email/message.pyc
-${PYSITELIB}/TMDA/pythonlib/email/mime/__init__.py
-${PYSITELIB}/TMDA/pythonlib/email/mime/__init__.pyc
-${PYSITELIB}/TMDA/pythonlib/email/mime/application.py
-${PYSITELIB}/TMDA/pythonlib/email/mime/application.pyc
-${PYSITELIB}/TMDA/pythonlib/email/mime/audio.py
-${PYSITELIB}/TMDA/pythonlib/email/mime/audio.pyc
-${PYSITELIB}/TMDA/pythonlib/email/mime/base.py
-${PYSITELIB}/TMDA/pythonlib/email/mime/base.pyc
-${PYSITELIB}/TMDA/pythonlib/email/mime/image.py
-${PYSITELIB}/TMDA/pythonlib/email/mime/image.pyc
-${PYSITELIB}/TMDA/pythonlib/email/mime/message.py
-${PYSITELIB}/TMDA/pythonlib/email/mime/message.pyc
-${PYSITELIB}/TMDA/pythonlib/email/mime/multipart.py
-${PYSITELIB}/TMDA/pythonlib/email/mime/multipart.pyc
-${PYSITELIB}/TMDA/pythonlib/email/mime/nonmultipart.py
-${PYSITELIB}/TMDA/pythonlib/email/mime/nonmultipart.pyc
-${PYSITELIB}/TMDA/pythonlib/email/mime/text.py
-${PYSITELIB}/TMDA/pythonlib/email/mime/text.pyc
-${PYSITELIB}/TMDA/pythonlib/email/parser.py
-${PYSITELIB}/TMDA/pythonlib/email/parser.pyc
-${PYSITELIB}/TMDA/pythonlib/email/quoprimime.py
-${PYSITELIB}/TMDA/pythonlib/email/quoprimime.pyc
-${PYSITELIB}/TMDA/pythonlib/email/utils.py
-${PYSITELIB}/TMDA/pythonlib/email/utils.pyc
-${HTMLDIR}/AbandonedPages.html
-${HTMLDIR}/AboutTmda.html
-${HTMLDIR}/AutoAdminGroup.html
-${HTMLDIR}/BadContent.html
-${HTMLDIR}/CategoryCategory.html
-${HTMLDIR}/CategoryHomepage.html
-${HTMLDIR}/CategoryTemplate.html
-${HTMLDIR}/ChallengeResponse.html
-${HTMLDIR}/ClientConfiguration.html
-${HTMLDIR}/ConfigurationOverview.html
-${HTMLDIR}/ConfigurationVariables.html
-${HTMLDIR}/DesktopEdition(2f)HowToConfigure.html
-${HTMLDIR}/DesktopEdition.html
-${HTMLDIR}/DrewRaines.html
-${HTMLDIR}/EditedSystemPages.html
-${HTMLDIR}/EventStats(2f)HitCounts.html
-${HTMLDIR}/EventStats(2f)UserAgents.html
-${HTMLDIR}/EventStats.html
-${HTMLDIR}/FilterSources.html
-${HTMLDIR}/FilterSpecification.html
-${HTMLDIR}/FindPage.html
-${HTMLDIR}/FortuneCookies.html
-${HTMLDIR}/FrontPage.html
-${HTMLDIR}/HeadHoncho.html
-${HTMLDIR}/HelpContents.html
-${HTMLDIR}/HelpForBeginners.html
-${HTMLDIR}/HelpForDevelopers.html
-${HTMLDIR}/HelpIndex.html
-${HTMLDIR}/HelpMiscellaneous(2f)ExperimentalFeatures.html
-${HTMLDIR}/HelpMiscellaneous(2f)FrequentlyAskedQuestions.html
-${HTMLDIR}/HelpMiscellaneous.html
-${HTMLDIR}/HelpOnAccessControlLists.html
-${HTMLDIR}/HelpOnActions(2f)AttachFile.html
-${HTMLDIR}/HelpOnActions.html
-${HTMLDIR}/HelpOnAdministration.html
-${HTMLDIR}/HelpOnAuthentication.html
-${HTMLDIR}/HelpOnAutoAdmin.html
-${HTMLDIR}/HelpOnCategories.html
-${HTMLDIR}/HelpOnConfiguration(2f)ApacheVoodoo.html
-${HTMLDIR}/HelpOnConfiguration(2f)CascadingStyleSheets.html
-${HTMLDIR}/HelpOnConfiguration(2f)EmailSupport.html
-${HTMLDIR}/HelpOnConfiguration(2f)FileAttachments.html
-${HTMLDIR}/HelpOnConfiguration(2f)IntegratingWithApache.html
-${HTMLDIR}/HelpOnConfiguration(2f)SecurityPolicy.html
-${HTMLDIR}/HelpOnConfiguration(2f)SurgeProtection.html
-${HTMLDIR}/HelpOnConfiguration(2f)UserPreferences.html
-${HTMLDIR}/HelpOnConfiguration.html
-${HTMLDIR}/HelpOnEditLocks.html
-${HTMLDIR}/HelpOnEditing(2f)SubPages.html
-${HTMLDIR}/HelpOnEditing.html
-${HTMLDIR}/HelpOnFormatting.html
-${HTMLDIR}/HelpOnGraphicalEditor.html
-${HTMLDIR}/HelpOnHeadlines.html
-${HTMLDIR}/HelpOnInstalling(2f)AolServer.html
-${HTMLDIR}/HelpOnInstalling(2f)ApacheOnLinux.html
-${HTMLDIR}/HelpOnInstalling(2f)ApacheOnLinuxFtp.html
-${HTMLDIR}/HelpOnInstalling(2f)ApacheOnMacOsx.html
-${HTMLDIR}/HelpOnInstalling(2f)ApacheOnWin32.html
-${HTMLDIR}/HelpOnInstalling(2f)ApacheWithModPython.html
-${HTMLDIR}/HelpOnInstalling(2f)BasicInstallation.html
-${HTMLDIR}/HelpOnInstalling(2f)FastCgi.html
-${HTMLDIR}/HelpOnInstalling(2f)InternetInformationServer.html
-${HTMLDIR}/HelpOnInstalling(2f)MinimalWiki.html
-${HTMLDIR}/HelpOnInstalling(2f)StandaloneServer.html
-${HTMLDIR}/HelpOnInstalling(2f)TroubleShooting.html
-${HTMLDIR}/HelpOnInstalling(2f)TwistedWeb.html
-${HTMLDIR}/HelpOnInstalling(2f)WebLogic.html
-${HTMLDIR}/HelpOnInstalling(2f)WikiInstanceCreation.html
-${HTMLDIR}/HelpOnInstalling.html
-${HTMLDIR}/HelpOnLanguages.html
-${HTMLDIR}/HelpOnLinking.html
-${HTMLDIR}/HelpOnLists.html
-${HTMLDIR}/HelpOnMacros(2f)ImageLink.html
-${HTMLDIR}/HelpOnMacros(2f)Include.html
-${HTMLDIR}/HelpOnMacros(2f)MailTo.html
-${HTMLDIR}/HelpOnMacros.html
-${HTMLDIR}/HelpOnNavigation.html
-${HTMLDIR}/HelpOnPackageInstaller.html
-${HTMLDIR}/HelpOnPageCreation.html
-${HTMLDIR}/HelpOnPageDeletion.html
-${HTMLDIR}/HelpOnParsers(2f)ReStructuredText(2f)RstPrimer.html
-${HTMLDIR}/HelpOnParsers(2f)ReStructuredText.html
-${HTMLDIR}/HelpOnParsers.html
-${HTMLDIR}/HelpOnProcessingInstructions.html
-${HTMLDIR}/HelpOnProcessors.html
-${HTMLDIR}/HelpOnRules.html
-${HTMLDIR}/HelpOnSearching.html
-${HTMLDIR}/HelpOnSkins.html
-${HTMLDIR}/HelpOnSlideShows(2f)000_Introduction.html
-${HTMLDIR}/HelpOnSlideShows(2f)100_Creating_the_slides.html
-${HTMLDIR}/HelpOnSlideShows(2f)900_Last_but_not_least(3a)_Running_your_presentation(2e).html
-${HTMLDIR}/HelpOnSlideShows.html
-${HTMLDIR}/HelpOnSmileys.html
-${HTMLDIR}/HelpOnSpellCheck.html
-${HTMLDIR}/HelpOnSuperUser.html
-${HTMLDIR}/HelpOnTables.html
-${HTMLDIR}/HelpOnTemplates.html
-${HTMLDIR}/HelpOnThemes.html
-${HTMLDIR}/HelpOnUpdating.html
-${HTMLDIR}/HelpOnUpdatingPython.html
-${HTMLDIR}/HelpOnUserHandling.html
-${HTMLDIR}/HelpOnUserPreferences.html
-${HTMLDIR}/HelpOnVariables.html
-${HTMLDIR}/HelpOnXmlPages.html
-${HTMLDIR}/HelpTemplate.html
-${HTMLDIR}/HomepageGroupsTemplate.html
-${HTMLDIR}/HomepagePrivatePageTemplate.html
-${HTMLDIR}/HomepageReadPageTemplate.html
-${HTMLDIR}/HomepageReadWritePageTemplate.html
-${HTMLDIR}/HomepageTemplate.html
-${HTMLDIR}/InterWiki.html
-${HTMLDIR}/JasonMastaler.html
-${HTMLDIR}/LocalBadContent.html
-${HTMLDIR}/LocalSpellingWords.html
-${HTMLDIR}/MailingLists.html
-${HTMLDIR}/MarkHorn.html
-${HTMLDIR}/MissingHomePage.html
-${HTMLDIR}/MissingPage.html
-${HTMLDIR}/MoinMoin(2f)InstallDocs.html
-${HTMLDIR}/MoinMoin(2f)TextFormatting.html
-${HTMLDIR}/MoinMoin.html
-${HTMLDIR}/MoinPagesEditorGroup.html
-${HTMLDIR}/OrphanedPages.html
-${HTMLDIR}/PageHits.html
-${HTMLDIR}/PageSize.html
-${HTMLDIR}/PreConfiguration.html
-${HTMLDIR}/ProjectGroupsTemplate.html
-${HTMLDIR}/ProjectTemplate.html
-${HTMLDIR}/RandomPage.html
-${HTMLDIR}/RecentChanges.html
-${HTMLDIR}/ServerConfiguration.html
-${HTMLDIR}/SiteNavigation.html
-${HTMLDIR}/SlideShowHandOutTemplate.html
-${HTMLDIR}/SlideShowTemplate.html
-${HTMLDIR}/SlideTemplate.html
-${HTMLDIR}/SpamAssassin.html
-${HTMLDIR}/SyntaxReference.html
-${HTMLDIR}/SystemInfo.html
-${HTMLDIR}/SystemPagesGroup.html
-${HTMLDIR}/SystemPagesInEnglishGroup.html
-${HTMLDIR}/TemplateHowto.html
-${HTMLDIR}/TitleIndex.html
-${HTMLDIR}/TmdaBouncedDeletePendingHowto.html
-${HTMLDIR}/TmdaCgi.html
-${HTMLDIR}/TmdaCode.html
-${HTMLDIR}/TmdaCommercialSupport.html
-${HTMLDIR}/TmdaConfiguration.html
-${HTMLDIR}/TmdaDocumentation.html
-${HTMLDIR}/TmdaDonations.html
-${HTMLDIR}/TmdaDownload.html
-${HTMLDIR}/TmdaFaq.html
-${HTMLDIR}/TmdaFeatures.html
-${HTMLDIR}/TmdaFetchMailHowTo.html
-${HTMLDIR}/TmdaFingerprint.html
-${HTMLDIR}/TmdaHashCashHowto.html
-${HTMLDIR}/TmdaHistory.html
-${HTMLDIR}/TmdaHowtos.html
-${HTMLDIR}/TmdaInUse.html
-${HTMLDIR}/TmdaInstall.html
-${HTMLDIR}/TmdaInstallation.html
-${HTMLDIR}/TmdaLogos.html
-${HTMLDIR}/TmdaOfmipdHowto.html
-${HTMLDIR}/TmdaOneDotTwoDesign.html
-${HTMLDIR}/TmdaOneDotTwoTodoList.html
-${HTMLDIR}/TmdaPatchSubmissions.html
-${HTMLDIR}/TmdaPendingAsMaildir.html
-${HTMLDIR}/TmdaPendingAsMaildirHowto.html
-${HTMLDIR}/TmdaPostfixPolicy.html
-${HTMLDIR}/TmdaPressCoverage.html
-${HTMLDIR}/TmdaProviders.html
-${HTMLDIR}/TmdaRequirements.html
-${HTMLDIR}/TmdaServices.html
-${HTMLDIR}/TmdaSupport.html
-${HTMLDIR}/TmdaTestimonials.html
-${HTMLDIR}/TmdaTipsAndTricks.html
-${HTMLDIR}/TmdaUpgrade.html
-${HTMLDIR}/ToddJacobs.html
-${HTMLDIR}/TroubleShooting.html
-${HTMLDIR}/UserPreferences.html
-${HTMLDIR}/VirtualDomainsHowto.html
-${HTMLDIR}/WantedPages.html
-${HTMLDIR}/WhyWikiWorks.html
-${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)000_What_is_a_Wiki(3f).html
-${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)050_First_Steps.html
-${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)060_How_do_I_navigate(3f).html
-${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)090_The_Editor.html
-${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)091_Tips_on_the_Editor.html
-${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)100_Text_markup.html
-${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)110_Headlines_and_Paragraphs.html
-${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)130_Lists.html
-${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)150_Tables.html
-${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)180_Macros.html
-${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)191_Creating_new_Pages.html
-${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)195_Actions.html
-${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)200_Wikiquette.html
-${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)210_Organisation_and_Structure.html
-${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)900_Exercises.html
-${HTMLDIR}/WikiCourse(2f)BasicIntroduction.html
-${HTMLDIR}/WikiCourse(2f)BasicIntroductionHandOut.html
-${HTMLDIR}/WikiCourse.html
-${HTMLDIR}/WikiHomePage.html
-${HTMLDIR}/WikiName.html
-${HTMLDIR}/WikiSandBox.html
-${HTMLDIR}/WikiWikiWeb.html
-${HTMLDIR}/WordIndex.html
-${HTMLDIR}/XsltVersion.html
-${HTMLDIR}/attachments/HelpOnActions(2f)AttachFile/unzip1.png
-${HTMLDIR}/attachments/HelpOnActions(2f)AttachFile/unzip2.png
-${HTMLDIR}/attachments/HelpOnActions(2f)AttachFile/unzip3a.png
-${HTMLDIR}/attachments/HelpOnActions(2f)AttachFile/unzip3b.png
-${HTMLDIR}/attachments/HelpOnActions(2f)AttachFile/unzip5.png
-${HTMLDIR}/attachments/HelpOnActions(2f)AttachFile/unzip6.png
-${HTMLDIR}/attachments/HelpOnActions(2f)AttachFile/unzip6b.png
-${HTMLDIR}/attachments/HelpOnActions(2f)AttachFile/unzip7.png
-${HTMLDIR}/attachments/HelpOnInstalling(2f)ApacheOnLinuxFtp/explore.py
-${HTMLDIR}/attachments/HelpOnInstalling(2f)ApacheOnLinuxFtp/explore.pyc
-${HTMLDIR}/attachments/HelpOnInstalling(2f)BasicInstallation/pythontest.cgi
-${HTMLDIR}/attachments/HelpOnInstalling(2f)WikiInstanceCreation/createinstance.sh
-${HTMLDIR}/attachments/HelpOnTables/MiniPage.png
-${HTMLDIR}/attachments/TmdaFetchMailHowTo/xtmdaheader-1.1.c
-${HTMLDIR}/attachments/TmdaFingerprint/tmda-fingerprint
-${HTMLDIR}/attachments/TmdaPostfixPolicy/tmda-postfix-policy.sh
-${HTMLDIR}/attachments/WikiSandBox/mytest.png
-${HTMLDIR}/bounce_address(2e)py.html
-${HTMLDIR}/deletepending_from_bouncemsg(2e)sh.html
-${HTMLDIR}/delpenbounce.html
-${HTMLDIR}/index.html
-${HTMLDIR}/tmda(2d)fingerprint.html
-${HTMLDIR}/tmda(2d)postfix(2d)policy(2e)sh.html
-${DOCDIR}/CODENAMES
-${DOCDIR}/COPYING
-${DOCDIR}/CRYPTO
-${DOCDIR}/ChangeLog
-${DOCDIR}/INSTALL
-${DOCDIR}/NEWS
-${DOCDIR}/README
-${DOCDIR}/THANKS
-${DOCDIR}/UPGRADE
-${EGDIR}/ChangeLog
-${EGDIR}/collectaddys
-${EGDIR}/def2html
-${EGDIR}/printcdb
-${EGDIR}/printdbm
-${EGDIR}/sendit.sh
-${EGDIR}/smtp-check-sender
-${EGDIR}/tmda.el
-${EGDIR}/tmda.spec
-${EGDIR}/tofmipd.init
-${EGDIR}/tofmipd.sysconfig
-${EGDIR}/update-internaldomains
-${EGDIR}/vadduser-tmda
-${EGDIR}/vmailmgr-vdir.sh
-${EGDIR}/vpopmail-vdir.sh
-${EGDIR}/vtmdarc
-${EGDIR}/wrapfd3.sh
-${EGDIR}/dot-tmda/README
-${EGDIR}/dot-tmda/config
-${EGDIR}/dot-tmda/crypt_key
-${EGDIR}/dot-tmda/filters/incoming
-${EGDIR}/dot-tmda/filters/outgoing
-${EGDIR}/dot-tmda/lists/blacklist
-${EGDIR}/dot-tmda/lists/confirmed
-${EGDIR}/dot-tmda/lists/whitelist
-${EGDIR}/ofmipd-stunnel-daemons/README.txt
-${EGDIR}/ofmipd-stunnel-daemons/stunnel.conf
-${EGDIR}/ofmipd-stunnel-xinetd/README.txt
-${EGDIR}/ofmipd-stunnel-xinetd/stunnel-wrapper
-${EGDIR}/ofmipd-stunnel-xinetd/stunnel.conf
-${EGDIR}/ofmipd-stunnel-xinetd/tmda-ofmipd-wrapper
-${EGDIR}/ofmipd-stunnel-xinetd/xinetd.d-tmda-ofmipd-starttls
-${SHAREDIR}/bounce_expired_dated.txt
-${SHAREDIR}/bounce_fail_dated.txt
-${SHAREDIR}/bounce_fail_keyword.txt
-${SHAREDIR}/bounce_fail_sender.txt
-${SHAREDIR}/bounce_incoming.txt
-${SHAREDIR}/bounce_invalid_confirmation.txt
-${SHAREDIR}/bounce_missing_pending.txt
-${SHAREDIR}/confirm_accept.txt
-${SHAREDIR}/confirm_request.txt
-share/examples/rc.d/tofmipd
-@dirrm ${SHAREDIR}
-@dirrm ${DOCDIR}
-@dirrm ${HTMLDIR}/attachments/HelpOnActions(2f)AttachFile
-@dirrm ${HTMLDIR}/attachments/HelpOnInstalling(2f)ApacheOnLinuxFtp
-@dirrm ${HTMLDIR}/attachments/HelpOnInstalling(2f)BasicInstallation
-@dirrm ${HTMLDIR}/attachments/HelpOnInstalling(2f)WikiInstanceCreation
-@dirrm ${HTMLDIR}/attachments/HelpOnTables
-@dirrm ${HTMLDIR}/attachments/TmdaFetchMailHowTo
-@dirrm ${HTMLDIR}/attachments/TmdaFingerprint
-@dirrm ${HTMLDIR}/attachments/TmdaPostfixPolicy
-@dirrm ${HTMLDIR}/attachments/WikiSandBox
-@dirrm ${HTMLDIR}/attachments
-@dirrm ${HTMLDIR}
-@dirrm ${EGDIR}/ofmipd-stunnel-xinetd
-@dirrm ${EGDIR}/ofmipd-stunnel-daemons
-@dirrm ${EGDIR}/dot-tmda/lists
-@dirrm ${EGDIR}/dot-tmda/filters
-@dirrm ${EGDIR}/dot-tmda
-@dirrm ${EGDIR}
-@dirrm ${PYSITELIB}/TMDA/pythonlib/email/mime
-@dirrm ${PYSITELIB}/TMDA/pythonlib/email
-@dirrm ${PYSITELIB}/TMDA/pythonlib
-@dirrm ${PYSITELIB}/TMDA
diff --git a/mail/tmda/distinfo b/mail/tmda/distinfo
deleted file mode 100644
index a21365f61b7..00000000000
--- a/mail/tmda/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.20 2007/02/26 03:44:21 schmonz Exp $
-
-SHA1 (tmda-1.1.11.tgz) = 790ab6f4258451cb5f18a39883015b896a48a9c1
-RMD160 (tmda-1.1.11.tgz) = cc8160a3b60e927611e2363d530d9e539f92dbc0
-Size (tmda-1.1.11.tgz) = 1422504 bytes
-SHA1 (patch-ab) = 4cac0a76d160eebedc06e1789728be5872113fee
diff --git a/mail/tmda/files/tofmipd.sh b/mail/tmda/files/tofmipd.sh
deleted file mode 100755
index e3466a39bac..00000000000
--- a/mail/tmda/files/tofmipd.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: tofmipd.sh,v 1.3 2007/02/27 00:18:46 schmonz Exp $
-#
-
-# PROVIDE: mail
-# REQUIRE: LOGIN
-
-name="tofmipd"
-
-# User-settable rc.conf variables and their default values:
-: ${tofmipd_tcphost:="localhost"}
-: ${tofmipd_tcpport:="8025"}
-: ${tofmipd_log:="YES"}
-: ${tofmipd_logcmd:="logger -t nb${name} -p mail.info"}
-: ${tofmipd_nologcmd:="@CAT@ >/dev/null"}
-
-. /etc/rc.subr
-
-rcvar=${name}
-command="@PREFIX@/bin/tmda-ofmipd"
-command_interpreter="@PYTHONBIN@"
-start_precmd="tofmipd_precmd"
-
-tofmipd_precmd()
-{
- checkyesno tofmipd_log || tofmipd_logcmd=${tofmipd_nologcmd}
- command="@SETENV@ - ${command} ${tofmipd_flags} -p ${tofmipd_tcphost}:${tofmipd_tcpport} -f -L 2>&1 | @SU@ -m tofmipd -c '${tofmipd_logcmd}'"
- command_args="&"
- rc_flags=""
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/tmda/patches/patch-ab b/mail/tmda/patches/patch-ab
deleted file mode 100644
index ed85c23fec2..00000000000
--- a/mail/tmda/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/02/26 03:44:21 schmonz Exp $
-
---- TMDA/Util.py.orig 2007-02-23 15:20:10.000000000 -0500
-+++ TMDA/Util.py
-@@ -584,7 +584,13 @@ def sendmail(msgstr, envrecip, envsender
- Defaults.MAIL_TRANSFER_AGENT in ('postfix', 'qmail') and \
- Defaults.MAIL_TRANSPORT == 'sendmail':
- envsender = ''
-- if Defaults.MAIL_TRANSPORT == 'sendmail':
-+ if Defaults.MAIL_TRANSPORT == 'sendmail' and \
-+ Defaults.MAIL_TRANSFER_AGENT == 'qmail':
-+ # skip "-i" for qmail-inject (invalid option, and it's the default)
-+ cmd = (Defaults.SENDMAIL_PROGRAM,
-+ '-f', envsender, '--', envrecip)
-+ pipecmd(cmd, msgstr)
-+ elif Defaults.MAIL_TRANSPORT == 'sendmail':
- # You can avoid the shell by passing a tuple of arguments as
- # the command instead of a string. This will cause the
- # popen2.Popen3() code to execvp() "/usr/bin/sendmail" with
diff --git a/mail/tnef/DESCR b/mail/tnef/DESCR
deleted file mode 100644
index eecae02215d..00000000000
--- a/mail/tnef/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-TNEF is a program for unpacking MIME attachments of type
-"application/ms-tnef". This is a Microsoft only attachment. Due to the
-proliferation of Microsoft Outlook and Exchange mail servers, more and
-more mail is encapsulated into this format. The TNEF program allows
-one to unpack the attachments which were encapsulated into the TNEF
-attachment, thus alleviating the need to use Microsoft Outlook to view
-the attachment.
diff --git a/mail/tnef/Makefile b/mail/tnef/Makefile
deleted file mode 100644
index 40990223c3c..00000000000
--- a/mail/tnef/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2006/11/18 21:08:17 wiz Exp $
-#
-
-DISTNAME= tnef-1.4.3
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tnef/}
-
-MAINTAINER= heinz@NetBSD.org
-HOMEPAGE= http://tnef.sourceforge.net/
-COMMENT= Decode MS-TNEF MIME attachments
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-GNU_CONFIGURE= YES
-TEST_TARGET= check
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.tnef
-PKG_SUPPORTED_OPTIONS= debug
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+= --enable-debug
-.endif
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/tnef/PLIST b/mail/tnef/PLIST
deleted file mode 100644
index 21acfa66e2b..00000000000
--- a/mail/tnef/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:01:38 zuntum Exp $
-bin/tnef
-man/man1/tnef.1
diff --git a/mail/tnef/distinfo b/mail/tnef/distinfo
deleted file mode 100644
index c31a60ce2a9..00000000000
--- a/mail/tnef/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.14 2006/11/18 21:08:17 wiz Exp $
-
-SHA1 (tnef-1.4.3.tar.gz) = 699be103018ee985b1a1edc865c7047816571577
-RMD160 (tnef-1.4.3.tar.gz) = a94ab3ff029eeb2ff20f2cce8a64043cf10f3e97
-Size (tnef-1.4.3.tar.gz) = 3920517 bytes
diff --git a/mail/tnef2txt/DESCR b/mail/tnef2txt/DESCR
deleted file mode 100644
index 958d27ec22e..00000000000
--- a/mail/tnef2txt/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
-Several Microsoft Windows email applications support the Transport Neutral
-Encapsulation Format (TNEF). This is a method for MAPI compliant mail programs
-to transfer data to each other across gateways. Generally, a mail agent will
-create a MIME multipart message containing the text body of the mail message,
-and a single attachment of type application/ms-tnef. This attachment at least
-follows the format of MIME messages, if not the intent. Usually, this bitstream
-contains no more information than is already contained in the headers and body
-of the message, but instead of attaching attachments to the email message as
-separate MIME attachments, they are included in the TNEF attachment. To handle
-this, I wrote a program tnef2txt which will dump the information in the TNEF
-bitstream, and also dump files to disk which are contained in the bitstream.
-Just run the program without arguments for usage information. You can call this
-program from a mailcap file with the following line:
-
-application/ms-tnef; tnef2txt %s; copiousoutput
-
-or, if you wish to save attachments to disk which are in the bitstream:
-
-application/ms-tnef; tnef2txt -s %s; copiousoutput
diff --git a/mail/tnef2txt/Makefile b/mail/tnef2txt/Makefile
deleted file mode 100644
index 0f37ad26269..00000000000
--- a/mail/tnef2txt/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:30:02 jlam Exp $
-#
-
-DISTNAME= tnef2txt-1.4
-CATEGORIES= mail
-MASTER_SITES= http://www.fiction.net/blong/programs/tnef2txt/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.fiction.net/blong/programs/
-COMMENT= Portable application/ms-tnef parser
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-BUILD_TARGET= tnef2txt
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/tnef2txt ${PREFIX}/bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/tnef2txt/PLIST b/mail/tnef2txt/PLIST
deleted file mode 100644
index 7501a07da05..00000000000
--- a/mail/tnef2txt/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/02/14 13:16:36 drochner Exp $
-bin/tnef2txt
diff --git a/mail/tnef2txt/distinfo b/mail/tnef2txt/distinfo
deleted file mode 100644
index 6889be2e8a7..00000000000
--- a/mail/tnef2txt/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:30 agc Exp $
-
-SHA1 (tnef2txt-1.4.tar.gz) = 012c86f5c3812c38ff1a79efa4f0c4468e92eb78
-RMD160 (tnef2txt-1.4.tar.gz) = b5d244ac79ee404b2feb0eed9507c606c2bfd401
-Size (tnef2txt-1.4.tar.gz) = 36568 bytes
-SHA1 (patch-aa) = 166a353bd13a4231c77816a1231a95ef21f22d4d
diff --git a/mail/tnef2txt/patches/patch-aa b/mail/tnef2txt/patches/patch-aa
deleted file mode 100644
index 5b43b488ad3..00000000000
--- a/mail/tnef2txt/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/05/10 23:18:47 minskim Exp $
-
---- Makefile.orig 1997-07-22 12:57:12.000000000 -0500
-+++ Makefile
-@@ -1,12 +1,12 @@
-
--CC = gcc
-+#CC = gcc
-
- # Possible platforms are SUN, HPUX, DEC, SGI, AIX, Linux and MSDOS
- # The main definitions are for 32/16 bits and for byte order, the
- # default is big endian. You can do -D__BYTE_ORDER 1234 for little
- # endian
- PLATFORM = -DHPUX
--CFLAGS = -g -O2
-+#CFLAGS = -g -O2
-
-
- tnef2txt: config.h tnef.h tnef.c
diff --git a/mail/turba/DESCR b/mail/turba/DESCR
deleted file mode 100644
index 22d512c0214..00000000000
--- a/mail/turba/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-Turba is a set of PHP scripts that implement a contacts directory and
-management interface. Turba also provides an API for external applications
-to interface with address books, providing adding and searching features that
-can be hooked right into other applications.
-
-Turba is a complete basic contact management application. SQL, LDAP, and Horde
-Preferences backends are available and are well tested. The fields in the
-address books can be defined in a very flexible way, just by changing the
-config files. Import/export from/to Pine, Mulberry, CSV, TSV, and vCard
-contacts. You can create distribution lists from your addressbooks, which are
-handled transparently by IMP and other Horde applications. And there are Horde
-API functions to add and search for contacts.
diff --git a/mail/turba/MESSAGE b/mail/turba/MESSAGE
deleted file mode 100644
index 2b1e533b14a..00000000000
--- a/mail/turba/MESSAGE
+++ /dev/null
@@ -1,26 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2006/07/18 23:26:54 ben Exp $
-
-Please refer to the file:
-
- ${PREFIX}/share/doc/turba/INSTALL
-
-on how to setup your Turba installation. You need to at least edit
-
- ${PREFIX}/share/horde/config/registry.php
-
-to enable Turba in the horde framework. You will also need to configure Turba
-by using the Horde administrative interface.
-
-If you use an SQL backend, you may need to create the Turba objects using
-the appropriate script under
-
- ${PREFIX}/share/horde/turba/scripts/sql/
-
-Finally you will also need to make Turba accessible through your HTTP server.
-If you are running Apache and ap-php, then you can add the following lines
-to httpd.conf:
-
- Include ${PKG_SYSCONFDIR}/turba.conf
-
-===========================================================================
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
deleted file mode 100644
index 79ef7715dbc..00000000000
--- a/mail/turba/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2007/03/18 12:14:05 adrianp Exp $
-
-DISTNAME= turba-h3-${TURBAVER}
-PKGNAME= turba-${TURBAVER}
-CATEGORIES= mail www
-MASTER_SITES= http://ftp.horde.org/pub/turba/ \
- ftp://ftp.horde.org/pub/turba/
-
-MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://www.horde.org/turba/
-COMMENT= Horde contact management application
-
-DEPENDS+= horde>=3.0.0:../../www/horde
-
-.include "../../mk/bsd.prefs.mk"
-
-DOCDIR= ${PREFIX}/share/doc/turba
-EGDIR= ${PREFIX}/share/examples/turba
-HORDEDIR= ${PREFIX}/share/horde
-TURBADIR= ${HORDEDIR}/turba
-TURBAVER= 2.1.4
-PAXDIRS= lib locale po scripts templates themes
-USE_TOOLS+= perl:run
-
-MESSAGE_SUBST+= TURBADIR=${TURBADIR:Q}
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-REPLACE_PERL+= ${WRKSRC}/scripts/ldap/addou.pl
-
-PKG_SYSCONFSUBDIR?= httpd
-
-SUBST_CLASSES+= files
-SUBST_STAGE.files= post-build
-SUBST_FILES.files= turba.conf.dist
-SUBST_SED.files= -e "s|@TURBADIR@|${TURBADIR}|g"
-SUBST_MESSAGE.files= Fixing configuration files.
-
-CONF_FILES= ${EGDIR}/turba.conf ${PKG_SYSCONFDIR}/turba.conf
-CONF_FILES_PERMS+= ${TURBADIR}/config/sources.php.dist \
- ${TURBADIR}/config/sources.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
-CONF_FILES+= ${TURBADIR}/config/attributes.php.dist \
- ${TURBADIR}/config/attributes.php
-CONF_FILES_PERMS+= ${TURBADIR}/config/conf.xml.dist \
- ${TURBADIR}/config/conf.xml \
- ${APACHE_USER} ${ROOT_GROUP} 0440
-CONF_FILES_PERMS+= ${TURBADIR}/config/menu.php.dist \
- ${TURBADIR}/config/menu.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
-CONF_FILES_PERMS+= ${TURBADIR}/config/prefs.php.dist \
- ${TURBADIR}/config/prefs.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
-
-.include "options.mk"
-
-do-build:
- @${CP} ${FILESDIR}/turba.conf.dist ${WRKSRC}/turba.conf.dist
- @${CP} ${WRKSRC}/config/conf.xml ${WRKSRC}/config/conf.xml.dist
- @${FIND} ${WRKSRC} -name .htaccess -print | ${XARGS} ${RM} -f
- @${CHMOD} 0750 ${WRKSRC}/scripts/ldap/addou.pl
-
-do-install:
- ${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA_DIR} ${TURBADIR}
- ${INSTALL_DATA_DIR} ${TURBADIR}/config
- ${INSTALL_DATA} ${WRKSRC}/turba.conf.dist ${EGDIR}/turba.conf
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/INSTALL ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/LDAP ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/RELEASE_NOTES ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/UPGRADING ${DOCDIR}
-
-. for d in ${PAXDIRS}
- ${INSTALL_DATA_DIR} ${TURBADIR}/${d:Q}
-. endfor
-
-. for d in ${PAXDIRS}
- @cd ${WRKSRC}/${d:Q} && ${PAX} -rwpma . ${TURBADIR}/${d:Q}
-. endfor
-
- ${INSTALL_DATA} ${WRKSRC}/config/*.dist ${TURBADIR}/config
- ${INSTALL_DATA} ${WRKSRC}/*.php ${TURBADIR}
- @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TURBADIR}
- @${FIND} ${TURBADIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
- @${FIND} ${TURBADIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
- @${CHOWN} ${APACHE_USER}:${SHAREGRP} ${TURBADIR}/config
- @${CHMOD} 0750 ${TURBADIR}/config
-
-.include "../../lang/php/phpversion.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/turba/PLIST b/mail/turba/PLIST
deleted file mode 100644
index ea834beeffe..00000000000
--- a/mail/turba/PLIST
+++ /dev/null
@@ -1,277 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2007/03/18 12:14:05 adrianp Exp $
-share/doc/turba/INSTALL
-share/doc/turba/LDAP
-share/doc/turba/README
-share/doc/turba/RELEASE_NOTES
-share/doc/turba/UPGRADING
-share/examples/turba/turba.conf
-share/horde/turba/add.php
-share/horde/turba/addressbooks.php
-share/horde/turba/browse.php
-share/horde/turba/config/attributes.php.dist
-share/horde/turba/config/conf.xml.dist
-share/horde/turba/config/menu.php.dist
-share/horde/turba/config/mime_drivers.php.dist
-share/horde/turba/config/prefs.php.dist
-share/horde/turba/config/sources.php.dist
-share/horde/turba/data.php
-share/horde/turba/delete.php
-share/horde/turba/display.php
-share/horde/turba/edit.php
-share/horde/turba/index.php
-share/horde/turba/lib/Block/minisearch.php
-share/horde/turba/lib/Block/tree_menu.php
-share/horde/turba/lib/Driver.php
-share/horde/turba/lib/Driver/imsp.php
-share/horde/turba/lib/Driver/kolab.php
-share/horde/turba/lib/Driver/ldap.php
-share/horde/turba/lib/Driver/null.php
-share/horde/turba/lib/Driver/prefs.php
-share/horde/turba/lib/Driver/sql.php
-share/horde/turba/lib/Group.php
-share/horde/turba/lib/List.php
-share/horde/turba/lib/ListView.php
-share/horde/turba/lib/Object.php
-share/horde/turba/lib/Object/Group.php
-share/horde/turba/lib/ObjectView.php
-share/horde/turba/lib/Renderer.php
-share/horde/turba/lib/Turba.php
-share/horde/turba/lib/api.php
-share/horde/turba/lib/base.php
-share/horde/turba/lib/prefs.php
-share/horde/turba/lib/tests/tovcard.phpt
-share/horde/turba/lib/version.php
-share/horde/turba/locale/ar_SY/LC_MESSAGES/turba.mo
-share/horde/turba/locale/bg_BG/LC_MESSAGES/turba.mo
-share/horde/turba/locale/ca_ES/LC_MESSAGES/turba.mo
-share/horde/turba/locale/ca_ES/help.xml
-share/horde/turba/locale/cs_CZ/LC_MESSAGES/turba.mo
-share/horde/turba/locale/da_DK/LC_MESSAGES/turba.mo
-share/horde/turba/locale/de_DE/LC_MESSAGES/turba.mo
-share/horde/turba/locale/de_DE/help.xml
-share/horde/turba/locale/el_GR/LC_MESSAGES/turba.mo
-share/horde/turba/locale/en_US/help.xml
-share/horde/turba/locale/es_ES/LC_MESSAGES/turba.mo
-share/horde/turba/locale/es_ES/help.xml
-share/horde/turba/locale/et_EE/LC_MESSAGES/turba.mo
-share/horde/turba/locale/fa_IR/LC_MESSAGES/turba.mo
-share/horde/turba/locale/fa_IR/help.xml
-share/horde/turba/locale/fi_FI/LC_MESSAGES/turba.mo
-share/horde/turba/locale/fi_FI/help.xml
-share/horde/turba/locale/fr_FR/LC_MESSAGES/turba.mo
-share/horde/turba/locale/fr_FR/help.xml
-share/horde/turba/locale/gl_ES/LC_MESSAGES/turba.mo
-share/horde/turba/locale/hu_HU/LC_MESSAGES/turba.mo
-share/horde/turba/locale/is_IS/LC_MESSAGES/turba.mo
-share/horde/turba/locale/it_IT/LC_MESSAGES/turba.mo
-share/horde/turba/locale/ja_JP/LC_MESSAGES/turba.mo
-share/horde/turba/locale/ko_KR/LC_MESSAGES/turba.mo
-share/horde/turba/locale/lt_LT/LC_MESSAGES/turba.mo
-share/horde/turba/locale/lv_LV/LC_MESSAGES/turba.mo
-share/horde/turba/locale/mk_MK/LC_MESSAGES/turba.mo
-share/horde/turba/locale/nb_NO/LC_MESSAGES/turba.mo
-share/horde/turba/locale/nl_NL/LC_MESSAGES/turba.mo
-share/horde/turba/locale/nn_NO/LC_MESSAGES/turba.mo
-share/horde/turba/locale/pl_PL/LC_MESSAGES/turba.mo
-share/horde/turba/locale/pt_BR/LC_MESSAGES/turba.mo
-share/horde/turba/locale/pt_BR/help.xml
-share/horde/turba/locale/pt_PT/LC_MESSAGES/turba.mo
-share/horde/turba/locale/pt_PT/help.xml
-share/horde/turba/locale/ro_RO/LC_MESSAGES/turba.mo
-share/horde/turba/locale/ru_RU/LC_MESSAGES/turba.mo
-share/horde/turba/locale/sk_SK/LC_MESSAGES/turba.mo
-share/horde/turba/locale/sk_SK/help.xml
-share/horde/turba/locale/sl_SI/LC_MESSAGES/turba.mo
-share/horde/turba/locale/sv_SE/LC_MESSAGES/turba.mo
-share/horde/turba/locale/tr_TR/LC_MESSAGES/turba.mo
-share/horde/turba/locale/tr_TR/help.xml
-share/horde/turba/locale/uk_UA/LC_MESSAGES/turba.mo
-share/horde/turba/locale/zh_CN/LC_MESSAGES/turba.mo
-share/horde/turba/locale/zh_TW/LC_MESSAGES/turba.mo
-share/horde/turba/minisearch.php
-share/horde/turba/po/README
-share/horde/turba/po/ar_SY.po
-share/horde/turba/po/bg_BG.po
-share/horde/turba/po/ca_ES.po
-share/horde/turba/po/cs_CZ.po
-share/horde/turba/po/da_DK.po
-share/horde/turba/po/de_DE.po
-share/horde/turba/po/el_GR.po
-share/horde/turba/po/es_ES.po
-share/horde/turba/po/et_EE.po
-share/horde/turba/po/fa_IR.po
-share/horde/turba/po/fi_FI.po
-share/horde/turba/po/fr_FR.po
-share/horde/turba/po/gl_ES.po
-share/horde/turba/po/hu_HU.po
-share/horde/turba/po/is_IS.po
-share/horde/turba/po/it_IT.po
-share/horde/turba/po/ja_JP.po
-share/horde/turba/po/ko_KR.po
-share/horde/turba/po/lt_LT.po
-share/horde/turba/po/lv_LV.po
-share/horde/turba/po/mk_MK.po
-share/horde/turba/po/nb_NO.po
-share/horde/turba/po/nl_NL.po
-share/horde/turba/po/nn_NO.po
-share/horde/turba/po/pl_PL.po
-share/horde/turba/po/pt_BR.po
-share/horde/turba/po/pt_PT.po
-share/horde/turba/po/ro_RO.po
-share/horde/turba/po/ru_RU.po
-share/horde/turba/po/sk_SK.po
-share/horde/turba/po/sl_SI.po
-share/horde/turba/po/sv_SE.po
-share/horde/turba/po/tr_TR.po
-share/horde/turba/po/turba.pot
-share/horde/turba/po/uk_UA.po
-share/horde/turba/po/zh_CN.po
-share/horde/turba/po/zh_TW.po
-share/horde/turba/scripts/Turba.reg
-share/horde/turba/scripts/import_vcards.php
-share/horde/turba/scripts/ldap/addou
-share/horde/turba/scripts/ldap/addou.pl
-share/horde/turba/scripts/ldap/core.schema.patch
-share/horde/turba/scripts/ldap/rfc2739.schema
-share/horde/turba/scripts/sql/turba_objects.mssql.sql
-share/horde/turba/scripts/sql/turba_objects.mysql.sql
-share/horde/turba/scripts/sql/turba_objects.oci8.sql
-share/horde/turba/scripts/sql/turba_objects.pgsql.sql
-share/horde/turba/scripts/sql/turba_objects.sql
-share/horde/turba/scripts/sql/turba_weddingguests.sql
-share/horde/turba/scripts/sql/turba.xml
-share/horde/turba/scripts/upgrades/1.1_to_1.2.sql
-share/horde/turba/scripts/upgrades/1.2_to_2.0.oci8.sql
-share/horde/turba/scripts/upgrades/1.2_to_2.0.sql
-share/horde/turba/scripts/upgrades/create_default_histories.php
-share/horde/turba/scripts/upgrades/public_to_horde_share.php
-share/horde/turba/search.php
-share/horde/turba/templates/addressbooks.inc
-share/horde/turba/templates/block/minisearch.inc
-share/horde/turba/templates/browse/actions.inc
-share/horde/turba/templates/browse/column_footers.inc
-share/horde/turba/templates/browse/column_headers.inc
-share/horde/turba/templates/browse/contactrow.inc
-share/horde/turba/templates/browse/footer.inc
-share/horde/turba/templates/browse/footerAlpha.inc
-share/horde/turba/templates/browse/header.inc
-share/horde/turba/templates/browse/javascript.inc
-share/horde/turba/templates/browse/row.inc
-share/horde/turba/templates/browse/search.inc
-share/horde/turba/templates/browse/search_criteria.inc
-share/horde/turba/templates/common-header.inc
-share/horde/turba/templates/data/export.inc
-share/horde/turba/templates/data/import.inc
-share/horde/turba/templates/menu.inc
-share/horde/turba/templates/prefs/addressbookselect.inc
-share/horde/turba/templates/prefs/columnselect.inc
-share/horde/turba/templates/prefs/imsp_opt.inc
-share/horde/turba/test.php
-share/horde/turba/themes/graphics/contact.png
-share/horde/turba/themes/graphics/favicon.ico
-share/horde/turba/themes/graphics/group.png
-share/horde/turba/themes/graphics/menu/browse.png
-share/horde/turba/themes/graphics/menu/new.png
-share/horde/turba/themes/graphics/new.png
-share/horde/turba/themes/graphics/turba.png
-share/horde/turba/themes/ideas/screen.css
-share/horde/turba/themes/screen.css
-share/horde/turba/vcard.php
-share/horde/turba/view.php
-@dirrm share/horde/turba/themes/graphics/menu
-@dirrm share/horde/turba/themes/graphics
-@dirrm share/horde/turba/themes/ideas
-@dirrm share/horde/turba/themes
-@dirrm share/horde/turba/templates/prefs
-@dirrm share/horde/turba/templates/data
-@dirrm share/horde/turba/templates/browse
-@dirrm share/horde/turba/templates/block
-@dirrm share/horde/turba/templates
-@dirrm share/horde/turba/scripts/upgrades
-@dirrm share/horde/turba/scripts/sql
-@dirrm share/horde/turba/scripts/ldap
-@dirrm share/horde/turba/scripts
-@dirrm share/horde/turba/po
-@dirrm share/horde/turba/locale/zh_TW/LC_MESSAGES
-@dirrm share/horde/turba/locale/zh_TW
-@dirrm share/horde/turba/locale/zh_CN/LC_MESSAGES
-@dirrm share/horde/turba/locale/zh_CN
-@dirrm share/horde/turba/locale/uk_UA/LC_MESSAGES
-@dirrm share/horde/turba/locale/uk_UA
-@dirrm share/horde/turba/locale/tr_TR/LC_MESSAGES
-@dirrm share/horde/turba/locale/tr_TR
-@dirrm share/horde/turba/locale/sv_SE/LC_MESSAGES
-@dirrm share/horde/turba/locale/sv_SE
-@dirrm share/horde/turba/locale/sl_SI/LC_MESSAGES
-@dirrm share/horde/turba/locale/sl_SI
-@dirrm share/horde/turba/locale/sk_SK/LC_MESSAGES
-@dirrm share/horde/turba/locale/sk_SK
-@dirrm share/horde/turba/locale/ru_RU/LC_MESSAGES
-@dirrm share/horde/turba/locale/ru_RU
-@dirrm share/horde/turba/locale/ro_RO/LC_MESSAGES
-@dirrm share/horde/turba/locale/ro_RO
-@dirrm share/horde/turba/locale/pt_PT/LC_MESSAGES
-@dirrm share/horde/turba/locale/pt_PT
-@dirrm share/horde/turba/locale/pt_BR/LC_MESSAGES
-@dirrm share/horde/turba/locale/pt_BR
-@dirrm share/horde/turba/locale/pl_PL/LC_MESSAGES
-@dirrm share/horde/turba/locale/pl_PL
-@dirrm share/horde/turba/locale/nn_NO/LC_MESSAGES
-@dirrm share/horde/turba/locale/nn_NO
-@dirrm share/horde/turba/locale/nl_NL/LC_MESSAGES
-@dirrm share/horde/turba/locale/nl_NL
-@dirrm share/horde/turba/locale/nb_NO/LC_MESSAGES
-@dirrm share/horde/turba/locale/nb_NO
-@dirrm share/horde/turba/locale/mk_MK/LC_MESSAGES
-@dirrm share/horde/turba/locale/mk_MK
-@dirrm share/horde/turba/locale/lv_LV/LC_MESSAGES
-@dirrm share/horde/turba/locale/lv_LV
-@dirrm share/horde/turba/locale/lt_LT/LC_MESSAGES
-@dirrm share/horde/turba/locale/lt_LT
-@dirrm share/horde/turba/locale/ko_KR/LC_MESSAGES
-@dirrm share/horde/turba/locale/ko_KR
-@dirrm share/horde/turba/locale/ja_JP/LC_MESSAGES
-@dirrm share/horde/turba/locale/ja_JP
-@dirrm share/horde/turba/locale/it_IT/LC_MESSAGES
-@dirrm share/horde/turba/locale/it_IT
-@dirrm share/horde/turba/locale/hu_HU/LC_MESSAGES
-@dirrm share/horde/turba/locale/hu_HU
-@dirrm share/horde/turba/locale/gl_ES/LC_MESSAGES
-@dirrm share/horde/turba/locale/gl_ES
-@dirrm share/horde/turba/locale/fr_FR/LC_MESSAGES
-@dirrm share/horde/turba/locale/fr_FR
-@dirrm share/horde/turba/locale/fi_FI/LC_MESSAGES
-@dirrm share/horde/turba/locale/fi_FI
-@dirrm share/horde/turba/locale/fa_IR/LC_MESSAGES
-@dirrm share/horde/turba/locale/fa_IR
-@dirrm share/horde/turba/locale/et_EE/LC_MESSAGES
-@dirrm share/horde/turba/locale/et_EE
-@dirrm share/horde/turba/locale/es_ES/LC_MESSAGES
-@dirrm share/horde/turba/locale/es_ES
-@dirrm share/horde/turba/locale/en_US
-@dirrm share/horde/turba/locale/el_GR/LC_MESSAGES
-@dirrm share/horde/turba/locale/el_GR
-@dirrm share/horde/turba/locale/de_DE/LC_MESSAGES
-@dirrm share/horde/turba/locale/de_DE
-@dirrm share/horde/turba/locale/da_DK/LC_MESSAGES
-@dirrm share/horde/turba/locale/da_DK
-@dirrm share/horde/turba/locale/cs_CZ/LC_MESSAGES
-@dirrm share/horde/turba/locale/cs_CZ
-@dirrm share/horde/turba/locale/ca_ES/LC_MESSAGES
-@dirrm share/horde/turba/locale/ca_ES
-@dirrm share/horde/turba/locale/bg_BG/LC_MESSAGES
-@dirrm share/horde/turba/locale/bg_BG
-@dirrm share/horde/turba/locale/ar_SY/LC_MESSAGES
-@dirrm share/horde/turba/locale/ar_SY
-@dirrm share/horde/turba/locale/is_IS/LC_MESSAGES
-@dirrm share/horde/turba/locale/is_IS
-@dirrm share/horde/turba/locale
-@dirrm share/horde/turba/lib/Object
-@dirrm share/horde/turba/lib/Driver
-@dirrm share/horde/turba/lib/Block
-@dirrm share/horde/turba/lib/tests
-@dirrm share/horde/turba/lib
-@unexec ${RMDIR} %D/share/horde/turba/config 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/horde/turba 2>/dev/null || ${TRUE}
-@dirrm share/examples/turba
-@dirrm share/doc/turba
diff --git a/mail/turba/distinfo b/mail/turba/distinfo
deleted file mode 100644
index 84273bdbd04..00000000000
--- a/mail/turba/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.8 2007/03/18 12:14:05 adrianp Exp $
-
-SHA1 (turba-h3-2.1.4.tar.gz) = 92b462224ef537aa9095bed7bfb72d80a3feb7ea
-RMD160 (turba-h3-2.1.4.tar.gz) = 8b5d8ab08bac54230b29428a4172a48bffe2ea93
-Size (turba-h3-2.1.4.tar.gz) = 1809857 bytes
diff --git a/mail/turba/files/turba.conf.dist b/mail/turba/files/turba.conf.dist
deleted file mode 100644
index 89318c54790..00000000000
--- a/mail/turba/files/turba.conf.dist
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: turba.conf.dist,v 1.1.1.1 2005/03/25 13:21:43 adrianp Exp $
-#
-# Turba configuration file fragment for Apache
-
-# For security, don't serve pages from the Turba configuration and library
-# directories.
-#
-<Directory "@TURBADIR@/config">
- Order deny,allow
- Deny from all
-</Directory>
-<Directory "@TURBADIR@/lib">
- Order deny,allow
- Deny from all
-</Directory>
-<Directory "@TURBADIR@/locale">
- Order deny,allow
- Deny from all
-</Directory>
-<Directory "@TURBADIR@/po">
- Order deny,allow
- Deny from all
-</Directory>
-<Directory "@TURBADIR@/scripts">
- Order deny,allow
- Deny from all
-</Directory>
-<Directory "@TURBADIR@/templates">
- Order deny,allow
- Deny from all
-</Directory>
diff --git a/mail/turba/options.mk b/mail/turba/options.mk
deleted file mode 100644
index 27f39d1266c..00000000000
--- a/mail/turba/options.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2006/06/02 18:27:56 joerg Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.turba
-PKG_SUPPORTED_OPTIONS= ldap mysql
-PKG_SUGGESTED_OPTIONS= ldap
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Use OpenLDAP for storing data
-###
-.if !empty(PKG_OPTIONS:Mldap)
-DEPENDS+= ${PHP_PKG_PREFIX}-ldap>=4.3.3:../../databases/php-ldap
-.endif
-
-###
-### Use MySQL for storing data
-###
-.if !empty(PKG_OPTIONS:Mmysql)
-DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql
-.endif
diff --git a/mail/up-imapproxy/DESCR b/mail/up-imapproxy/DESCR
deleted file mode 100644
index a411d9ca02b..00000000000
--- a/mail/up-imapproxy/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Proxies IMAP transactions between an IMAP client and an IMAP server. The
-general idea is that the client should never know that it's not talking to
-the real IMAP server. The only thing that makes this a slightly unique Imap
-Proxy server is that it caches server connections.
diff --git a/mail/up-imapproxy/Makefile b/mail/up-imapproxy/Makefile
deleted file mode 100644
index e8898440965..00000000000
--- a/mail/up-imapproxy/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/08 21:58:31 adrianp Exp $
-
-DISTNAME= up-imapproxy-1.2.4
-CATEGORIES= mail
-MASTER_SITES= http://www.imapproxy.org/downloads/
-
-MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://www.imapproxy.org/
-COMMENT= Connection caching IMAP proxy server
-
-GNU_CONFIGURE= YES
-RCD_SCRIPTS= upimapproxy
-
-SUBST_CLASSES+= paths
-SUBST_STAGE.paths= post-patch
-SUBST_FILES.paths= include/imapproxy.h
-SUBST_SED.paths= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
-SUBST_MESSAGE.paths= Fixing hard coded paths.
-
-CONF_FILES= ${PREFIX}/share/examples/up-imapproxy/imapproxy.conf \
- ${PKG_SYSCONFDIR}/imapproxy.conf
-
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/up-imapproxy
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/up-imapproxy
-
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/up-imapproxy
- ${INSTALL_DATA} ${WRKSRC}/README.ssl ${PREFIX}/share/doc/up-imapproxy
-
- ${INSTALL_DATA} ${WRKSRC}/README.known_issues \
- ${PREFIX}/share/doc/up-imapproxy
- ${INSTALL_DATA} ${WRKSRC}/scripts/imapproxy.conf \
- ${PREFIX}/share/examples/up-imapproxy
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/up-imapproxy/PLIST b/mail/up-imapproxy/PLIST
deleted file mode 100644
index 6548631baea..00000000000
--- a/mail/up-imapproxy/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/08 21:58:31 adrianp Exp $
-sbin/in.imapproxyd
-sbin/pimpstat
-share/doc/up-imapproxy/README
-share/doc/up-imapproxy/README.known_issues
-share/doc/up-imapproxy/README.ssl
-share/examples/rc.d/upimapproxy
-share/examples/up-imapproxy/imapproxy.conf
-@dirrm share/examples/up-imapproxy
-@dirrm share/doc/up-imapproxy
diff --git a/mail/up-imapproxy/distinfo b/mail/up-imapproxy/distinfo
deleted file mode 100644
index 2e3ab0e924f..00000000000
--- a/mail/up-imapproxy/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/05/10 12:25:09 adrianp Exp $
-
-SHA1 (up-imapproxy-1.2.4.tar.gz) = e2484d413ef8613a8af567d8e7a7f9836c603bfb
-RMD160 (up-imapproxy-1.2.4.tar.gz) = f763af637c3988d01a3f67d7437516327962a4e3
-Size (up-imapproxy-1.2.4.tar.gz) = 131331 bytes
-SHA1 (patch-aa) = ff6f92050ec95f5ac3b1b82585e427a66338809e
-SHA1 (patch-ab) = 3a7a54799cc089fce71c7f60f63e4b757a9f3485
-SHA1 (patch-ac) = 1f2cd6af6a2a7d472f7d0f507da7e56ac2afc5a3
-SHA1 (patch-ad) = 90800e5502c5f76d7e67e718c162621d385d632b
-SHA1 (patch-ae) = 3c361aa68399325503ae64e74efada28522e10a6
-SHA1 (patch-af) = 5589475efe0b58ba683efadc817b8730a314a491
-SHA1 (patch-ag) = eb626aa4b2a3c1226c55f033249b875e7428d46a
diff --git a/mail/up-imapproxy/files/upimapproxy.sh b/mail/up-imapproxy/files/upimapproxy.sh
deleted file mode 100644
index 0fccd85dc8d..00000000000
--- a/mail/up-imapproxy/files/upimapproxy.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: upimapproxy.sh,v 1.1.1.1 2006/05/08 21:58:31 adrianp Exp $
-#
-
-# PROVIDE: upimapproxy
-# REQUIRE: DAEMON
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="upimapproxy"
-rcvar=$name
-command="@PREFIX@/sbin/in.imapproxyd"
-required_files="@PKG_SYSCONFDIR@/imapproxy.conf"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/up-imapproxy/patches/patch-aa b/mail/up-imapproxy/patches/patch-aa
deleted file mode 100644
index a29e3544a25..00000000000
--- a/mail/up-imapproxy/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/05/08 21:58:31 adrianp Exp $
-
-# set default location of config file
-
---- include/imapproxy.h.orig Fri Jun 25 00:20:05 2004
-+++ include/imapproxy.h Fri Jun 25 00:20:54 2004
-@@ -145,7 +145,7 @@
- #define SELECT_STATUS_BUF_SIZE 256 /* size of select status */
-
- #ifndef DEFAULT_CONFIG_FILE
--#define DEFAULT_CONFIG_FILE "/etc/imapproxy.conf"
-+#define DEFAULT_CONFIG_FILE "@PKG_SYSCONFDIR@/imapproxy.conf"
- #endif
-
- #define LITERAL_PASSWORD 1
diff --git a/mail/up-imapproxy/patches/patch-ab b/mail/up-imapproxy/patches/patch-ab
deleted file mode 100644
index dc71fd25081..00000000000
--- a/mail/up-imapproxy/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/05/08 21:58:31 adrianp Exp $
-
-# fix a format string vulnerability (DSA 852-1)
-
---- src/main.c.orig 2005-11-03 15:41:01.000000000 +0000
-+++ src/main.c
-@@ -849,7 +849,7 @@ static int ParseBannerAndCapability( cha
- exit( 1 );
- }
-
-- sprintf( DestBuf, CP );
-+ sprintf( DestBuf, "%s", CP );
-
- /*
- * initially assume that the server doesn't support UNSELECT.
diff --git a/mail/up-imapproxy/patches/patch-ac b/mail/up-imapproxy/patches/patch-ac
deleted file mode 100644
index 244abe85406..00000000000
--- a/mail/up-imapproxy/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/05/09 17:17:48 joerg Exp $
-
---- config.h.in.orig 2006-05-09 17:04:28.000000000 +0000
-+++ config.h.in
-@@ -90,6 +90,7 @@
- #undef const
-
- #if HAVE_SYS_MMAN_H
-+#include <sys/types.h>
- #include <sys/mman.h>
- #endif
-
diff --git a/mail/up-imapproxy/patches/patch-ad b/mail/up-imapproxy/patches/patch-ad
deleted file mode 100644
index 84dc0d4365e..00000000000
--- a/mail/up-imapproxy/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/05/09 17:17:48 joerg Exp $
-
---- src/imapcommon.c.orig 2006-05-09 17:07:44.000000000 +0000
-+++ src/imapcommon.c
-@@ -136,6 +136,7 @@
-
- #include <openssl/evp.h>
- #include <openssl/err.h>
-+#include <openssl/md5.h>
-
- #include <pthread.h>
- #include <sys/types.h>
diff --git a/mail/up-imapproxy/patches/patch-ae b/mail/up-imapproxy/patches/patch-ae
deleted file mode 100644
index f17bc19aaf3..00000000000
--- a/mail/up-imapproxy/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/05/09 17:17:48 joerg Exp $
-
---- src/select.c.orig 2006-05-09 17:09:17.000000000 +0000
-+++ src/select.c
-@@ -69,7 +69,6 @@
- /*
- * External globals
- */
--extern int errno;
- extern IMAPCounter_Struct *IMAPCount;
-
- /*
diff --git a/mail/up-imapproxy/patches/patch-af b/mail/up-imapproxy/patches/patch-af
deleted file mode 100644
index 7d21a324550..00000000000
--- a/mail/up-imapproxy/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.2 2006/05/10 12:25:09 adrianp Exp $
-
---- Makefile.in.orig 2005-08-31 17:32:23.000000000 +0100
-+++ Makefile.in 2006-05-09 18:32:51.000000000 +0100
-@@ -79,8 +79,8 @@
-
- install: $(XYD_BIN) $(TAT_BIN)
- mkdir -p $(EBIN)
-- $(INSTALL) -o bin -g bin -m 0755 $(XYD_BIN) $(EBIN)
-- $(INSTALL) -o bin -g bin -m 0755 $(TAT_BIN) $(EBIN)
-+ $(BSD_INSTALL_PROGRAM) $(XYD_BIN) $(EBIN)
-+ $(BSD_INSTALL_PROGRAM) $(TAT_BIN) $(EBIN)
-
- install-init:
- $(INSTALL) -o root -g sys -m 0755 ./scripts/imapproxy.init $(ETC)/init.d/imapproxy
diff --git a/mail/up-imapproxy/patches/patch-ag b/mail/up-imapproxy/patches/patch-ag
deleted file mode 100644
index a534b6617d5..00000000000
--- a/mail/up-imapproxy/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/05/09 18:05:09 adrianp Exp $
-
---- configure.orig 2005-08-31 17:32:23.000000000 +0100
-+++ configure
-@@ -3419,7 +3419,7 @@ else
- curses_found=no
- fi
-
--if test "$curses_found" == no; then
-+if test "$curses_found" = no; then
- echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
- echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6
- if test "${ac_cv_lib_ncurses_initscr+set}" = set; then
diff --git a/mail/vm/DESCR b/mail/vm/DESCR
deleted file mode 100644
index 37ef6d3eabf..00000000000
--- a/mail/vm/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-VM (View Mail) is an Emacs subsystem that allows UNIX mail to be read
-and disposed of within Emacs. Commands exist to do the normal things
-expected of a mail user agent, such as generating replies, saving
-messages to folders, deleting messages and so on. There are other more
-advanced commands that do tasks like bursting and creating digests,
-message forwarding, and organizing message presentation according to
-various criteria.
diff --git a/mail/vm/Makefile b/mail/vm/Makefile
deleted file mode 100644
index cc440221ade..00000000000
--- a/mail/vm/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile,v 1.30 2006/04/05 15:50:27 jlam Exp $
-
-DISTNAME= vm-7.19
-PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.uni-mainz.de/pub/software/gnu/vm/ \
- ftp://tug.org/vm/ \
- ftp://psg.com/pub/vm/ \
- ftp://sunsite.cnlab-switch.ch/mirror/vm/ \
- ftp://ftp.uu.net/networking/mail/vm/ \
- http://www.interhack.net/projects/vm/ \
- ftp://ftp.ccs.neu.edu/net/mirrors/VM/ \
- http://www.rge.com/pub/mail/vm/ \
- http://ftp.lip6.fr/pub/unix/mail/vm/ \
- http://ftp.jussieu.fr/pub/unix/mail/vm/ \
- ftp://ftp.surfnet.nl/pub/mail/vm/ \
- http://ftp.algx.net/pub/packages/mail/vm/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.wonderworks.com/vm/
-COMMENT= VM (View Mail) is an advanced mail user agent for Emacs
-
-.include "../../mk/emacs.mk"
-
-USE_TOOLS+= makeinfo
-INFO_FILES= # PLIST
-
-.if ${EMACS_FLAVOR} == "xemacs"
-PIXMAPDIR= ${EMACS_LISPPREFIX:H}/etc/vm
-.elif ${EMACS_FLAVOR} == "emacs"
-PIXMAPDIR= ${EMACS_LISPPREFIX}/vm/pixmaps
-.endif
-
-MAKEFLAGS+= EMACS=${EMACS_BIN:Q}
-MAKE_ENV+= LISPDIR=${EMACS_LISPPREFIX}/vm
-MAKE_ENV+= INFODIR=${INFODIR:Q}
-MAKE_ENV+= PIXMAPDIR=${PIXMAPDIR:Q}
-MAKE_ENV+= BINDIR=${PREFIX:Q}/bin
-PLIST_SUBST+= PIXMAPDIR=${PIXMAPDIR:S/^${PREFIX}\///:Q}
-
-INSTALLATION_DIRS= bin ${EMACS_INFOPREFIX} ${EMACS_LISPPREFIX}/vm \
- ${PIXMAPDIR}
-
-do-install:
- cd ${WRKSRC} && ${INSTALL_DATA} *.el* ${EMACS_LISPPREFIX}/vm
- cd ${WRKSRC}; for f in *.info *.info-[0-9]*; do \
- ${TEST} ! -f "$$f" || \
- ${INSTALL_DATA} "$$f" ${EMACS_INFOPREFIX}; \
- done
- ${INSTALL_DATA} ${WRKSRC}/pixmaps/*.x[pb]m ${PIXMAPDIR}
- cd ${WRKSRC} && ${INSTALL_PROGRAM} qp-decode qp-encode \
- base64-decode base64-encode ${PREFIX}/bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/vm/PLIST b/mail/vm/PLIST
deleted file mode 100644
index ce0f549efaf..00000000000
--- a/mail/vm/PLIST
+++ /dev/null
@@ -1,175 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/05 15:50:27 jlam Exp $
-bin/base64-decode
-bin/base64-encode
-bin/qp-decode
-bin/qp-encode
-${PIXMAPDIR}/audio_stamp-colorful.xpm
-${PIXMAPDIR}/audio_stamp-simple.xpm
-${PIXMAPDIR}/autofile-dn.xbm
-${PIXMAPDIR}/autofile-dn.xpm
-${PIXMAPDIR}/autofile-up.xbm
-${PIXMAPDIR}/autofile-up.xpm
-${PIXMAPDIR}/autofile-xx.xbm
-${PIXMAPDIR}/compose-dn.xbm
-${PIXMAPDIR}/compose-dn.xpm
-${PIXMAPDIR}/compose-up.xbm
-${PIXMAPDIR}/compose-up.xpm
-${PIXMAPDIR}/compose-xx.xbm
-${PIXMAPDIR}/delete-dn.xbm
-${PIXMAPDIR}/delete-dn.xpm
-${PIXMAPDIR}/delete-up.xbm
-${PIXMAPDIR}/delete-up.xpm
-${PIXMAPDIR}/delete-xx.xbm
-${PIXMAPDIR}/document-colorful.xpm
-${PIXMAPDIR}/document-simple.xpm
-${PIXMAPDIR}/file-dn.xbm
-${PIXMAPDIR}/file-dn.xpm
-${PIXMAPDIR}/file-up.xbm
-${PIXMAPDIR}/file-up.xpm
-${PIXMAPDIR}/file-xx.xbm
-${PIXMAPDIR}/film-colorful.xpm
-${PIXMAPDIR}/film-simple.xpm
-${PIXMAPDIR}/gear-colorful.xpm
-${PIXMAPDIR}/gear-simple.xpm
-${PIXMAPDIR}/getmail-dn.xbm
-${PIXMAPDIR}/getmail-dn.xpm
-${PIXMAPDIR}/getmail-up.xbm
-${PIXMAPDIR}/getmail-up.xpm
-${PIXMAPDIR}/getmail-xx.xbm
-${PIXMAPDIR}/help-dn.xbm
-${PIXMAPDIR}/help-dn.xpm
-${PIXMAPDIR}/help-up.xbm
-${PIXMAPDIR}/help-up.xpm
-${PIXMAPDIR}/help-xx.xbm
-${PIXMAPDIR}/message-colorful.xpm
-${PIXMAPDIR}/message-simple.xpm
-${PIXMAPDIR}/mime-colorful-dn.xpm
-${PIXMAPDIR}/mime-colorful-up.xpm
-${PIXMAPDIR}/mime-colorful-xx.xpm
-${PIXMAPDIR}/mime-dn.xbm
-${PIXMAPDIR}/mime-simple-dn.xpm
-${PIXMAPDIR}/mime-simple-up.xpm
-${PIXMAPDIR}/mime-simple-xx.xpm
-${PIXMAPDIR}/mime-up.xbm
-${PIXMAPDIR}/mime-xx.xbm
-${PIXMAPDIR}/mona_stamp-colorful.xpm
-${PIXMAPDIR}/mona_stamp-simple.xpm
-${PIXMAPDIR}/next-dn.xbm
-${PIXMAPDIR}/next-dn.xpm
-${PIXMAPDIR}/next-up.xbm
-${PIXMAPDIR}/next-up.xpm
-${PIXMAPDIR}/next-xx.xbm
-${PIXMAPDIR}/previous-dn.xbm
-${PIXMAPDIR}/previous-dn.xpm
-${PIXMAPDIR}/previous-up.xbm
-${PIXMAPDIR}/previous-up.xpm
-${PIXMAPDIR}/previous-xx.xbm
-${PIXMAPDIR}/print-dn.xbm
-${PIXMAPDIR}/print-dn.xpm
-${PIXMAPDIR}/print-up.xbm
-${PIXMAPDIR}/print-up.xpm
-${PIXMAPDIR}/print-xx.xbm
-${PIXMAPDIR}/quit-dn.xbm
-${PIXMAPDIR}/quit-dn.xpm
-${PIXMAPDIR}/quit-up.xbm
-${PIXMAPDIR}/quit-up.xpm
-${PIXMAPDIR}/quit-xx.xbm
-${PIXMAPDIR}/recover-dn.xbm
-${PIXMAPDIR}/recover-dn.xpm
-${PIXMAPDIR}/recover-up.xbm
-${PIXMAPDIR}/recover-up.xpm
-${PIXMAPDIR}/recover-xx.xbm
-${PIXMAPDIR}/reply-dn.xbm
-${PIXMAPDIR}/reply-dn.xpm
-${PIXMAPDIR}/reply-up.xbm
-${PIXMAPDIR}/reply-up.xpm
-${PIXMAPDIR}/reply-xx.xbm
-${PIXMAPDIR}/stuffed_box-colorful.xpm
-${PIXMAPDIR}/stuffed_box-simple.xpm
-${PIXMAPDIR}/undelete-dn.xbm
-${PIXMAPDIR}/undelete-dn.xpm
-${PIXMAPDIR}/undelete-up.xbm
-${PIXMAPDIR}/undelete-up.xpm
-${PIXMAPDIR}/undelete-xx.xbm
-${PIXMAPDIR}/visit-dn.xbm
-${PIXMAPDIR}/visit-dn.xpm
-${PIXMAPDIR}/visit-up.xbm
-${PIXMAPDIR}/visit-up.xpm
-${PIXMAPDIR}/visit-xx.xbm
-${EMACS_INFOPREFIX}/vm.info
-${EMACS_LISPPREFIX}/vm/tapestry.el
-${EMACS_LISPPREFIX}/vm/tapestry.elc
-${EMACS_LISPPREFIX}/vm/vm-autoload.el
-${EMACS_LISPPREFIX}/vm/vm-autoload.elc
-${EMACS_LISPPREFIX}/vm/vm-byteopts.el
-${EMACS_LISPPREFIX}/vm/vm-crypto.el
-${EMACS_LISPPREFIX}/vm/vm-crypto.elc
-${EMACS_LISPPREFIX}/vm/vm-delete.el
-${EMACS_LISPPREFIX}/vm/vm-delete.elc
-${EMACS_LISPPREFIX}/vm/vm-digest.el
-${EMACS_LISPPREFIX}/vm/vm-digest.elc
-${EMACS_LISPPREFIX}/vm/vm-easymenu.el
-${EMACS_LISPPREFIX}/vm/vm-easymenu.elc
-${EMACS_LISPPREFIX}/vm/vm-edit.el
-${EMACS_LISPPREFIX}/vm/vm-edit.elc
-${EMACS_LISPPREFIX}/vm/vm-folder.el
-${EMACS_LISPPREFIX}/vm/vm-folder.elc
-${EMACS_LISPPREFIX}/vm/vm-imap.el
-${EMACS_LISPPREFIX}/vm/vm-imap.elc
-${EMACS_LISPPREFIX}/vm/vm-license.el
-${EMACS_LISPPREFIX}/vm/vm-license.elc
-${EMACS_LISPPREFIX}/vm/vm-macro.el
-${EMACS_LISPPREFIX}/vm/vm-macro.elc
-${EMACS_LISPPREFIX}/vm/vm-mark.el
-${EMACS_LISPPREFIX}/vm/vm-mark.elc
-${EMACS_LISPPREFIX}/vm/vm-menu.el
-${EMACS_LISPPREFIX}/vm/vm-menu.elc
-${EMACS_LISPPREFIX}/vm/vm-message.el
-${EMACS_LISPPREFIX}/vm/vm-message.elc
-${EMACS_LISPPREFIX}/vm/vm-mime.el
-${EMACS_LISPPREFIX}/vm/vm-mime.elc
-${EMACS_LISPPREFIX}/vm/vm-minibuf.el
-${EMACS_LISPPREFIX}/vm/vm-minibuf.elc
-${EMACS_LISPPREFIX}/vm/vm-misc.el
-${EMACS_LISPPREFIX}/vm/vm-misc.elc
-${EMACS_LISPPREFIX}/vm/vm-motion.el
-${EMACS_LISPPREFIX}/vm/vm-motion.elc
-${EMACS_LISPPREFIX}/vm/vm-mouse.el
-${EMACS_LISPPREFIX}/vm/vm-mouse.elc
-${EMACS_LISPPREFIX}/vm/vm-page.el
-${EMACS_LISPPREFIX}/vm/vm-page.elc
-${EMACS_LISPPREFIX}/vm/vm-pop.el
-${EMACS_LISPPREFIX}/vm/vm-pop.elc
-${EMACS_LISPPREFIX}/vm/vm-reply.el
-${EMACS_LISPPREFIX}/vm/vm-reply.elc
-${EMACS_LISPPREFIX}/vm/vm-save.el
-${EMACS_LISPPREFIX}/vm/vm-save.elc
-${EMACS_LISPPREFIX}/vm/vm-search.el
-${EMACS_LISPPREFIX}/vm/vm-search.elc
-${EMACS_LISPPREFIX}/vm/vm-sort.el
-${EMACS_LISPPREFIX}/vm/vm-sort.elc
-${EMACS_LISPPREFIX}/vm/vm-startup.el
-${EMACS_LISPPREFIX}/vm/vm-startup.elc
-${EMACS_LISPPREFIX}/vm/vm-summary.el
-${EMACS_LISPPREFIX}/vm/vm-summary.elc
-${EMACS_LISPPREFIX}/vm/vm-thread.el
-${EMACS_LISPPREFIX}/vm/vm-thread.elc
-${EMACS_LISPPREFIX}/vm/vm-toolbar.el
-${EMACS_LISPPREFIX}/vm/vm-toolbar.elc
-${EMACS_LISPPREFIX}/vm/vm-undo.el
-${EMACS_LISPPREFIX}/vm/vm-undo.elc
-${EMACS_LISPPREFIX}/vm/vm-user.el
-${EMACS_LISPPREFIX}/vm/vm-user.elc
-${EMACS_LISPPREFIX}/vm/vm-vars.el
-${EMACS_LISPPREFIX}/vm/vm-vars.elc
-${EMACS_LISPPREFIX}/vm/vm-version.el
-${EMACS_LISPPREFIX}/vm/vm-version.elc
-${EMACS_LISPPREFIX}/vm/vm-virtual.el
-${EMACS_LISPPREFIX}/vm/vm-virtual.elc
-${EMACS_LISPPREFIX}/vm/vm-window.el
-${EMACS_LISPPREFIX}/vm/vm-window.elc
-${EMACS_LISPPREFIX}/vm/vm.el
-${EMACS_LISPPREFIX}/vm/vm.elc
-@unexec ${RMDIR} -p %D/${PIXMAPDIR} 2>/dev/null || ${TRUE}
-@dirrm ${EMACS_LISPPREFIX}/vm
-@unexec ${RMDIR} -p %D/${EMACS_LISPPREFIX} 2>/dev/null || ${TRUE}
diff --git a/mail/vm/distinfo b/mail/vm/distinfo
deleted file mode 100644
index c0053e1a2d2..00000000000
--- a/mail/vm/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.15 2005/08/28 04:25:30 uebayasi Exp $
-
-SHA1 (vm-7.19.tar.gz) = 0fe9012b8988ebdec7641f48aca0ef365549c590
-RMD160 (vm-7.19.tar.gz) = 7a28c0a096f1f8093cffb9fc621cd270dd67b432
-Size (vm-7.19.tar.gz) = 381658 bytes
-SHA1 (patch-aa) = 7b8e9b8bcc1c03604fc0d2a81683754b823dc7a6
-SHA1 (patch-ab) = 51ea93e4b4066fbab7e75d03bea2cffd20c85440
diff --git a/mail/vm/patches/patch-aa b/mail/vm/patches/patch-aa
deleted file mode 100644
index 3c25fb303dc..00000000000
--- a/mail/vm/patches/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2002/05/04 02:32:07 jtb Exp $
-
---- Makefile.orig Sat May 4 03:21:17 2002
-+++ Makefile Sat May 4 03:22:54 2002
-@@ -2,24 +2,24 @@
- # prior to 19.14 for XEmacs are unsupported.
-
- # what emacs is called on your system
--EMACS = emacs
-+#EMACS = emacs
-
- # top of the installation
--prefix = /usr/local
-+prefix = ${PREFIX}
-
- # where the Info file should go
--INFODIR = ${prefix}/lib/emacs/info
-+#INFODIR = ${prefix}/lib/emacs/info
-
- # where the vm.elc, tapestry.elc, etc. files should go
--LISPDIR = ${prefix}/lib/emacs/site-lisp
-+#LISPDIR = ${prefix}/lib/emacs/site-lisp
-
- # where the toolbar pixmaps should go.
- # vm-toolbar-pixmap-directory must point to the same place.
- # vm-image-directory must point to the same place.
--PIXMAPDIR = ${prefix}/lib/emacs/etc/vm
-+#PIXMAPDIR = ${prefix}/lib/emacs/etc/vm
-
- # where the binaries should be go.
--BINDIR = ${prefix}/bin
-+#BINDIR = ${prefix}/bin
-
- ############## no user servicable parts beyond this point ###################
-
-@@ -134,7 +134,7 @@
-
- vm.info: vm.texinfo
- @echo "making vm.info..."
-- @$(EMACS) $(BATCHFLAGS) -insert vm.texinfo -l texinfmt -f texinfo-format-buffer -f save-buffer
-+ $(MAKEINFO) vm.texinfo
-
- # We use tr -d because Emacs under Cygwin apparently outputs CRLF
- # under Windows. We remove the CRs.
diff --git a/mail/vm/patches/patch-ab b/mail/vm/patches/patch-ab
deleted file mode 100644
index e7c53eb3801..00000000000
--- a/mail/vm/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2003/02/19 22:06:20 jtb Exp $
-
---- vm.texinfo.orig Tue May 28 19:45:36 2002
-+++ vm.texinfo
-@@ -2,7 +2,7 @@
- @setfilename vm.info
- @settitle VM User's Manual
- @direntry
--* VM:: A mail reader.
-+* VM: (vm). A mail reader.
- @end direntry
- @iftex
- @finalout
diff --git a/mail/wl/DESCR b/mail/wl/DESCR
deleted file mode 100644
index 300043e79ea..00000000000
--- a/mail/wl/DESCR
+++ /dev/null
@@ -1,20 +0,0 @@
-Wanderlust is a mail/news management system with IMAP4rev1 support for Emacs.
-
- * Implementation in elisp only.
- * Support of IMAP4rev1, NNTP, POP(POP3/APOP), MH and Maildir.
- * Integrated access to messages based on Folder Specifications like Mew.
- * Key bindings and mark processing like Mew.
- * Management of threads and unread messages.
- * Folder mode to select and edit subscribed folders.
- * Message cache, Disconnected Operation.
- * MH-like Fcc (Fcc: %Backup is possible).
- * Full support of MIME (by SEMI).
- * Draft editing of mail and news as a same interface.
- * Icon based interface for the list of Folder (XEmacs and Emacs 21).
- * Skip fetching of a large message part of MIME(IMAP4).
- * Server side searching (IMAP4), internationalized searching is available.
- * Virtual folder.
- * Compressed folder.
- * Automatic expiration of old messages.
- * Automatic refiling.
- * Draft templates.
diff --git a/mail/wl/Makefile b/mail/wl/Makefile
deleted file mode 100644
index 0e2fe7aab15..00000000000
--- a/mail/wl/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# $NetBSD: Makefile,v 1.34 2007/03/23 02:43:22 jnemeth Exp $
-
-DISTNAME= wl-2.14.0
-PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION= 5
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.gohome.org/wl/stable/
-
-MAINTAINER= tech-pkg-ja@jp.NetBSD.org
-HOMEPAGE= http://www.gohome.org/wl/
-COMMENT= Mail/news management system with IMAP4rev1 support for Emacs
-
-.include "../../mk/emacs.mk"
-
-DEPENDS+= ${EMACS_PKGNAME_PREFIX}semi>=1.14.6:../../devel/semi
-# apel and bbdb are included in xemacs-packages
-.if ${EMACS_FLAVOR} == "emacs"
-DEPENDS+= ${EMACS_PKGNAME_PREFIX}apel>=10.6:../../devel/apel
-DEPENDS+= ${EMACS_PKGNAME_PREFIX}bbdb-[0-9]*:../../misc/bbdb
-.endif
-DEPENDS+= ${EMACS_PKGNAME_PREFIX}flim>=1.14.7:../../devel/flim
-DEPENDS+= ${EMACS_PKGNAME_PREFIX}emacs-w3m>=1.19:../../www/emacs-w3m
-
-EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 xemacs214
-
-BUILD_TARGET= all info
-INSTALL_TARGET= install install-info
-MAKE_FLAGS+= INFODIR=${EMACS_INFOPREFIX:Q}
-MAKE_FLAGS+= LISPDIR=${EMACS_LISPPREFIX:Q}
-MAKE_FLAGS+= EMACS=${EMACS_FLAVOR:Q}
-MAKE_FLAGS+= PIXMAPDIR=${PREFIX:Q}/share/wl
-INFO_FILES= # PLIST
-
-
-DOCDIR= ${PREFIX}/share/doc/wl
-EXAMPLESDIR= ${PREFIX}/share/examples/wl
-INSTALLATION_DIRS= ${DOCDIR} ${EXAMPLESDIR} ${EMACS_INFOPREFIX}
-
-.include "../../security/openssl/buildlink3.mk"
-
-post-install:
- ${INSTALL_DATA_DIR} ${DOCDIR:Q}/en
- ${INSTALL_DATA_DIR} ${DOCDIR:Q}/ja
- @set -e; \
- for f in BUGS NEWS README; do \
- ${INSTALL_DATA} ${WRKSRC:Q}/"$$f" ${DOCDIR:Q}/en; \
- ${INSTALL_DATA} ${WRKSRC:Q}/"$$f".ja ${DOCDIR:Q}/ja; \
- done
- ${INSTALL_DATA_DIR} ${EXAMPLESDIR:Q}/en
- ${INSTALL_DATA_DIR} ${EXAMPLESDIR:Q}/ja
- ${INSTALL_DATA} ${WRKSRC:Q}/samples/en/dot.* ${EXAMPLESDIR:Q}/en
- ${INSTALL_DATA} ${WRKSRC:Q}/samples/ja/dot.* ${EXAMPLESDIR:Q}/ja
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/wl/PLIST b/mail/wl/PLIST
deleted file mode 100644
index 6f2432012db..00000000000
--- a/mail/wl/PLIST
+++ /dev/null
@@ -1,346 +0,0 @@
-@comment $NetBSD: PLIST,v 1.10 2007/03/23 02:43:22 jnemeth Exp $
-${EMACS_INFOPREFIX}/wl-ja.info
-${EMACS_INFOPREFIX}/wl.info
-${EMACS_LISPPREFIX}/wl/acap.el
-${EMACS_LISPPREFIX}/wl/acap.elc
-${EMACS_LISPPREFIX}/wl/bbdb-wl.el
-${EMACS_LISPPREFIX}/wl/bbdb-wl.elc
-${EMACS_LISPPREFIX}/wl/elmo-access.el
-${EMACS_LISPPREFIX}/wl/elmo-access.elc
-${EMACS_LISPPREFIX}/wl/elmo-archive.el
-${EMACS_LISPPREFIX}/wl/elmo-archive.elc
-${EMACS_LISPPREFIX}/wl/elmo-cache.el
-${EMACS_LISPPREFIX}/wl/elmo-cache.elc
-${EMACS_LISPPREFIX}/wl/elmo-date.el
-${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/elmo-database.el
-${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/elmo-database.elc
-${EMACS_LISPPREFIX}/wl/elmo-date.elc
-${EMACS_LISPPREFIX}/wl/elmo-dop.el
-${EMACS_LISPPREFIX}/wl/elmo-dop.elc
-${EMACS_LISPPREFIX}/wl/elmo-file.el
-${EMACS_LISPPREFIX}/wl/elmo-file.elc
-${EMACS_LISPPREFIX}/wl/elmo-filter.el
-${EMACS_LISPPREFIX}/wl/elmo-filter.elc
-${EMACS_LISPPREFIX}/wl/elmo-flag.el
-${EMACS_LISPPREFIX}/wl/elmo-flag.elc
-${EMACS_LISPPREFIX}/wl/elmo-imap4.el
-${EMACS_LISPPREFIX}/wl/elmo-imap4.elc
-${EMACS_LISPPREFIX}/wl/elmo-internal.el
-${EMACS_LISPPREFIX}/wl/elmo-internal.elc
-${EMACS_LISPPREFIX}/wl/elmo-localdir.el
-${EMACS_LISPPREFIX}/wl/elmo-localdir.elc
-${EMACS_LISPPREFIX}/wl/elmo-localnews.el
-${EMACS_LISPPREFIX}/wl/elmo-localnews.elc
-${EMACS_LISPPREFIX}/wl/elmo-maildir.el
-${EMACS_LISPPREFIX}/wl/elmo-maildir.elc
-${EMACS_LISPPREFIX}/wl/elmo-map.el
-${EMACS_LISPPREFIX}/wl/elmo-map.elc
-${EMACS_LISPPREFIX}/wl/elmo-mime.el
-${EMACS_LISPPREFIX}/wl/elmo-mime.elc
-${EMACS_LISPPREFIX}/wl/elmo-msgdb.el
-${EMACS_LISPPREFIX}/wl/elmo-msgdb.elc
-${EMACS_LISPPREFIX}/wl/elmo-multi.el
-${EMACS_LISPPREFIX}/wl/elmo-multi.elc
-${EMACS_LISPPREFIX}/wl/elmo-net.el
-${EMACS_LISPPREFIX}/wl/elmo-net.elc
-${EMACS_LISPPREFIX}/wl/elmo-nmz.el
-${EMACS_LISPPREFIX}/wl/elmo-nmz.elc
-${EMACS_LISPPREFIX}/wl/elmo-nntp.el
-${EMACS_LISPPREFIX}/wl/elmo-nntp.elc
-${EMACS_LISPPREFIX}/wl/elmo-null.el
-${EMACS_LISPPREFIX}/wl/elmo-null.elc
-${EMACS_LISPPREFIX}/wl/elmo-pipe.el
-${EMACS_LISPPREFIX}/wl/elmo-pipe.elc
-${EMACS_LISPPREFIX}/wl/elmo-pop3.el
-${EMACS_LISPPREFIX}/wl/elmo-pop3.elc
-${EMACS_LISPPREFIX}/wl/elmo-sendlog.el
-${EMACS_LISPPREFIX}/wl/elmo-sendlog.elc
-${EMACS_LISPPREFIX}/wl/elmo-shimbun.el
-${EMACS_LISPPREFIX}/wl/elmo-shimbun.elc
-${EMACS_LISPPREFIX}/wl/elmo-signal.el
-${EMACS_LISPPREFIX}/wl/elmo-signal.elc
-${EMACS_LISPPREFIX}/wl/elmo-spam.el
-${EMACS_LISPPREFIX}/wl/elmo-spam.elc
-${EMACS_LISPPREFIX}/wl/elmo-split.el
-${EMACS_LISPPREFIX}/wl/elmo-split.elc
-${EMACS_LISPPREFIX}/wl/elmo-util.el
-${EMACS_LISPPREFIX}/wl/elmo-util.elc
-${EMACS_LISPPREFIX}/wl/elmo-vars.el
-${EMACS_LISPPREFIX}/wl/elmo-vars.elc
-${EMACS_LISPPREFIX}/wl/elmo-version.el
-${EMACS_LISPPREFIX}/wl/elmo-version.elc
-${EMACS_LISPPREFIX}/wl/elmo.el
-${EMACS_LISPPREFIX}/wl/elmo.elc
-${EMACS_LISPPREFIX}/wl/elsp-bogofilter.el
-${EMACS_LISPPREFIX}/wl/elsp-bogofilter.elc
-${EMACS_LISPPREFIX}/wl/elsp-bsfilter.el
-${EMACS_LISPPREFIX}/wl/elsp-bsfilter.elc
-${EMACS_LISPPREFIX}/wl/elsp-sa.el
-${EMACS_LISPPREFIX}/wl/elsp-sa.elc
-${EMACS_LISPPREFIX}/wl/elsp-spamoracle.el
-${EMACS_LISPPREFIX}/wl/elsp-spamoracle.elc
-${EMACS_LISPPREFIX}/wl/im-wl.el
-${EMACS_LISPPREFIX}/wl/im-wl.elc
-${EMACS_LISPPREFIX}/wl/mmimap.el
-${EMACS_LISPPREFIX}/wl/mmimap.elc
-${EMACS_LISPPREFIX}/wl/modb-entity.el
-${EMACS_LISPPREFIX}/wl/modb-entity.elc
-${EMACS_LISPPREFIX}/wl/modb-legacy.el
-${EMACS_LISPPREFIX}/wl/modb-legacy.elc
-${EMACS_LISPPREFIX}/wl/modb-standard.el
-${EMACS_LISPPREFIX}/wl/modb-standard.elc
-${EMACS_LISPPREFIX}/wl/modb.el
-${EMACS_LISPPREFIX}/wl/modb.elc
-${EMACS_LISPPREFIX}/wl/pldap.el
-${EMACS_LISPPREFIX}/wl/pldap.elc
-${EMACS_LISPPREFIX}/wl/rfc2368.el
-${EMACS_LISPPREFIX}/wl/rfc2368.elc
-${EMACS_LISPPREFIX}/wl/slp.el
-${EMACS_LISPPREFIX}/wl/slp.elc
-${EMACS_LISPPREFIX}/wl/ssl.el
-${EMACS_LISPPREFIX}/wl/ssl.elc
-${EMACS_LISPPREFIX}/wl/utf7.el
-${EMACS_LISPPREFIX}/wl/utf7.elc
-${EMACS_LISPPREFIX}/wl/wl-acap.el
-${EMACS_LISPPREFIX}/wl/wl-acap.elc
-${EMACS_LISPPREFIX}/wl/wl-action.el
-${EMACS_LISPPREFIX}/wl/wl-action.elc
-${EMACS_LISPPREFIX}/wl/wl-addrbook.el
-${EMACS_LISPPREFIX}/wl/wl-addrbook.elc
-${EMACS_LISPPREFIX}/wl/wl-address.el
-${EMACS_LISPPREFIX}/wl/wl-address.elc
-${EMACS_LISPPREFIX}/wl/wl-addrmgr.el
-${EMACS_LISPPREFIX}/wl/wl-addrmgr.elc
-${EMACS_LISPPREFIX}/wl/wl-batch.el
-${EMACS_LISPPREFIX}/wl/wl-batch.elc
-${EMACS_LISPPREFIX}/wl/wl-complete.el
-${EMACS_LISPPREFIX}/wl/wl-complete.elc
-${EMACS_LISPPREFIX}/wl/wl-demo.el
-${EMACS_LISPPREFIX}/wl/wl-demo.elc
-${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/wl-dnd.el
-${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/wl-dnd.elc
-${EMACS_LISPPREFIX}/wl/wl-draft.el
-${EMACS_LISPPREFIX}/wl/wl-draft.elc
-${FOR_emacs21}${EMACS_LISPPREFIX}/wl/wl-e21.el
-${FOR_emacs21}${EMACS_LISPPREFIX}/wl/wl-e21.elc
-${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/wl-xmas.el
-${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/wl-xmas.elc
-${EMACS_LISPPREFIX}/wl/wl-expire.el
-${EMACS_LISPPREFIX}/wl/wl-expire.elc
-${EMACS_LISPPREFIX}/wl/wl-fldmgr.el
-${EMACS_LISPPREFIX}/wl/wl-fldmgr.elc
-${EMACS_LISPPREFIX}/wl/wl-folder.el
-${EMACS_LISPPREFIX}/wl/wl-folder.elc
-${EMACS_LISPPREFIX}/wl/wl-highlight.el
-${EMACS_LISPPREFIX}/wl/wl-highlight.elc
-${EMACS_LISPPREFIX}/wl/wl-mailto.el
-${EMACS_LISPPREFIX}/wl/wl-mailto.elc
-${EMACS_LISPPREFIX}/wl/wl-message.el
-${EMACS_LISPPREFIX}/wl/wl-message.elc
-${EMACS_LISPPREFIX}/wl/wl-mime.el
-${EMACS_LISPPREFIX}/wl/wl-mime.elc
-${EMACS_LISPPREFIX}/wl/wl-news.el
-${EMACS_LISPPREFIX}/wl/wl-news.elc
-${EMACS_LISPPREFIX}/wl/wl-refile.el
-${EMACS_LISPPREFIX}/wl/wl-refile.elc
-${EMACS_LISPPREFIX}/wl/wl-score.el
-${EMACS_LISPPREFIX}/wl/wl-score.elc
-${EMACS_LISPPREFIX}/wl/wl-spam.el
-${EMACS_LISPPREFIX}/wl/wl-spam.elc
-${EMACS_LISPPREFIX}/wl/wl-summary.el
-${EMACS_LISPPREFIX}/wl/wl-summary.elc
-${EMACS_LISPPREFIX}/wl/wl-template.el
-${EMACS_LISPPREFIX}/wl/wl-template.elc
-${EMACS_LISPPREFIX}/wl/wl-thread.el
-${EMACS_LISPPREFIX}/wl/wl-thread.elc
-${EMACS_LISPPREFIX}/wl/wl-util.el
-${EMACS_LISPPREFIX}/wl/wl-util.elc
-${EMACS_LISPPREFIX}/wl/wl-vars.el
-${EMACS_LISPPREFIX}/wl/wl-vars.elc
-${EMACS_LISPPREFIX}/wl/wl-version.el
-${EMACS_LISPPREFIX}/wl/wl-version.elc
-${EMACS_LISPPREFIX}/wl/wl.el
-${EMACS_LISPPREFIX}/wl/wl.elc
-share/doc/wl/en/BUGS
-share/doc/wl/en/NEWS
-share/doc/wl/en/README
-share/doc/wl/ja/BUGS.ja
-share/doc/wl/ja/NEWS.ja
-share/doc/wl/ja/README.ja
-share/examples/wl/en/dot.addresses
-share/examples/wl/en/dot.folders
-share/examples/wl/en/dot.wl
-share/examples/wl/ja/dot.addresses
-share/examples/wl/ja/dot.folders
-share/examples/wl/ja/dot.wl
-${FOR_emacs21}share/wl/access.xpm
-${FOR_emacs21}share/wl/archive.xpm
-${FOR_emacs21}share/wl/closed.xpm
-${FOR_emacs21}share/wl/draft.xpm
-${FOR_emacs21}share/wl/elmo.xpm
-${FOR_emacs21}share/wl/file.xpm
-${FOR_emacs21}share/wl/filter.xpm
-${FOR_emacs21}share/wl/imap.xpm
-${FOR_emacs21}share/wl/internal.xpm
-${FOR_emacs21}share/wl/letter.xpm
-${FOR_emacs21}share/wl/local.xpm
-${FOR_emacs21}share/wl/localnews.xpm
-${FOR_emacs21}share/wl/maildir.xpm
-${FOR_emacs21}share/wl/multi.xpm
-${FOR_emacs21}share/wl/news.xpm
-${FOR_emacs21}share/wl/nmz.xpm
-${FOR_emacs21}share/wl/no-letter.xpm
-${FOR_emacs21}share/wl/opened.xpm
-${FOR_emacs21}share/wl/pipe.xpm
-${FOR_emacs21}share/wl/plugged.xpm
-${FOR_emacs21}share/wl/pop.xpm
-${FOR_emacs21}share/wl/queue.xpm
-${FOR_emacs21}share/wl/shimbun.xpm
-${FOR_emacs21}share/wl/trash-e.xpm
-${FOR_emacs21}share/wl/trash.xpm
-${FOR_emacs21}share/wl/unplugged.xpm
-${FOR_emacs21}share/wl/wl-alpha-logo.img
-${FOR_emacs21}share/wl/wl-alpha-logo.xbm
-${FOR_emacs21}share/wl/wl-alpha-logo.xpm
-${FOR_emacs21}share/wl/wl-alpha-xmas-logo.img
-${FOR_emacs21}share/wl/wl-alpha-xmas-logo.xbm
-${FOR_emacs21}share/wl/wl-alpha-xmas-logo.xpm
-${FOR_emacs21}share/wl/wl-beta-logo.img
-${FOR_emacs21}share/wl/wl-beta-logo.xbm
-${FOR_emacs21}share/wl/wl-beta-logo.xpm
-${FOR_emacs21}share/wl/wl-beta-xmas-logo.img
-${FOR_emacs21}share/wl/wl-beta-xmas-logo.xbm
-${FOR_emacs21}share/wl/wl-beta-xmas-logo.xpm
-${FOR_emacs21}share/wl/wl-draft-insert-signature-up.xpm
-${FOR_emacs21}share/wl/wl-draft-kill-up.xpm
-${FOR_emacs21}share/wl/wl-draft-save-and-exit-up.xpm
-${FOR_emacs21}share/wl/wl-draft-send-from-toolbar-down.xpm
-${FOR_emacs21}share/wl/wl-draft-send-from-toolbar-up.xpm
-${FOR_emacs21}share/wl/wl-draft-up.xpm
-${FOR_emacs21}share/wl/wl-draft-yank-original-up.xpm
-${FOR_emacs21}share/wl/wl-exit-up.xpm
-${FOR_emacs21}share/wl/wl-folder-check-current-entity-up.xpm
-${FOR_emacs21}share/wl/wl-folder-empty-trash-up.xpm
-${FOR_emacs21}share/wl/wl-folder-goto-draft-folder-up.xpm
-${FOR_emacs21}share/wl/wl-folder-jump-to-current-entity-no-sync-up.xpm
-${FOR_emacs21}share/wl/wl-folder-jump-to-current-entity-up.xpm
-${FOR_emacs21}share/wl/wl-folder-next-entity-up.xpm
-${FOR_emacs21}share/wl/wl-folder-prev-entity-up.xpm
-${FOR_emacs21}share/wl/wl-folder-read-up.xpm
-${FOR_emacs21}share/wl/wl-folder-select-entity-up.xpm
-${FOR_emacs21}share/wl/wl-folder-sync-current-entity-up.xpm
-${FOR_emacs21}share/wl/wl-folder-zoom-entity-up.xpm
-${FOR_emacs21}share/wl/wl-message-extract-content-up.xpm
-${FOR_emacs21}share/wl/wl-message-next-content-up.xpm
-${FOR_emacs21}share/wl/wl-message-play-content-up.xpm
-${FOR_emacs21}share/wl/wl-message-prev-content-up.xpm
-${FOR_emacs21}share/wl/wl-message-quit-up.xpm
-${FOR_emacs21}share/wl/wl-message-read-up.xpm
-${FOR_emacs21}share/wl/wl-stable-logo.img
-${FOR_emacs21}share/wl/wl-stable-logo.xbm
-${FOR_emacs21}share/wl/wl-stable-logo.xpm
-${FOR_emacs21}share/wl/wl-stable-xmas-logo.img
-${FOR_emacs21}share/wl/wl-stable-xmas-logo.xbm
-${FOR_emacs21}share/wl/wl-stable-xmas-logo.xpm
-${FOR_emacs21}share/wl/wl-summary-delete-up.xpm
-${FOR_emacs21}share/wl/wl-summary-dispose-up.xpm
-${FOR_emacs21}share/wl/wl-summary-exit-up.xpm
-${FOR_emacs21}share/wl/wl-summary-forward-up.xpm
-${FOR_emacs21}share/wl/wl-summary-jump-to-current-message-up.xpm
-${FOR_emacs21}share/wl/wl-summary-next-page-up.xpm
-${FOR_emacs21}share/wl/wl-summary-next-up.xpm
-${FOR_emacs21}share/wl/wl-summary-prev-page-up.xpm
-${FOR_emacs21}share/wl/wl-summary-prev-up.xpm
-${FOR_emacs21}share/wl/wl-summary-read-up.xpm
-${FOR_emacs21}share/wl/wl-summary-reply-up.xpm
-${FOR_emacs21}share/wl/wl-summary-reply-with-citation-up.xpm
-${FOR_emacs21}share/wl/wl-summary-set-flags-up.xpm
-${FOR_emacs21}share/wl/wl-summary-sync-force-update-up.xpm
-${FOR_emacs21}share/wl/wl-write-current-folder-up.xpm
-${FOR_xemacs214}share/wl/access.xpm
-${FOR_xemacs214}share/wl/archive.xpm
-${FOR_xemacs214}share/wl/closed.xpm
-${FOR_xemacs214}share/wl/draft.xpm
-${FOR_xemacs214}share/wl/elmo.xpm
-${FOR_xemacs214}share/wl/file.xpm
-${FOR_xemacs214}share/wl/filter.xpm
-${FOR_xemacs214}share/wl/imap.xpm
-${FOR_xemacs214}share/wl/internal.xpm
-${FOR_xemacs214}share/wl/letter.xpm
-${FOR_xemacs214}share/wl/local.xpm
-${FOR_xemacs214}share/wl/localnews.xpm
-${FOR_xemacs214}share/wl/maildir.xpm
-${FOR_xemacs214}share/wl/multi.xpm
-${FOR_xemacs214}share/wl/news.xpm
-${FOR_xemacs214}share/wl/nmz.xpm
-${FOR_xemacs214}share/wl/no-letter.xpm
-${FOR_xemacs214}share/wl/opened.xpm
-${FOR_xemacs214}share/wl/pipe.xpm
-${FOR_xemacs214}share/wl/plugged.xpm
-${FOR_xemacs214}share/wl/pop.xpm
-${FOR_xemacs214}share/wl/queue.xpm
-${FOR_xemacs214}share/wl/shimbun.xpm
-${FOR_xemacs214}share/wl/trash-e.xpm
-${FOR_xemacs214}share/wl/trash.xpm
-${FOR_xemacs214}share/wl/unplugged.xpm
-${FOR_xemacs214}share/wl/wl-alpha-logo.xbm
-${FOR_xemacs214}share/wl/wl-alpha-logo.xpm
-${FOR_xemacs214}share/wl/wl-alpha-xmas-logo.xbm
-${FOR_xemacs214}share/wl/wl-alpha-xmas-logo.xpm
-${FOR_xemacs214}share/wl/wl-beta-logo.xbm
-${FOR_xemacs214}share/wl/wl-beta-logo.xpm
-${FOR_xemacs214}share/wl/wl-beta-xmas-logo.xbm
-${FOR_xemacs214}share/wl/wl-beta-xmas-logo.xpm
-${FOR_xemacs214}share/wl/wl-draft-insert-signature-up.xpm
-${FOR_xemacs214}share/wl/wl-draft-kill-up.xpm
-${FOR_xemacs214}share/wl/wl-draft-save-and-exit-up.xpm
-${FOR_xemacs214}share/wl/wl-draft-send-from-toolbar-down.xpm
-${FOR_xemacs214}share/wl/wl-draft-send-from-toolbar-up.xpm
-${FOR_xemacs214}share/wl/wl-draft-up.xpm
-${FOR_xemacs214}share/wl/wl-draft-yank-original-up.xpm
-${FOR_xemacs214}share/wl/wl-exit-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-check-current-entity-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-empty-trash-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-goto-draft-folder-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-jump-to-current-entity-no-sync-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-jump-to-current-entity-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-next-entity-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-prev-entity-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-read-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-select-entity-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-sync-current-entity-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-zoom-entity-up.xpm
-${FOR_xemacs214}share/wl/wl-message-extract-content-up.xpm
-${FOR_xemacs214}share/wl/wl-message-next-content-up.xpm
-${FOR_xemacs214}share/wl/wl-message-play-content-up.xpm
-${FOR_xemacs214}share/wl/wl-message-prev-content-up.xpm
-${FOR_xemacs214}share/wl/wl-message-quit-up.xpm
-${FOR_xemacs214}share/wl/wl-message-read-up.xpm
-${FOR_xemacs214}share/wl/wl-stable-logo.xbm
-${FOR_xemacs214}share/wl/wl-stable-logo.xpm
-${FOR_xemacs214}share/wl/wl-stable-xmas-logo.xbm
-${FOR_xemacs214}share/wl/wl-stable-xmas-logo.xpm
-${FOR_xemacs214}share/wl/wl-summary-delete-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-dispose-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-exit-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-forward-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-jump-to-current-message-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-next-page-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-next-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-prev-page-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-prev-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-read-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-reply-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-reply-with-citation-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-set-flags-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-sync-force-update-up.xpm
-${FOR_xemacs214}share/wl/wl-write-current-folder-up.xpm
-@dirrm share/wl
-@dirrm share/wl
-@dirrm share/examples/wl/ja
-@dirrm share/examples/wl/en
-@dirrm share/examples/wl
-@dirrm share/doc/wl/ja
-@dirrm share/doc/wl/en
-@dirrm share/doc/wl
-@dirrm ${EMACS_LISPPREFIX}/wl
diff --git a/mail/wl/distinfo b/mail/wl/distinfo
deleted file mode 100644
index 1a7596e2723..00000000000
--- a/mail/wl/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.13 2006/04/08 19:02:18 jlam Exp $
-
-SHA1 (wl-2.14.0.tar.gz) = 75b93013444cb27ca540462afbaefdce0e157b3f
-RMD160 (wl-2.14.0.tar.gz) = 1a5aa025fc05cbcf2a7d390b1804cc1b22f5df2b
-Size (wl-2.14.0.tar.gz) = 1101505 bytes
-SHA1 (patch-aa) = ede97cce8b2574737a91941a905e067c940fb50a
diff --git a/mail/wl/patches/patch-aa b/mail/wl/patches/patch-aa
deleted file mode 100644
index 792f53fe1bc..00000000000
--- a/mail/wl/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/01/08 11:47:17 jun Exp $
-
---- WL-CFG.orig Tue Oct 23 20:44:04 2001
-+++ WL-CFG
-@@ -9,7 +9,7 @@
- ; load-path))
-
- ;; If you want to install utils, uncomment following line.
--;(setq wl-install-utils t)
-+(setq wl-install-utils t)
-
- ;; Set language for info file ("ja" or "en", both in default).
- ;; If you only need manual in English, uncomment following line.
diff --git a/mail/wmbiff/DESCR b/mail/wmbiff/DESCR
deleted file mode 100644
index af969d194d2..00000000000
--- a/mail/wmbiff/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-wmBiff is a WindowMaker docking utility, that displays the number of
-total messages or unread mail messages in differrent mailboxes.
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
deleted file mode 100644
index c6e4e59535b..00000000000
--- a/mail/wmbiff/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.31 2007/02/06 12:24:50 joerg Exp $
-
-DISTNAME= wmbiff-0.4.26
-PKGREVISION= 5
-CATEGORIES= mail x11 windowmaker
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wmbiff/}
-
-MAINTAINER= tron@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/wmbiff/
-COMMENT= xbuffy like "mail-checker" for WindowMaker
-
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-
-EX_DIR= ${PREFIX}/share/examples/wmbiff
-
-post-install:
- ${INSTALL_DATA_DIR} ${EX_DIR}
- ${INSTALL_DATA} ${WRKSRC}/wmbiff/sample.wmbiffrc ${EX_DIR}
-
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../wm/windowmaker/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/wmbiff/PLIST b/mail/wmbiff/PLIST
deleted file mode 100644
index f36d06c5adf..00000000000
--- a/mail/wmbiff/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/31 12:57:07 tron Exp $
-bin/wmbiff
-man/man1/wmbiff.1
-man/man5/wmbiffrc.5
-share/examples/wmbiff/sample.wmbiffrc
-share/wmbiff/skins/wmbiff-master-contrast.xpm
-share/wmbiff/skins/wmbiff-master-led.xpm
-@dirrm share/examples/wmbiff
-@dirrm share/wmbiff/skins
-@dirrm share/wmbiff
diff --git a/mail/wmbiff/distinfo b/mail/wmbiff/distinfo
deleted file mode 100644
index 7c2c0454365..00000000000
--- a/mail/wmbiff/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.13 2005/09/06 15:49:35 adam Exp $
-
-SHA1 (wmbiff-0.4.26.tar.gz) = cb2fc49bc741209c22d8a50f0f164e34c4a9332d
-RMD160 (wmbiff-0.4.26.tar.gz) = f5ccb17fb6846283cb7cde7996310a65600a8883
-Size (wmbiff-0.4.26.tar.gz) = 200237 bytes
-SHA1 (patch-aa) = 0a4607f2e5d6d3066d9b9994665b659dfbcc003b
-SHA1 (patch-ab) = d84f1c4333d7c192748f5170460563ae7fe0955d
-SHA1 (patch-ac) = d7abfc902dffdfa646957d1bc0157e1ee59dfb86
diff --git a/mail/wmbiff/patches/patch-aa b/mail/wmbiff/patches/patch-aa
deleted file mode 100644
index 006e592265c..00000000000
--- a/mail/wmbiff/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2005/09/06 15:49:35 adam Exp $
-
---- Makefile.in.orig 2004-10-11 00:30:40.000000000 +0000
-+++ Makefile.in
-@@ -121,7 +121,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = wmgeneral wmbiff autoconf scripts
-+SUBDIRS = wmgeneral wmbiff autoconf
- EXTRA_DIST = ChangeLog FAQ README.licq TODO
-
- ACLOCAL_FLAGS = -I autoconf
diff --git a/mail/wmbiff/patches/patch-ab b/mail/wmbiff/patches/patch-ab
deleted file mode 100644
index 6017e33b4c4..00000000000
--- a/mail/wmbiff/patches/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2004/08/27 10:10:22 tron Exp $
-
---- wmbiff/ShellClient.c.orig 2004-06-18 23:28:16.000000000 +0200
-+++ wmbiff/ShellClient.c 2004-08-27 12:03:23.000000000 +0200
-@@ -152,6 +152,21 @@
- return (strdup_ordie(bigbuffer));
- }
-
-+static char *mystrcasestr(const char *big, const char *little)
-+{
-+ int blen, llen;
-+
-+ blen = strlen(big);
-+ llen = strlen(little);
-+ while (blen >= llen) {
-+ if (strncasecmp(big, little, llen) == 0)
-+ return (char *)big;
-+ big++;
-+ blen--;
-+ }
-+ return NULL;
-+}
-+
- int shellCmdCheck(Pop3 pc)
- {
- int count_status = 0;
-@@ -189,7 +204,7 @@
- pc->UnreadMsgs = 0;
- pc->TotalMsgs = count_status;
- }
-- } else if (strcasestr(commandOutput, "unable")) {
-+ } else if (mystrcasestr(commandOutput, "unable") != NULL) {
- return -1;
- } else if (sscanf(commandOutput, "%9s\n", pc->TextStatus) == 1) {
- /* validate the string input */
diff --git a/mail/wmbiff/patches/patch-ac b/mail/wmbiff/patches/patch-ac
deleted file mode 100644
index 9e8744af081..00000000000
--- a/mail/wmbiff/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2005/09/06 15:49:35 adam Exp $
-
---- wmbiff/tlsComm.c.orig 2004-10-11 00:29:47.000000000 +0000
-+++ wmbiff/tlsComm.c
-@@ -412,10 +412,12 @@ tls_check_certificate(struct connection_
- "server's certificate is invalid or not X.509.\n"
- "there may be a problem with the certificate stored in your certfile\n");
- }
-+#ifdef GNUTLS_CERT_NOT_TRUSTED
- } else if (certstat & GNUTLS_CERT_NOT_TRUSTED) {
- TDM(DEBUG_INFO, "server's certificate is not trusted.\n");
- TDM(DEBUG_INFO,
- "to verify that a certificate is trusted, use the certfile option.\n");
-+#endif
- }
-
- if (gnutls_x509_crt_init(&cert) < 0) {
diff --git a/mail/wmmail/DESCR b/mail/wmmail/DESCR
deleted file mode 100644
index f81aef018ec..00000000000
--- a/mail/wmmail/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-WMMail.app is a "mail-checker" like xbiff. It is largely based on
-asmail, but has been modified to work with Window Maker instead of
-AfterStep.
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
deleted file mode 100644
index 29541c77626..00000000000
--- a/mail/wmmail/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.31 2007/02/06 18:59:42 joerg Exp $
-
-DISTNAME= WMMail.app-0.64
-PKGNAME= wmmail-0.64
-PKGREVISION= 3
-CATEGORIES= mail x11 windowmaker
-MASTER_SITES= http://www.eecg.utoronto.ca/~chanb/WMMail.app/
-
-MAINTAINER= tron@NetBSD.org
-HOMEPAGE= http://www.eecg.toronto.edu/cgi-bin/cgiwrap/chanb/index.cgi?wmmail
-COMMENT= xbiff like "mail-checker" for WindowMaker
-
-DEPENDS+= windowmaker>=0.80.0nb1:../../wm/windowmaker
-
-USE_X11BASE= yes
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-PL-incs="-I${LOCALBASE}/include" \
- --with-PL-libs="-L${LOCALBASE}/lib"
-
-.include "../../devel/libproplist/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/wmmail/PLIST b/mail/wmmail/PLIST
deleted file mode 100644
index 35c9b23a4c5..00000000000
--- a/mail/wmmail/PLIST
+++ /dev/null
@@ -1,54 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/03/30 19:48:05 wiz Exp $
-GNUstep/Apps/WMMail.app/Anims/NeXT/Mail1.xpm
-GNUstep/Apps/WMMail.app/Anims/NeXT/Mail2.xpm
-GNUstep/Apps/WMMail.app/Anims/NeXT/Mail3.xpm
-GNUstep/Apps/WMMail.app/Anims/asmail/asmail-new.xpm
-GNUstep/Apps/WMMail.app/Anims/asmail/asmail-no.xpm
-GNUstep/Apps/WMMail.app/Anims/asmail/asmail-old.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e-no.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e0.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e1.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e10.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e11.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e2.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e3.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e4.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e5.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e6.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e7.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e8.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e9.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e0.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e1.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e10.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e11.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e2.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e3.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e4.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e5.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e6.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e7.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e8.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e9.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-no.xpm
-GNUstep/Apps/WMMail.app/Defaults/WMMail
-GNUstep/Apps/WMMail.app/Sounds/NewMail.au
-GNUstep/Apps/WMMail.app/Sounds/NoMail.au
-GNUstep/Apps/WMMail.app/Sounds/bark.au
-GNUstep/Apps/WMMail.app/Sounds/bass_snap.au
-GNUstep/Apps/WMMail.app/Sounds/clink.au
-GNUstep/Apps/WMMail.app/Sounds/doorbell.au
-GNUstep/Apps/WMMail.app/Sounds/drip.au
-GNUstep/Apps/WMMail.app/Sounds/hammer.au
-GNUstep/Apps/WMMail.app/Sounds/monkey.au
-GNUstep/Apps/WMMail.app/WMMail
-@dirrm GNUstep/Apps/WMMail.app/Sounds
-@dirrm GNUstep/Apps/WMMail.app/Defaults
-@dirrm GNUstep/Apps/WMMail.app/Anims/monitor-e
-@dirrm GNUstep/Apps/WMMail.app/Anims/e
-@dirrm GNUstep/Apps/WMMail.app/Anims/asmail
-@dirrm GNUstep/Apps/WMMail.app/Anims/NeXT
-@dirrm GNUstep/Apps/WMMail.app/Anims
-@dirrm GNUstep/Apps/WMMail.app
-@unexec ${RMDIR} %D/GNUstep/Apps 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/GNUstep 2>/dev/null || ${TRUE}
diff --git a/mail/wmmail/distinfo b/mail/wmmail/distinfo
deleted file mode 100644
index 4a427dffef2..00000000000
--- a/mail/wmmail/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 09:59:30 agc Exp $
-
-SHA1 (WMMail.app-0.64.tar.gz) = 3077ab562fd97f7fee1505330eca60f9645ee6a9
-RMD160 (WMMail.app-0.64.tar.gz) = 9f8c7c3efce8de43785d2c7a6fa9286dec9fb6fe
-Size (WMMail.app-0.64.tar.gz) = 147305 bytes
-SHA1 (patch-aa) = afeaff242ccf423a1e2ca3368941b6230185878e
-SHA1 (patch-ac) = 565d442850f7b406fad588dd5e045b465a40fbab
-SHA1 (patch-ad) = 13251a2ab4a656cf1452dc785d98e39b39aa7c94
diff --git a/mail/wmmail/patches/patch-aa b/mail/wmmail/patches/patch-aa
deleted file mode 100644
index 4a7c0d617e8..00000000000
--- a/mail/wmmail/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2002/10/27 13:39:08 bouyer Exp $
-
---- src/Makefile.in.orig Wed Mar 31 05:34:59 1999
-+++ src/Makefile.in Sun Jun 27 12:42:49 1999
-@@ -90,13 +90,13 @@
- DEFS = @DEFS@ -I. -I$(srcdir)
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lXt -lSM -lICE
- WMMail_OBJECTS = global.o imap.o list.o maildir.o mbox.o mh.o net.o \
- pop3.o properties.o std_icons.o wmmail.o wmutil.o
- WMMail_LDADD = $(LDADD)
- WMMail_DEPENDENCIES =
- WMMail_LDFLAGS =
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -DPREFIX=\"@prefix@\"
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --git a/mail/wmmail/patches/patch-ac b/mail/wmmail/patches/patch-ac
deleted file mode 100644
index 141d4f1cb73..00000000000
--- a/mail/wmmail/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2000/10/15 21:54:55 tron Exp $
-
---- Defaults/Makefile.in.orig Wed Mar 31 05:34:59 1999
-+++ Defaults/Makefile.in Sun Jun 27 13:05:21 1999
-@@ -209,6 +209,7 @@
- WMMail: $(srcdir)/WMMail.in ./Makefile
- -rm -f WMMail
- sed -e "s:#wmmaildir#:$(wmmaildir):" -e "s://:/:" \
-+ -e "s:#LOCALBASE#:$(LOCALBASE):" \
- $(srcdir)/WMMail.in > WMMail ; \
- chmod 644 WMMail
-
diff --git a/mail/wmmail/patches/patch-ad b/mail/wmmail/patches/patch-ad
deleted file mode 100644
index 3db9978bdd6..00000000000
--- a/mail/wmmail/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2000/10/15 21:54:55 tron Exp $
-
---- Defaults/WMMail.in.orig Mon Mar 29 13:55:08 1999
-+++ Defaults/WMMail.in Sun Jun 27 13:03:50 1999
-@@ -7,7 +7,6 @@
- DisplayLocation = (0, 10);
- ExecuteOnClick = "xterm -geom 80x25 -name pine -T PINE -e pine -i";
- ExecuteOnNew = "play #wmmaildir#/Sounds/doorbell.au";
-- ExecuteOnNewOnce = No;
- Animations = {
- Empty = {
- Delay = 10;
-@@ -32,10 +31,10 @@
- Name = "Home";
- Type = mbox;
- UpdateInterval = 15;
-- ExecuteOnUpdate = "/usr/local/bin/fetchmail";
-+ ExecuteOnUpdate = "#LOCALBASE#/bin/fetchmail";
- Options = {
- CheckTimeStampOnly = No;
-- Path = "/var/spool/mail/bryan";
-+ Path = "/var/mail/bryan";
- MailboxHasInternalData = Yes;
- };
- },
diff --git a/mail/xbuffy/DESCR b/mail/xbuffy/DESCR
deleted file mode 100644
index 5835b3bb6a8..00000000000
--- a/mail/xbuffy/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Basically, XBuffy (and Xmultibiff) is a XBiff-type program with a lot
-of new options. With XBuffy you can watch multiple mailboxes. When
-new mail arrives, you can have a pop up window showing the From: and
-Subject: lines. You can also set it up to launch your favorite mail
-reader when you click on a box. Currently, xbuffy is only capable of
-watching mailboxes with the standard mailbox format (messages separated
-with a From line).
diff --git a/mail/xbuffy/Makefile b/mail/xbuffy/Makefile
deleted file mode 100644
index c7e403f6dd2..00000000000
--- a/mail/xbuffy/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2007/02/06 18:30:26 joerg Exp $
-#
-
-DISTNAME= xbuffy-3.4
-PKGREVISION= 1
-CATEGORIES= mail x11
-MASTER_SITES= ftp://ftp.virginia.edu/pub/xbuffy/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Replacement for xbiff that handles multiple mail files
-
-GNU_CONFIGURE= YES
-USE_X11BASE= YES
-
-CPPFLAGS+= -I${X11BASE}/include
-CPPFLAGS+= -Wall
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/XBuffy.ad ${PREFIX}/lib/X11/app-defaults/XBuffy
-
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/xbuffy/PLIST b/mail/xbuffy/PLIST
deleted file mode 100644
index b8abd7a0643..00000000000
--- a/mail/xbuffy/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:01:44 zuntum Exp $
-bin/xbuffy
-man/man1/xbuffy.1
-lib/X11/app-defaults/XBuffy
diff --git a/mail/xbuffy/distinfo b/mail/xbuffy/distinfo
deleted file mode 100644
index 4bbb1765ee8..00000000000
--- a/mail/xbuffy/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:30 agc Exp $
-
-SHA1 (xbuffy-3.4.tar.gz) = 088031eda9ea64a43c86ff51d7d37bedcb213d66
-RMD160 (xbuffy-3.4.tar.gz) = 902b98d60e4ba929e5dd656022cfbdf49c9fcde9
-Size (xbuffy-3.4.tar.gz) = 77612 bytes
-SHA1 (patch-ab) = 9e3ad3dbdb4ffc0c54514694a05fc815cc8ea20f
-SHA1 (patch-ac) = 458fe29fb60f4bcc37a5e69b465126c9ed94b5da
-SHA1 (patch-ad) = 4485a879adc5319128ced34e36e6007b14fd8418
-SHA1 (patch-ae) = 7874c2ba3f2f29bcc60774945956e3703ad26d40
-SHA1 (patch-af) = a3f7a934885a250a97b788d42d5ac8534445f30f
-SHA1 (patch-ag) = fabc076530b6d966e88e9539f513165b9590a388
-SHA1 (patch-ah) = d505e4659cae9c6787e35a82b04079a9514f21e6
diff --git a/mail/xbuffy/patches/patch-ab b/mail/xbuffy/patches/patch-ab
deleted file mode 100644
index fcf2a7a7547..00000000000
--- a/mail/xbuffy/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/05 02:04:49 wiz Exp $
-
---- libdyn/dyn_append.c.orig Tue Aug 10 04:34:01 1999
-+++ libdyn/dyn_append.c
-@@ -11,6 +11,7 @@
- */
-
- #include <stdio.h>
-+#include <string.h>
-
- #include "dynP.h"
-
-@@ -20,7 +21,7 @@
- int num;
- {
- if (obj->debug)
-- fprintf(stderr, "dyn: append: Writing %d bytes from %d to %d + %d\n",
-+ fprintf(stderr, "dyn: append: Writing %d bytes from %p to %p + %d\n",
- obj->el_size*num, els, obj->array, obj->num_el*obj->el_size);
-
- if (obj->size < obj->num_el + num) {
diff --git a/mail/xbuffy/patches/patch-ac b/mail/xbuffy/patches/patch-ac
deleted file mode 100644
index 33c4330b040..00000000000
--- a/mail/xbuffy/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/12/05 02:04:49 wiz Exp $
-
---- libdyn/dyn_create.c.orig Fri Dec 10 20:56:02 1993
-+++ libdyn/dyn_create.c
-@@ -12,6 +12,7 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
-
- #include "dynP.h"
-
diff --git a/mail/xbuffy/patches/patch-ad b/mail/xbuffy/patches/patch-ad
deleted file mode 100644
index 59178287410..00000000000
--- a/mail/xbuffy/patches/patch-ad
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/12/05 02:04:49 wiz Exp $
-
---- libdyn/dyn_delete.c.orig Tue Aug 10 04:37:42 1999
-+++ libdyn/dyn_delete.c
-@@ -11,6 +11,7 @@
- */
-
- #include <stdio.h>
-+#include <string.h>
-
- #include "dynP.h"
-
-@@ -46,7 +47,7 @@
- else {
- if (obj->debug)
- fprintf(stderr,
-- "dyn: delete: copying %d bytes from %d + %d to + %d.\n",
-+ "dyn: delete: copying %d bytes from %p + %d to + %d.\n",
- obj->el_size*(obj->num_el - index), obj->array,
- (index+1)*obj->el_size, index*obj->el_size);
-
-@@ -61,7 +62,7 @@
- if (obj->paranoid) {
- if (obj->debug)
- fprintf(stderr,
-- "dyn: delete: zeroing %d bytes from %d + %d\n",
-+ "dyn: delete: zeroing %d bytes from %p + %d\n",
- obj->el_size, obj->array,
- obj->el_size*(obj->num_el - 1));
- /* bzero(obj->array + obj->el_size*(obj->num_el - 1), obj->el_size);*/
diff --git a/mail/xbuffy/patches/patch-ae b/mail/xbuffy/patches/patch-ae
deleted file mode 100644
index e00e5e04728..00000000000
--- a/mail/xbuffy/patches/patch-ae
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/12/05 02:04:49 wiz Exp $
-
---- libdyn/dyn_insert.c.orig Tue Aug 10 04:35:43 1999
-+++ libdyn/dyn_insert.c
-@@ -11,6 +11,7 @@
- */
-
- #include <stdio.h>
-+#include <string.h>
- #include "dynP.h"
-
- int DynInsert(obj, index, els, num)
-@@ -35,7 +36,7 @@
- }
-
- if (obj->debug)
-- fprintf(stderr,"dyn: insert: Moving %d bytes from %d + %d to + %d\n",
-+ fprintf(stderr,"dyn: insert: Moving %d bytes from %p + %d to + %d\n",
- (obj->num_el-index)*obj->el_size, obj->array,
- obj->el_size*index, obj->el_size*(index+num));
-
-@@ -49,7 +50,7 @@
-
-
- if (obj->debug)
-- fprintf(stderr, "dyn: insert: Copying %d bytes from %d to %d + %d\n",
-+ fprintf(stderr, "dyn: insert: Copying %d bytes from %p to %p + %d\n",
- obj->el_size*num, els, obj->array, obj->el_size*index);
-
- /* bcopy(els, obj->array + obj->el_size*index, obj->el_size*num); */
diff --git a/mail/xbuffy/patches/patch-af b/mail/xbuffy/patches/patch-af
deleted file mode 100644
index 9fcbfa1555b..00000000000
--- a/mail/xbuffy/patches/patch-af
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2000/12/05 02:04:49 wiz Exp $
-
---- libdyn/dyn_put.c.orig Tue Aug 10 04:36:12 1999
-+++ libdyn/dyn_put.c
-@@ -11,6 +11,7 @@
- */
-
- #include <stdio.h>
-+#include <string.h>
-
- #include "dynP.h"
-
-@@ -34,7 +35,7 @@
- }
-
- if (obj->debug)
-- fprintf(stderr, "dyn: get: Returning address %d + %d.\n",
-+ fprintf(stderr, "dyn: get: Returning address %p + %d.\n",
- obj->array, obj->el_size*num);
-
- return (DynPtr) obj->array + obj->el_size*num;
-@@ -67,7 +68,7 @@
- int ret;
-
- if (obj->debug)
-- fprintf(stderr, "dyn: put: Writing %d bytes from %d to %d + %d\n",
-+ fprintf(stderr, "dyn: put: Writing %d bytes from %p to %p + %d\n",
- obj->el_size, el, obj->array, index*obj->el_size);
-
- if ((ret = _DynResize(obj, index)) != DYN_OK)
diff --git a/mail/xbuffy/patches/patch-ag b/mail/xbuffy/patches/patch-ag
deleted file mode 100644
index 19c6fe20fd5..00000000000
--- a/mail/xbuffy/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2000/12/05 02:04:49 wiz Exp $
-
---- libdyn/dyn_realloc.c.orig Fri Dec 10 20:56:05 1993
-+++ libdyn/dyn_realloc.c
-@@ -11,6 +11,7 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
-
- #include "dynP.h"
-
diff --git a/mail/xbuffy/patches/patch-ah b/mail/xbuffy/patches/patch-ah
deleted file mode 100644
index 306c2648677..00000000000
--- a/mail/xbuffy/patches/patch-ah
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2000/12/05 02:04:49 wiz Exp $
-
---- xbuffy.c.orig Thu Aug 19 18:41:49 1999
-+++ xbuffy.c
-@@ -178,11 +178,7 @@
- int num = 0;
- Arg args[5];
- int nargs;
-- static BoxInfo_t *tempNews = 0;
- BoxInfo_t *currentBox;
-- int found;
-- static char *mailHeader = NULL;
-- int headerSize;
- Boolean beenTouched;
- Boolean isIcon = FALSE;
-
diff --git a/mail/xfmail/DESCR b/mail/xfmail/DESCR
deleted file mode 100644
index d84dab3f6fb..00000000000
--- a/mail/xfmail/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-XFMail is X11 application for receiving electronic mail. It was created
-using XForms library toolkit by T.C. Zhao and Mark Overmars.
-
-It's partially compatible with MH style mail- boxes but it does not
-require any mh tools to be installed on the system. You can read most of
-your MH folders and messages with XFMail.
-
-XFMail has very friendly user interface and it's extremely easy in use. It
-implements most of the mail functionality in one program and it does
-not require any additional tools.
-
-It makes use of the faces libraries, showing the faces when available.
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
deleted file mode 100644
index 4a324e22ba5..00000000000
--- a/mail/xfmail/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.41 2006/12/15 20:32:58 joerg Exp $
-
-DISTNAME= xfmail-1.5.5
-PKGREVISION= 1
-CATEGORIES= mail x11
-MASTER_SITES= ftp://xfmail.ufies.org/pub/xfmail/release/1.4.7/source/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= root@garbled.net
-HOMEPAGE= http://xfmail.slappy.org/
-COMMENT= Xforms based mail application for Unix operating systems
-
-RESTRICTED= Selling this software requires permission of the authors.
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-
-USE_X11BASE= YES
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-GNU_CONFIGURE= YES
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xfmail
- ${INSTALL_DATA} ${WRKSRC}/Copyright ${PREFIX}/share/doc/xfmail
-
-.include "../../databases/gdbm/buildlink3.mk"
-.include "../../devel/glib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xforms/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/xfmail/PLIST b/mail/xfmail/PLIST
deleted file mode 100644
index 5d4f7efd4b8..00000000000
--- a/mail/xfmail/PLIST
+++ /dev/null
@@ -1,39 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/02/10 19:10:21 garbled Exp $
-share/xfmail/abook.xpm
-share/xfmail/abort.xpm
-share/xfmail/attach.xpm
-share/xfmail/delete.xpm
-share/xfmail/delsign.xpm
-share/xfmail/edit.xpm
-share/xfmail/exit.xpm
-share/xfmail/forward.xpm
-share/xfmail/gena.xpm
-share/xfmail/help.xpm
-share/xfmail/icon_mail.xpm
-share/xfmail/icon_nomail.xpm
-share/xfmail/insert.xpm
-share/xfmail/insorig.xpm
-share/xfmail/mail_edit.xpm
-share/xfmail/mailcur.xbm
-share/xfmail/mailcur_mask.xbm
-share/xfmail/move.xpm
-share/xfmail/newmail.xpm
-share/xfmail/next.xpm
-share/xfmail/nextu.xpm
-share/xfmail/prev.xpm
-share/xfmail/prevu.xpm
-share/xfmail/print.xpm
-share/xfmail/reply.xpm
-share/xfmail/retr.xpm
-share/xfmail/save.xpm
-share/xfmail/send.xpm
-share/xfmail/sign.xpm
-share/xfmail/spell.xpm
-share/xfmail/view.xpm
-share/doc/xfmail/Copyright
-man/man1/xfmail.1
-lib/libeditor.la
-lib/libmail.la
-bin/xfmail
-@dirrm share/doc/xfmail
-@dirrm share/xfmail
diff --git a/mail/xfmail/distinfo b/mail/xfmail/distinfo
deleted file mode 100644
index b07b8956ede..00000000000
--- a/mail/xfmail/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.10 2006/10/23 07:47:15 rillig Exp $
-
-SHA1 (xfmail-1.5.5.tar.bz2) = 7a98486d1f8cce956efaf37d9540369d5f327401
-RMD160 (xfmail-1.5.5.tar.bz2) = bf3e866d6fa37b7b9959c532b1f4b82fb57eb307
-Size (xfmail-1.5.5.tar.bz2) = 1185913 bytes
-SHA1 (patch-aa) = 678f14ddf5a9360d82fc09cbc296620fe8c66125
-SHA1 (patch-ab) = 17de1abd320f38e38a72194531d358061cbd2eb4
-SHA1 (patch-ac) = f04aad8c7d44183cf16743c31c1779b42da500a1
-SHA1 (patch-ad) = 91d92fb76b5ecf9c07295b942a34628ce212ae3d
-SHA1 (patch-ae) = 8d1d16f62511b78fc20c47e78eebc83dd8feac8d
diff --git a/mail/xfmail/patches/patch-aa b/mail/xfmail/patches/patch-aa
deleted file mode 100644
index bb76b02e874..00000000000
--- a/mail/xfmail/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2006/02/26 13:44:18 joerg Exp $
-
---- src/mail/fmail.h.orig 2004-01-02 03:54:01.000000000 +0000
-+++ src/mail/fmail.h
-@@ -170,7 +170,7 @@ char *strchr (), *strrchr ();
- #define sys_nerr 65535
- #else
- #ifndef sys_nerr
-- #ifndef __FreeBSD__
-+ #if !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__)
- extern int sys_nerr;
- #endif
- #endif
diff --git a/mail/xfmail/patches/patch-ab b/mail/xfmail/patches/patch-ab
deleted file mode 100644
index 719c381fc86..00000000000
--- a/mail/xfmail/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2005/03/16 16:17:42 rillig Exp $
-
---- src/mail/addrbookdb.cpp.orig Fri Jan 2 04:54:01 2004
-+++ src/mail/addrbookdb.cpp Wed Mar 16 14:13:41 2005
-@@ -174,7 +174,11 @@ AddressBookDB::Load(const char *configdi
- dir = opendir(configdir);
- if (dir == NULL)
- return false;
-+#ifdef HAVE_READDIR_R
- while (readdir_r(dir, &entry, &result) == 0 && result != NULL) {
-+#else
-+ while ( (result = readdir(dir)) != NULL) {
-+#endif
- if (NAMLEN(result) > 8 && strncmp(result->d_name, ".xfbook.", 8) == 0) {
- strncpy(buf, result->d_name, NAMLEN(result));
- buf[NAMLEN(result)] = '\0';
diff --git a/mail/xfmail/patches/patch-ac b/mail/xfmail/patches/patch-ac
deleted file mode 100644
index a11c8112514..00000000000
--- a/mail/xfmail/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2005/03/16 16:17:42 rillig Exp $
-
---- configure.orig Sun Jan 18 19:01:45 2004
-+++ configure Wed Mar 16 16:52:31 2005
-@@ -27214,7 +27214,7 @@ done
-
-
-
--for ac_func in regcomp madvise vsnprintf snprintf flock lockf strchr memcpy memmove strtoul strerror sysconf sys_nerr utimes setlocale unsetenv
-+for ac_func in regcomp madvise vsnprintf snprintf flock lockf strchr memcpy memmove strtoul strerror sysconf sys_nerr utimes setlocale unsetenv readdir_r
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/mail/xfmail/patches/patch-ad b/mail/xfmail/patches/patch-ad
deleted file mode 100644
index bf8e58f8349..00000000000
--- a/mail/xfmail/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2005/03/16 16:17:42 rillig Exp $
-
---- src/include/config.h.in.orig Sun Jan 18 19:01:41 2004
-+++ src/include/config.h.in Wed Mar 16 16:59:26 2005
-@@ -115,6 +115,8 @@
- /* Define to 1 if you have the `RAND_status' function. */
- #undef HAVE_RAND_STATUS
-
-+#undef HAVE_READDIR_R
-+
- /* Define to 1 if you have the `regcomp' function. */
- #undef HAVE_REGCOMP
-
diff --git a/mail/xfmail/patches/patch-ae b/mail/xfmail/patches/patch-ae
deleted file mode 100644
index 20be953b6a9..00000000000
--- a/mail/xfmail/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2006/10/23 07:47:15 rillig Exp $
-
---- contrib/misc/build.sh.in.orig 2001-02-05 21:49:26.000000000 +0100
-+++ contrib/misc/build.sh.in 2006-10-23 09:40:03.000000000 +0200
-@@ -65,7 +65,7 @@ then
- ERR=1
- fi
-
--if [ "$ERR" == "1" ]
-+if [ "$ERR" = "1" ]
- then
- echo "Exitting..."
- exit
-@@ -85,7 +85,7 @@ cd ..
- $TAR cvvf $TEMPDIR/$NAME-$VERSION.tar $NAME
- $GZIP $TEMPDIR/$NAME-$VERSION.tar
-
--echo "#!/bin/bash" > $TEMPDIR/$EXE
-+echo "#!/bin/sh" > $TEMPDIR/$EXE
- echo >> $TEMPDIR/$EXE
- echo "cat > $NAME-$VERSION.uuencoded <<'REAL_EOF'" >> $TEMPDIR/$EXE
- $UUENCODE $TEMPDIR/$NAME-$VERSION.tar.gz $NAME-$VERSION.tar.gz >>$TEMPDIR/$EXE
diff --git a/mail/xmailbox/DESCR b/mail/xmailbox/DESCR
deleted file mode 100644
index 349ecbcd5d8..00000000000
--- a/mail/xmailbox/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
-The xmailbox program started out as an enhanced xbiff. However, the latest
-version includes support for sound effects and animation. The default
-functionality employs two images for the "mail in mailbox" and "no mail"
-states, in the form of XPM type 3 files. The default images are, respectively,
-that of an empty mailbox with its flag down, and that of an open mailbox,
-with its flag up and a letter visible inside. Animation can be enabled for
-playing up to 8 XPM files in repeated sequence.
-
-The application can also, optionally, play a sound through a workstation's
-audio device, instead of generating the default beep sound, whenever new
-mail arrives.
-
-By default, pressing any mouse button in the image forces xmailbox to
-remember the current size of the mail file as being the "empty" size and
-to change its image accordingly. In addition to this, the user can
-optionally have xmailbox invoke his/her favourite mail retrieving program.
-
-By Dimitrios P. Bouras (dbouras@hol.gr) and
-William K. W. Cheung (wcheung@mail.spiralcomm.com)
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
deleted file mode 100644
index d261459089a..00000000000
--- a/mail/xmailbox/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:45 wiz Exp $
-#
-
-DISTNAME= xmailbox-2.5
-PKGREVISION= 2
-CATEGORIES= mail x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
-
-MAINTAINER= bouyer@NetBSD.org
-COMMENT= Enhanced xbiff, with pixmap and sound support
-
-USE_IMAKE= YES
-
-MAKE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}
-MAKE_ENV+= INSTALL_MAN=${INSTALL_MAN:Q}
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/xmailbox
- cd ${WRKSRC}/icons && ${INSTALL_DATA} \
- 0xmail1.xpm 1xmail1.xpm 2xmail1.xpm 3xmail1.xpm 4xmail1.xpm \
- 5xmail1.xpm xmail1.xpm xnomail1.xpm \
- ${PREFIX}/share/xmailbox
-
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/xmailbox/PLIST b/mail/xmailbox/PLIST
deleted file mode 100644
index 12445e63b65..00000000000
--- a/mail/xmailbox/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2003/03/02 20:19:43 jschauma Exp $
-bin/xmailbox
-lib/X11/app-defaults/XMailbox
-share/xmailbox/0xmail1.xpm
-share/xmailbox/1xmail1.xpm
-share/xmailbox/2xmail1.xpm
-share/xmailbox/3xmail1.xpm
-share/xmailbox/4xmail1.xpm
-share/xmailbox/5xmail1.xpm
-share/xmailbox/xmail1.xpm
-share/xmailbox/xnomail1.xpm
-${IMAKE_MAN_DIR}/xmailbox.${IMAKE_MANNEWSUFFIX}
-@exec ${MKDIR} %D/share/xmailbox
-@unexec ${RM} -rf %D/share/xmailbox
diff --git a/mail/xmailbox/distinfo b/mail/xmailbox/distinfo
deleted file mode 100644
index c1b31c3fbdf..00000000000
--- a/mail/xmailbox/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/03/04 16:27:26 schwarz Exp $
-
-SHA1 (xmailbox-2.5.tar.gz) = 5a213b7551c1d288bb5d5eb16b857c24ac72be38
-RMD160 (xmailbox-2.5.tar.gz) = 9a3c1e3fae890bdb84da09cca8357ceba9705b25
-Size (xmailbox-2.5.tar.gz) = 43535 bytes
-SHA1 (patch-aa) = 31682497caef92bed7b0cde4c1ace990079938af
-SHA1 (patch-ab) = de5e0dc8ec927827c156d61a1e4291ddaa6973dc
-SHA1 (patch-ac) = 239a8698d2150b3846e14086da85daad52b1edc8
diff --git a/mail/xmailbox/patches/patch-aa b/mail/xmailbox/patches/patch-aa
deleted file mode 100644
index d5695a8d1d4..00000000000
--- a/mail/xmailbox/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/05/25 15:30:34 bouyer Exp $
-
---- XMailbox.ad.orig Tue May 25 17:01:18 1999
-+++ XMailbox.ad Tue May 25 17:04:29 1999
-@@ -1,16 +1,16 @@
- !--------------------
- ! XMailbox defaults
- !--------------------
--xmailbox*geometry: -24+102
-+! xmailbox*geometry: -24+102
- xmailbox*volume: 50
- xmailbox*update: 60
--xmailbox*onceOnly: true
--xmailbox*mailNumOfXpmFile: 1
-+xmailbox*onceOnly: false
-+xmailbox*mailNumOfXpmFile: 6
- xmailbox*mailAnimOnce: true
--! xmailbox*mailAnimUpdate: 1000
--! xmailbox*mailapp: echo 'setenv LINES 25; setenv COLUMNS 80; xterm -n Elm -e elm' | /bin/csh -f -s
-+xmailbox*mailAnimUpdate: 800
-+xmailbox*nomailXpmFile: /usr/X11R6/share/xmailbox/xnomail1.xpm
-+xmailbox*mailXpmFile: /usr/X11R6/share/xmailbox/xmail1.xpm
-+xmailbox*mailapp: echo 'setenv LINES 25; setenv COLUMNS 80; xterm -n Mutt -e mutt' | /bin/csh -f -s
- ! xmailbox*mailSndFile: /usr/public/lib/sounds/bong.au
- ! xmailbox*mailSndComm: /usr/public/bin/play %s
--! xmailbox*nomailXpmFile: /usr/X11/include/X11/pixmaps/mail0.xpm
--! xmailbox*mailXpmFile: /usr/X11/include/X11/pixmaps/mail1.xpm
-
diff --git a/mail/xmailbox/patches/patch-ab b/mail/xmailbox/patches/patch-ab
deleted file mode 100644
index 54cb83a92a7..00000000000
--- a/mail/xmailbox/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2000/01/09 01:50:02 wiz Exp $
---- MailboxP.h.orig Tue May 25 17:10:18 1999
-+++ MailboxP.h Tue May 25 17:10:28 1999
-@@ -36,7 +36,7 @@
-
- #include "Mailbox.h"
- #include <X11/Xaw/SimpleP.h>
--#include <xpm.h>
-+#include <X11/xpm.h>
-
- #ifdef SYSV
- #define MAILBOX_DIRECTORY "/usr/mail"
diff --git a/mail/xmailbox/patches/patch-ac b/mail/xmailbox/patches/patch-ac
deleted file mode 100644
index 986ff9fcf90..00000000000
--- a/mail/xmailbox/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/03/04 16:27:26 schwarz Exp $
-
---- Mailbox.c.orig 2005-03-04 15:58:13.000000000 +0100
-+++ Mailbox.c 2005-03-04 15:58:52.000000000 +0100
-@@ -276,7 +276,7 @@
- return (XtGetGC ((Widget) w, valuemask, &xgcv));
- }
-
--int zombiekiller()
-+void zombiekiller()
- {
- int status;
-
diff --git a/mail/xmailwatcher/DESCR b/mail/xmailwatcher/DESCR
deleted file mode 100644
index c52118a234c..00000000000
--- a/mail/xmailwatcher/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This is XMAILWATCHER, which periodically checks a user's mailbox. If
-there is mail, the user is notified either by a changing icon, or by a
-list of senders and subjects in an X object.
diff --git a/mail/xmailwatcher/Makefile b/mail/xmailwatcher/Makefile
deleted file mode 100644
index 4d8930fdce5..00000000000
--- a/mail/xmailwatcher/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:45 wiz Exp $
-
-DISTNAME= xmailwatcher
-PKGNAME= ${DISTNAME}-1.6
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.dcs.ed.ac.uk/pub/X11/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Mailbox checker which displays sender and subject lines of mails
-
-USE_IMAKE= yes
-
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/xmailwatcher/PLIST b/mail/xmailwatcher/PLIST
deleted file mode 100644
index 9c74f907f55..00000000000
--- a/mail/xmailwatcher/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/01/22 02:37:12 joerg Exp $
-bin/xmailwatcher
-${IMAKE_MAN_DIR}/xmailwatcher.${IMAKE_MAN_SUFFIX}
diff --git a/mail/xmailwatcher/distinfo b/mail/xmailwatcher/distinfo
deleted file mode 100644
index f4266486b28..00000000000
--- a/mail/xmailwatcher/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:30 agc Exp $
-
-SHA1 (xmailwatcher.tar.gz) = eed0c1b39a0877471ab4a862a49f1fd8b5bfacfc
-RMD160 (xmailwatcher.tar.gz) = acdd522889330b998f313274cd3f6405dceee1ae
-Size (xmailwatcher.tar.gz) = 15393 bytes
-SHA1 (patch-aa) = f9af02cab5c4b3244e1a5ac346b8fff123fcf441
diff --git a/mail/xmailwatcher/patches/patch-aa b/mail/xmailwatcher/patches/patch-aa
deleted file mode 100644
index fb98fb63bc1..00000000000
--- a/mail/xmailwatcher/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/06/27 18:26:54 nra Exp $
-
---- box.c.orig Sat Feb 3 18:13:00 2001
-+++ box.c Sat Feb 3 18:13:50 2001
-@@ -31,7 +31,7 @@
- #include <unistd.h>
- #include <sys/stat.h>
- #include <sys/types.h>
--#include <sys/dir.h>
-+#include <dirent.h>
- #include <X11/Xos.h>
-
- /* MIME processing */
-@@ -235,7 +235,7 @@
- int n, i, tally;
- char oneFrom[160];
- char *pos;
-- char filename[PATH_MAX];
-+ char filename[FILENAME_MAX];
-
- if (flags & BOX_DEBUG) (void) printf("MHparseMailbox(%s)\n", mailbox);
-
diff --git a/mail/yatsvrs/DEINSTALL b/mail/yatsvrs/DEINSTALL
deleted file mode 100644
index a7e9d0d4d0c..00000000000
--- a/mail/yatsvrs/DEINSTALL
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# $Id: DEINSTALL,v 1.3 2004/12/15 13:18:02 taca Exp $
-
-YAT_CONF_DIR="@PKG_SYSCONFDIR@"
-DEFAULT_ADMIN="@DEFAULT_ADMIN@"
-MIN="@YATSVR_MINGID@"
-MAX="@YATSVR_MAXGID@"
-
-case "$2" in
-DEINSTALL)
-
- admin=`${CAT} ${YAT_CONF_DIR}/.admin`
- if [ "$admin" = "${DEFAULT_ADMIN}" ]; then
- ${RM} -f ${YAT_CONF_DIR}/.admin
- fi
- ${AWK} -F: '$1 !~ /^no/ { if ($3 < '$MIN' || $3 > '$MAX') print $1}' \
- /etc/group > /tmp/hidden-group
- if ${CMP} -s ${YAT_CONF_DIR}/.hidden-group /tmp/hidden-group; then
- ${RM} -f ${YAT_CONF_DIR}/.hidden-group
- fi
- ${RM} -f /tmp/hidden-group
- ${RM} -f ${YAT_CONF_DIR}/*\~old
- ;;
-esac
diff --git a/mail/yatsvrs/DESCR b/mail/yatsvrs/DESCR
deleted file mode 100644
index 7932372dbd7..00000000000
--- a/mail/yatsvrs/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-YAT is an extended POP3 server and supporting servers.
-It contains the following programs.
-
- yatd YAT server; extended POP3 server
- ascyd Apop shared Secret changer for Yatsvr
- yatconfd YAT configuration daemon
-
-Yatd was based on Berkeley's popper program and previously known as
-yatsvr. Yatd has its own extension to the POP3 protocol for
-WinYAT, a commercial product from JEPRO Co., Ltd, but it still
-works as standard POP3 server. The extension to POP3 is documented
-in an attached Japanese document.
diff --git a/mail/yatsvrs/INSTALL b/mail/yatsvrs/INSTALL
deleted file mode 100644
index c5ae1d5b672..00000000000
--- a/mail/yatsvrs/INSTALL
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# $Id: INSTALL,v 1.4 2004/12/15 13:18:02 taca Exp $
-
-YAT_CONF_DIR="@PKG_SYSCONFDIR@"
-DEFAULT_ADMIN="@DEFAULT_ADMIN@"
-MIN="@YATSVR_MINGID@"
-MAX="@YATSVR_MAXGID@"
-
-case ${STAGE} in
-POST-INSTALL)
- if [ ! -f ${YAT_CONF_DIR}/.admin ]; then
- echo ${DEFAULT_ADMIN} > ${YAT_CONF_DIR}/.admin
- ${CHMOD} 0600 ${YAT_CONF_DIR}/.admin
- fi
- # hack for restrict groups
- ${AWK} -F: '$1 !~ /^no/ { if ($3 < '$MIN' || $3 > '$MAX') print $1}' \
- /etc/group > ${YAT_CONF_DIR}/.hidden-group
- ${CHMOD} 0600 ${YAT_CONF_DIR}/.hidden-group
- ;;
-esac
diff --git a/mail/yatsvrs/MESSAGE b/mail/yatsvrs/MESSAGE
deleted file mode 100644
index fe58349a395..00000000000
--- a/mail/yatsvrs/MESSAGE
+++ /dev/null
@@ -1,22 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/07/15 22:57:29 heinz Exp $
-
-1. Add /etc/services those services.
-
-yatconf 54111/tcp
-ascy 54106/tcp
-
- Since those port numbers are not official one, please choose
- appropriate values for your environment.
-
-2. Please install inetd.conf(5)'s entry like bellow.
-
-pop3 stream tcp nowait root ${LOCALBASE}/libexec/yatd yatd
-yatconf stream tcp nowait root ${LOCALBASE}/libexec/yatconfd yatconfd
-ascy stream tcp nowait root ${LOCALBASE}/libexec/ascyd ascyd
-
- You should add appropriate options.
-
-3. Edit yatsvrrc and yatrc2 in ${PKG_SYSCONFDIR}.
-
-===========================================================================
diff --git a/mail/yatsvrs/Makefile b/mail/yatsvrs/Makefile
deleted file mode 100644
index 979bdae8cf3..00000000000
--- a/mail/yatsvrs/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/03/14 01:14:30 jlam Exp $
-#
-
-DISTNAME= yatsvrs-5.00p6
-PKGNAME= ${DISTNAME:S/p/./}
-PKGREVISION= 4
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.jone-system.com/pub/jepro/yatsvr/
-
-MAINTAINER= taca@NetBSD.org
-HOMEPAGE= # not available
-COMMENT= Extended POP3 server and some supporting servers
-
-CONFLICTS= ascyd-* yatsvr4-*
-
-GNU_CONFIGURE= yes
-DOCS= IMPORTANT README UPDATE doc/YATCONF doc/YATEXT4
-DOCDIR= ${PREFIX}/share/doc/yatsvr5
-EXAMPLES= yatrc2 yatsvrrc
-EXAMPLESDIR= ${PREFIX}/share/examples/yatsvr5
-
-CONFIGURE_ARGS+= --enable-popper-xmit
-CONFIGURE_ARGS+= --with-log-facility=${YATSVR_LOGFAC:Q}
-CONFIGURE_ARGS+= --with-yat-sys-dir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --with-yat-sys-old-dir-v4=${OLDCONFDIR:Q}
-CONFIGURE_ARGS+= --enable-shadow-password
-
-DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
-INSTALL_FILE= ${WRKDIR}/INSTALL
-
-FILES_SUBST+= DEFAULT_ADMIN=${DEFAULT_YATADMIN:Q}
-FILES_SUBST+= YATSVR_MINGID=${YATSVR_MINGID:Q}
-FILES_SUBST+= YATSVR_MAXGID=${YATSVR_MAXGID:Q}
-
-.for f in ${EXAMPLES}
-CONF_FILES+= ${EXAMPLESDIR}/${f} ${PKG_SYSCONFDIR}/${f}
-.endfor
-OWN_DIRS+= ${PKG_SYSCONFDIR}
-
-.include "../../mk/bsd.prefs.mk"
-
-YATSVR_LOGFAC?= LOG_LOCAL4
-YATSVR_MINGID?= 1001
-YATSVR_MAXGID?= 64999
-DEFAULT_YATADMIN?= root
-PKG_SYSCONFSUBDIR?= yatsvr5
-OLDCONFDIR?= ${PKG_SYSCONFBASE}/yat
-
-post-install:
- ${INSTALL_DATA_DIR} ${DOCDIR}
-.for f in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}
-.endfor
- ${INSTALL_DATA_DIR} ${EXAMPLESDIR}
-.for f in ${EXAMPLES}
- ${INSTALL_DATA} ${WRKSRC}/sample/${f} ${EXAMPLESDIR}/${f}
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/yatsvrs/PLIST b/mail/yatsvrs/PLIST
deleted file mode 100644
index 0eb3ce347dd..00000000000
--- a/mail/yatsvrs/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/10/23 21:45:16 rillig Exp $
-libexec/ascyd
-libexec/yatconfd
-libexec/yatd
-share/doc/yatsvr5/IMPORTANT
-share/doc/yatsvr5/README
-share/doc/yatsvr5/UPDATE
-share/doc/yatsvr5/YATCONF
-share/doc/yatsvr5/YATEXT4
-@dirrm share/doc/yatsvr5
-share/examples/yatsvr5/yatrc2
-share/examples/yatsvr5/yatsvrrc
-@dirrm share/examples/yatsvr5
diff --git a/mail/yatsvrs/distinfo b/mail/yatsvrs/distinfo
deleted file mode 100644
index 11a270f2c85..00000000000
--- a/mail/yatsvrs/distinfo
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: distinfo,v 1.12 2006/09/22 18:58:59 joerg Exp $
-
-SHA1 (yatsvrs-5.00p6.tar.gz) = be94b29c8631acc1d7b3c4313501b6d674e6b43f
-RMD160 (yatsvrs-5.00p6.tar.gz) = 9920ac63a2477100ddc54196c76d6d700b144642
-Size (yatsvrs-5.00p6.tar.gz) = 210067 bytes
-SHA1 (patch-aa) = 33b8ed3f600c6d4ce4492b88d004fb1f954fdc24
-SHA1 (patch-ab) = e5db32324dc4d801f468db985ac99e687c41089d
-SHA1 (patch-ac) = e34b2364f0039a135a7ebcd24c84b6d101581489
-SHA1 (patch-ad) = 392b8f6abd208c9387b2953792af2638aacbae23
-SHA1 (patch-ae) = 20f860d23b990eebe0c0e4a3f36ae658032a0c61
-SHA1 (patch-af) = e91f015118fb5ab95fccecf09205198894f89395
-SHA1 (patch-ag) = a0327cf05d1bf0142087af454d6a62f29a069eab
-SHA1 (patch-ah) = cdd32e7a7474b94601c69c4ab6a304542af7da42
-SHA1 (patch-ai) = 43ec227de986c3f2170deceb24444974773bb3a3
-SHA1 (patch-aj) = fc13d80bc08a84d86e627adad167d96684151541
-SHA1 (patch-ak) = ec11aabeca579944e78053065759986cb96c1da2
-SHA1 (patch-al) = eed8524c6dfabdb03cabd556abfa38b4f16aecac
-SHA1 (patch-am) = 4e6c7112fe380aafbe275c18dd85e794e058ec9b
-SHA1 (patch-ao) = f697fe18121dcee1a279b5e4e8d318789cef8211
-SHA1 (patch-ap) = f42ade29527d1910f271c10797f6bd8d9f3710cc
-SHA1 (patch-aq) = ea2d7d2f21ebe3aea163d6de0a95060be2ecc381
-SHA1 (patch-ar) = 8f26f7a180790070e1137c9840c1e0edcfc02a66
-SHA1 (patch-as) = 5156e666d446cecf582aab900f911e568f7e8d8a
-SHA1 (patch-at) = 73704aa7d506c5a97f4fef3cc03e6ac8e983497e
-SHA1 (patch-au) = 63aa76a7a9c55c9877fe2a336903828d193c3658
-SHA1 (patch-av) = 4c87a76438f97fcafa29083c37d3a225bd219cc2
-SHA1 (patch-aw) = 31a7f22c6e78b87d7bec66d0dd77641884ffb107
-SHA1 (patch-ax) = 70ff600e44ae05e27b240fb285da7a848baa4543
-SHA1 (patch-ay) = 7af5466cf2f2630ab34b1638cf45fbf7247f731d
-SHA1 (patch-az) = 29790a4630628b95900d260a30f1b2db21d54975
-SHA1 (patch-ba) = f309f85700bfdf487899aac178fb99e7173b6748
-SHA1 (patch-bb) = 97f52dc43b6ac426e26268d21e1133e6e7a7174f
-SHA1 (patch-bc) = e98bfffaf407b909a197dd39763287bc8c548303
-SHA1 (patch-bd) = 69d9c81055c9d4abe54dba867e901172cd174179
-SHA1 (patch-be) = e2bd65bf1c4345e2a81749237d22104c99ce6a71
-SHA1 (patch-bf) = 5f45a4799834d49d52d5ffe781967e1ccc2d793b
-SHA1 (patch-bg) = 3b75fc375e4bb4121292f562b609038bbf2276f8
-SHA1 (patch-bh) = a9160a6156c2e8ea783dc11bdb5df6663f274192
-SHA1 (patch-bi) = a17c470217673bb1f40e446a2867ced0a8c26cf3
-SHA1 (patch-bj) = 50728ec84bee5177f60695fe3cff4c595636b300
-SHA1 (patch-bk) = f3ae9b2bc8ef898e85739f8a2361752062c545f7
-SHA1 (patch-bl) = 37b01451503a5b8035ea872b349ef4dff89cccd4
-SHA1 (patch-bm) = e5d8e27c820e1d23254e3b8250def76045029b4d
-SHA1 (patch-bn) = bef58405d86167fb566942cdef24182be67e46c8
-SHA1 (patch-bo) = 95b8c7de41628700bd52c6428e92d489087df8b1
-SHA1 (patch-bp) = ae6cf703bca51589fe15d11f3f8aac3c04454f34
diff --git a/mail/yatsvrs/patches/patch-aa b/mail/yatsvrs/patches/patch-aa
deleted file mode 100644
index 27f3c0d9f93..00000000000
--- a/mail/yatsvrs/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/12/21 03:55:13 taca Exp $
-
---- Makefile.in.orig Thu Dec 20 21:31:50 2001
-+++ Makefile.in Fri Dec 21 00:34:46 2001
-@@ -68,7 +68,7 @@
- YAT5SYSDIR = @YAT5SYSDIR@
- YATSYSDIROLD = @YATSYSDIROLD@
-
--SUBDIRS = common yatd yatconfd ascyd doc sample
-+SUBDIRS = common yatd yatconfd ascyd doc
- EXTRA_DIST = conf.h pkg_ver.h IMPORTANT INSTALL README UPDATE pkg_ver.h.in yatsvr5.00.spec.in yatsvr5.00.spec
-
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/mail/yatsvrs/patches/patch-ab b/mail/yatsvrs/patches/patch-ab
deleted file mode 100644
index feb8e81d5ab..00000000000
--- a/mail/yatsvrs/patches/patch-ab
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/01/08 09:39:57 taca Exp $
-
---- ascyd/Makefile.in.orig 2001-12-20 21:31:52.000000000 +0900
-+++ ascyd/Makefile.in
-@@ -68,7 +68,7 @@ VERSION = @VERSION@
- YAT5SYSDIR = @YAT5SYSDIR@
- YATSYSDIROLD = @YATSYSDIROLD@
-
--AM_CPPFLAGS = -I../common -DYATSYSDIROLD=\"@YATSYSDIROLD@\" -DYAT5SYSDIR=\"$(YAT5SYSDIR)\" -Wall -Wstrict-prototypes # -Werror
-+AM_CPPFLAGS = -I../common -DYATSYSDIROLD=\"@YATSYSDIROLD@\" -DYAT5SYSDIR=\"$(YAT5SYSDIR)\"
-
- sbin_PROGRAMS = ascyd
- ascyd_SOURCES = apop.c ascy.h entry.c error.c etc.c greeting.c init.c lock.c message.c msg2cmd.c newpass.c newsecret.c pass.c prototype.h quit.c sighand.c user.c ver.c version.h
-@@ -125,18 +125,18 @@ maintainer-clean-sbinPROGRAMS:
-
- install-sbinPROGRAMS: $(sbin_PROGRAMS)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(sbindir)
-+ $(mkinstalldirs) $(DESTDIR)$(libexecdir)
- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
- if test -f $$p; then \
-- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- else :; fi; \
- done
-
- uninstall-sbinPROGRAMS:
- @$(NORMAL_UNINSTALL)
- list='$(sbin_PROGRAMS)'; for p in $$list; do \
-- rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+ rm -f $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- done
-
- .c.o:
-@@ -263,7 +263,7 @@ all-redirect: all-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(sbindir)
-+ $(mkinstalldirs) $(DESTDIR)$(libexecdir)
-
-
- mostlyclean-generic:
diff --git a/mail/yatsvrs/patches/patch-ac b/mail/yatsvrs/patches/patch-ac
deleted file mode 100644
index 360dcfff737..00000000000
--- a/mail/yatsvrs/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- ascyd/entry.c.orig Tue Jun 26 20:23:15 2001
-+++ ascyd/entry.c
-@@ -188,7 +188,7 @@
- Msg2Cli(ASCY_SUCCESS, "%.512s @%.256s",
- szGreeting , SysData.szMyHost);
- #else
-- Msg2Cli(ASCY_SUCCESS, "%.512s <%u.%u@%.256s>",
-+ Msg2Cli(ASCY_SUCCESS, "%.512s <%u.%ld@%.256s>",
- szGreeting,
- SysData.pid, SysData.timeStart, SysData.szMyHost);
- #endif
diff --git a/mail/yatsvrs/patches/patch-ad b/mail/yatsvrs/patches/patch-ad
deleted file mode 100644
index 878ea6e6ed5..00000000000
--- a/mail/yatsvrs/patches/patch-ad
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- ascyd/message.c.orig Mon Jun 25 14:57:45 2001
-+++ ascyd/message.c
-@@ -9,13 +9,13 @@
- */
- int Msg2Cli(
- #ifdef STDC_HEADERS
-- int stat, CONST char * pFmt, ...
-+ int status, CONST char * pFmt, ...
- #else
-- stat, pFmt, va_alist
-+ status, pFmt, va_alist
- #endif
- )
- #ifndef STDC_HEADERS
-- int stat;
-+ int status;
- CONST char * pFmt;
- va_dcl
- #endif
-@@ -32,7 +32,7 @@
- if (feof(stdout) || ferror(stdout))
- SysData.Flags.errCliIO = 1;
-
-- sprintf(szMsg, "%d ", stat);
-+ sprintf(szMsg, "%d ", status);
- p = index(szMsg, '\0');
- *p++ = ' ';
- *p = '\0';
-@@ -89,7 +89,7 @@
- else
- LogNOTICE("<<<NO CONNECTION>>> %.512s", szMsg);
- va_end(ap);
-- return stat;
-+ return status;
- }
-
- /*
diff --git a/mail/yatsvrs/patches/patch-ae b/mail/yatsvrs/patches/patch-ae
deleted file mode 100644
index eb00bf5376c..00000000000
--- a/mail/yatsvrs/patches/patch-ae
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- ascyd/prototype.h.orig Fri Jun 22 21:16:55 2001
-+++ ascyd/prototype.h
-@@ -32,12 +32,18 @@
- char *strlwr __P((char *));
- int atoi2 __P((char *));
-
--void LogDEBUG __P((CONST char * pFmt, ...));
--void LogNOTICE __P((CONST char * pFmt, ...));
--int Msg2Cli __P((int stat, CONST char * pFmt, ...));
--void Str2Cli __P((CONST char * pFmt, ...));
--void ErrSetData __P((int codeErr, int Flags, CONST char * pFmt, ...));
--void WARNING __P((int codeErr, int Flags, CONST char * pFmt, ...));
-+void LogDEBUG __P((CONST char * pFmt, ...))
-+ __attribute__((__format__(__printf__, 1, 2)));
-+void LogNOTICE __P((CONST char * pFmt, ...))
-+ __attribute__((__format__(__printf__, 1, 2)));
-+int Msg2Cli __P((int, CONST char * pFmt, ...))
-+ __attribute__((__format__(__printf__, 2, 3)));
-+void Str2Cli __P((CONST char * pFmt, ...))
-+ __attribute__((__format__(__printf__, 1, 2)));
-+void ErrSetData __P((int codeErr, int Flags, CONST char * pFmt, ...))
-+ __attribute__((__format__(__printf__, 3, 4)));
-+void WARNING __P((int codeErr, int Flags, CONST char * pFmt, ...))
-+ __attribute__((__format__(__printf__, 3, 4)));
-
- /* etc.c */
- char * CatchLine __P((char *, int, FILE *));
diff --git a/mail/yatsvrs/patches/patch-af b/mail/yatsvrs/patches/patch-af
deleted file mode 100644
index 8cf42f8da73..00000000000
--- a/mail/yatsvrs/patches/patch-af
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-af,v 1.2 2003/10/05 04:25:15 taca Exp $
-
---- ascyd/sighand.c.orig 2001-06-25 16:28:21.000000000 +0900
-+++ ascyd/sighand.c
-@@ -60,7 +60,6 @@ void SigUnblock()
- void SigHandler(iSig)
- int iSig;
- {
-- CONST char * pMsg;
- int codeErr;
-
- /*
-@@ -72,17 +71,14 @@ void SigHandler(iSig)
-
- switch (iSig) {
- case SIGALRM:
-- pMsg = NULL;
- codeErr = ERRYS_TIMEOUT;
-+ WARNING(codeErr, 0, NULL);
- break;
-- case SIGHUP:
-- case SIGTERM:
- default:
- codeErr = ERRYS_SIGNAL;
-- pMsg = "#%d";
-+ WARNING(codeErr, 0, "#%d", iSig);
- break;
- }
-- WARNING(codeErr, 0, pMsg, iSig);
-
- if (SysData.Flags.lock)
- SessionUnlock();
-@@ -94,7 +90,7 @@ void SigHandler(iSig)
- }
- #endif
-
-- ErrSetData(codeErr, 0, pMsg, iSig);
-+ ErrSetData(codeErr, 0, (codeErr == ERRYS_SIGNAL)? "#%d": NULL, iSig);
- Msg2Cli(FAILURE, NULL);
-
- exit(1);
diff --git a/mail/yatsvrs/patches/patch-ag b/mail/yatsvrs/patches/patch-ag
deleted file mode 100644
index 92d3f3d2dfb..00000000000
--- a/mail/yatsvrs/patches/patch-ag
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2006/01/08 19:30:02 joerg Exp $
-
---- conf.h.orig 2001-07-09 09:19:03.000000000 +0000
-+++ conf.h
-@@ -26,30 +26,33 @@
-
- #if SIZEOF_OFF_T == SIZEOF_LONG_LONG
- # define LONGLONG_OFF_T
-+# define LONGLONG_CAST(c) (long long)(c)
- # ifndef LONGLONG_OPTC
--# if defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+# if defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- # define LONGLONG_OPTC "q"
- # elif defined( __sun__ )
- # define LONGLONG_OPTC "ll"
- # else
--# define LONGLONG_OPTC "ul"
-+# define LONGLONG_OPTC "lu"
- # endif
- # endif /* LONGLONG_OPTC */
- #elif SIZEOF_OFF_T == SIZEOF_LONG
- # undef LONGLONG_OFF_T
-+# define LONGLONG_CAST(c) (c)
-+# define LONGLONG_OPTC /* */
- #else
- # error
- #endif /* SIZEOF_OFF_T == SIZEOF_LONG_LONG */
-
- /* symbol BSD44 */
--#if defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- #define BSD44
- #else
- #undef BSD44
- #endif
-
- /* symbol Ignore Mnt Quota */
--#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- #define IGNORE_MNT_QUOTA
- #else
- #undef IGNORE_MNT_QUOTA
-@@ -522,7 +525,7 @@
-
- #ifndef HAVE_MEMMOVE
- #include "common/memmove.h"
--#endif HAVE_MEMMOVE
-+#endif /* HAVE_MEMMOVE */
-
- #ifdef LOGWTMP
- #include <utmp.h>
diff --git a/mail/yatsvrs/patches/patch-ah b/mail/yatsvrs/patches/patch-ah
deleted file mode 100644
index 50116cdf792..00000000000
--- a/mail/yatsvrs/patches/patch-ah
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- sample/yatrc2.orig Wed Jul 4 12:34:11 2001
-+++ sample/yatrc2
-@@ -27,18 +27,18 @@
-
- # Default Kanji code
- [KANJI]
-- files: JIS, JIS, ^[$B, ^[(J
-+ files: JIS, JIS, ^[$B, ^[(B
-
- # Common aliases
- [ALIAS]
-- $B%a!<%k4IM}<T(B: postmaster@your.domain.jp
-- $B%K%e!<%94IM}<T(B: news@your.domain.jp
-- $B%7%9%F%`4IM}<T(B: root@your.domain.jp
-- Web$B4IM}<T(B: webmaster@your.domain.jp
-+# $B%a!<%k4IM}<T(B: postmaster@your.domain.jp
-+# $B%K%e!<%94IM}<T(B: news@your.domain.jp
-+# $B%7%9%F%`4IM}<T(B: root@your.domain.jp
-+# Web$B4IM}<T(B: webmaster@your.domain.jp
-
- # Common alias group
- [ALIASGRP]
-- $B4IM}?M(B: $B%a!<%k4IM}<T(B $B%K%e!<%94IM}<T(B $B%7%9%F%`4IM}<T(B
-+# $B4IM}?M(B: $B%a!<%k4IM}<T(B $B%K%e!<%94IM}<T(B $B%7%9%F%`4IM}<T(B
-
- # customization
- [CUSTOM]
diff --git a/mail/yatsvrs/patches/patch-ai b/mail/yatsvrs/patches/patch-ai
deleted file mode 100644
index d9b67e5b750..00000000000
--- a/mail/yatsvrs/patches/patch-ai
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2005/01/08 09:39:57 taca Exp $
-
---- yatconfd/Makefile.in.orig 2001-12-20 21:31:51.000000000 +0900
-+++ yatconfd/Makefile.in
-@@ -68,7 +68,7 @@ VERSION = @VERSION@
- YAT5SYSDIR = @YAT5SYSDIR@
- YATSYSDIROLD = @YATSYSDIROLD@
-
--AM_CPPFLAGS = -I../common -DYATSYSDIROLD=\"@YATSYSDIROLD@\" -DYAT5SYSDIR=\"$(YAT5SYSDIR)\" -Wall -Wstrict-prototypes
-+AM_CPPFLAGS = -I../common -DYATSYSDIROLD=\"@YATSYSDIROLD@\" -DYAT5SYSDIR=\"$(YAT5SYSDIR)\"
-
-
- sbin_PROGRAMS = yatconfd
-@@ -127,18 +127,18 @@ maintainer-clean-sbinPROGRAMS:
-
- install-sbinPROGRAMS: $(sbin_PROGRAMS)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(sbindir)
-+ $(mkinstalldirs) $(DESTDIR)$(libexecdir)
- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
- if test -f $$p; then \
-- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- else :; fi; \
- done
-
- uninstall-sbinPROGRAMS:
- @$(NORMAL_UNINSTALL)
- list='$(sbin_PROGRAMS)'; for p in $$list; do \
-- rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+ rm -f $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- done
-
- .c.o:
-@@ -268,7 +268,7 @@ all-redirect: all-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(sbindir)
-+ $(mkinstalldirs) $(DESTDIR)$(libexecdir)
-
-
- mostlyclean-generic:
diff --git a/mail/yatsvrs/patches/patch-aj b/mail/yatsvrs/patches/patch-aj
deleted file mode 100644
index 099540c643f..00000000000
--- a/mail/yatsvrs/patches/patch-aj
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatconfd/message.c.orig Mon Jun 25 17:45:45 2001
-+++ yatconfd/message.c
-@@ -9,13 +9,13 @@
- */
- int Msg2Cli(
- #ifdef STDC_HEADERS
-- int stat, CONST char * pFmt, ...
-+ int status, CONST char * pFmt, ...
- #else
-- stat, pFmt, va_alist
-+ status, pFmt, va_alist
- #endif
- )
- #ifndef STDC_HEADERS
-- int stat;
-+ int status;
- CONST char * pFmt;
- va_dcl
- #endif
-@@ -32,7 +32,7 @@
- if (feof(stdout) || ferror(stdout))
- SysData.Flags.errCliIO = 1;
-
-- strcpy(szMsg, stat==SUCCESS ? ANS_POSITIVE : ANS_NEGATIVE);
-+ strcpy(szMsg, status==SUCCESS ? ANS_POSITIVE : ANS_NEGATIVE);
- p = strchr(szMsg, '\0');
- *p++ = ' ';
- *p = '\0';
-@@ -89,7 +89,7 @@
- else
- LogNOTICE("<<<NO CONNECTION>>> %.512s", szMsg);
- va_end(ap);
-- return stat;
-+ return status;
- }
-
- /*
diff --git a/mail/yatsvrs/patches/patch-ak b/mail/yatsvrs/patches/patch-ak
deleted file mode 100644
index 8484881f038..00000000000
--- a/mail/yatsvrs/patches/patch-ak
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatconfd/yatconf.h.orig Mon Jul 9 09:43:11 2001
-+++ yatconfd/yatconf.h
-@@ -279,12 +279,18 @@
- char * strlwr __P((char *));
- int atoi2 __P((char *));
-
--void LogDEBUG __P((CONST char * pFmt, ...));
--void LogNOTICE __P((CONST char * pFmt, ...));
--int Msg2Cli __P((int stat, CONST char * pFmt, ...));
--void Str2Cli __P((CONST char * pFmt, ...));
--void ErrSetData __P((int codeErr, int Flags, CONST char * pFmt, ...));
--void WARNING __P((int codeErr, int Flags, CONST char * pFmt, ...));
-+void LogDEBUG __P((CONST char * pFmt, ...))
-+ __attribute__((__format__(__printf__, 1, 2)));
-+void LogNOTICE __P((CONST char * pFmt, ...))
-+ __attribute__((__format__(__printf__, 1, 2)));
-+int Msg2Cli __P((int, CONST char * pFmt, ...))
-+ __attribute__((__format__(__printf__, 2, 3)));
-+void Str2Cli __P((CONST char * pFmt, ...))
-+ __attribute__((__format__(__printf__, 1, 2)));
-+void ErrSetData __P((int codeErr, int Flags, CONST char * pFmt, ...))
-+ __attribute__((__format__(__printf__, 3, 4)));
-+void WARNING __P((int codeErr, int Flags, CONST char * pFmt, ...))
-+ __attribute__((__format__(__printf__, 3, 4)));
-
- /* etc.c */
- char * CatchLine __P((char *, int, FILE *));
diff --git a/mail/yatsvrs/patches/patch-al b/mail/yatsvrs/patches/patch-al
deleted file mode 100644
index 7622367cf75..00000000000
--- a/mail/yatsvrs/patches/patch-al
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-al,v 1.2 2003/10/05 04:25:15 taca Exp $
-
---- yatconfd/yatconfd.c.orig 2001-06-26 20:25:22.000000000 +0900
-+++ yatconfd/yatconfd.c
-@@ -259,7 +259,7 @@ int main (argc, argv)
- Msg2Cli(SUCCESS, "%.512s @%.256s",
- szGreeting , SysData.szMyHost);
- #else
-- Msg2Cli(SUCCESS, "%.512s <%u.%u@%.256s>",
-+ Msg2Cli(SUCCESS, "%.512s <%u.%ld@%.256s>",
- szGreeting,
- SysData.pid, SysData.timeStart, SysData.szMyHost);
- #endif
-@@ -360,32 +360,26 @@ int main (argc, argv)
- static void SigHandler(iSig)
- int iSig;
- {
-- CONST char * pMsg;
- int codeErr;
-
-- /* POSIX シグナルでは,シグナルハンドラが呼び出されている間はシグナ
-- ルは呼ばれない */
-- /*
-- static int fSigHandled = 0;
-- if (fSigHandled)
-+#if 0
-+ static int fSigHandled = 0;
-+ if (fSigHandled)
- return ;
-- fSigHandled = 1;
-- SigBlock();
-- */
-+ fSigHandled = 1;
-+ SigBlock();
-+#endif
-
- switch (iSig) {
- case SIGALRM:
-- pMsg = NULL;
- codeErr = ERRYS_TIMEOUT;
-+ WARNING(codeErr, 0, NULL);
- break;
-- case SIGHUP:
-- case SIGTERM:
- default:
- codeErr = ERRYS_SIGNAL;
-- pMsg = "#%d";
-+ WARNING(codeErr, 0, "#%d", iSig);
- break;
- }
-- WARNING(codeErr, 0, pMsg, iSig);
-
- UnLockAll();
-
-@@ -396,7 +390,7 @@ static void SigHandler(iSig)
- }
- #endif
-
-- ErrSetData(codeErr, 0, pMsg, iSig);
-+ ErrSetData(codeErr, 0, (codeErr == ERRYS_SIGNAL)? "#%d": NULL, iSig);
- Msg2Cli(FAILURE, NULL);
-
- exit(1);
diff --git a/mail/yatsvrs/patches/patch-am b/mail/yatsvrs/patches/patch-am
deleted file mode 100644
index 8f6e681514f..00000000000
--- a/mail/yatsvrs/patches/patch-am
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-am,v 1.4 2006/02/24 19:12:18 joerg Exp $
-
---- config.h.in.orig 2006-02-24 18:59:41.000000000 +0000
-+++ config.h.in
-@@ -99,8 +99,10 @@
- /* Define if you have the statfs function. */
- #undef HAVE_STATFS
-
-+#if !defined(__DragonFly__)
- /* Define if you have the statvfs function. */
- #undef HAVE_STATVFS
-+#endif
-
- /* Define if you have the strcasecmp function. */
- #undef HAVE_STRCASECMP
-@@ -186,8 +188,10 @@
- /* Define if you have the <sys/quota.h> header file. */
- #undef HAVE_SYS_QUOTA_H
-
-+#if !defined(__DragonFly__)
- /* Define if you have the <sys/statvfs.h> header file. */
- #undef HAVE_SYS_STATVFS_H
-+#endif
-
- /* Define if you have the <sys/time.h> header file. */
- #undef HAVE_SYS_TIME_H
diff --git a/mail/yatsvrs/patches/patch-ao b/mail/yatsvrs/patches/patch-ao
deleted file mode 100644
index ade4d8a78f2..00000000000
--- a/mail/yatsvrs/patches/patch-ao
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ao,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatconfd/yc_grplst.c.orig Fri Jun 8 17:56:12 2001
-+++ yatconfd/yc_grplst.c
-@@ -12,7 +12,7 @@
- char *p, *p2;
- int i;
-
-- LogDEBUG("SetMembers(%x\t%.256s)", pEntry, pszData);
-+ LogDEBUG("SetMembers(%p\t%.256s)", pEntry, pszData);
- if ((p = strdup(pszData)) == NULL) {
- ErrSetData(ENOMEM, ERRFLG_SYSERR, NULL);
- WARNING(ENOMEM, ERRFLG_SYSERR, NULL);
-@@ -47,7 +47,7 @@
- pEntry->member[i] = NULL;
- break;
- }
-- LogDEBUG("End of SetMembers(%x\t%.256s)", pEntry, pszData);
-+ LogDEBUG("End of SetMembers(%p\t%.256s)", pEntry, pszData);
- return pEntry->buffer;
- }
-
-@@ -56,7 +56,7 @@
- struct yc_admin *pEntry;
- static struct yc_admin **ppEntry, *pLast;
-
-- LogDEBUG("AddEntry(%x, %.1000s)", ppEntry1st, pszData);
-+ LogDEBUG("AddEntry(%p, %.1000s)", ppEntry1st, pszData);
- if (ppEntry1st != NULL) {
- ppEntry = ppEntry1st;
-
diff --git a/mail/yatsvrs/patches/patch-ap b/mail/yatsvrs/patches/patch-ap
deleted file mode 100644
index e80ea9ffccb..00000000000
--- a/mail/yatsvrs/patches/patch-ap
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ap,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatconfd/yc_user.c.orig Mon Jun 4 15:43:51 2001
-+++ yatconfd/yc_user.c
-@@ -84,8 +84,6 @@
- return ENOMEM;
- }
-
--static CONST char *pszFmt;
--
- static int _FuncUser()
- {
- if (CheckArgc(2, 2))
-@@ -105,8 +103,6 @@
- ErrSetData(ENOMEM, ERRFLG_FATAL | ERRFLG_SYSERR, NULL);
- return FAILURE;
- }
--
-- Msg2Cli(SUCCESS, pszFmt, SysData.szUser);
- return SUCCESS;
- }
-
-@@ -115,6 +111,10 @@
- */
- int FuncUser()
- {
-- pszFmt = "'%.256s' is welcome here.";
-- return _FuncUser();
-+ int status;
-+
-+ status = _FuncUser();
-+ if (status == SUCCESS)
-+ Msg2Cli(SUCCESS, "'%.256s' is welcome here.", SysData.szUser);
-+ return status;
- }
diff --git a/mail/yatsvrs/patches/patch-aq b/mail/yatsvrs/patches/patch-aq
deleted file mode 100644
index 54a3413da0e..00000000000
--- a/mail/yatsvrs/patches/patch-aq
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-aq,v 1.2 2005/01/08 09:39:57 taca Exp $
-
---- yatd/Makefile.in.orig 2001-12-20 21:31:51.000000000 +0900
-+++ yatd/Makefile.in
-@@ -68,7 +68,7 @@ VERSION = @VERSION@
- YAT5SYSDIR = @YAT5SYSDIR@
- YATSYSDIROLD = @YATSYSDIROLD@
-
--AM_CPPFLAGS = -I../common -DYATSYSDIROLD=\"@YATSYSDIROLD@\" -DYAT5SYSDIR=\"$(YAT5SYSDIR)\" -Wall -Wstrict-prototypes # -Werror
-+AM_CPPFLAGS = -I../common -DYATSYSDIROLD=\"@YATSYSDIROLD@\" -DYAT5SYSDIR=\"$(YAT5SYSDIR)\"
-
-
- sbin_PROGRAMS = yatd
-@@ -132,18 +132,18 @@ maintainer-clean-sbinPROGRAMS:
-
- install-sbinPROGRAMS: $(sbin_PROGRAMS)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(sbindir)
-+ $(mkinstalldirs) $(DESTDIR)$(libexecdir)
- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
- if test -f $$p; then \
-- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- else :; fi; \
- done
-
- uninstall-sbinPROGRAMS:
- @$(NORMAL_UNINSTALL)
- list='$(sbin_PROGRAMS)'; for p in $$list; do \
-- rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+ rm -f $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- done
-
- .c.o:
-@@ -371,7 +371,7 @@ all-redirect: all-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(sbindir)
-+ $(mkinstalldirs) $(DESTDIR)$(libexecdir)
-
-
- mostlyclean-generic:
diff --git a/mail/yatsvrs/patches/patch-ar b/mail/yatsvrs/patches/patch-ar
deleted file mode 100644
index 8629649a7b9..00000000000
--- a/mail/yatsvrs/patches/patch-ar
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ar,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatd/apop.c.orig Mon Jun 4 15:43:51 2001
-+++ yatd/apop.c
-@@ -43,7 +43,7 @@
- char szApopFile[MAXPATHLEN], szBuf[MAXLINELEN];
- FILE *fp;
- char *p;
-- int nLen;
-+ size_t nLen;
-
- sprintf(szApopFile, "%.512s/%.64s",
- SysData.pUserHomeDir, YATAPOPFILE);
-@@ -56,7 +56,7 @@
- GOTO LBL_ERROR;
- if ((p = strchr(szBuf, '\n')) != NULL)
- *p = '\0';
-- Base64DecodeLine(pszSecret, (size_t *)&nLen, szBuf);
-+ Base64DecodeLine(pszSecret, &nLen, szBuf);
-
- fclose(fp);
- return SUCCESS;
diff --git a/mail/yatsvrs/patches/patch-as b/mail/yatsvrs/patches/patch-as
deleted file mode 100644
index 95a94e81f4c..00000000000
--- a/mail/yatsvrs/patches/patch-as
+++ /dev/null
@@ -1,138 +0,0 @@
-$NetBSD: patch-as,v 1.5 2006/09/22 18:58:59 joerg Exp $
-
---- yatd/dfree.c.orig 2001-07-09 03:32:52.000000000 +0000
-+++ yatd/dfree.c
-@@ -39,6 +39,13 @@ typedef u_long quota_size_t;
- # include <sys/quota.h>
- #endif /* HAVE_SYS_QUOTA_H */
-
-+#ifdef __DragonFly__
-+#include <sys/param.h>
-+#if __DragonFly_version >= 160000
-+#define dqblk ufs_dqblk
-+#endif
-+#endif
-+
- static int
- quotactl_wrapper __P((const char *pPath, struct dqblk *quota_block));
- static int
-@@ -72,12 +79,6 @@ quota_get_inode_current __P(( struct dqb
-
- #define DEBUG_LOCAL
-
--#ifndef LONGLONG_OPTC
--/* LONGLONG_OPTCが定義されていない場合には 空白を定義して,
-- リテラルの糊として使う */
--#define LONGLONG_OPTC /* */
--#endif
--
- int DFreeCheck(pPath, pSizFree, pNodFree)
- char * pPath; /* ユーザーのホームディレクトリの位置 */
- OFF_T * pSizFree; /* 空きブロック数 */
-@@ -99,7 +100,7 @@ int DFreeCheck(pPath, pSizFree, pNodFree
- nodLimit = *pNodFree; /* リミットのノード数を指定する */
-
- #ifdef DEBUG_LOCAL
-- LogDEBUG("sizLimit:%" LONGLONG_OPTC "d, nodLimit:%d, sizof(OFF_T):%d",
-+ LogDEBUG("sizLimit:%" LONGLONG_OPTC "d, nodLimit:%ld, sizof(OFF_T):%d",
- sizLimit, nodLimit, sizeof (OFF_T));
- #endif /* DEBUG_LOCAL */
-
-@@ -122,23 +123,30 @@ int DFreeCheck(pPath, pSizFree, pNodFree
- #ifdef DEBUG_LOCAL
- # ifdef BSD44
- LogDEBUG("statfs() returns:");
-+# ifdef HAVE_STATVFS
-+ LogDEBUG(" flags: 0x%lx", statfsBuf.f_flag);
-+# else
- LogDEBUG(" type: %d", statfsBuf.f_type);
-- LogDEBUG(" flags: 0x%x", statfsBuf.f_flags);
--# ifdef __NetBSD__
-+ LogDEBUG(" flags: 0x%lx", statfsBuf.f_flags);
-+# ifdef __NetBSD__
- LogDEBUG(" oflags: 0x%x", statfsBuf.f_oflags);
--# endif
-+# endif /* __NetBSD__ */
-+# endif /* HAVE_STATVFS */
- # ifdef BSDOS1
- LogDEBUG(" fsize: %d", statfsBuf.f_fsize);
- # endif
-- LogDEBUG(" bsize: %d", statfsBuf.f_bsize);
-- LogDEBUG(" iosize: %d", statfsBuf.f_iosize);
-- LogDEBUG(" blocks: %d", statfsBuf.f_blocks);
-- LogDEBUG(" bfree: %d", statfsBuf.f_bfree);
-- LogDEBUG(" bavail: %d", statfsBuf.f_bavail);
-- LogDEBUG(" files: %d", statfsBuf.f_files);
-- LogDEBUG(" ffree: %d", statfsBuf.f_ffree);
-- LogDEBUG(" fsid: %d", statfsBuf.f_fsid);
-- LogDEBUG(" owner %d", statfsBuf.f_owner);
-+ LogDEBUG(" bsize: %ld", statfsBuf.f_bsize);
-+ LogDEBUG(" iosize: %ld", statfsBuf.f_iosize);
-+ LogDEBUG(" blocks: %ld", statfsBuf.f_blocks);
-+ LogDEBUG(" bfree: %ld", statfsBuf.f_bfree);
-+ LogDEBUG(" bavail: %ld", statfsBuf.f_bavail);
-+ LogDEBUG(" files: %ld", statfsBuf.f_files);
-+ LogDEBUG(" ffree: %ld", statfsBuf.f_ffree);
-+# ifdef HAVE_STATVFS
-+ LogDEBUG(" fsid: %d-%d", statfsBuf.f_fsidx.__fsid_val[0], statfsBuf.f_fsidx.__fsid_val[1]);
-+# else
-+ LogDEBUG(" fsid: %d-%d", statfsBuf.f_fsid.val[0], statfsBuf.f_fsid.val[1]);
-+# endif /* HAVE_STATVFS */
- #ifdef STRUCT_STATFS_HAVE_F_FSTYPENAME
- LogDEBUG(" fstypename: %.256s", statfsBuf.f_fstypename);
- #endif
-@@ -311,7 +319,7 @@ int FuncDFree()
- nodFree = SysData.nodLimitFree;
-
- #ifdef DEBUG_LOCAL
-- LogDEBUG("FuncDFree(): sizFree:%" LONGLONG_OPTC "d, nodFree:%d",
-+ LogDEBUG("FuncDFree(): sizFree:%" LONGLONG_OPTC "d, nodFree:%ld",
- sizFree, nodFree);
- #endif
-
-@@ -325,7 +333,7 @@ int FuncDFree()
- if (DFreeCheck(SysData.szUserFldrDir, &sizFree, &nodFree)){
- return FAILURE;
- }
-- Msg2Cli(SUCCESS, "%" LONGLONG_OPTC "d %d", sizFree, nodFree);
-+ Msg2Cli(SUCCESS, "%" LONGLONG_OPTC "d %ld", sizFree, nodFree);
- #endif /* DONT_CHECKDFREE */
- return SUCCESS;
- }
-@@ -427,7 +435,7 @@ static inline quota_size_t quota_get_ino
-
- #ifdef STRUCT_DQBLK_CURRENT_FILES
- retval = (quota_size_t)quota_block->dqb_curfiles;
--#endif STRUCT_DQBLK_CURRENT_FILES
-+#endif /* STRUCT_DQBLK_CURRENT_FILES */
-
- return retval;
- }
-@@ -449,12 +457,12 @@ static int quotactl_wrapper(pPath,quota_
- switch( status ){
- case SUCCESS:
- LogDEBUG("quotactl() returns:");
-- LogDEBUG(" bhardlimit: %d",quota_get_block_hard_limit(quota_block));
-- LogDEBUG(" bsoftlimit: %d",quota_get_block_soft_limit(quota_block));
-- LogDEBUG(" curblocks : %d",quota_get_block_current(quota_block));
-- LogDEBUG(" ihardlimit: %d",quota_get_inode_hard_limit(quota_block));
-- LogDEBUG(" isoftlimit: %d",quota_get_inode_soft_limit(quota_block));
-- LogDEBUG(" curinodes : %d", quota_get_inode_current(quota_block));
-+ LogDEBUG(" bhardlimit: %ld",quota_get_block_hard_limit(quota_block));
-+ LogDEBUG(" bsoftlimit: %ld",quota_get_block_soft_limit(quota_block));
-+ LogDEBUG(" curblocks : %ld",quota_get_block_current(quota_block));
-+ LogDEBUG(" ihardlimit: %ld",quota_get_inode_hard_limit(quota_block));
-+ LogDEBUG(" isoftlimit: %ld",quota_get_inode_soft_limit(quota_block));
-+ LogDEBUG(" curinodes : %ld", quota_get_inode_current(quota_block));
- return SUCCESS;
- case FAILURE:
- return FAILURE;
-@@ -494,7 +502,7 @@ static int quotactl_systemcall_support(
- status = quotactl(QCMD(Q_GETQUOTA, USRQUOTA),SysData.szMntFrom,
- SysData.pPwd->pw_uid, (caddr_t)quota_block);
-
--#elif defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-
- /* Get disk quota limits and current usage for the user or group
- (as determined by the command type) with identifier id. addr
diff --git a/mail/yatsvrs/patches/patch-at b/mail/yatsvrs/patches/patch-at
deleted file mode 100644
index ef4c0d823ad..00000000000
--- a/mail/yatsvrs/patches/patch-at
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD: patch-at,v 1.3 2004/12/15 13:18:02 taca Exp $
-
---- yatd/entry.c.orig 2001-07-09 12:32:52.000000000 +0900
-+++ yatd/entry.c
-@@ -106,6 +106,7 @@ struct SYS_DAT SysData = {
-
- { 0, 0 }, /* flags */
-
-+ 0, /* allow_xtnd */
- };
-
- /* Autherization-User state commands */
-@@ -338,7 +339,7 @@ int CheckArgs(argc, argv)
- LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7,
- };
-
-- while ((c = getopt(argc, argv, "d01234567s:")) != EOF) {
-+ while ((c = getopt(argc, argv, "d01234567s:x")) != EOF) {
- switch (c) {
- case 'd': /* DEBUG option */
- SysData.fDebug = 1;
-@@ -346,6 +347,9 @@ int CheckArgs(argc, argv)
- case 's': /* System Directory */
- strcpy(SysData.szSysDir, optarg);
- break;
-+ case 'x':
-+ SysData.allow_xtnd = 1;
-+ break;
- default:
- if ((c < '0') || ('7' < c)) {
- fprintf(stderr, "Usage: %.256s [-d]\n", argv[0]);
-@@ -431,7 +435,7 @@ int main (argc, argv)
- Msg2Cli(SUCCESS, "%.512s @%.256s",
- szGreeting , SysData.szMyHost);
- #else
-- Msg2Cli(SUCCESS, "%.512s <%u.%u@%.256s>",
-+ Msg2Cli(SUCCESS, "%.512s <%u.%ld@%.256s>",
- szGreeting,
- SysData.pid, SysData.timeStart, SysData.szMyHost);
- #endif
-@@ -560,34 +564,30 @@ int main (argc, argv)
- #ifdef HAVE_SIGACTION
-
- static void signal_handler(int signum){
-- CONST char * pMsg;
- int codeErr;
-
- /* sigaction - handler is not re-entrant */
-
-- /*
-+#if 0
- static int fSigHandled = 0;
- if (fSigHandled){
- return ;
- }
- fSigHandled = 1;
- SigBlock();
-- */
-+#endif
-
-- pMsg = NULL;
- syslog( LOG_DEBUG , "signal_handler call ");
- switch (signum) {
- case SIGALRM:
- codeErr = ERRYS_TIMEOUT;
-+ WARNING(codeErr, 0, NULL);
- break;
-- case SIGHUP:
-- case SIGTERM:
- default:
- codeErr = ERRYS_SIGNAL;
-- pMsg = "#%d";
-+ WARNING(codeErr, 0, "#%d", signum);
- break;
- }
-- WARNING(codeErr, 0, pMsg, signum);
-
- if (SysData.Flags.pidFile)
- DelPidFile(1);
-@@ -602,7 +602,7 @@ static void signal_handler(int signum){
- }
- #endif
-
-- ErrSetData(codeErr, 0, pMsg, signum);
-+ ErrSetData(codeErr, 0, (codeErr == ERRYS_SIGNAL)? "#%d": NULL, signum);
- Msg2Cli(FAILURE, NULL);
-
- exit(1);
diff --git a/mail/yatsvrs/patches/patch-au b/mail/yatsvrs/patches/patch-au
deleted file mode 100644
index 73f16575e29..00000000000
--- a/mail/yatsvrs/patches/patch-au
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-au,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatd/env.c.orig Tue Jun 5 17:35:24 2001
-+++ yatd/env.c
-@@ -277,7 +277,7 @@
- if (SysData.argc > 1) {
- if (strcasecmp(SysData.argv[1], YATENV_NOW) == 0) {
- timeNow = time(NULL);
-- Msg2Cli(SUCCESS, "%.256s %d", SysData.argv[1], timeNow);
-+ Msg2Cli(SUCCESS, "%.256s %ld", SysData.argv[1], timeNow);
- }
- else if ((pEnv = GetYatEnv(pFldr, SysData.argv[1])) && pEnv->pszValue)
- Msg2Cli(SUCCESS, "%.256s %.256s", pEnv->pszName, pEnv->pszValue);
-@@ -291,7 +291,7 @@
- Str2Cli("%.256s %.256s", pEnv->pszName, pEnv->pszValue);
- }
- timeNow = time(NULL);
-- Str2Cli("%.256s %d", YATENV_NOW, timeNow);
-+ Str2Cli("%.256s %ld", YATENV_NOW, timeNow);
- EOM2Cli();
- }
- return SUCCESS;
diff --git a/mail/yatsvrs/patches/patch-av b/mail/yatsvrs/patches/patch-av
deleted file mode 100644
index 0150ebbf33f..00000000000
--- a/mail/yatsvrs/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.2 2001/12/21 03:55:13 taca Exp $
-
---- yatd/fldr_etc.c.orig Wed Dec 19 23:08:04 2001
-+++ yatd/fldr_etc.c Fri Dec 21 00:36:45 2001
-@@ -275,7 +275,7 @@
- }
-
- #ifdef DEBUG_LOCAL
-- LogDEBUG("<<<Summary: %.256s %u %u %u",
-+ LogDEBUG("<<<Summary: %.256s %ld %d %d",
- FldrSummary.szName, FldrSummary.mtime,
- FldrSummary.nMail, FldrSummary.nMailUnseen);
- #endif
diff --git a/mail/yatsvrs/patches/patch-aw b/mail/yatsvrs/patches/patch-aw
deleted file mode 100644
index d8a2b758938..00000000000
--- a/mail/yatsvrs/patches/patch-aw
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aw,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatd/inc.c.orig Fri Jun 22 12:05:02 2001
-+++ yatd/inc.c
-@@ -650,7 +650,7 @@
- GOTO LBL_ERROR;
- }
-
-- Msg2Cli(SUCCESS, "You have %d message(s) (%d octets).",
-+ Msg2Cli(SUCCESS, "You have %d message(s) (%ld octets).",
- SysData.pFldrCur->nMailAvail,
- SysData.pFldrCur->sizMailsAvail);
- return SUCCESS;
diff --git a/mail/yatsvrs/patches/patch-ax b/mail/yatsvrs/patches/patch-ax
deleted file mode 100644
index 49fca2647fd..00000000000
--- a/mail/yatsvrs/patches/patch-ax
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ax,v 1.2 2003/10/05 04:25:15 taca Exp $
-
---- yatd/init.c.orig 2001-12-19 22:43:44.000000000 +0900
-+++ yatd/init.c
-@@ -5,7 +5,7 @@
-
- #ifdef HAVE_MNTENT_H
- #include <mntent.h>
--#endif HAVE_MNTENT_H
-+#endif
-
- /* #define DEBUG_LOCAL 1 */
-
-@@ -385,7 +385,7 @@ int InitByYatsvrRc(fSys)
- #else
- "Invalid %s value : %d",
- #endif
-- YSCONF_DFLIMITSIZ, sizLimit);
-+ YSCONF_DFLIMITSIZ, LONGLONG_CAST(sizLimit));
- }
- else
- SysData.sizLimitFree = sizLimit;
-@@ -400,7 +400,7 @@ int InitByYatsvrRc(fSys)
- #endif
- if ((nodLimit < MINLIMITNODFREE) || (MAXLIMITNODFREE < nodLimit)) {
- WARNING(ERRYS_DUMMY, 0,
-- "Invalid %s value : %d", YSCONF_DFLIMITNOD, nodLimit);
-+ "Invalid %s value : %ld", YSCONF_DFLIMITNOD, nodLimit);
- }
- else
- SysData.nodLimitFree = nodLimit;
diff --git a/mail/yatsvrs/patches/patch-ay b/mail/yatsvrs/patches/patch-ay
deleted file mode 100644
index 8a90a91c874..00000000000
--- a/mail/yatsvrs/patches/patch-ay
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-ay,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatd/list.c.orig Mon Jun 4 15:43:51 2001
-+++ yatd/list.c
-@@ -36,12 +36,12 @@
- #else
- "%u %u",
- #endif
-- i, pMail->lLength);
-+ i, LONGLONG_CAST(pMail->lLength));
- return SUCCESS;
- }
-
- /* begin of scan list */
-- Msg2Cli(SUCCESS, "%u messages (%u octets)",
-+ Msg2Cli(SUCCESS, "%u messages (%lu octets)",
- pFldr->nMailAvail, pFldr->sizMailsAvail);
-
- for (i = 0; i < pFldr->nMail; i++) {
-@@ -56,7 +56,7 @@
- #else
- "%u %u",
- #endif
-- i+1, pMail->lLength);
-+ i+1, LONGLONG_CAST(pMail->lLength));
- }
-
- EOM2Cli();
-@@ -93,12 +93,12 @@
- #else
- "%u %u %s",
- #endif
-- i, pMail->lLength, MarkMkStr(szMark, pMail));
-+ i, LONGLONG_CAST(pMail->lLength), MarkMkStr(szMark, pMail));
- return SUCCESS;
- }
-
- /* begin of scan list */
-- Msg2Cli(SUCCESS, "%u messages (%u octets)",
-+ Msg2Cli(SUCCESS, "%u messages (%ld octets)",
- pFldr->nMailAvail, pFldr->sizMailsAvail);
-
- for (i = 0; i < pFldr->nMail; i++) {
-@@ -113,7 +113,7 @@
- #else
- "%u %lu %s",
- #endif
-- i+1, pMail->lLength, MarkMkStr(szMark, pMail));
-+ i+1, LONGLONG_CAST(pMail->lLength), MarkMkStr(szMark, pMail));
- }
-
- EOM2Cli();
-@@ -144,7 +144,7 @@
- iStart = 0;
-
- /* begin of scan list */
-- Msg2Cli(SUCCESS, "%u messages (%u octets)",
-+ Msg2Cli(SUCCESS, "%u messages (%ld octets)",
- pFldr->nMailAvail, pFldr->sizMailsAvail);
-
- for (i = iStart; i <= iEnd; i++) {
-@@ -159,8 +159,8 @@
- #else
- "%u %s %lu %s",
- #endif
-- i+1, MakeUniqID(szID, pFldr, pMail->id), pMail->lLength,
-- MarkMkStr(szMark, pMail));
-+ i+1, MakeUniqID(szID, pFldr, pMail->id),
-+ LONGLONG_CAST(pMail->lLength), MarkMkStr(szMark, pMail));
- }
-
- EOM2Cli();
diff --git a/mail/yatsvrs/patches/patch-az b/mail/yatsvrs/patches/patch-az
deleted file mode 100644
index 4f9357b0857..00000000000
--- a/mail/yatsvrs/patches/patch-az
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-az,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatd/mark.c.orig Mon Jun 4 15:43:51 2001
-+++ yatd/mark.c
-@@ -81,7 +81,7 @@
- #else
- "%u %u %s",
- #endif
-- i, pMail->lLength, MarkMkStr(szMark, pMail));
-+ i, LONGLONG_CAST(pMail->lLength), MarkMkStr(szMark, pMail));
-
- return SUCCESS;
- }
-@@ -140,7 +140,7 @@
- #else
- "%u %u %s",
- #endif
-- i, pMail->lLength, MarkMkStr(szMark, pMail));
-+ i, LONGLONG_CAST(pMail->lLength), MarkMkStr(szMark, pMail));
-
- return SUCCESS;
- }
diff --git a/mail/yatsvrs/patches/patch-ba b/mail/yatsvrs/patches/patch-ba
deleted file mode 100644
index 28a8fec2370..00000000000
--- a/mail/yatsvrs/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatd/mbchg.c.orig Mon Jun 4 15:43:51 2001
-+++ yatd/mbchg.c
-@@ -41,7 +41,7 @@
- return FAILURE;
- }
-
-- Msg2Cli(SUCCESS, "%d message(s) (%d octets).",
-+ Msg2Cli(SUCCESS, "%d message(s) (%ld octets).",
- pFldr->nMailAvail,
- pFldr->sizMailsAvail);
- return SUCCESS;
diff --git a/mail/yatsvrs/patches/patch-bb b/mail/yatsvrs/patches/patch-bb
deleted file mode 100644
index a2c34da6cb5..00000000000
--- a/mail/yatsvrs/patches/patch-bb
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-bb,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatd/message.c.orig Fri Jun 8 16:29:24 2001
-+++ yatd/message.c
-@@ -9,10 +9,10 @@
- */
-
- #ifdef STDC_HEADERS
--int Msg2Cli(int stat, CONST char * pFmt, ...)
-+int Msg2Cli(int status, CONST char * pFmt, ...)
- #else
--int Msg2Cli(stat, pFmt, va_alist)
-- int stat;
-+int Msg2Cli(status, pFmt, va_alist)
-+ int status;
- CONST char * pFmt;
- va_dcl
- #endif
-@@ -33,7 +33,7 @@
- if (feof(stdout) || ferror(stdout))
- SysData.Flags.errCliIO = 1;
-
-- strcpy(szMsg, stat==SUCCESS ? ANS_POSITIVE : ANS_NEGATIVE);
-+ strcpy(szMsg, status==SUCCESS ? ANS_POSITIVE : ANS_NEGATIVE);
- p = index(szMsg, '\0');
- *p++ = ' ';
- *p = '\0';
-@@ -89,7 +89,7 @@
- else
- LogNOTICE("<<<NO CONNECTION>>> %.512s", szMsg);
- va_end(ap);
-- return stat;
-+ return status;
- }
-
- /*
diff --git a/mail/yatsvrs/patches/patch-bc b/mail/yatsvrs/patches/patch-bc
deleted file mode 100644
index 32c0631a782..00000000000
--- a/mail/yatsvrs/patches/patch-bc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bc,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatd/pass.c.orig Wed Jun 27 20:58:17 2001
-+++ yatd/pass.c
-@@ -187,7 +187,7 @@
- }
- }
-
-- Msg2Cli(SUCCESS, "You have %d message(s) (%d octets).",
-+ Msg2Cli(SUCCESS, "You have %d message(s) (%ld octets).",
- pFldr->nMailAvail, pFldr->sizMailsAvail);
-
- return SUCCESS;
diff --git a/mail/yatsvrs/patches/patch-bd b/mail/yatsvrs/patches/patch-bd
deleted file mode 100644
index 115212cd1c8..00000000000
--- a/mail/yatsvrs/patches/patch-bd
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-bd,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatd/prototype.h.orig Mon Jul 2 12:51:50 2001
-+++ yatd/prototype.h
-@@ -22,12 +22,18 @@
- #endif
- char * strlwr __P((char *));
-
--void LogDEBUG __P((CONST char * pFmt, ...));
--void LogNOTICE __P((CONST char * pFmt, ...));
--int Msg2Cli __P((int stat, CONST char * pFmt, ...));
--void Str2Cli __P((CONST char * pFmt, ...));
--void ErrSetData __P((int codeErr, int Flags, CONST char * pFmt, ...));
--void WARNING __P((int codeErr, int Flags, CONST char * pFmt, ...));
-+void LogDEBUG __P((CONST char * pFmt, ...))
-+ __attribute__((__format__(__printf__, 1, 2)));
-+void LogNOTICE __P((CONST char * pFmt, ...))
-+ __attribute__((__format__(__printf__, 1, 2)));
-+int Msg2Cli __P((int, CONST char * pFmt, ...))
-+ __attribute__((__format__(__printf__, 2, 3)));
-+void Str2Cli __P((CONST char * pFmt, ...))
-+ __attribute__((__format__(__printf__, 1, 2)));
-+void ErrSetData __P((int codeErr, int Flags, CONST char * pFmt, ...))
-+ __attribute__((__format__(__printf__, 3, 4)));
-+void WARNING __P((int codeErr, int Flags, CONST char * pFmt, ...))
-+ __attribute__((__format__(__printf__, 3, 4)));
-
- /* etc.c */
- char * CatchLine __P((char *, int, FILE *));
diff --git a/mail/yatsvrs/patches/patch-be b/mail/yatsvrs/patches/patch-be
deleted file mode 100644
index 1afdd042e40..00000000000
--- a/mail/yatsvrs/patches/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-be,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatd/rset.c.orig Mon Jun 4 15:43:51 2001
-+++ yatd/rset.c
-@@ -121,7 +121,7 @@
- pFldr->iMailLast = pFldr->iMailLast0;
- FldrMarkUpdate(pFldr);
-
-- Msg2Cli(SUCCESS, "You have %d message(s) (%d octets).",
-+ Msg2Cli(SUCCESS, "You have %d message(s) (%ld octets).",
- pFldr->nMailAvail,
- pFldr->sizMailsAvail);
- return SUCCESS;
diff --git a/mail/yatsvrs/patches/patch-bf b/mail/yatsvrs/patches/patch-bf
deleted file mode 100644
index 58a134074ad..00000000000
--- a/mail/yatsvrs/patches/patch-bf
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-bf,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatd/store.c.orig Mon Jun 4 15:43:51 2001
-+++ yatd/store.c
-@@ -168,7 +168,13 @@
- Msg2Cli(SUCCESS, "Please send message to store.");
- if (net2Fldr(pFldr, stdin, 0))
- return FAILURE;
-- Msg2Cli(SUCCESS, "%d %d",
-- pFldr->nMail, (pFldr->pArryMail[pFldr->nMail-1])->lLength);
-+ Msg2Cli(SUCCESS,
-+#ifdef LONGLONG_OFF_T
-+ "%d %" LONGLONG_OPTC "u",
-+#else
-+ "%d %u",
-+#endif
-+ pFldr->nMail,
-+ LONGLONG_CAST(((pFldr->pArryMail[pFldr->nMail-1])->lLength)));
- return SUCCESS;
- }
diff --git a/mail/yatsvrs/patches/patch-bg b/mail/yatsvrs/patches/patch-bg
deleted file mode 100644
index ae89bacdb97..00000000000
--- a/mail/yatsvrs/patches/patch-bg
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bg,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatd/tcplib.c.orig Fri Jun 22 20:05:49 2001
-+++ yatd/tcplib.c
-@@ -71,7 +71,7 @@
-
- if ((pHent=gethostbyaddr((char *)&(pSck->inAddr), sizeof (struct in_addr),
- AF_INET)) == NULL) {
-- WARNING(ERRYS_DUMMY, 0, "gethostbyaddr(%d) failed", pszHost);
-+ WARNING(ERRYS_DUMMY, 0, "gethostbyaddr(%s) failed", pszHost);
- pSck->pszHost = NULL;
- }
- else if ((pSck->pszHost = strdup(pHent->h_name)) == NULL) {
diff --git a/mail/yatsvrs/patches/patch-bh b/mail/yatsvrs/patches/patch-bh
deleted file mode 100644
index b043f868e42..00000000000
--- a/mail/yatsvrs/patches/patch-bh
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-bh,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatd/uidl.c.orig Mon Jun 4 15:43:51 2001
-+++ yatd/uidl.c
-@@ -38,12 +38,12 @@
- if (MailCheckFlags(pMail))
- return FAILURE;
-
-- Msg2Cli(SUCCESS, "%u %.256s", i, MakeUniqID(Buffer, pFldr, pMail->id));
-+ Msg2Cli(SUCCESS, "%d %.256s", i, MakeUniqID(Buffer, pFldr, pMail->id));
- return SUCCESS;
- }
-
- /* begin of scan list */
-- Msg2Cli(SUCCESS, "%u messages (%u octets)",
-+ Msg2Cli(SUCCESS, "%u messages (%ld octets)",
- pFldr->nMailAvail, pFldr->sizMailsAvail);
-
- for (i = 0; i < pFldr->nMail; i++) {
diff --git a/mail/yatsvrs/patches/patch-bi b/mail/yatsvrs/patches/patch-bi
deleted file mode 100644
index 47a6985d9de..00000000000
--- a/mail/yatsvrs/patches/patch-bi
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bi,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatd/update.c.orig Mon Jul 9 11:56:40 2001
-+++ yatd/update.c
-@@ -301,7 +301,7 @@
- GOTO LBL_CONTINUE;
- LogDEBUG("#%.256s %.80s",
- pFldr->szName, ctime(&(statBuf.st_mtime)));
-- LogDEBUG("%.256s %u %d %d %d\n",
-+ LogDEBUG("%.256s %ld %d %d %d\n",
- pFldr->szName, statBuf.st_mtime,
- pFldr->nMailAvail, pFldr->nMailUnseen, pFldr->nMailDel);
- fprintf(fp, "%.256s %lu %d %u %d\n",
diff --git a/mail/yatsvrs/patches/patch-bj b/mail/yatsvrs/patches/patch-bj
deleted file mode 100644
index d2d0dfde8d0..00000000000
--- a/mail/yatsvrs/patches/patch-bj
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-bj,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
-
---- yatd/user.c.orig Mon Jul 2 14:12:43 2001
-+++ yatd/user.c
-@@ -86,8 +86,6 @@
- return ENOMEM;
- }
-
--static CONST char *pszFmt;
--
- static int _FuncUser()
- {
- if (CheckArgc(2, 2))
-@@ -105,8 +103,6 @@
- ErrSetData(ENOMEM, ERRFLG_FATAL | ERRFLG_SYSERR, NULL);
- return FAILURE;
- }
--
-- Msg2Cli(SUCCESS, pszFmt, SysData.szUser);
- return SUCCESS;
- }
-
-@@ -115,23 +111,35 @@
- */
- int FuncUser()
- {
-- pszFmt = "'%.256s' is welcome here.";
-- return _FuncUser();
-+ int status;
-+
-+ status = _FuncUser();
-+ if (status == SUCCESS)
-+ Msg2Cli(status, "'%.256s' is welcome here.", SysData.szUser);
-+ return status;
- }
- /*
- * 'kill' command
- */
- int FuncUserKill()
- {
-- pszFmt = "Kill you, '%.256s'.";
-- return _FuncUser();
-+ int status;
-+
-+ status = _FuncUser();
-+ if (status == SUCCESS)
-+ Msg2Cli(status, "Kill you, '%.256s'.", SysData.szUser);
-+ return status;
- }
- /*
- * 'kill9' command
- */
- int FuncUserKill9()
- {
-- pszFmt = "Go to hell!, '%.256s'.";
-+ int status;
-+
- SysData.Flags.kill9 = 1;
-- return _FuncUser();
-+ status = _FuncUser();
-+ if (status == SUCCESS)
-+ Msg2Cli(status, "Go to hell!, '%.256s'.", SysData.szUser);
-+ return status;
- }
diff --git a/mail/yatsvrs/patches/patch-bk b/mail/yatsvrs/patches/patch-bk
deleted file mode 100644
index 2d3638a9119..00000000000
--- a/mail/yatsvrs/patches/patch-bk
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-bk,v 1.3 2003/10/05 04:25:15 taca Exp $
-
---- yatd/v2conv.c.orig 2001-12-19 22:56:15.000000000 +0900
-+++ yatd/v2conv.c
-@@ -148,7 +148,7 @@ static void V2GetSummary(pFldrParent)
- }
-
- #ifdef DEBUG_LOCAL
-- LogDEBUG("<<<V2 Summary: %.256s %u %u %u",
-+ LogDEBUG("<<<V2 Summary: %.256s %ld %u %u",
- V2Fldr.szName, V2Fldr.mtime,
- V2Fldr.nMail, V2Fldr.nMailUnseen);
- #endif
-@@ -389,7 +389,7 @@ int V2FldrScan()
- }
- else if (errno != ENOENT)
- WARNING(errno, ERRFLG_SYSERR,
-- "stat(%.256s) failed", szV2MboxFile, SYS_ERRMSG);
-+ "stat(%.256s) failed/%s", szV2MboxFile, SYS_ERRMSG);
- }
-
- LBL_SKIPUCBMBOX:
-@@ -421,7 +421,7 @@ int V2FldrScan()
- strcpy(pFileName, pDirect->d_name);
- if (stat(szV2MboxFile, &statBuf) == -1) {
- WARNING(errno, ERRFLG_SYSERR,
-- "stat(%.256s) failed", szV2MboxFile, SYS_ERRMSG);
-+ "stat(%.256s) failed/%s", szV2MboxFile, SYS_ERRMSG);
- continue;
- }
- if ((statBuf.st_mode & S_IFMT) == S_IFREG) {
-@@ -564,7 +564,7 @@ int FuncCnv2()
-
- if (Cnv2(SysData.argv[1]))
- return FAILURE;
-- Msg2Cli(SUCCESS, "You have %d message(s) (%d octets).",
-+ Msg2Cli(SUCCESS, "You have %d message(s) (%ld octets).",
- SysData.pFldrCur->nMailAvail,
- SysData.pFldrCur->sizMailsAvail);
- return SUCCESS;
diff --git a/mail/yatsvrs/patches/patch-bl b/mail/yatsvrs/patches/patch-bl
deleted file mode 100644
index 903f14c00b2..00000000000
--- a/mail/yatsvrs/patches/patch-bl
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bl,v 1.1 2002/04/01 04:43:34 dmcmahill Exp $
-
---- common/base64.c.orig Fri Jun 22 03:49:56 2001
-+++ common/base64.c
-@@ -110,7 +110,7 @@
- p = strchr(Base64Charset, c);
- if (p == NULL)
- return 0;
-- return (((unsigned)p - (unsigned)Base64Charset) & 077);
-+ return (((unsigned long)p - (unsigned long)Base64Charset) & 077);
- }
-
- int Base64DecodeLine(pDst0, pnLen, pSrc0)
diff --git a/mail/yatsvrs/patches/patch-bm b/mail/yatsvrs/patches/patch-bm
deleted file mode 100644
index 02646fd5a79..00000000000
--- a/mail/yatsvrs/patches/patch-bm
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-bm,v 1.1 2003/10/05 04:25:15 taca Exp $
-
---- yatd/xmit.c.orig 2001-06-22 16:49:59.000000000 +0900
-+++ yatd/xmit.c
-@@ -43,7 +43,7 @@ int FuncXmit ()
- /* Receive the message */
- #ifdef DEBUG_LOCAL
- LogDEBUG("Receiving mail message");
--#endif DEBUG_LOCAL
-+#endif
- while (CatchPopLineWithSig(Buffer, MAXLINELEN, stdin) != NULL) {
- if ((fputs(Buffer, fp) == EOF) || (fputs("\n", fp) == EOF)) {
- if (SkipPopGabage(stdin)) {
-@@ -70,7 +70,7 @@ int FuncXmit ()
-
- #ifdef DEBUG_LOCAL
- LogDEBUG("Forking for \"%.256s\"",MAIL_COMMAND);
--#endif DEBUG_LOCAL
-+#endif
- /* Send the message */
- switch (pid = fork()) {
- case 0:
-@@ -87,7 +87,7 @@ int FuncXmit ()
- #ifdef DEBUG_LOCAL
- if (!SysData.fDebug)
- unlink (szTmp);
--#endif DEBUG_LOCAL
-+#endif
- ErrSetData(errno, ERRFLG_SYSERR, "fork() failed");
- return FAILURE;
- default:
diff --git a/mail/yatsvrs/patches/patch-bn b/mail/yatsvrs/patches/patch-bn
deleted file mode 100644
index 085a83967b4..00000000000
--- a/mail/yatsvrs/patches/patch-bn
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-bn,v 1.2 2005/01/08 09:39:57 taca Exp $
-
---- configure.orig 2001-12-20 16:23:50.000000000 +0900
-+++ configure
-@@ -1016,9 +1016,9 @@ else
- CFLAGS=
- fi
- fi
--
--
--
-+if test $ac_cv_prog_gcc = yes; then
-+ CFLAGS="$CFLAGS -Wall -Wstrict-prototypes"
-+fi
-
- echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
- echo "configure:1025: checking for ${CC-cc} option to accept ANSI C" >&5
-@@ -3929,6 +3929,10 @@ test -n "$MAIL_COMMAND" && break
- done
- test -n "$MAIL_COMMAND" || MAIL_COMMAND="no"
-
-+ case "${OPSYS}" in
-+ IRIX|SunOS) MAIL_COMMAND="/usr/lib/sendmail";;
-+ *) MAIL_COMMAND="/usr/sbin/sendmail";;
-+ esac
- if test "$MAIL_COMMAND" = "no" ; then
- { echo "configure: error: configure script cannot find sendmail. " 1>&2; exit 1; }
- else
diff --git a/mail/yatsvrs/patches/patch-bo b/mail/yatsvrs/patches/patch-bo
deleted file mode 100644
index 2f96ce6732b..00000000000
--- a/mail/yatsvrs/patches/patch-bo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bo,v 1.1 2004/12/15 13:18:02 taca Exp $
-
---- yatd/xtnd.c.orig 2001-06-04 15:43:51.000000000 +0900
-+++ yatd/xtnd.c
-@@ -23,6 +23,10 @@ int FuncXtnd()
- {
- struct CMD_DAT * pCmd;
-
-+ if (SysData.allow_xtnd == 0) {
-+ return (*FuncNoCmd)();
-+ }
-+
- ArgShift(1);
- if (SysData.argc <= 0) {
- ErrSetData(ERRYS_XTNDNUL, 0, NULL);
diff --git a/mail/yatsvrs/patches/patch-bp b/mail/yatsvrs/patches/patch-bp
deleted file mode 100644
index 356a3fa4a60..00000000000
--- a/mail/yatsvrs/patches/patch-bp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bp,v 1.1 2004/12/15 13:18:02 taca Exp $
-
---- yatd/yatsvr.h.orig 2001-07-09 12:32:52.000000000 +0900
-+++ yatd/yatsvr.h
-@@ -371,6 +371,7 @@ struct SYS_DAT {
- unsigned pop3AuthFail: 1; /* pop3 authentication is failed */
- unsigned newByUidl : 1; /* determine new mail by UIDL */
- } Flags; /* flags */
-+ int allow_xtnd; /* allow XTND commands */
- };
-
- #define ERRFLG_SYSERR BIT(0)