summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/postfix/Makefile117
-rw-r--r--mail/postfix/distinfo4
-rw-r--r--mail/postfix/files/patch-ab22
-rw-r--r--mail/postfix/files/patch-ac22
-rw-r--r--mail/postfix/files/patch-ad11
-rw-r--r--mail/postfix/files/patch-ae11
-rw-r--r--mail/postfix/files/patch-af22
-rw-r--r--mail/postfix/files/patch-ag15
-rw-r--r--mail/postfix/files/patch-ao22
-rw-r--r--mail/postfix/files/patch-ap22
-rw-r--r--mail/postfix/files/patch-bb17
-rw-r--r--mail/postfix/files/patch-bc19
-rw-r--r--mail/postfix/files/patch-bl11
-rw-r--r--mail/postfix/files/patch-bm19
-rw-r--r--mail/postfix/files/patch-bo19
-rw-r--r--mail/postfix/files/patch-bp42
-rw-r--r--mail/postfix/files/patch-cb45
-rw-r--r--mail/postfix/files/patch-cc11
-rw-r--r--mail/postfix/files/patch-cd31
-rw-r--r--mail/postfix/files/patch-ce31
-rw-r--r--mail/postfix/files/patch-cf11
-rw-r--r--mail/postfix/files/patch-cg31
-rw-r--r--mail/postfix/files/patch-ch31
-rw-r--r--mail/postfix/files/patch-ci31
-rw-r--r--mail/postfix/files/patch-da11
-rw-r--r--mail/postfix/files/patch-db20
-rw-r--r--mail/postfix/files/patch-dc20
-rw-r--r--mail/postfix/files/patch-dd11
-rw-r--r--mail/postfix/files/patch-de20
-rw-r--r--mail/postfix/files/patch-df20
-rw-r--r--mail/postfix/files/patch-dg20
-rw-r--r--mail/postfix/files/patch-ea4
-rw-r--r--mail/postfix/files/patch-eb4
-rw-r--r--mail/postfix/files/patch-ec4
-rw-r--r--mail/postfix/files/patch-ed4
-rw-r--r--mail/postfix/files/patch-ee4
-rw-r--r--mail/postfix/files/patch-ef4
-rw-r--r--mail/postfix/files/patch-eg54
-rw-r--r--mail/postfix/files/patch-eh4
-rw-r--r--mail/postfix/files/patch-ei21
-rw-r--r--mail/postfix/files/patch-ej21
-rw-r--r--mail/postfix/files/patch-fa12
-rw-r--r--mail/postfix/files/patch-fb10
-rw-r--r--mail/postfix/files/patch-ga4
-rw-r--r--mail/postfix/files/patch-gb4
-rw-r--r--mail/postfix/files/patch-lmtp.h13
-rw-r--r--mail/postfix/pkg-install6
-rw-r--r--mail/postfix/pkg-plist133
-rw-r--r--mail/postfix/scripts/configure.postfix129
-rw-r--r--mail/postfix1/Makefile117
-rw-r--r--mail/postfix1/distinfo4
-rw-r--r--mail/postfix1/files/patch-ab22
-rw-r--r--mail/postfix1/files/patch-ac22
-rw-r--r--mail/postfix1/files/patch-ad11
-rw-r--r--mail/postfix1/files/patch-ae11
-rw-r--r--mail/postfix1/files/patch-af22
-rw-r--r--mail/postfix1/files/patch-ag15
-rw-r--r--mail/postfix1/files/patch-ao22
-rw-r--r--mail/postfix1/files/patch-ap22
-rw-r--r--mail/postfix1/files/patch-bb17
-rw-r--r--mail/postfix1/files/patch-bc19
-rw-r--r--mail/postfix1/files/patch-bl11
-rw-r--r--mail/postfix1/files/patch-bm19
-rw-r--r--mail/postfix1/files/patch-bo19
-rw-r--r--mail/postfix1/files/patch-bp42
-rw-r--r--mail/postfix1/files/patch-cb45
-rw-r--r--mail/postfix1/files/patch-cc11
-rw-r--r--mail/postfix1/files/patch-cd31
-rw-r--r--mail/postfix1/files/patch-ce31
-rw-r--r--mail/postfix1/files/patch-cf11
-rw-r--r--mail/postfix1/files/patch-cg31
-rw-r--r--mail/postfix1/files/patch-ch31
-rw-r--r--mail/postfix1/files/patch-ci31
-rw-r--r--mail/postfix1/files/patch-da11
-rw-r--r--mail/postfix1/files/patch-db20
-rw-r--r--mail/postfix1/files/patch-dc20
-rw-r--r--mail/postfix1/files/patch-dd11
-rw-r--r--mail/postfix1/files/patch-de20
-rw-r--r--mail/postfix1/files/patch-df20
-rw-r--r--mail/postfix1/files/patch-dg20
-rw-r--r--mail/postfix1/files/patch-ea4
-rw-r--r--mail/postfix1/files/patch-eb4
-rw-r--r--mail/postfix1/files/patch-ec4
-rw-r--r--mail/postfix1/files/patch-ed4
-rw-r--r--mail/postfix1/files/patch-ee4
-rw-r--r--mail/postfix1/files/patch-ef4
-rw-r--r--mail/postfix1/files/patch-eg54
-rw-r--r--mail/postfix1/files/patch-eh4
-rw-r--r--mail/postfix1/files/patch-ei21
-rw-r--r--mail/postfix1/files/patch-ej21
-rw-r--r--mail/postfix1/files/patch-fa12
-rw-r--r--mail/postfix1/files/patch-fb10
-rw-r--r--mail/postfix1/files/patch-ga4
-rw-r--r--mail/postfix1/files/patch-gb4
-rw-r--r--mail/postfix1/files/patch-lmtp.h13
-rw-r--r--mail/postfix1/pkg-install6
-rw-r--r--mail/postfix1/pkg-plist133
-rw-r--r--mail/postfix1/scripts/configure.postfix129
-rw-r--r--mail/postfix20/Makefile117
-rw-r--r--mail/postfix20/distinfo4
-rw-r--r--mail/postfix20/files/patch-ab22
-rw-r--r--mail/postfix20/files/patch-ac22
-rw-r--r--mail/postfix20/files/patch-ad11
-rw-r--r--mail/postfix20/files/patch-ae11
-rw-r--r--mail/postfix20/files/patch-af22
-rw-r--r--mail/postfix20/files/patch-ag15
-rw-r--r--mail/postfix20/files/patch-ao22
-rw-r--r--mail/postfix20/files/patch-ap22
-rw-r--r--mail/postfix20/files/patch-bb17
-rw-r--r--mail/postfix20/files/patch-bc19
-rw-r--r--mail/postfix20/files/patch-bl11
-rw-r--r--mail/postfix20/files/patch-bm19
-rw-r--r--mail/postfix20/files/patch-bo19
-rw-r--r--mail/postfix20/files/patch-bp42
-rw-r--r--mail/postfix20/files/patch-cb45
-rw-r--r--mail/postfix20/files/patch-cc11
-rw-r--r--mail/postfix20/files/patch-cd31
-rw-r--r--mail/postfix20/files/patch-ce31
-rw-r--r--mail/postfix20/files/patch-cf11
-rw-r--r--mail/postfix20/files/patch-cg31
-rw-r--r--mail/postfix20/files/patch-ch31
-rw-r--r--mail/postfix20/files/patch-ci31
-rw-r--r--mail/postfix20/files/patch-da11
-rw-r--r--mail/postfix20/files/patch-db20
-rw-r--r--mail/postfix20/files/patch-dc20
-rw-r--r--mail/postfix20/files/patch-dd11
-rw-r--r--mail/postfix20/files/patch-de20
-rw-r--r--mail/postfix20/files/patch-df20
-rw-r--r--mail/postfix20/files/patch-dg20
-rw-r--r--mail/postfix20/files/patch-ea4
-rw-r--r--mail/postfix20/files/patch-eb4
-rw-r--r--mail/postfix20/files/patch-ec4
-rw-r--r--mail/postfix20/files/patch-ed4
-rw-r--r--mail/postfix20/files/patch-ee4
-rw-r--r--mail/postfix20/files/patch-ef4
-rw-r--r--mail/postfix20/files/patch-eg54
-rw-r--r--mail/postfix20/files/patch-eh4
-rw-r--r--mail/postfix20/files/patch-ei21
-rw-r--r--mail/postfix20/files/patch-ej21
-rw-r--r--mail/postfix20/files/patch-fa12
-rw-r--r--mail/postfix20/files/patch-fb10
-rw-r--r--mail/postfix20/files/patch-ga4
-rw-r--r--mail/postfix20/files/patch-gb4
-rw-r--r--mail/postfix20/files/patch-lmtp.h13
-rw-r--r--mail/postfix20/pkg-install6
-rw-r--r--mail/postfix20/pkg-plist133
-rw-r--r--mail/postfix20/scripts/configure.postfix129
-rw-r--r--mail/postfix21/Makefile117
-rw-r--r--mail/postfix21/distinfo4
-rw-r--r--mail/postfix21/files/patch-ab22
-rw-r--r--mail/postfix21/files/patch-ac22
-rw-r--r--mail/postfix21/files/patch-ad11
-rw-r--r--mail/postfix21/files/patch-ae11
-rw-r--r--mail/postfix21/files/patch-af22
-rw-r--r--mail/postfix21/files/patch-ag15
-rw-r--r--mail/postfix21/files/patch-ao22
-rw-r--r--mail/postfix21/files/patch-ap22
-rw-r--r--mail/postfix21/files/patch-bb17
-rw-r--r--mail/postfix21/files/patch-bc19
-rw-r--r--mail/postfix21/files/patch-bl11
-rw-r--r--mail/postfix21/files/patch-bm19
-rw-r--r--mail/postfix21/files/patch-bo19
-rw-r--r--mail/postfix21/files/patch-bp42
-rw-r--r--mail/postfix21/files/patch-cb45
-rw-r--r--mail/postfix21/files/patch-cc11
-rw-r--r--mail/postfix21/files/patch-cd31
-rw-r--r--mail/postfix21/files/patch-ce31
-rw-r--r--mail/postfix21/files/patch-cf11
-rw-r--r--mail/postfix21/files/patch-cg31
-rw-r--r--mail/postfix21/files/patch-ch31
-rw-r--r--mail/postfix21/files/patch-ci31
-rw-r--r--mail/postfix21/files/patch-da11
-rw-r--r--mail/postfix21/files/patch-db20
-rw-r--r--mail/postfix21/files/patch-dc20
-rw-r--r--mail/postfix21/files/patch-dd11
-rw-r--r--mail/postfix21/files/patch-de20
-rw-r--r--mail/postfix21/files/patch-df20
-rw-r--r--mail/postfix21/files/patch-dg20
-rw-r--r--mail/postfix21/files/patch-ea4
-rw-r--r--mail/postfix21/files/patch-eb4
-rw-r--r--mail/postfix21/files/patch-ec4
-rw-r--r--mail/postfix21/files/patch-ed4
-rw-r--r--mail/postfix21/files/patch-ee4
-rw-r--r--mail/postfix21/files/patch-ef4
-rw-r--r--mail/postfix21/files/patch-eg54
-rw-r--r--mail/postfix21/files/patch-eh4
-rw-r--r--mail/postfix21/files/patch-ei21
-rw-r--r--mail/postfix21/files/patch-ej21
-rw-r--r--mail/postfix21/files/patch-fa12
-rw-r--r--mail/postfix21/files/patch-fb10
-rw-r--r--mail/postfix21/files/patch-ga4
-rw-r--r--mail/postfix21/files/patch-gb4
-rw-r--r--mail/postfix21/files/patch-lmtp.h13
-rw-r--r--mail/postfix21/pkg-install6
-rw-r--r--mail/postfix21/pkg-plist133
-rw-r--r--mail/postfix21/scripts/configure.postfix129
-rw-r--r--mail/postfix22/Makefile117
-rw-r--r--mail/postfix22/distinfo4
-rw-r--r--mail/postfix22/files/patch-ab22
-rw-r--r--mail/postfix22/files/patch-ac22
-rw-r--r--mail/postfix22/files/patch-ad11
-rw-r--r--mail/postfix22/files/patch-ae11
-rw-r--r--mail/postfix22/files/patch-af22
-rw-r--r--mail/postfix22/files/patch-ag15
-rw-r--r--mail/postfix22/files/patch-ao22
-rw-r--r--mail/postfix22/files/patch-ap22
-rw-r--r--mail/postfix22/files/patch-bb17
-rw-r--r--mail/postfix22/files/patch-bc19
-rw-r--r--mail/postfix22/files/patch-bl11
-rw-r--r--mail/postfix22/files/patch-bm19
-rw-r--r--mail/postfix22/files/patch-bo19
-rw-r--r--mail/postfix22/files/patch-bp42
-rw-r--r--mail/postfix22/files/patch-cb45
-rw-r--r--mail/postfix22/files/patch-cc11
-rw-r--r--mail/postfix22/files/patch-cd31
-rw-r--r--mail/postfix22/files/patch-ce31
-rw-r--r--mail/postfix22/files/patch-cf11
-rw-r--r--mail/postfix22/files/patch-cg31
-rw-r--r--mail/postfix22/files/patch-ch31
-rw-r--r--mail/postfix22/files/patch-ci31
-rw-r--r--mail/postfix22/files/patch-da11
-rw-r--r--mail/postfix22/files/patch-db20
-rw-r--r--mail/postfix22/files/patch-dc20
-rw-r--r--mail/postfix22/files/patch-dd11
-rw-r--r--mail/postfix22/files/patch-de20
-rw-r--r--mail/postfix22/files/patch-df20
-rw-r--r--mail/postfix22/files/patch-dg20
-rw-r--r--mail/postfix22/files/patch-ea4
-rw-r--r--mail/postfix22/files/patch-eb4
-rw-r--r--mail/postfix22/files/patch-ec4
-rw-r--r--mail/postfix22/files/patch-ed4
-rw-r--r--mail/postfix22/files/patch-ee4
-rw-r--r--mail/postfix22/files/patch-ef4
-rw-r--r--mail/postfix22/files/patch-eg54
-rw-r--r--mail/postfix22/files/patch-eh4
-rw-r--r--mail/postfix22/files/patch-ei21
-rw-r--r--mail/postfix22/files/patch-ej21
-rw-r--r--mail/postfix22/files/patch-fa12
-rw-r--r--mail/postfix22/files/patch-fb10
-rw-r--r--mail/postfix22/files/patch-ga4
-rw-r--r--mail/postfix22/files/patch-gb4
-rw-r--r--mail/postfix22/files/patch-lmtp.h13
-rw-r--r--mail/postfix22/pkg-install6
-rw-r--r--mail/postfix22/pkg-plist133
-rw-r--r--mail/postfix22/scripts/configure.postfix129
-rw-r--r--mail/postfix23/Makefile117
-rw-r--r--mail/postfix23/distinfo4
-rw-r--r--mail/postfix23/files/patch-ab22
-rw-r--r--mail/postfix23/files/patch-ac22
-rw-r--r--mail/postfix23/files/patch-ad11
-rw-r--r--mail/postfix23/files/patch-ae11
-rw-r--r--mail/postfix23/files/patch-af22
-rw-r--r--mail/postfix23/files/patch-ag15
-rw-r--r--mail/postfix23/files/patch-ao22
-rw-r--r--mail/postfix23/files/patch-ap22
-rw-r--r--mail/postfix23/files/patch-bb17
-rw-r--r--mail/postfix23/files/patch-bc19
-rw-r--r--mail/postfix23/files/patch-bl11
-rw-r--r--mail/postfix23/files/patch-bm19
-rw-r--r--mail/postfix23/files/patch-bo19
-rw-r--r--mail/postfix23/files/patch-bp42
-rw-r--r--mail/postfix23/files/patch-cb45
-rw-r--r--mail/postfix23/files/patch-cc11
-rw-r--r--mail/postfix23/files/patch-cd31
-rw-r--r--mail/postfix23/files/patch-ce31
-rw-r--r--mail/postfix23/files/patch-cf11
-rw-r--r--mail/postfix23/files/patch-cg31
-rw-r--r--mail/postfix23/files/patch-ch31
-rw-r--r--mail/postfix23/files/patch-ci31
-rw-r--r--mail/postfix23/files/patch-da11
-rw-r--r--mail/postfix23/files/patch-db20
-rw-r--r--mail/postfix23/files/patch-dc20
-rw-r--r--mail/postfix23/files/patch-dd11
-rw-r--r--mail/postfix23/files/patch-de20
-rw-r--r--mail/postfix23/files/patch-df20
-rw-r--r--mail/postfix23/files/patch-dg20
-rw-r--r--mail/postfix23/files/patch-ea4
-rw-r--r--mail/postfix23/files/patch-eb4
-rw-r--r--mail/postfix23/files/patch-ec4
-rw-r--r--mail/postfix23/files/patch-ed4
-rw-r--r--mail/postfix23/files/patch-ee4
-rw-r--r--mail/postfix23/files/patch-ef4
-rw-r--r--mail/postfix23/files/patch-eg54
-rw-r--r--mail/postfix23/files/patch-eh4
-rw-r--r--mail/postfix23/files/patch-ei21
-rw-r--r--mail/postfix23/files/patch-ej21
-rw-r--r--mail/postfix23/files/patch-fa12
-rw-r--r--mail/postfix23/files/patch-fb10
-rw-r--r--mail/postfix23/files/patch-ga4
-rw-r--r--mail/postfix23/files/patch-gb4
-rw-r--r--mail/postfix23/files/patch-lmtp.h13
-rw-r--r--mail/postfix23/pkg-install6
-rw-r--r--mail/postfix23/pkg-plist133
-rw-r--r--mail/postfix23/scripts/configure.postfix129
-rw-r--r--mail/postfix24/Makefile117
-rw-r--r--mail/postfix24/distinfo4
-rw-r--r--mail/postfix24/files/patch-ab22
-rw-r--r--mail/postfix24/files/patch-ac22
-rw-r--r--mail/postfix24/files/patch-ad11
-rw-r--r--mail/postfix24/files/patch-ae11
-rw-r--r--mail/postfix24/files/patch-af22
-rw-r--r--mail/postfix24/files/patch-ag15
-rw-r--r--mail/postfix24/files/patch-ao22
-rw-r--r--mail/postfix24/files/patch-ap22
-rw-r--r--mail/postfix24/files/patch-bb17
-rw-r--r--mail/postfix24/files/patch-bc19
-rw-r--r--mail/postfix24/files/patch-bl11
-rw-r--r--mail/postfix24/files/patch-bm19
-rw-r--r--mail/postfix24/files/patch-bo19
-rw-r--r--mail/postfix24/files/patch-bp42
-rw-r--r--mail/postfix24/files/patch-cb45
-rw-r--r--mail/postfix24/files/patch-cc11
-rw-r--r--mail/postfix24/files/patch-cd31
-rw-r--r--mail/postfix24/files/patch-ce31
-rw-r--r--mail/postfix24/files/patch-cf11
-rw-r--r--mail/postfix24/files/patch-cg31
-rw-r--r--mail/postfix24/files/patch-ch31
-rw-r--r--mail/postfix24/files/patch-ci31
-rw-r--r--mail/postfix24/files/patch-da11
-rw-r--r--mail/postfix24/files/patch-db20
-rw-r--r--mail/postfix24/files/patch-dc20
-rw-r--r--mail/postfix24/files/patch-dd11
-rw-r--r--mail/postfix24/files/patch-de20
-rw-r--r--mail/postfix24/files/patch-df20
-rw-r--r--mail/postfix24/files/patch-dg20
-rw-r--r--mail/postfix24/files/patch-ea4
-rw-r--r--mail/postfix24/files/patch-eb4
-rw-r--r--mail/postfix24/files/patch-ec4
-rw-r--r--mail/postfix24/files/patch-ed4
-rw-r--r--mail/postfix24/files/patch-ee4
-rw-r--r--mail/postfix24/files/patch-ef4
-rw-r--r--mail/postfix24/files/patch-eg54
-rw-r--r--mail/postfix24/files/patch-eh4
-rw-r--r--mail/postfix24/files/patch-ei21
-rw-r--r--mail/postfix24/files/patch-ej21
-rw-r--r--mail/postfix24/files/patch-fa12
-rw-r--r--mail/postfix24/files/patch-fb10
-rw-r--r--mail/postfix24/files/patch-ga4
-rw-r--r--mail/postfix24/files/patch-gb4
-rw-r--r--mail/postfix24/files/patch-lmtp.h13
-rw-r--r--mail/postfix24/pkg-install6
-rw-r--r--mail/postfix24/pkg-plist133
-rw-r--r--mail/postfix24/scripts/configure.postfix129
-rw-r--r--mail/postfix25/Makefile117
-rw-r--r--mail/postfix25/distinfo4
-rw-r--r--mail/postfix25/files/patch-ab22
-rw-r--r--mail/postfix25/files/patch-ac22
-rw-r--r--mail/postfix25/files/patch-ad11
-rw-r--r--mail/postfix25/files/patch-ae11
-rw-r--r--mail/postfix25/files/patch-af22
-rw-r--r--mail/postfix25/files/patch-ag15
-rw-r--r--mail/postfix25/files/patch-ao22
-rw-r--r--mail/postfix25/files/patch-ap22
-rw-r--r--mail/postfix25/files/patch-bb17
-rw-r--r--mail/postfix25/files/patch-bc19
-rw-r--r--mail/postfix25/files/patch-bl11
-rw-r--r--mail/postfix25/files/patch-bm19
-rw-r--r--mail/postfix25/files/patch-bo19
-rw-r--r--mail/postfix25/files/patch-bp42
-rw-r--r--mail/postfix25/files/patch-cb45
-rw-r--r--mail/postfix25/files/patch-cc11
-rw-r--r--mail/postfix25/files/patch-cd31
-rw-r--r--mail/postfix25/files/patch-ce31
-rw-r--r--mail/postfix25/files/patch-cf11
-rw-r--r--mail/postfix25/files/patch-cg31
-rw-r--r--mail/postfix25/files/patch-ch31
-rw-r--r--mail/postfix25/files/patch-ci31
-rw-r--r--mail/postfix25/files/patch-da11
-rw-r--r--mail/postfix25/files/patch-db20
-rw-r--r--mail/postfix25/files/patch-dc20
-rw-r--r--mail/postfix25/files/patch-dd11
-rw-r--r--mail/postfix25/files/patch-de20
-rw-r--r--mail/postfix25/files/patch-df20
-rw-r--r--mail/postfix25/files/patch-dg20
-rw-r--r--mail/postfix25/files/patch-ea4
-rw-r--r--mail/postfix25/files/patch-eb4
-rw-r--r--mail/postfix25/files/patch-ec4
-rw-r--r--mail/postfix25/files/patch-ed4
-rw-r--r--mail/postfix25/files/patch-ee4
-rw-r--r--mail/postfix25/files/patch-ef4
-rw-r--r--mail/postfix25/files/patch-eg54
-rw-r--r--mail/postfix25/files/patch-eh4
-rw-r--r--mail/postfix25/files/patch-ei21
-rw-r--r--mail/postfix25/files/patch-ej21
-rw-r--r--mail/postfix25/files/patch-fa12
-rw-r--r--mail/postfix25/files/patch-fb10
-rw-r--r--mail/postfix25/files/patch-ga4
-rw-r--r--mail/postfix25/files/patch-gb4
-rw-r--r--mail/postfix25/files/patch-lmtp.h13
-rw-r--r--mail/postfix25/pkg-install6
-rw-r--r--mail/postfix25/pkg-plist133
-rw-r--r--mail/postfix25/scripts/configure.postfix129
-rw-r--r--mail/postfix26/Makefile117
-rw-r--r--mail/postfix26/distinfo4
-rw-r--r--mail/postfix26/files/patch-ab22
-rw-r--r--mail/postfix26/files/patch-ac22
-rw-r--r--mail/postfix26/files/patch-ad11
-rw-r--r--mail/postfix26/files/patch-ae11
-rw-r--r--mail/postfix26/files/patch-af22
-rw-r--r--mail/postfix26/files/patch-ag15
-rw-r--r--mail/postfix26/files/patch-ao22
-rw-r--r--mail/postfix26/files/patch-ap22
-rw-r--r--mail/postfix26/files/patch-bb17
-rw-r--r--mail/postfix26/files/patch-bc19
-rw-r--r--mail/postfix26/files/patch-bl11
-rw-r--r--mail/postfix26/files/patch-bm19
-rw-r--r--mail/postfix26/files/patch-bo19
-rw-r--r--mail/postfix26/files/patch-bp42
-rw-r--r--mail/postfix26/files/patch-cb45
-rw-r--r--mail/postfix26/files/patch-cc11
-rw-r--r--mail/postfix26/files/patch-cd31
-rw-r--r--mail/postfix26/files/patch-ce31
-rw-r--r--mail/postfix26/files/patch-cf11
-rw-r--r--mail/postfix26/files/patch-cg31
-rw-r--r--mail/postfix26/files/patch-ch31
-rw-r--r--mail/postfix26/files/patch-ci31
-rw-r--r--mail/postfix26/files/patch-da11
-rw-r--r--mail/postfix26/files/patch-db20
-rw-r--r--mail/postfix26/files/patch-dc20
-rw-r--r--mail/postfix26/files/patch-dd11
-rw-r--r--mail/postfix26/files/patch-de20
-rw-r--r--mail/postfix26/files/patch-df20
-rw-r--r--mail/postfix26/files/patch-dg20
-rw-r--r--mail/postfix26/files/patch-ea4
-rw-r--r--mail/postfix26/files/patch-eb4
-rw-r--r--mail/postfix26/files/patch-ec4
-rw-r--r--mail/postfix26/files/patch-ed4
-rw-r--r--mail/postfix26/files/patch-ee4
-rw-r--r--mail/postfix26/files/patch-ef4
-rw-r--r--mail/postfix26/files/patch-eg54
-rw-r--r--mail/postfix26/files/patch-eh4
-rw-r--r--mail/postfix26/files/patch-ei21
-rw-r--r--mail/postfix26/files/patch-ej21
-rw-r--r--mail/postfix26/files/patch-fa12
-rw-r--r--mail/postfix26/files/patch-fb10
-rw-r--r--mail/postfix26/files/patch-ga4
-rw-r--r--mail/postfix26/files/patch-gb4
-rw-r--r--mail/postfix26/files/patch-lmtp.h13
-rw-r--r--mail/postfix26/pkg-install6
-rw-r--r--mail/postfix26/pkg-plist133
-rw-r--r--mail/postfix26/scripts/configure.postfix129
-rw-r--r--mail/postfix27/Makefile117
-rw-r--r--mail/postfix27/distinfo4
-rw-r--r--mail/postfix27/files/patch-ab22
-rw-r--r--mail/postfix27/files/patch-ac22
-rw-r--r--mail/postfix27/files/patch-ad11
-rw-r--r--mail/postfix27/files/patch-ae11
-rw-r--r--mail/postfix27/files/patch-af22
-rw-r--r--mail/postfix27/files/patch-ag15
-rw-r--r--mail/postfix27/files/patch-ao22
-rw-r--r--mail/postfix27/files/patch-ap22
-rw-r--r--mail/postfix27/files/patch-bb17
-rw-r--r--mail/postfix27/files/patch-bc19
-rw-r--r--mail/postfix27/files/patch-bl11
-rw-r--r--mail/postfix27/files/patch-bm19
-rw-r--r--mail/postfix27/files/patch-bo19
-rw-r--r--mail/postfix27/files/patch-bp42
-rw-r--r--mail/postfix27/files/patch-cb45
-rw-r--r--mail/postfix27/files/patch-cc11
-rw-r--r--mail/postfix27/files/patch-cd31
-rw-r--r--mail/postfix27/files/patch-ce31
-rw-r--r--mail/postfix27/files/patch-cf11
-rw-r--r--mail/postfix27/files/patch-cg31
-rw-r--r--mail/postfix27/files/patch-ch31
-rw-r--r--mail/postfix27/files/patch-ci31
-rw-r--r--mail/postfix27/files/patch-da11
-rw-r--r--mail/postfix27/files/patch-db20
-rw-r--r--mail/postfix27/files/patch-dc20
-rw-r--r--mail/postfix27/files/patch-dd11
-rw-r--r--mail/postfix27/files/patch-de20
-rw-r--r--mail/postfix27/files/patch-df20
-rw-r--r--mail/postfix27/files/patch-dg20
-rw-r--r--mail/postfix27/files/patch-ea4
-rw-r--r--mail/postfix27/files/patch-eb4
-rw-r--r--mail/postfix27/files/patch-ec4
-rw-r--r--mail/postfix27/files/patch-ed4
-rw-r--r--mail/postfix27/files/patch-ee4
-rw-r--r--mail/postfix27/files/patch-ef4
-rw-r--r--mail/postfix27/files/patch-eg54
-rw-r--r--mail/postfix27/files/patch-eh4
-rw-r--r--mail/postfix27/files/patch-ei21
-rw-r--r--mail/postfix27/files/patch-ej21
-rw-r--r--mail/postfix27/files/patch-fa12
-rw-r--r--mail/postfix27/files/patch-fb10
-rw-r--r--mail/postfix27/files/patch-ga4
-rw-r--r--mail/postfix27/files/patch-gb4
-rw-r--r--mail/postfix27/files/patch-lmtp.h13
-rw-r--r--mail/postfix27/pkg-install6
-rw-r--r--mail/postfix27/pkg-plist133
-rw-r--r--mail/postfix27/scripts/configure.postfix129
-rw-r--r--mail/postfix28/Makefile117
-rw-r--r--mail/postfix28/distinfo4
-rw-r--r--mail/postfix28/files/patch-ab22
-rw-r--r--mail/postfix28/files/patch-ac22
-rw-r--r--mail/postfix28/files/patch-ad11
-rw-r--r--mail/postfix28/files/patch-ae11
-rw-r--r--mail/postfix28/files/patch-af22
-rw-r--r--mail/postfix28/files/patch-ag15
-rw-r--r--mail/postfix28/files/patch-ao22
-rw-r--r--mail/postfix28/files/patch-ap22
-rw-r--r--mail/postfix28/files/patch-bb17
-rw-r--r--mail/postfix28/files/patch-bc19
-rw-r--r--mail/postfix28/files/patch-bl11
-rw-r--r--mail/postfix28/files/patch-bm19
-rw-r--r--mail/postfix28/files/patch-bo19
-rw-r--r--mail/postfix28/files/patch-bp42
-rw-r--r--mail/postfix28/files/patch-cb45
-rw-r--r--mail/postfix28/files/patch-cc11
-rw-r--r--mail/postfix28/files/patch-cd31
-rw-r--r--mail/postfix28/files/patch-ce31
-rw-r--r--mail/postfix28/files/patch-cf11
-rw-r--r--mail/postfix28/files/patch-cg31
-rw-r--r--mail/postfix28/files/patch-ch31
-rw-r--r--mail/postfix28/files/patch-ci31
-rw-r--r--mail/postfix28/files/patch-da11
-rw-r--r--mail/postfix28/files/patch-db20
-rw-r--r--mail/postfix28/files/patch-dc20
-rw-r--r--mail/postfix28/files/patch-dd11
-rw-r--r--mail/postfix28/files/patch-de20
-rw-r--r--mail/postfix28/files/patch-df20
-rw-r--r--mail/postfix28/files/patch-dg20
-rw-r--r--mail/postfix28/files/patch-ea4
-rw-r--r--mail/postfix28/files/patch-eb4
-rw-r--r--mail/postfix28/files/patch-ec4
-rw-r--r--mail/postfix28/files/patch-ed4
-rw-r--r--mail/postfix28/files/patch-ee4
-rw-r--r--mail/postfix28/files/patch-ef4
-rw-r--r--mail/postfix28/files/patch-eg54
-rw-r--r--mail/postfix28/files/patch-eh4
-rw-r--r--mail/postfix28/files/patch-ei21
-rw-r--r--mail/postfix28/files/patch-ej21
-rw-r--r--mail/postfix28/files/patch-fa12
-rw-r--r--mail/postfix28/files/patch-fb10
-rw-r--r--mail/postfix28/files/patch-ga4
-rw-r--r--mail/postfix28/files/patch-gb4
-rw-r--r--mail/postfix28/files/patch-lmtp.h13
-rw-r--r--mail/postfix28/pkg-install6
-rw-r--r--mail/postfix28/pkg-plist133
-rw-r--r--mail/postfix28/scripts/configure.postfix129
539 files changed, 9020 insertions, 3894 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 839c9f1819ad..9c4068489960 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,90 +1,82 @@
# New ports collection makefile for: postfix
-# Date created: 18 Mar 1999
+# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
PORTNAME= postfix
-PORTVERSION= 19991231.13
-PORTREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
+PORTVERSION= 20010228
+CATEGORIES= mail ipv6
+MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
+ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
ftp://ftp.tux.org/pub/net/postfix/official/ \
ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
ftp://ftp.samurai.com/pub/postfix/official/ \
- ftp://ftp.nl.uu.net/pub/unix/mail/postfix/official/ \
- ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
- ftp://ftp.mira.net/pub/unix/mail/postfix/official/ \
- ftp://coda.nctu.edu.tw/network/mail/postfix/official/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-DISTNAME= ${PORTNAME}-19991231-pl13
+MASTER_SITE_SUBDIR= . old related/postfix
+DISTNAME= release-${PORTVERSION}
MAINTAINER= blaz@amis.net
-.if !defined(DEBUG)
-MAKEFILEFLAGS+= DEBUG=
-.endif
-
-.if defined(CC)
-MAKEFILEFLAGS+= CC="${CC}"
-.endif
-
-MAKEFILEFLAGS+= OPT="${CFLAGS}"
-SCRIPTS_ENV+= MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-
MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
sendmail.1
-MAN5= access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
+MAN5= access.5 aliases.5 canonical.5 regexp_table.5 relocated.5 \
+ transport.5 virtual.5
-MAN8= bounce.8 cleanup.8 defer.8 error.8 local.8 master.8 pickup.8 \
- pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 trivial-rewrite.8
+MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
+ master.8 pickup.8 pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 \
+ spawn.8 trivial-rewrite.8
CONF1= access aliases canonical main.cf master.cf \
- relocated transport virtual
+ regexp_table relocated transport virtual
CONF2= sample-aliases.cf sample-canonical.cf sample-debug.cf \
- sample-filter.cf sample-local.cf sample-misc.cf \
+ sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
sample-rate.cf sample-regexp.cf sample-relocated.cf \
sample-resource.cf sample-rewrite.cf sample-smtp.cf \
sample-smtpd.cf sample-transport.cf sample-virtual.cf
-BIN1= bounce cleanup error local master pickup \
- pipe qmgr showq smtp smtpd trivial-rewrite
+BIN1= bounce cleanup error flush lmtp local master pickup \
+ pipe qmgr showq smtp smtpd spawn trivial-rewrite
BIN2= postalias postcat postconf postdrop postfix \
postkick postlock postlog postmap postsuper sendmail
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
-POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz
+.if defined(NOPORTDOCS)
+PLIST_SUB+= SUB_DOCS="@comment "
+.else
+PLIST_SUB+= SUB_DOCS=""
+DOCDIR= ${PREFIX}/share/doc/postfix
.endif
-.if defined(WITH_LDAP)
-CONF2+= sample-ldap.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-PLIST_SUB+= WITH_LDAP=""
-.else
-PLIST_SUB+= WITH_LDAP="@comment "
+.if !defined(DEBUG)
+MAKEFILEFLAGS+= DEBUG=
.endif
-.if defined(WITH_PCRE)
-CONF2+= sample-pcre.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libpcre.a
-PLIST_SUB+= WITH_PCRE=""
-.else
-PLIST_SUB+= WITH_PCRE="@comment "
+.if defined(CC)
+MAKEFILEFLAGS+= CC="${CC}"
+.endif
+
+MAKEFILEFLAGS+= OPT="${CFLAGS}"
+
+SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
+ PREFIX="${PREFIX}" \
+ TOUCH="${TOUCH}" \
+ MKDIR="${MKDIR}" \
+ MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
+
+pre-fetch:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
post-patch:
- (cd ${WRKSRC} && make -f Makefile.init makefiles ${MAKEFILEFLAGS} \
+ (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
${ECHO} "all: default" >> Makefile)
@@ -122,7 +114,13 @@ do-install:
.for file in ${BIN2}
@${INSTALL_PROGRAM} \
- ${WRKSRC}/${file}/${file} \
+ ${WRKSRC}/src/${file}/${file} \
+ ${PREFIX}/sbin
+.endfor
+
+.for file in ${BIN3}
+ @${INSTALL_PROGRAM} \
+ ${WRKSRC}/src/smtpstone/${file} \
${PREFIX}/sbin
.endfor
@@ -145,11 +143,9 @@ do-install:
.endfor
.if !defined(NOPORTDOCS)
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix
- @cd ${WRKSRC} && ${INSTALL_DATA} LDAP_README MYSQL_README ${PREFIX}/share/doc/postfix
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix/html
- @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${PREFIX}/share/doc/postfix/html && \
- ${ECHO_MSG} "Installed documentation in ${PREFIX}/share/doc/postfix"
+ @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCDIR}
+ @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCDIR} && \
+ ${ECHO_MSG} "Installed HTML documentation in ${DOCDIR}"
.endif
@${ECHO_MSG} '--------------------------------------------------'
@@ -160,6 +156,9 @@ do-install:
post-install:
@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+post-clean:
+ @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
.include <bsd.port.pre.mk>
replace:
@@ -170,10 +169,10 @@ replace:
${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
${ECHO} "#" >> /etc/mail/mailer.conf
- ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
+ ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
.else
@${ECHO_MSG} "===> Replacing sendmail"
@if [ -e /usr/sbin/sendmail ]; then \
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 854fffa3294c..d6f4fd5c198a 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1 +1,3 @@
-MD5 (postfix-19991231-pl13.tar.gz) = f119438aae0aa1346953ae326864da9e
+MD5 (release-20010228.tar.gz) = 6af46cc231ca1e09e60393542d5611bd
+MD5 (pfixtls-0.7.0-20010228-0.9.6.tar.gz) = 64699fb4f0bb4dc87ba1c6c7aef81366
+MD5 (postfix-20010225snap-v6-20010228a.diff.gz) = 8646724c2d00e4d162b63456247cf4fb
diff --git a/mail/postfix/files/patch-ab b/mail/postfix/files/patch-ab
index d705b8a7f594..7c81d3dc12c9 100644
--- a/mail/postfix/files/patch-ab
+++ b/mail/postfix/files/patch-ab
@@ -1,11 +1,11 @@
---- conf/canonical.orig Sun Sep 5 23:47:01 1999
-+++ conf/canonical Tue Nov 7 22:24:42 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix canonical table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/canonical\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- # DESCRIPTION
- # The optional \fBcanonical\fR file specifies an address mapping for
- # local and non-local addresses. The mapping is used by the
+*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000
+--- ./conf/canonical Thu Jun 1 21:53:23 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/canonical
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/canonical
+ #
diff --git a/mail/postfix/files/patch-ac b/mail/postfix/files/patch-ac
index 264335cb70fa..0fb2192cdd84 100644
--- a/mail/postfix/files/patch-ac
+++ b/mail/postfix/files/patch-ac
@@ -1,11 +1,11 @@
---- conf/access.orig Fri Dec 11 19:55:48 1998
-+++ conf/access Tue Nov 7 22:25:54 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix access table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/access\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/access\fR
- # DESCRIPTION
- # The optional \fBaccess\fR table directs the Postfix SMTP server
- # to selectively reject or accept mail from or to specific hosts,
+*** ./conf/access.orig Tue Mar 7 10:42:58 2000
+--- ./conf/access Thu Jun 1 21:53:36 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/access
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/access
+ #
diff --git a/mail/postfix/files/patch-ad b/mail/postfix/files/patch-ad
new file mode 100644
index 000000000000..c1b102574165
--- /dev/null
+++ b/mail/postfix/files/patch-ad
@@ -0,0 +1,11 @@
+*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/pcre_table Thu Jun 1 22:02:08 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix/files/patch-ae b/mail/postfix/files/patch-ae
new file mode 100644
index 000000000000..e396dd8626db
--- /dev/null
+++ b/mail/postfix/files/patch-ae
@@ -0,0 +1,11 @@
+*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/regexp_table Thu Jun 1 22:03:27 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix/files/patch-af b/mail/postfix/files/patch-af
index ec92981276c6..8fca6b208941 100644
--- a/mail/postfix/files/patch-af
+++ b/mail/postfix/files/patch-af
@@ -1,11 +1,11 @@
---- conf/relocated.orig Sun Sep 5 23:47:01 1999
-+++ conf/relocated Tue Nov 7 22:28:27 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix relocated table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/relocated\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- # DESCRIPTION
- # The optional \fBrelocated\fR file provides the information that is
- # used in "user has moved to \fInew_location\fR" bounce messages.
+*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000
+--- ./conf/relocated Thu Jun 1 22:03:59 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/relocated
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/relocated
+ #
diff --git a/mail/postfix/files/patch-ag b/mail/postfix/files/patch-ag
new file mode 100644
index 000000000000..54c0fa918d3b
--- /dev/null
+++ b/mail/postfix/files/patch-ag
@@ -0,0 +1,15 @@
+*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000
+--- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000
+***************
+*** 91,95 ****
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in /etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:/etc/postfix/saslpass
+
+--- 91,95 ----
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass
+
diff --git a/mail/postfix/files/patch-ao b/mail/postfix/files/patch-ao
index 206c152728da..fd854e181601 100644
--- a/mail/postfix/files/patch-ao
+++ b/mail/postfix/files/patch-ao
@@ -1,11 +1,11 @@
---- conf/transport.orig Fri Dec 31 20:54:11 1999
-+++ conf/transport Tue Nov 7 22:46:59 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix transport table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/transport\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- # DESCRIPTION
- # The optional \fBtransport\fR file specifies a mapping from domain
- # hierarchies to message delivery transports and/or relay hosts. The
+*** ./conf/transport.orig Tue Mar 7 10:42:58 2000
+--- ./conf/transport Thu Jun 1 22:13:41 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/transport
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/transport
+ #
diff --git a/mail/postfix/files/patch-ap b/mail/postfix/files/patch-ap
index b412ce386f8d..4598192cd5c1 100644
--- a/mail/postfix/files/patch-ap
+++ b/mail/postfix/files/patch-ap
@@ -1,11 +1,11 @@
---- conf/virtual.orig Tue Dec 21 03:00:13 1999
-+++ conf/virtual Tue Nov 7 22:48:18 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix virtual table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/virtual\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- # DESCRIPTION
- # The optional \fBvirtual\fR table specifies redirections for local
- # and non-local recipients or domains. The redirections are used by
+*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000
+--- ./conf/virtual Thu Jun 1 22:13:54 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/virtual
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/virtual
+ #
diff --git a/mail/postfix/files/patch-bb b/mail/postfix/files/patch-bb
index 6444bc0d1f75..ea744664dfa7 100644
--- a/mail/postfix/files/patch-bb
+++ b/mail/postfix/files/patch-bb
@@ -1,11 +1,20 @@
---- html/access.5.html.orig Fri Dec 11 19:55:49 1998
-+++ html/access.5.html Tue Nov 7 22:48:47 2000
+--- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000
++++ ./html/access.5.html Tue Nov 21 21:24:34 2000
@@ -9,7 +9,7 @@
access - format of Postfix access table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/access</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b>
-
+
<b>DESCRIPTION</b>
The optional <b>access</b> table directs the Postfix SMTP server
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the
+ indexed file after changing the access table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix/files/patch-bc b/mail/postfix/files/patch-bc
index 4d24077b9527..e407a9650585 100644
--- a/mail/postfix/files/patch-bc
+++ b/mail/postfix/files/patch-bc
@@ -1,11 +1,20 @@
---- html/canonical.5.html.orig Mon Sep 6 05:13:54 1999
-+++ html/canonical.5.html Tue Nov 7 22:51:05 2000
+--- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000
++++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000
@@ -9,7 +9,7 @@
canonical - format of Postfix canonical table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/canonical</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>canonical</b> file specifies an address mapping
+ The optional <b>canonical</b> table specifies an address mapping
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix/files/patch-bl b/mail/postfix/files/patch-bl
new file mode 100644
index 000000000000..176c7d1b64de
--- /dev/null
+++ b/mail/postfix/files/patch-bl
@@ -0,0 +1,11 @@
+*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000
+--- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000
+***************
+*** 11,13 ****
+ <b>SYNOPSIS</b>
+! regexp:/etc/postfix/filename
+
+--- 11,13 ----
+ <b>SYNOPSIS</b>
+! regexp:!!PREFIX!!/etc/postfix/filename
+
diff --git a/mail/postfix/files/patch-bm b/mail/postfix/files/patch-bm
index bc9479bea2fe..e5ccc2c50b94 100644
--- a/mail/postfix/files/patch-bm
+++ b/mail/postfix/files/patch-bm
@@ -1,11 +1,20 @@
---- html/relocated.5.html.orig Mon Sep 6 05:13:55 1999
-+++ html/relocated.5.html Tue Nov 7 22:52:46 2000
+--- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000
++++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000
@@ -9,7 +9,7 @@
relocated - format of Postfix relocated table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/relocated</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>relocated</b> file provides the information that
+ The optional <b>relocated</b> table provides the information that
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the
+ indexed file after changing the relocated table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix/files/patch-bo b/mail/postfix/files/patch-bo
index 41cbc4ca6d65..b45270be8151 100644
--- a/mail/postfix/files/patch-bo
+++ b/mail/postfix/files/patch-bo
@@ -1,11 +1,20 @@
---- html/transport.5.html.orig Fri Dec 31 20:54:56 1999
-+++ html/transport.5.html Tue Nov 7 22:53:50 2000
+--- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000
++++ ./html/transport.5.html Tue Nov 21 21:43:20 2000
@@ -9,7 +9,7 @@
transport - format of Postfix transport table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/transport</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>transport</b> file specifies a mapping from
+ The optional <b>transport</b> table specifies a mapping from
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the
+ indexed file after changing the transport table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix/files/patch-bp b/mail/postfix/files/patch-bp
index bb65bd98a7b8..5206bfd4bfd0 100644
--- a/mail/postfix/files/patch-bp
+++ b/mail/postfix/files/patch-bp
@@ -1,11 +1,43 @@
---- html/virtual.5.html.orig Tue Dec 21 03:00:58 1999
-+++ html/virtual.5.html Tue Nov 7 22:55:04 2000
+--- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000
++++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000
@@ -9,7 +9,7 @@
virtual - format of Postfix virtual table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/virtual</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>virtual</b> table specifies redirections for
+ The optional <b>virtual</b> table specifies address redirections
+@@ -27,7 +27,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
+@@ -52,7 +52,7 @@
+
+ Support for a Postfix-style virtual domain looks like:
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter)
+ <i>postmaster@virtual.domain</i> <i>postmaster</i>
+ <i>user1@virtual.domain</i> <i>address1</i>
+@@ -94,11 +94,11 @@
+
+ Support for a Sendmail-style virtual domain looks like:
+
+- /etc/postfix/main.cf:
++ !!PREFIX!!/etc/postfix/main.cf:
+ mydestination = $myhostname localhost.$mydomain $mydomain
+ <i>virtual.domain</i>
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>user1@virtual.domain</i> <i>address1</i>
+ <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i>
+
diff --git a/mail/postfix/files/patch-cb b/mail/postfix/files/patch-cb
index ef73429287d2..58559c7273d1 100644
--- a/mail/postfix/files/patch-cb
+++ b/mail/postfix/files/patch-cb
@@ -1,25 +1,20 @@
---- man/man1/sendmail.1.orig Thu Mar 30 17:46:10 2000
-+++ man/man1/sendmail.1 Wed Dec 20 18:37:45 2000
-@@ -61,10 +61,12 @@
- \fBjust-send-eight\fR.
- .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- The path name of the \fBsendmail.cf\fR file. Postfix configuration
--files are kept in \fB/etc/postfix\fR.
-+files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- .IP "\fB-F \fIfull_name\fR
- Set the sender full name. This is used only with messages that
- have no \fBFrom:\fR message header.
-+.IP "\fB-G\fR (ignored)"
-+Gateway (relay) submission, as opposed to initial user submission.
- .IP \fB-I\fR
- Initialize alias database. See the \fBnewaliases\fR
- command above.
-@@ -171,7 +173,7 @@
- .na
- .nf
- /var/spool/postfix, mail queue
--/etc/postfix, configuration files
-+!!PREFIX!!/etc/postfix, configuration files
- .SH CONFIGURATION PARAMETERS
- .na
- .nf
+*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000
+--- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000
+***************
+*** 63,65 ****
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+--- 63,65 ----
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+***************
+*** 173,175 ****
+ /var/spool/postfix, mail queue
+! /etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
+--- 173,175 ----
+ /var/spool/postfix, mail queue
+! !!PREFIX!!/etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
diff --git a/mail/postfix/files/patch-cc b/mail/postfix/files/patch-cc
new file mode 100644
index 000000000000..cd6946003217
--- /dev/null
+++ b/mail/postfix/files/patch-cc
@@ -0,0 +1,11 @@
+*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000
+***************
+*** 10,12 ****
+ .nf
+! pcre:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! pcre:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix/files/patch-cd b/mail/postfix/files/patch-cd
index 36461a39bb49..b51de44d0bee 100644
--- a/mail/postfix/files/patch-cd
+++ b/mail/postfix/files/patch-cd
@@ -1,11 +1,20 @@
---- man/man5/access.5.orig Fri Dec 11 19:55:52 1998
-+++ man/man5/access.5 Tue Nov 7 22:56:25 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/access\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/access\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/access.5 Thu Jun 1 22:39:55 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/access\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
diff --git a/mail/postfix/files/patch-ce b/mail/postfix/files/patch-ce
index 0e0bd4aa1ae5..f77053f8b3aa 100644
--- a/mail/postfix/files/patch-ce
+++ b/mail/postfix/files/patch-ce
@@ -1,11 +1,20 @@
---- man/man5/canonical.5.orig Mon Sep 6 05:13:32 1999
-+++ man/man5/canonical.5 Tue Nov 7 22:57:40 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/canonical\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/canonical\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
diff --git a/mail/postfix/files/patch-cf b/mail/postfix/files/patch-cf
new file mode 100644
index 000000000000..28fb053b94a7
--- /dev/null
+++ b/mail/postfix/files/patch-cf
@@ -0,0 +1,11 @@
+*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000
+***************
+*** 10,12 ****
+ .nf
+! regexp:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! regexp:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix/files/patch-cg b/mail/postfix/files/patch-cg
index cdce4aaddaf3..0ae82cc57669 100644
--- a/mail/postfix/files/patch-cg
+++ b/mail/postfix/files/patch-cg
@@ -1,11 +1,20 @@
---- man/man5/relocated.5.orig Mon Sep 6 05:13:33 1999
-+++ man/man5/relocated.5 Tue Nov 7 22:59:11 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/relocated\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/relocated\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ .SH DESCRIPTION
+***************
+*** 20,22 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
+--- 20,22 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
diff --git a/mail/postfix/files/patch-ch b/mail/postfix/files/patch-ch
index 80df028f9255..3ed047ea474c 100644
--- a/mail/postfix/files/patch-ch
+++ b/mail/postfix/files/patch-ch
@@ -1,11 +1,20 @@
---- man/man5/transport.5.orig Fri Dec 31 20:54:51 1999
-+++ man/man5/transport.5 Tue Nov 7 22:59:57 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/transport\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/transport\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
+--- 21,23 ----
+ for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
diff --git a/mail/postfix/files/patch-ci b/mail/postfix/files/patch-ci
index 889eed3f4d89..1a7cf4abbac7 100644
--- a/mail/postfix/files/patch-ci
+++ b/mail/postfix/files/patch-ci
@@ -1,11 +1,20 @@
---- man/man5/virtual.5.orig Tue Dec 21 03:00:51 1999
-+++ man/man5/virtual.5 Tue Nov 7 23:00:32 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/virtual\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/virtual\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ .SH DESCRIPTION
+***************
+*** 26,28 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
+--- 26,28 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
diff --git a/mail/postfix/files/patch-da b/mail/postfix/files/patch-da
new file mode 100644
index 000000000000..e57e31750d18
--- /dev/null
+++ b/mail/postfix/files/patch-da
@@ -0,0 +1,11 @@
+*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000
+--- ./proto/regexp_table Thu Jun 1 22:44:43 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix/files/patch-db b/mail/postfix/files/patch-db
new file mode 100644
index 000000000000..7f89fb770783
--- /dev/null
+++ b/mail/postfix/files/patch-db
@@ -0,0 +1,20 @@
+*** ./proto/access.orig Sun Apr 9 16:44:45 2000
+--- ./proto/access Thu Jun 1 22:45:05 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/access\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
diff --git a/mail/postfix/files/patch-dc b/mail/postfix/files/patch-dc
new file mode 100644
index 000000000000..786f2da45c32
--- /dev/null
+++ b/mail/postfix/files/patch-dc
@@ -0,0 +1,20 @@
+*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000
+--- ./proto/canonical Thu Jun 1 22:45:28 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/canonical\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
diff --git a/mail/postfix/files/patch-dd b/mail/postfix/files/patch-dd
new file mode 100644
index 000000000000..b65a57ff7d57
--- /dev/null
+++ b/mail/postfix/files/patch-dd
@@ -0,0 +1,11 @@
+*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000
+--- ./proto/pcre_table Thu Jun 1 22:45:41 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix/files/patch-de b/mail/postfix/files/patch-de
new file mode 100644
index 000000000000..73bb2af2261d
--- /dev/null
+++ b/mail/postfix/files/patch-de
@@ -0,0 +1,20 @@
+*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000
+--- ./proto/relocated Thu Jun 1 22:46:02 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/relocated\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ # DESCRIPTION
+***************
+*** 14,16 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
+--- 14,16 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
diff --git a/mail/postfix/files/patch-df b/mail/postfix/files/patch-df
new file mode 100644
index 000000000000..8d3fba96a224
--- /dev/null
+++ b/mail/postfix/files/patch-df
@@ -0,0 +1,20 @@
+*** ./proto/transport.orig Sun Apr 9 17:05:45 2000
+--- ./proto/transport Thu Jun 1 22:46:23 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/transport\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
+--- 15,17 ----
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
diff --git a/mail/postfix/files/patch-dg b/mail/postfix/files/patch-dg
new file mode 100644
index 000000000000..bff20a2cff3e
--- /dev/null
+++ b/mail/postfix/files/patch-dg
@@ -0,0 +1,20 @@
+*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000
+--- ./proto/virtual Thu Jun 1 22:46:40 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/virtual\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ # DESCRIPTION
+***************
+*** 20,22 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
+--- 20,22 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
diff --git a/mail/postfix/files/patch-ea b/mail/postfix/files/patch-ea
index 80647e0b2ba0..6c3f98d2af4f 100644
--- a/mail/postfix/files/patch-ea
+++ b/mail/postfix/files/patch-ea
@@ -1,5 +1,5 @@
-*** ./cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
---- ./cleanup/cleanup.c Thu Jun 1 21:52:22 2000
+*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
+--- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000
***************
*** 118,121 ****
/* FILES
diff --git a/mail/postfix/files/patch-eb b/mail/postfix/files/patch-eb
index d576de434580..e67680963d2d 100644
--- a/mail/postfix/files/patch-eb
+++ b/mail/postfix/files/patch-eb
@@ -1,5 +1,5 @@
-*** ./global/mail_conf.c.orig Sun May 7 18:51:16 2000
---- ./global/mail_conf.c Thu Jun 1 22:16:29 2000
+*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000
+--- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000
***************
*** 53,55 ****
/* FILES
diff --git a/mail/postfix/files/patch-ec b/mail/postfix/files/patch-ec
index 74edda76007b..6d12d1ce4c17 100644
--- a/mail/postfix/files/patch-ec
+++ b/mail/postfix/files/patch-ec
@@ -1,5 +1,5 @@
-*** ./global/mail_params.h.orig Wed May 31 19:18:31 2000
---- ./global/mail_params.h Thu Jun 1 22:17:10 2000
+*** ./src/global/mail_params.h.orig Wed May 31 19:18:31 2000
+--- ./src/global/mail_params.h Thu Jun 1 22:17:10 2000
***************
*** 155,157 ****
#ifndef DEF_PROGRAM_DIR
diff --git a/mail/postfix/files/patch-ed b/mail/postfix/files/patch-ed
index b573748b45e1..f971b62720d8 100644
--- a/mail/postfix/files/patch-ed
+++ b/mail/postfix/files/patch-ed
@@ -1,5 +1,5 @@
-*** ./local/mailbox.c.orig Fri Apr 28 16:55:53 2000
---- ./local/mailbox.c Thu Jun 1 22:37:48 2000
+*** ./src/local/mailbox.c.orig Fri Apr 28 16:55:53 2000
+--- ./src/local/mailbox.c Thu Jun 1 22:37:48 2000
***************
*** 15,17 ****
/* suppression. The default is direct mailbox delivery to
diff --git a/mail/postfix/files/patch-ee b/mail/postfix/files/patch-ee
index d79219b1ba62..ef44eac24b73 100644
--- a/mail/postfix/files/patch-ee
+++ b/mail/postfix/files/patch-ee
@@ -1,5 +1,5 @@
-*** ./master/master.c.orig Tue Mar 7 10:25:07 2000
---- ./master/master.c Thu Jun 1 22:43:50 2000
+*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000
+--- ./src/master/master.c Thu Jun 1 22:43:50 2000
***************
*** 104,107 ****
/* FILES
diff --git a/mail/postfix/files/patch-ef b/mail/postfix/files/patch-ef
index 44816a063b95..586b304a103d 100644
--- a/mail/postfix/files/patch-ef
+++ b/mail/postfix/files/patch-ef
@@ -1,5 +1,5 @@
-*** ./postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
---- ./postdrop/postdrop.c Thu Jun 1 22:44:22 2000
+*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
+--- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000
***************
*** 39,41 ****
/* /var/spool/postfix, mail queue
diff --git a/mail/postfix/files/patch-eg b/mail/postfix/files/patch-eg
index 28950509870c..2983bbfd86ea 100644
--- a/mail/postfix/files/patch-eg
+++ b/mail/postfix/files/patch-eg
@@ -1,34 +1,20 @@
---- sendmail/sendmail.c.orig Sun Mar 26 22:51:33 2000
-+++ sendmail/sendmail.c Wed Dec 20 18:17:31 2000
-@@ -55,10 +55,12 @@
- /* \fBjust-send-eight\fR.
- /* .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
--/* files are kept in \fB/etc/postfix\fR.
-+/* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- /* .IP "\fB-F \fIfull_name\fR
- /* Set the sender full name. This is used only with messages that
- /* have no \fBFrom:\fR message header.
-+/* .IP "\fB-G \fR (ignored)"
-+/* Gateway (relay) submission, as opposed to initial user submission.
- /* .IP \fB-I\fR
- /* Initialize alias database. See the \fBnewaliases\fR
- /* command above.
-@@ -157,7 +159,7 @@
- /* \fBdebugger_command\fR configuration parameter.
- /* FILES
- /* /var/spool/postfix, mail queue
--/* /etc/postfix, configuration files
-+/* !!PREFIX!!/etc/postfix, configuration files
- /* CONFIGURATION PARAMETERS
- /* .ad
- /* .fi
-@@ -710,6 +712,8 @@
- break;
- case 'F': /* full name */
- full_name = optarg;
-+ break;
-+ case 'G': /* gateway submission */
- break;
- case 'I': /* newaliases */
- mode = SM_MODE_NEWALIAS;
+*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000
+--- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000
+***************
+*** 57,59 ****
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+--- 57,59 ----
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+***************
+*** 159,161 ****
+ /* /var/spool/postfix, mail queue
+! /* /etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
+--- 159,161 ----
+ /* /var/spool/postfix, mail queue
+! /* !!PREFIX!!/etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix/files/patch-eh b/mail/postfix/files/patch-eh
index f95b51423128..c104c3680d21 100644
--- a/mail/postfix/files/patch-eh
+++ b/mail/postfix/files/patch-eh
@@ -1,5 +1,5 @@
-*** ./trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
---- ./trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
+*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
+--- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
***************
*** 32,34 ****
/* FILES
diff --git a/mail/postfix/files/patch-ei b/mail/postfix/files/patch-ei
new file mode 100644
index 000000000000..3029372b746e
--- /dev/null
+++ b/mail/postfix/files/patch-ei
@@ -0,0 +1,21 @@
+*** ./src/smtpd/smtpd.h.orig Thu Sep 14 10:17:23 2000
+--- ./src/smtpd/smtpd.h Thu Sep 14 10:17:38 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix/files/patch-ej b/mail/postfix/files/patch-ej
new file mode 100644
index 000000000000..6c5cf2e23758
--- /dev/null
+++ b/mail/postfix/files/patch-ej
@@ -0,0 +1,21 @@
+*** ./src/smtp/smtp.h.orig Thu Sep 14 13:04:43 2000
+--- ./src/smtp/smtp.h Thu Sep 14 13:04:53 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix/files/patch-fa b/mail/postfix/files/patch-fa
deleted file mode 100644
index bc1c2dc388c2..000000000000
--- a/mail/postfix/files/patch-fa
+++ /dev/null
@@ -1,12 +0,0 @@
---- makedefs.orig Sun Jan 23 03:04:27 2000
-+++ makedefs Mon Apr 3 08:59:17 2000
-@@ -89,6 +89,8 @@
- ;;
- FreeBSD.4*) SYSTYPE=FREEBSD4
- ;;
-+ FreeBSD.5*) SYSTYPE=FREEBSD5
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- NetBSD.1*) SYSTYPE=NETBSD1
-
diff --git a/mail/postfix/files/patch-fb b/mail/postfix/files/patch-fb
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix/files/patch-fb
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
- * makedefs script, and adding a section below for the new system.
- */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+ || defined(FREEBSD5) \
- || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
- || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix/files/patch-ga b/mail/postfix/files/patch-ga
index 3ad7120b8322..60a6dd578564 100644
--- a/mail/postfix/files/patch-ga
+++ b/mail/postfix/files/patch-ga
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_MYSQL" option at compile time ("make -DWITH_MYSQL").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
[Code contributed by Scott Cotton and Joshua Marcus, IC Group, Inc.]
diff --git a/mail/postfix/files/patch-gb b/mail/postfix/files/patch-gb
index 312c8c60f9e5..98816d155122 100644
--- a/mail/postfix/files/patch-gb
+++ b/mail/postfix/files/patch-gb
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_LDAP" option at compile time ("make -DWITH_LDAP").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
BUILDING WITH LDAP SUPPORT
==========================
diff --git a/mail/postfix/files/patch-lmtp.h b/mail/postfix/files/patch-lmtp.h
new file mode 100644
index 000000000000..3d941c034198
--- /dev/null
+++ b/mail/postfix/files/patch-lmtp.h
@@ -0,0 +1,13 @@
+--- ./src/lmtp/lmtp.h.orig Fri Jan 19 15:43:06 2001
++++ ./src/lmtp/lmtp.h Sat Feb 3 14:01:09 2001
+@@ -12,8 +12,8 @@
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+-#include <sasl.h>
+-#include <saslutil.h>
++#include <sasl/sasl.h>
++#include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix/pkg-install b/mail/postfix/pkg-install
index 933c669e6b98..0d18b67ddee3 100644
--- a/mail/postfix/pkg-install
+++ b/mail/postfix/pkg-install
@@ -1,4 +1,9 @@
#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
user=postfix
group=postfix
@@ -87,6 +92,5 @@ if [ x"$2" = xPOST-INSTALL ]; then
fi
/usr/sbin/chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
/bin/chmod 2555 ${PKG_PREFIX}/sbin/postdrop
- /bin/mkdir -p /var/spool/postfix
${PKG_PREFIX}/sbin/postfix check
fi
diff --git a/mail/postfix/pkg-plist b/mail/postfix/pkg-plist
index 5f8572883b4c..97167cb8ed15 100644
--- a/mail/postfix/pkg-plist
+++ b/mail/postfix/pkg-plist
@@ -5,24 +5,29 @@ etc/postfix/postfix-script
etc/postfix/sample-access
etc/postfix/sample-aliases
etc/postfix/sample-aliases.cf
+%%SUB_SASL%%etc/postfix/sample-auth.cf
etc/postfix/sample-canonical
etc/postfix/sample-canonical.cf
etc/postfix/sample-debug.cf
etc/postfix/sample-filter.cf
-%%WITH_LDAP%%etc/postfix/sample-ldap.cf
+etc/postfix/sample-flush.cf
+%%SUB_LDAP%%etc/postfix/sample-ldap.cf
etc/postfix/sample-local.cf
etc/postfix/sample-main.cf
etc/postfix/sample-master.cf
etc/postfix/sample-misc.cf
-%%WITH_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre_table
etc/postfix/sample-rate.cf
etc/postfix/sample-regexp.cf
+etc/postfix/sample-regexp_table
etc/postfix/sample-relocated
etc/postfix/sample-relocated.cf
etc/postfix/sample-resource.cf
etc/postfix/sample-rewrite.cf
etc/postfix/sample-smtp.cf
etc/postfix/sample-smtpd.cf
+%%SUB_TLS%%etc/postfix/sample-tls.cf
etc/postfix/sample-transport
etc/postfix/sample-transport.cf
etc/postfix/sample-virtual
@@ -30,6 +35,8 @@ etc/postfix/sample-virtual.cf
libexec/postfix/bounce
libexec/postfix/cleanup
libexec/postfix/error
+libexec/postfix/flush
+libexec/postfix/lmtp
libexec/postfix/local
libexec/postfix/master
libexec/postfix/pickup
@@ -38,6 +45,8 @@ libexec/postfix/qmgr
libexec/postfix/showq
libexec/postfix/smtp
libexec/postfix/smtpd
+libexec/postfix/spawn
+%%SUB_TLS%%libexec/postfix/tlsmgr
libexec/postfix/trivial-rewrite
sbin/postalias
sbin/postcat
@@ -50,62 +59,66 @@ sbin/postlog
sbin/postmap
sbin/postsuper
sbin/sendmail
-share/doc/postfix/LDAP_README
-share/doc/postfix/MYSQL_README
-share/doc/postfix/html/access.5.html
-share/doc/postfix/html/aliases.5.html
-share/doc/postfix/html/architecture.html
-share/doc/postfix/html/backstage.html
-share/doc/postfix/html/basic.html
-share/doc/postfix/html/big-picture.gif
-share/doc/postfix/html/big-picture.html
-share/doc/postfix/html/bounce.8.html
-share/doc/postfix/html/canonical.5.html
-share/doc/postfix/html/cleanup.8.html
-share/doc/postfix/html/commands.html
-share/doc/postfix/html/defer.8.html
-share/doc/postfix/html/delivering.html
-share/doc/postfix/html/error.8.html
-share/doc/postfix/html/faq.html
-share/doc/postfix/html/goals.html
-share/doc/postfix/html/inbound.gif
-share/doc/postfix/html/index.html
-share/doc/postfix/html/local.8.html
-share/doc/postfix/html/mailq.1.html
-share/doc/postfix/html/master.8.html
-share/doc/postfix/html/motivation.html
-share/doc/postfix/html/newaliases.1.html
-share/doc/postfix/html/outbound.gif
-share/doc/postfix/html/pickup.8.html
-share/doc/postfix/html/pipe.8.html
-share/doc/postfix/html/postalias.1.html
-share/doc/postfix/html/postcat.1.html
-share/doc/postfix/html/postconf.1.html
-share/doc/postfix/html/postdrop.1.html
-share/doc/postfix/html/postfix.1.html
-share/doc/postfix/html/postkick.1.html
-share/doc/postfix/html/postlock.1.html
-share/doc/postfix/html/postlog.1.html
-share/doc/postfix/html/postmap.1.html
-share/doc/postfix/html/postsuper.1.html
-share/doc/postfix/html/qmgr.8.html
-share/doc/postfix/html/queuing.html
-share/doc/postfix/html/rate.html
-share/doc/postfix/html/receiving.html
-share/doc/postfix/html/relocated.5.html
-share/doc/postfix/html/resource.html
-share/doc/postfix/html/rewrite.html
-share/doc/postfix/html/security.html
-share/doc/postfix/html/sendmail.1.html
-share/doc/postfix/html/showq.8.html
-share/doc/postfix/html/small-picture.gif
-share/doc/postfix/html/smtp.8.html
-share/doc/postfix/html/smtpd.8.html
-share/doc/postfix/html/transport.5.html
-share/doc/postfix/html/trivial-rewrite.8.html
-share/doc/postfix/html/uce.html
-share/doc/postfix/html/virtual.5.html
-@dirrm etc/postfix
+%%SUB_TEST%%sbin/smtp-sink
+%%SUB_TEST%%sbin/smtp-source
+%%SUB_DOCS%%share/doc/postfix/access.5.html
+%%SUB_DOCS%%share/doc/postfix/aliases.5.html
+%%SUB_DOCS%%share/doc/postfix/architecture.html
+%%SUB_DOCS%%share/doc/postfix/backstage.html
+%%SUB_DOCS%%share/doc/postfix/basic.html
+%%SUB_DOCS%%share/doc/postfix/big-picture.gif
+%%SUB_DOCS%%share/doc/postfix/big-picture.html
+%%SUB_DOCS%%share/doc/postfix/bounce.8.html
+%%SUB_DOCS%%share/doc/postfix/canonical.5.html
+%%SUB_DOCS%%share/doc/postfix/cleanup.8.html
+%%SUB_DOCS%%share/doc/postfix/commands.html
+%%SUB_DOCS%%share/doc/postfix/defer.8.html
+%%SUB_DOCS%%share/doc/postfix/delivering.html
+%%SUB_DOCS%%share/doc/postfix/error.8.html
+%%SUB_DOCS%%share/doc/postfix/faq.html
+%%SUB_DOCS%%share/doc/postfix/flush.8.html
+%%SUB_DOCS%%share/doc/postfix/goals.html
+%%SUB_DOCS%%share/doc/postfix/inbound.gif
+%%SUB_DOCS%%share/doc/postfix/index.html
+%%SUB_DOCS%%share/doc/postfix/lmtp.8.html
+%%SUB_DOCS%%share/doc/postfix/local.8.html
+%%SUB_DOCS%%share/doc/postfix/mailq.1.html
+%%SUB_DOCS%%share/doc/postfix/master.8.html
+%%SUB_DOCS%%share/doc/postfix/motivation.html
+%%SUB_DOCS%%share/doc/postfix/newaliases.1.html
+%%SUB_DOCS%%share/doc/postfix/outbound.gif
+%%SUB_DOCS%%share/doc/postfix/pcre_table.5.html
+%%SUB_DOCS%%share/doc/postfix/pickup.8.html
+%%SUB_DOCS%%share/doc/postfix/pipe.8.html
+%%SUB_DOCS%%share/doc/postfix/postalias.1.html
+%%SUB_DOCS%%share/doc/postfix/postcat.1.html
+%%SUB_DOCS%%share/doc/postfix/postconf.1.html
+%%SUB_DOCS%%share/doc/postfix/postdrop.1.html
+%%SUB_DOCS%%share/doc/postfix/postfix.1.html
+%%SUB_DOCS%%share/doc/postfix/postkick.1.html
+%%SUB_DOCS%%share/doc/postfix/postlock.1.html
+%%SUB_DOCS%%share/doc/postfix/postlog.1.html
+%%SUB_DOCS%%share/doc/postfix/postmap.1.html
+%%SUB_DOCS%%share/doc/postfix/postsuper.1.html
+%%SUB_DOCS%%share/doc/postfix/qmgr.8.html
+%%SUB_DOCS%%share/doc/postfix/queuing.html
+%%SUB_DOCS%%share/doc/postfix/rate.html
+%%SUB_DOCS%%share/doc/postfix/receiving.html
+%%SUB_DOCS%%share/doc/postfix/regexp_table.5.html
+%%SUB_DOCS%%share/doc/postfix/relocated.5.html
+%%SUB_DOCS%%share/doc/postfix/resource.html
+%%SUB_DOCS%%share/doc/postfix/rewrite.html
+%%SUB_DOCS%%share/doc/postfix/security.html
+%%SUB_DOCS%%share/doc/postfix/sendmail.1.html
+%%SUB_DOCS%%share/doc/postfix/showq.8.html
+%%SUB_DOCS%%share/doc/postfix/small-picture.gif
+%%SUB_DOCS%%share/doc/postfix/smtp.8.html
+%%SUB_DOCS%%share/doc/postfix/smtpd.8.html
+%%SUB_DOCS%%share/doc/postfix/spawn.8.html
+%%SUB_DOCS%%share/doc/postfix/transport.5.html
+%%SUB_DOCS%%share/doc/postfix/trivial-rewrite.8.html
+%%SUB_DOCS%%share/doc/postfix/uce.html
+%%SUB_DOCS%%share/doc/postfix/virtual.5.html
+%%SUB_DOCS%%@dirrm share/doc/postfix
@dirrm libexec/postfix
-@dirrm share/doc/postfix/html
-@dirrm share/doc/postfix
+@dirrm etc/postfix
diff --git a/mail/postfix/scripts/configure.postfix b/mail/postfix/scripts/configure.postfix
new file mode 100644
index 000000000000..86ca92625962
--- /dev/null
+++ b/mail/postfix/scripts/configure.postfix
@@ -0,0 +1,129 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.1 2001-03-04 19:35:00 sf Exp $
+
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
+ exit
+fi
+
+tempfile=`mktemp -t checklist`
+
+if [ "${BATCH}" = "yes" ]; then
+ set \"PCRE\"
+else
+ /usr/bin/dialog --title "Postfix configuration options" --clear \
+ --checklist "\n\
+Please select desired options:" -1 -1 16 \
+PCRE "Perl Compatible Regular Expressions" OFF \
+SASL "Cyrus SASL (Simple Authentication and Security Layer)" OFF \
+DB3 "Berkeley DB3 (required if SASL also built with DB3)" OFF \
+MySQL "MySQL map lookups" OFF \
+OpenLDAP "OpenLDAP map lookups" OFF \
+Test "SMTP/LMTP test server and generator" OFF \
+TLS "Secure Sockets Layer and Transport Layer Security" OFF \
+IPv6 "IPv6 support" OFF \
+2> $tempfile
+
+ retval=$?
+
+ if [ -s $tempfile ]; then
+ set `cat $tempfile`
+ fi
+ rm -f $tempfile
+
+ case $retval in
+ 0) if [ -z "$*" ]; then
+ echo "Nothing selected"
+ fi
+ ;;
+ 1) echo "Cancel pressed."
+ exit 1
+ ;;
+ esac
+fi
+
+${MKDIR} ${WRKDIRPREFIX}${CURDIR}
+exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+
+echo "PREFIX= ${PREFIX}"
+
+SUB_PCRE="@comment "
+SUB_SASL="@comment "
+SUB_TLS="@comment "
+SUB_LDAP="@comment "
+SUB_TEST="@comment "
+
+while [ "$1" ]; do
+ case $1 in
+ \"PCRE\")
+ echo "CONF1+= pcre_table"
+ echo "CONF2+= sample-pcre.cf"
+ echo "MAN5+= pcre_table.5"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre"
+ echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a"
+ SUB_PCRE=""
+ ;;
+ \"SASL\")
+ echo "CONF2+= sample-auth.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl"
+ echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -lpam -lcrypt"
+ echo ".if exists(/usr/lib/libkrb.a)"
+ echo "POSTFIX_AUXLIBS+= -lkrb -ldes -lcom_err"
+ echo ".endif"
+ SUB_SASL=""
+ ;;
+ \"TLS\")
+ echo "CONF2+= sample-tls.cf"
+ echo "BIN1+= tlsmgr"
+ echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl"
+ echo "POSTFIX_AUXLIBS+= -lssl -lcrypto"
+ echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.7.0-20010228-0.9.6.tar.gz"
+ echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.7.0-20010228-0.9.6/pfixtls.diff"
+ echo "PATCH_STRIP= -p1"
+ SUB_TLS=""
+ ;;
+ \"DB3\")
+ echo "LIB_DEPENDS+= db3.1:\${PORTSDIR}/databases/db3"
+ echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3"
+ echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3"
+ ;;
+ \"MySQL\")
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
+ echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
+ ;;
+ \"OpenLDAP\")
+ echo "CONF2+= sample-ldap.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
+ echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
+ SUB_LDAP=""
+ ;;
+ \"Test\")
+ echo "BIN3= smtp-sink smtp-source"
+ SUB_TEST=""
+ ;;
+ \"IPv6\")
+ echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/"
+ echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}"
+ echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz"
+ echo ""
+ echo "pre-patch:"
+ echo " cd \${WRKSRC} && ln -s . postfix"
+ echo ""
+ ;;
+ *)
+ echo "Invalid option(s): $*" > /dev/stderr
+ rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+echo "PLIST_SUB+= SUB_PCRE=\"${SUB_PCRE}\""
+echo "PLIST_SUB+= SUB_SASL=\"${SUB_SASL}\""
+echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\""
+echo "PLIST_SUB+= SUB_LDAP=\"${SUB_LDAP}\""
+echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index 839c9f1819ad..9c4068489960 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -1,90 +1,82 @@
# New ports collection makefile for: postfix
-# Date created: 18 Mar 1999
+# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
PORTNAME= postfix
-PORTVERSION= 19991231.13
-PORTREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
+PORTVERSION= 20010228
+CATEGORIES= mail ipv6
+MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
+ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
ftp://ftp.tux.org/pub/net/postfix/official/ \
ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
ftp://ftp.samurai.com/pub/postfix/official/ \
- ftp://ftp.nl.uu.net/pub/unix/mail/postfix/official/ \
- ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
- ftp://ftp.mira.net/pub/unix/mail/postfix/official/ \
- ftp://coda.nctu.edu.tw/network/mail/postfix/official/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-DISTNAME= ${PORTNAME}-19991231-pl13
+MASTER_SITE_SUBDIR= . old related/postfix
+DISTNAME= release-${PORTVERSION}
MAINTAINER= blaz@amis.net
-.if !defined(DEBUG)
-MAKEFILEFLAGS+= DEBUG=
-.endif
-
-.if defined(CC)
-MAKEFILEFLAGS+= CC="${CC}"
-.endif
-
-MAKEFILEFLAGS+= OPT="${CFLAGS}"
-SCRIPTS_ENV+= MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-
MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
sendmail.1
-MAN5= access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
+MAN5= access.5 aliases.5 canonical.5 regexp_table.5 relocated.5 \
+ transport.5 virtual.5
-MAN8= bounce.8 cleanup.8 defer.8 error.8 local.8 master.8 pickup.8 \
- pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 trivial-rewrite.8
+MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
+ master.8 pickup.8 pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 \
+ spawn.8 trivial-rewrite.8
CONF1= access aliases canonical main.cf master.cf \
- relocated transport virtual
+ regexp_table relocated transport virtual
CONF2= sample-aliases.cf sample-canonical.cf sample-debug.cf \
- sample-filter.cf sample-local.cf sample-misc.cf \
+ sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
sample-rate.cf sample-regexp.cf sample-relocated.cf \
sample-resource.cf sample-rewrite.cf sample-smtp.cf \
sample-smtpd.cf sample-transport.cf sample-virtual.cf
-BIN1= bounce cleanup error local master pickup \
- pipe qmgr showq smtp smtpd trivial-rewrite
+BIN1= bounce cleanup error flush lmtp local master pickup \
+ pipe qmgr showq smtp smtpd spawn trivial-rewrite
BIN2= postalias postcat postconf postdrop postfix \
postkick postlock postlog postmap postsuper sendmail
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
-POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz
+.if defined(NOPORTDOCS)
+PLIST_SUB+= SUB_DOCS="@comment "
+.else
+PLIST_SUB+= SUB_DOCS=""
+DOCDIR= ${PREFIX}/share/doc/postfix
.endif
-.if defined(WITH_LDAP)
-CONF2+= sample-ldap.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-PLIST_SUB+= WITH_LDAP=""
-.else
-PLIST_SUB+= WITH_LDAP="@comment "
+.if !defined(DEBUG)
+MAKEFILEFLAGS+= DEBUG=
.endif
-.if defined(WITH_PCRE)
-CONF2+= sample-pcre.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libpcre.a
-PLIST_SUB+= WITH_PCRE=""
-.else
-PLIST_SUB+= WITH_PCRE="@comment "
+.if defined(CC)
+MAKEFILEFLAGS+= CC="${CC}"
+.endif
+
+MAKEFILEFLAGS+= OPT="${CFLAGS}"
+
+SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
+ PREFIX="${PREFIX}" \
+ TOUCH="${TOUCH}" \
+ MKDIR="${MKDIR}" \
+ MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
+
+pre-fetch:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
post-patch:
- (cd ${WRKSRC} && make -f Makefile.init makefiles ${MAKEFILEFLAGS} \
+ (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
${ECHO} "all: default" >> Makefile)
@@ -122,7 +114,13 @@ do-install:
.for file in ${BIN2}
@${INSTALL_PROGRAM} \
- ${WRKSRC}/${file}/${file} \
+ ${WRKSRC}/src/${file}/${file} \
+ ${PREFIX}/sbin
+.endfor
+
+.for file in ${BIN3}
+ @${INSTALL_PROGRAM} \
+ ${WRKSRC}/src/smtpstone/${file} \
${PREFIX}/sbin
.endfor
@@ -145,11 +143,9 @@ do-install:
.endfor
.if !defined(NOPORTDOCS)
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix
- @cd ${WRKSRC} && ${INSTALL_DATA} LDAP_README MYSQL_README ${PREFIX}/share/doc/postfix
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix/html
- @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${PREFIX}/share/doc/postfix/html && \
- ${ECHO_MSG} "Installed documentation in ${PREFIX}/share/doc/postfix"
+ @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCDIR}
+ @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCDIR} && \
+ ${ECHO_MSG} "Installed HTML documentation in ${DOCDIR}"
.endif
@${ECHO_MSG} '--------------------------------------------------'
@@ -160,6 +156,9 @@ do-install:
post-install:
@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+post-clean:
+ @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
.include <bsd.port.pre.mk>
replace:
@@ -170,10 +169,10 @@ replace:
${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
${ECHO} "#" >> /etc/mail/mailer.conf
- ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
+ ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
.else
@${ECHO_MSG} "===> Replacing sendmail"
@if [ -e /usr/sbin/sendmail ]; then \
diff --git a/mail/postfix1/distinfo b/mail/postfix1/distinfo
index 854fffa3294c..d6f4fd5c198a 100644
--- a/mail/postfix1/distinfo
+++ b/mail/postfix1/distinfo
@@ -1 +1,3 @@
-MD5 (postfix-19991231-pl13.tar.gz) = f119438aae0aa1346953ae326864da9e
+MD5 (release-20010228.tar.gz) = 6af46cc231ca1e09e60393542d5611bd
+MD5 (pfixtls-0.7.0-20010228-0.9.6.tar.gz) = 64699fb4f0bb4dc87ba1c6c7aef81366
+MD5 (postfix-20010225snap-v6-20010228a.diff.gz) = 8646724c2d00e4d162b63456247cf4fb
diff --git a/mail/postfix1/files/patch-ab b/mail/postfix1/files/patch-ab
index d705b8a7f594..7c81d3dc12c9 100644
--- a/mail/postfix1/files/patch-ab
+++ b/mail/postfix1/files/patch-ab
@@ -1,11 +1,11 @@
---- conf/canonical.orig Sun Sep 5 23:47:01 1999
-+++ conf/canonical Tue Nov 7 22:24:42 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix canonical table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/canonical\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- # DESCRIPTION
- # The optional \fBcanonical\fR file specifies an address mapping for
- # local and non-local addresses. The mapping is used by the
+*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000
+--- ./conf/canonical Thu Jun 1 21:53:23 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/canonical
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/canonical
+ #
diff --git a/mail/postfix1/files/patch-ac b/mail/postfix1/files/patch-ac
index 264335cb70fa..0fb2192cdd84 100644
--- a/mail/postfix1/files/patch-ac
+++ b/mail/postfix1/files/patch-ac
@@ -1,11 +1,11 @@
---- conf/access.orig Fri Dec 11 19:55:48 1998
-+++ conf/access Tue Nov 7 22:25:54 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix access table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/access\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/access\fR
- # DESCRIPTION
- # The optional \fBaccess\fR table directs the Postfix SMTP server
- # to selectively reject or accept mail from or to specific hosts,
+*** ./conf/access.orig Tue Mar 7 10:42:58 2000
+--- ./conf/access Thu Jun 1 21:53:36 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/access
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/access
+ #
diff --git a/mail/postfix1/files/patch-ad b/mail/postfix1/files/patch-ad
new file mode 100644
index 000000000000..c1b102574165
--- /dev/null
+++ b/mail/postfix1/files/patch-ad
@@ -0,0 +1,11 @@
+*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/pcre_table Thu Jun 1 22:02:08 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix1/files/patch-ae b/mail/postfix1/files/patch-ae
new file mode 100644
index 000000000000..e396dd8626db
--- /dev/null
+++ b/mail/postfix1/files/patch-ae
@@ -0,0 +1,11 @@
+*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/regexp_table Thu Jun 1 22:03:27 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix1/files/patch-af b/mail/postfix1/files/patch-af
index ec92981276c6..8fca6b208941 100644
--- a/mail/postfix1/files/patch-af
+++ b/mail/postfix1/files/patch-af
@@ -1,11 +1,11 @@
---- conf/relocated.orig Sun Sep 5 23:47:01 1999
-+++ conf/relocated Tue Nov 7 22:28:27 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix relocated table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/relocated\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- # DESCRIPTION
- # The optional \fBrelocated\fR file provides the information that is
- # used in "user has moved to \fInew_location\fR" bounce messages.
+*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000
+--- ./conf/relocated Thu Jun 1 22:03:59 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/relocated
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/relocated
+ #
diff --git a/mail/postfix1/files/patch-ag b/mail/postfix1/files/patch-ag
new file mode 100644
index 000000000000..54c0fa918d3b
--- /dev/null
+++ b/mail/postfix1/files/patch-ag
@@ -0,0 +1,15 @@
+*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000
+--- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000
+***************
+*** 91,95 ****
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in /etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:/etc/postfix/saslpass
+
+--- 91,95 ----
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass
+
diff --git a/mail/postfix1/files/patch-ao b/mail/postfix1/files/patch-ao
index 206c152728da..fd854e181601 100644
--- a/mail/postfix1/files/patch-ao
+++ b/mail/postfix1/files/patch-ao
@@ -1,11 +1,11 @@
---- conf/transport.orig Fri Dec 31 20:54:11 1999
-+++ conf/transport Tue Nov 7 22:46:59 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix transport table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/transport\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- # DESCRIPTION
- # The optional \fBtransport\fR file specifies a mapping from domain
- # hierarchies to message delivery transports and/or relay hosts. The
+*** ./conf/transport.orig Tue Mar 7 10:42:58 2000
+--- ./conf/transport Thu Jun 1 22:13:41 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/transport
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/transport
+ #
diff --git a/mail/postfix1/files/patch-ap b/mail/postfix1/files/patch-ap
index b412ce386f8d..4598192cd5c1 100644
--- a/mail/postfix1/files/patch-ap
+++ b/mail/postfix1/files/patch-ap
@@ -1,11 +1,11 @@
---- conf/virtual.orig Tue Dec 21 03:00:13 1999
-+++ conf/virtual Tue Nov 7 22:48:18 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix virtual table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/virtual\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- # DESCRIPTION
- # The optional \fBvirtual\fR table specifies redirections for local
- # and non-local recipients or domains. The redirections are used by
+*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000
+--- ./conf/virtual Thu Jun 1 22:13:54 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/virtual
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/virtual
+ #
diff --git a/mail/postfix1/files/patch-bb b/mail/postfix1/files/patch-bb
index 6444bc0d1f75..ea744664dfa7 100644
--- a/mail/postfix1/files/patch-bb
+++ b/mail/postfix1/files/patch-bb
@@ -1,11 +1,20 @@
---- html/access.5.html.orig Fri Dec 11 19:55:49 1998
-+++ html/access.5.html Tue Nov 7 22:48:47 2000
+--- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000
++++ ./html/access.5.html Tue Nov 21 21:24:34 2000
@@ -9,7 +9,7 @@
access - format of Postfix access table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/access</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b>
-
+
<b>DESCRIPTION</b>
The optional <b>access</b> table directs the Postfix SMTP server
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the
+ indexed file after changing the access table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix1/files/patch-bc b/mail/postfix1/files/patch-bc
index 4d24077b9527..e407a9650585 100644
--- a/mail/postfix1/files/patch-bc
+++ b/mail/postfix1/files/patch-bc
@@ -1,11 +1,20 @@
---- html/canonical.5.html.orig Mon Sep 6 05:13:54 1999
-+++ html/canonical.5.html Tue Nov 7 22:51:05 2000
+--- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000
++++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000
@@ -9,7 +9,7 @@
canonical - format of Postfix canonical table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/canonical</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>canonical</b> file specifies an address mapping
+ The optional <b>canonical</b> table specifies an address mapping
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix1/files/patch-bl b/mail/postfix1/files/patch-bl
new file mode 100644
index 000000000000..176c7d1b64de
--- /dev/null
+++ b/mail/postfix1/files/patch-bl
@@ -0,0 +1,11 @@
+*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000
+--- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000
+***************
+*** 11,13 ****
+ <b>SYNOPSIS</b>
+! regexp:/etc/postfix/filename
+
+--- 11,13 ----
+ <b>SYNOPSIS</b>
+! regexp:!!PREFIX!!/etc/postfix/filename
+
diff --git a/mail/postfix1/files/patch-bm b/mail/postfix1/files/patch-bm
index bc9479bea2fe..e5ccc2c50b94 100644
--- a/mail/postfix1/files/patch-bm
+++ b/mail/postfix1/files/patch-bm
@@ -1,11 +1,20 @@
---- html/relocated.5.html.orig Mon Sep 6 05:13:55 1999
-+++ html/relocated.5.html Tue Nov 7 22:52:46 2000
+--- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000
++++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000
@@ -9,7 +9,7 @@
relocated - format of Postfix relocated table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/relocated</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>relocated</b> file provides the information that
+ The optional <b>relocated</b> table provides the information that
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the
+ indexed file after changing the relocated table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix1/files/patch-bo b/mail/postfix1/files/patch-bo
index 41cbc4ca6d65..b45270be8151 100644
--- a/mail/postfix1/files/patch-bo
+++ b/mail/postfix1/files/patch-bo
@@ -1,11 +1,20 @@
---- html/transport.5.html.orig Fri Dec 31 20:54:56 1999
-+++ html/transport.5.html Tue Nov 7 22:53:50 2000
+--- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000
++++ ./html/transport.5.html Tue Nov 21 21:43:20 2000
@@ -9,7 +9,7 @@
transport - format of Postfix transport table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/transport</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>transport</b> file specifies a mapping from
+ The optional <b>transport</b> table specifies a mapping from
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the
+ indexed file after changing the transport table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix1/files/patch-bp b/mail/postfix1/files/patch-bp
index bb65bd98a7b8..5206bfd4bfd0 100644
--- a/mail/postfix1/files/patch-bp
+++ b/mail/postfix1/files/patch-bp
@@ -1,11 +1,43 @@
---- html/virtual.5.html.orig Tue Dec 21 03:00:58 1999
-+++ html/virtual.5.html Tue Nov 7 22:55:04 2000
+--- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000
++++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000
@@ -9,7 +9,7 @@
virtual - format of Postfix virtual table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/virtual</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>virtual</b> table specifies redirections for
+ The optional <b>virtual</b> table specifies address redirections
+@@ -27,7 +27,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
+@@ -52,7 +52,7 @@
+
+ Support for a Postfix-style virtual domain looks like:
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter)
+ <i>postmaster@virtual.domain</i> <i>postmaster</i>
+ <i>user1@virtual.domain</i> <i>address1</i>
+@@ -94,11 +94,11 @@
+
+ Support for a Sendmail-style virtual domain looks like:
+
+- /etc/postfix/main.cf:
++ !!PREFIX!!/etc/postfix/main.cf:
+ mydestination = $myhostname localhost.$mydomain $mydomain
+ <i>virtual.domain</i>
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>user1@virtual.domain</i> <i>address1</i>
+ <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i>
+
diff --git a/mail/postfix1/files/patch-cb b/mail/postfix1/files/patch-cb
index ef73429287d2..58559c7273d1 100644
--- a/mail/postfix1/files/patch-cb
+++ b/mail/postfix1/files/patch-cb
@@ -1,25 +1,20 @@
---- man/man1/sendmail.1.orig Thu Mar 30 17:46:10 2000
-+++ man/man1/sendmail.1 Wed Dec 20 18:37:45 2000
-@@ -61,10 +61,12 @@
- \fBjust-send-eight\fR.
- .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- The path name of the \fBsendmail.cf\fR file. Postfix configuration
--files are kept in \fB/etc/postfix\fR.
-+files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- .IP "\fB-F \fIfull_name\fR
- Set the sender full name. This is used only with messages that
- have no \fBFrom:\fR message header.
-+.IP "\fB-G\fR (ignored)"
-+Gateway (relay) submission, as opposed to initial user submission.
- .IP \fB-I\fR
- Initialize alias database. See the \fBnewaliases\fR
- command above.
-@@ -171,7 +173,7 @@
- .na
- .nf
- /var/spool/postfix, mail queue
--/etc/postfix, configuration files
-+!!PREFIX!!/etc/postfix, configuration files
- .SH CONFIGURATION PARAMETERS
- .na
- .nf
+*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000
+--- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000
+***************
+*** 63,65 ****
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+--- 63,65 ----
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+***************
+*** 173,175 ****
+ /var/spool/postfix, mail queue
+! /etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
+--- 173,175 ----
+ /var/spool/postfix, mail queue
+! !!PREFIX!!/etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
diff --git a/mail/postfix1/files/patch-cc b/mail/postfix1/files/patch-cc
new file mode 100644
index 000000000000..cd6946003217
--- /dev/null
+++ b/mail/postfix1/files/patch-cc
@@ -0,0 +1,11 @@
+*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000
+***************
+*** 10,12 ****
+ .nf
+! pcre:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! pcre:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix1/files/patch-cd b/mail/postfix1/files/patch-cd
index 36461a39bb49..b51de44d0bee 100644
--- a/mail/postfix1/files/patch-cd
+++ b/mail/postfix1/files/patch-cd
@@ -1,11 +1,20 @@
---- man/man5/access.5.orig Fri Dec 11 19:55:52 1998
-+++ man/man5/access.5 Tue Nov 7 22:56:25 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/access\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/access\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/access.5 Thu Jun 1 22:39:55 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/access\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
diff --git a/mail/postfix1/files/patch-ce b/mail/postfix1/files/patch-ce
index 0e0bd4aa1ae5..f77053f8b3aa 100644
--- a/mail/postfix1/files/patch-ce
+++ b/mail/postfix1/files/patch-ce
@@ -1,11 +1,20 @@
---- man/man5/canonical.5.orig Mon Sep 6 05:13:32 1999
-+++ man/man5/canonical.5 Tue Nov 7 22:57:40 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/canonical\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/canonical\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
diff --git a/mail/postfix1/files/patch-cf b/mail/postfix1/files/patch-cf
new file mode 100644
index 000000000000..28fb053b94a7
--- /dev/null
+++ b/mail/postfix1/files/patch-cf
@@ -0,0 +1,11 @@
+*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000
+***************
+*** 10,12 ****
+ .nf
+! regexp:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! regexp:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix1/files/patch-cg b/mail/postfix1/files/patch-cg
index cdce4aaddaf3..0ae82cc57669 100644
--- a/mail/postfix1/files/patch-cg
+++ b/mail/postfix1/files/patch-cg
@@ -1,11 +1,20 @@
---- man/man5/relocated.5.orig Mon Sep 6 05:13:33 1999
-+++ man/man5/relocated.5 Tue Nov 7 22:59:11 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/relocated\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/relocated\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ .SH DESCRIPTION
+***************
+*** 20,22 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
+--- 20,22 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
diff --git a/mail/postfix1/files/patch-ch b/mail/postfix1/files/patch-ch
index 80df028f9255..3ed047ea474c 100644
--- a/mail/postfix1/files/patch-ch
+++ b/mail/postfix1/files/patch-ch
@@ -1,11 +1,20 @@
---- man/man5/transport.5.orig Fri Dec 31 20:54:51 1999
-+++ man/man5/transport.5 Tue Nov 7 22:59:57 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/transport\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/transport\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
+--- 21,23 ----
+ for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
diff --git a/mail/postfix1/files/patch-ci b/mail/postfix1/files/patch-ci
index 889eed3f4d89..1a7cf4abbac7 100644
--- a/mail/postfix1/files/patch-ci
+++ b/mail/postfix1/files/patch-ci
@@ -1,11 +1,20 @@
---- man/man5/virtual.5.orig Tue Dec 21 03:00:51 1999
-+++ man/man5/virtual.5 Tue Nov 7 23:00:32 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/virtual\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/virtual\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ .SH DESCRIPTION
+***************
+*** 26,28 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
+--- 26,28 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
diff --git a/mail/postfix1/files/patch-da b/mail/postfix1/files/patch-da
new file mode 100644
index 000000000000..e57e31750d18
--- /dev/null
+++ b/mail/postfix1/files/patch-da
@@ -0,0 +1,11 @@
+*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000
+--- ./proto/regexp_table Thu Jun 1 22:44:43 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix1/files/patch-db b/mail/postfix1/files/patch-db
new file mode 100644
index 000000000000..7f89fb770783
--- /dev/null
+++ b/mail/postfix1/files/patch-db
@@ -0,0 +1,20 @@
+*** ./proto/access.orig Sun Apr 9 16:44:45 2000
+--- ./proto/access Thu Jun 1 22:45:05 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/access\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
diff --git a/mail/postfix1/files/patch-dc b/mail/postfix1/files/patch-dc
new file mode 100644
index 000000000000..786f2da45c32
--- /dev/null
+++ b/mail/postfix1/files/patch-dc
@@ -0,0 +1,20 @@
+*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000
+--- ./proto/canonical Thu Jun 1 22:45:28 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/canonical\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
diff --git a/mail/postfix1/files/patch-dd b/mail/postfix1/files/patch-dd
new file mode 100644
index 000000000000..b65a57ff7d57
--- /dev/null
+++ b/mail/postfix1/files/patch-dd
@@ -0,0 +1,11 @@
+*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000
+--- ./proto/pcre_table Thu Jun 1 22:45:41 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix1/files/patch-de b/mail/postfix1/files/patch-de
new file mode 100644
index 000000000000..73bb2af2261d
--- /dev/null
+++ b/mail/postfix1/files/patch-de
@@ -0,0 +1,20 @@
+*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000
+--- ./proto/relocated Thu Jun 1 22:46:02 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/relocated\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ # DESCRIPTION
+***************
+*** 14,16 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
+--- 14,16 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
diff --git a/mail/postfix1/files/patch-df b/mail/postfix1/files/patch-df
new file mode 100644
index 000000000000..8d3fba96a224
--- /dev/null
+++ b/mail/postfix1/files/patch-df
@@ -0,0 +1,20 @@
+*** ./proto/transport.orig Sun Apr 9 17:05:45 2000
+--- ./proto/transport Thu Jun 1 22:46:23 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/transport\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
+--- 15,17 ----
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
diff --git a/mail/postfix1/files/patch-dg b/mail/postfix1/files/patch-dg
new file mode 100644
index 000000000000..bff20a2cff3e
--- /dev/null
+++ b/mail/postfix1/files/patch-dg
@@ -0,0 +1,20 @@
+*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000
+--- ./proto/virtual Thu Jun 1 22:46:40 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/virtual\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ # DESCRIPTION
+***************
+*** 20,22 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
+--- 20,22 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
diff --git a/mail/postfix1/files/patch-ea b/mail/postfix1/files/patch-ea
index 80647e0b2ba0..6c3f98d2af4f 100644
--- a/mail/postfix1/files/patch-ea
+++ b/mail/postfix1/files/patch-ea
@@ -1,5 +1,5 @@
-*** ./cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
---- ./cleanup/cleanup.c Thu Jun 1 21:52:22 2000
+*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
+--- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000
***************
*** 118,121 ****
/* FILES
diff --git a/mail/postfix1/files/patch-eb b/mail/postfix1/files/patch-eb
index d576de434580..e67680963d2d 100644
--- a/mail/postfix1/files/patch-eb
+++ b/mail/postfix1/files/patch-eb
@@ -1,5 +1,5 @@
-*** ./global/mail_conf.c.orig Sun May 7 18:51:16 2000
---- ./global/mail_conf.c Thu Jun 1 22:16:29 2000
+*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000
+--- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000
***************
*** 53,55 ****
/* FILES
diff --git a/mail/postfix1/files/patch-ec b/mail/postfix1/files/patch-ec
index 74edda76007b..6d12d1ce4c17 100644
--- a/mail/postfix1/files/patch-ec
+++ b/mail/postfix1/files/patch-ec
@@ -1,5 +1,5 @@
-*** ./global/mail_params.h.orig Wed May 31 19:18:31 2000
---- ./global/mail_params.h Thu Jun 1 22:17:10 2000
+*** ./src/global/mail_params.h.orig Wed May 31 19:18:31 2000
+--- ./src/global/mail_params.h Thu Jun 1 22:17:10 2000
***************
*** 155,157 ****
#ifndef DEF_PROGRAM_DIR
diff --git a/mail/postfix1/files/patch-ed b/mail/postfix1/files/patch-ed
index b573748b45e1..f971b62720d8 100644
--- a/mail/postfix1/files/patch-ed
+++ b/mail/postfix1/files/patch-ed
@@ -1,5 +1,5 @@
-*** ./local/mailbox.c.orig Fri Apr 28 16:55:53 2000
---- ./local/mailbox.c Thu Jun 1 22:37:48 2000
+*** ./src/local/mailbox.c.orig Fri Apr 28 16:55:53 2000
+--- ./src/local/mailbox.c Thu Jun 1 22:37:48 2000
***************
*** 15,17 ****
/* suppression. The default is direct mailbox delivery to
diff --git a/mail/postfix1/files/patch-ee b/mail/postfix1/files/patch-ee
index d79219b1ba62..ef44eac24b73 100644
--- a/mail/postfix1/files/patch-ee
+++ b/mail/postfix1/files/patch-ee
@@ -1,5 +1,5 @@
-*** ./master/master.c.orig Tue Mar 7 10:25:07 2000
---- ./master/master.c Thu Jun 1 22:43:50 2000
+*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000
+--- ./src/master/master.c Thu Jun 1 22:43:50 2000
***************
*** 104,107 ****
/* FILES
diff --git a/mail/postfix1/files/patch-ef b/mail/postfix1/files/patch-ef
index 44816a063b95..586b304a103d 100644
--- a/mail/postfix1/files/patch-ef
+++ b/mail/postfix1/files/patch-ef
@@ -1,5 +1,5 @@
-*** ./postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
---- ./postdrop/postdrop.c Thu Jun 1 22:44:22 2000
+*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
+--- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000
***************
*** 39,41 ****
/* /var/spool/postfix, mail queue
diff --git a/mail/postfix1/files/patch-eg b/mail/postfix1/files/patch-eg
index 28950509870c..2983bbfd86ea 100644
--- a/mail/postfix1/files/patch-eg
+++ b/mail/postfix1/files/patch-eg
@@ -1,34 +1,20 @@
---- sendmail/sendmail.c.orig Sun Mar 26 22:51:33 2000
-+++ sendmail/sendmail.c Wed Dec 20 18:17:31 2000
-@@ -55,10 +55,12 @@
- /* \fBjust-send-eight\fR.
- /* .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
--/* files are kept in \fB/etc/postfix\fR.
-+/* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- /* .IP "\fB-F \fIfull_name\fR
- /* Set the sender full name. This is used only with messages that
- /* have no \fBFrom:\fR message header.
-+/* .IP "\fB-G \fR (ignored)"
-+/* Gateway (relay) submission, as opposed to initial user submission.
- /* .IP \fB-I\fR
- /* Initialize alias database. See the \fBnewaliases\fR
- /* command above.
-@@ -157,7 +159,7 @@
- /* \fBdebugger_command\fR configuration parameter.
- /* FILES
- /* /var/spool/postfix, mail queue
--/* /etc/postfix, configuration files
-+/* !!PREFIX!!/etc/postfix, configuration files
- /* CONFIGURATION PARAMETERS
- /* .ad
- /* .fi
-@@ -710,6 +712,8 @@
- break;
- case 'F': /* full name */
- full_name = optarg;
-+ break;
-+ case 'G': /* gateway submission */
- break;
- case 'I': /* newaliases */
- mode = SM_MODE_NEWALIAS;
+*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000
+--- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000
+***************
+*** 57,59 ****
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+--- 57,59 ----
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+***************
+*** 159,161 ****
+ /* /var/spool/postfix, mail queue
+! /* /etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
+--- 159,161 ----
+ /* /var/spool/postfix, mail queue
+! /* !!PREFIX!!/etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix1/files/patch-eh b/mail/postfix1/files/patch-eh
index f95b51423128..c104c3680d21 100644
--- a/mail/postfix1/files/patch-eh
+++ b/mail/postfix1/files/patch-eh
@@ -1,5 +1,5 @@
-*** ./trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
---- ./trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
+*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
+--- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
***************
*** 32,34 ****
/* FILES
diff --git a/mail/postfix1/files/patch-ei b/mail/postfix1/files/patch-ei
new file mode 100644
index 000000000000..3029372b746e
--- /dev/null
+++ b/mail/postfix1/files/patch-ei
@@ -0,0 +1,21 @@
+*** ./src/smtpd/smtpd.h.orig Thu Sep 14 10:17:23 2000
+--- ./src/smtpd/smtpd.h Thu Sep 14 10:17:38 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix1/files/patch-ej b/mail/postfix1/files/patch-ej
new file mode 100644
index 000000000000..6c5cf2e23758
--- /dev/null
+++ b/mail/postfix1/files/patch-ej
@@ -0,0 +1,21 @@
+*** ./src/smtp/smtp.h.orig Thu Sep 14 13:04:43 2000
+--- ./src/smtp/smtp.h Thu Sep 14 13:04:53 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix1/files/patch-fa b/mail/postfix1/files/patch-fa
deleted file mode 100644
index bc1c2dc388c2..000000000000
--- a/mail/postfix1/files/patch-fa
+++ /dev/null
@@ -1,12 +0,0 @@
---- makedefs.orig Sun Jan 23 03:04:27 2000
-+++ makedefs Mon Apr 3 08:59:17 2000
-@@ -89,6 +89,8 @@
- ;;
- FreeBSD.4*) SYSTYPE=FREEBSD4
- ;;
-+ FreeBSD.5*) SYSTYPE=FREEBSD5
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- NetBSD.1*) SYSTYPE=NETBSD1
-
diff --git a/mail/postfix1/files/patch-fb b/mail/postfix1/files/patch-fb
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix1/files/patch-fb
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
- * makedefs script, and adding a section below for the new system.
- */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+ || defined(FREEBSD5) \
- || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
- || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix1/files/patch-ga b/mail/postfix1/files/patch-ga
index 3ad7120b8322..60a6dd578564 100644
--- a/mail/postfix1/files/patch-ga
+++ b/mail/postfix1/files/patch-ga
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_MYSQL" option at compile time ("make -DWITH_MYSQL").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
[Code contributed by Scott Cotton and Joshua Marcus, IC Group, Inc.]
diff --git a/mail/postfix1/files/patch-gb b/mail/postfix1/files/patch-gb
index 312c8c60f9e5..98816d155122 100644
--- a/mail/postfix1/files/patch-gb
+++ b/mail/postfix1/files/patch-gb
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_LDAP" option at compile time ("make -DWITH_LDAP").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
BUILDING WITH LDAP SUPPORT
==========================
diff --git a/mail/postfix1/files/patch-lmtp.h b/mail/postfix1/files/patch-lmtp.h
new file mode 100644
index 000000000000..3d941c034198
--- /dev/null
+++ b/mail/postfix1/files/patch-lmtp.h
@@ -0,0 +1,13 @@
+--- ./src/lmtp/lmtp.h.orig Fri Jan 19 15:43:06 2001
++++ ./src/lmtp/lmtp.h Sat Feb 3 14:01:09 2001
+@@ -12,8 +12,8 @@
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+-#include <sasl.h>
+-#include <saslutil.h>
++#include <sasl/sasl.h>
++#include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix1/pkg-install b/mail/postfix1/pkg-install
index 933c669e6b98..0d18b67ddee3 100644
--- a/mail/postfix1/pkg-install
+++ b/mail/postfix1/pkg-install
@@ -1,4 +1,9 @@
#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
user=postfix
group=postfix
@@ -87,6 +92,5 @@ if [ x"$2" = xPOST-INSTALL ]; then
fi
/usr/sbin/chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
/bin/chmod 2555 ${PKG_PREFIX}/sbin/postdrop
- /bin/mkdir -p /var/spool/postfix
${PKG_PREFIX}/sbin/postfix check
fi
diff --git a/mail/postfix1/pkg-plist b/mail/postfix1/pkg-plist
index 5f8572883b4c..97167cb8ed15 100644
--- a/mail/postfix1/pkg-plist
+++ b/mail/postfix1/pkg-plist
@@ -5,24 +5,29 @@ etc/postfix/postfix-script
etc/postfix/sample-access
etc/postfix/sample-aliases
etc/postfix/sample-aliases.cf
+%%SUB_SASL%%etc/postfix/sample-auth.cf
etc/postfix/sample-canonical
etc/postfix/sample-canonical.cf
etc/postfix/sample-debug.cf
etc/postfix/sample-filter.cf
-%%WITH_LDAP%%etc/postfix/sample-ldap.cf
+etc/postfix/sample-flush.cf
+%%SUB_LDAP%%etc/postfix/sample-ldap.cf
etc/postfix/sample-local.cf
etc/postfix/sample-main.cf
etc/postfix/sample-master.cf
etc/postfix/sample-misc.cf
-%%WITH_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre_table
etc/postfix/sample-rate.cf
etc/postfix/sample-regexp.cf
+etc/postfix/sample-regexp_table
etc/postfix/sample-relocated
etc/postfix/sample-relocated.cf
etc/postfix/sample-resource.cf
etc/postfix/sample-rewrite.cf
etc/postfix/sample-smtp.cf
etc/postfix/sample-smtpd.cf
+%%SUB_TLS%%etc/postfix/sample-tls.cf
etc/postfix/sample-transport
etc/postfix/sample-transport.cf
etc/postfix/sample-virtual
@@ -30,6 +35,8 @@ etc/postfix/sample-virtual.cf
libexec/postfix/bounce
libexec/postfix/cleanup
libexec/postfix/error
+libexec/postfix/flush
+libexec/postfix/lmtp
libexec/postfix/local
libexec/postfix/master
libexec/postfix/pickup
@@ -38,6 +45,8 @@ libexec/postfix/qmgr
libexec/postfix/showq
libexec/postfix/smtp
libexec/postfix/smtpd
+libexec/postfix/spawn
+%%SUB_TLS%%libexec/postfix/tlsmgr
libexec/postfix/trivial-rewrite
sbin/postalias
sbin/postcat
@@ -50,62 +59,66 @@ sbin/postlog
sbin/postmap
sbin/postsuper
sbin/sendmail
-share/doc/postfix/LDAP_README
-share/doc/postfix/MYSQL_README
-share/doc/postfix/html/access.5.html
-share/doc/postfix/html/aliases.5.html
-share/doc/postfix/html/architecture.html
-share/doc/postfix/html/backstage.html
-share/doc/postfix/html/basic.html
-share/doc/postfix/html/big-picture.gif
-share/doc/postfix/html/big-picture.html
-share/doc/postfix/html/bounce.8.html
-share/doc/postfix/html/canonical.5.html
-share/doc/postfix/html/cleanup.8.html
-share/doc/postfix/html/commands.html
-share/doc/postfix/html/defer.8.html
-share/doc/postfix/html/delivering.html
-share/doc/postfix/html/error.8.html
-share/doc/postfix/html/faq.html
-share/doc/postfix/html/goals.html
-share/doc/postfix/html/inbound.gif
-share/doc/postfix/html/index.html
-share/doc/postfix/html/local.8.html
-share/doc/postfix/html/mailq.1.html
-share/doc/postfix/html/master.8.html
-share/doc/postfix/html/motivation.html
-share/doc/postfix/html/newaliases.1.html
-share/doc/postfix/html/outbound.gif
-share/doc/postfix/html/pickup.8.html
-share/doc/postfix/html/pipe.8.html
-share/doc/postfix/html/postalias.1.html
-share/doc/postfix/html/postcat.1.html
-share/doc/postfix/html/postconf.1.html
-share/doc/postfix/html/postdrop.1.html
-share/doc/postfix/html/postfix.1.html
-share/doc/postfix/html/postkick.1.html
-share/doc/postfix/html/postlock.1.html
-share/doc/postfix/html/postlog.1.html
-share/doc/postfix/html/postmap.1.html
-share/doc/postfix/html/postsuper.1.html
-share/doc/postfix/html/qmgr.8.html
-share/doc/postfix/html/queuing.html
-share/doc/postfix/html/rate.html
-share/doc/postfix/html/receiving.html
-share/doc/postfix/html/relocated.5.html
-share/doc/postfix/html/resource.html
-share/doc/postfix/html/rewrite.html
-share/doc/postfix/html/security.html
-share/doc/postfix/html/sendmail.1.html
-share/doc/postfix/html/showq.8.html
-share/doc/postfix/html/small-picture.gif
-share/doc/postfix/html/smtp.8.html
-share/doc/postfix/html/smtpd.8.html
-share/doc/postfix/html/transport.5.html
-share/doc/postfix/html/trivial-rewrite.8.html
-share/doc/postfix/html/uce.html
-share/doc/postfix/html/virtual.5.html
-@dirrm etc/postfix
+%%SUB_TEST%%sbin/smtp-sink
+%%SUB_TEST%%sbin/smtp-source
+%%SUB_DOCS%%share/doc/postfix/access.5.html
+%%SUB_DOCS%%share/doc/postfix/aliases.5.html
+%%SUB_DOCS%%share/doc/postfix/architecture.html
+%%SUB_DOCS%%share/doc/postfix/backstage.html
+%%SUB_DOCS%%share/doc/postfix/basic.html
+%%SUB_DOCS%%share/doc/postfix/big-picture.gif
+%%SUB_DOCS%%share/doc/postfix/big-picture.html
+%%SUB_DOCS%%share/doc/postfix/bounce.8.html
+%%SUB_DOCS%%share/doc/postfix/canonical.5.html
+%%SUB_DOCS%%share/doc/postfix/cleanup.8.html
+%%SUB_DOCS%%share/doc/postfix/commands.html
+%%SUB_DOCS%%share/doc/postfix/defer.8.html
+%%SUB_DOCS%%share/doc/postfix/delivering.html
+%%SUB_DOCS%%share/doc/postfix/error.8.html
+%%SUB_DOCS%%share/doc/postfix/faq.html
+%%SUB_DOCS%%share/doc/postfix/flush.8.html
+%%SUB_DOCS%%share/doc/postfix/goals.html
+%%SUB_DOCS%%share/doc/postfix/inbound.gif
+%%SUB_DOCS%%share/doc/postfix/index.html
+%%SUB_DOCS%%share/doc/postfix/lmtp.8.html
+%%SUB_DOCS%%share/doc/postfix/local.8.html
+%%SUB_DOCS%%share/doc/postfix/mailq.1.html
+%%SUB_DOCS%%share/doc/postfix/master.8.html
+%%SUB_DOCS%%share/doc/postfix/motivation.html
+%%SUB_DOCS%%share/doc/postfix/newaliases.1.html
+%%SUB_DOCS%%share/doc/postfix/outbound.gif
+%%SUB_DOCS%%share/doc/postfix/pcre_table.5.html
+%%SUB_DOCS%%share/doc/postfix/pickup.8.html
+%%SUB_DOCS%%share/doc/postfix/pipe.8.html
+%%SUB_DOCS%%share/doc/postfix/postalias.1.html
+%%SUB_DOCS%%share/doc/postfix/postcat.1.html
+%%SUB_DOCS%%share/doc/postfix/postconf.1.html
+%%SUB_DOCS%%share/doc/postfix/postdrop.1.html
+%%SUB_DOCS%%share/doc/postfix/postfix.1.html
+%%SUB_DOCS%%share/doc/postfix/postkick.1.html
+%%SUB_DOCS%%share/doc/postfix/postlock.1.html
+%%SUB_DOCS%%share/doc/postfix/postlog.1.html
+%%SUB_DOCS%%share/doc/postfix/postmap.1.html
+%%SUB_DOCS%%share/doc/postfix/postsuper.1.html
+%%SUB_DOCS%%share/doc/postfix/qmgr.8.html
+%%SUB_DOCS%%share/doc/postfix/queuing.html
+%%SUB_DOCS%%share/doc/postfix/rate.html
+%%SUB_DOCS%%share/doc/postfix/receiving.html
+%%SUB_DOCS%%share/doc/postfix/regexp_table.5.html
+%%SUB_DOCS%%share/doc/postfix/relocated.5.html
+%%SUB_DOCS%%share/doc/postfix/resource.html
+%%SUB_DOCS%%share/doc/postfix/rewrite.html
+%%SUB_DOCS%%share/doc/postfix/security.html
+%%SUB_DOCS%%share/doc/postfix/sendmail.1.html
+%%SUB_DOCS%%share/doc/postfix/showq.8.html
+%%SUB_DOCS%%share/doc/postfix/small-picture.gif
+%%SUB_DOCS%%share/doc/postfix/smtp.8.html
+%%SUB_DOCS%%share/doc/postfix/smtpd.8.html
+%%SUB_DOCS%%share/doc/postfix/spawn.8.html
+%%SUB_DOCS%%share/doc/postfix/transport.5.html
+%%SUB_DOCS%%share/doc/postfix/trivial-rewrite.8.html
+%%SUB_DOCS%%share/doc/postfix/uce.html
+%%SUB_DOCS%%share/doc/postfix/virtual.5.html
+%%SUB_DOCS%%@dirrm share/doc/postfix
@dirrm libexec/postfix
-@dirrm share/doc/postfix/html
-@dirrm share/doc/postfix
+@dirrm etc/postfix
diff --git a/mail/postfix1/scripts/configure.postfix b/mail/postfix1/scripts/configure.postfix
new file mode 100644
index 000000000000..b0baf10d6b34
--- /dev/null
+++ b/mail/postfix1/scripts/configure.postfix
@@ -0,0 +1,129 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix1/scripts/Attic/configure.postfix,v 1.1 2001-03-04 19:35:00 sf Exp $
+
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
+ exit
+fi
+
+tempfile=`mktemp -t checklist`
+
+if [ "${BATCH}" = "yes" ]; then
+ set \"PCRE\"
+else
+ /usr/bin/dialog --title "Postfix configuration options" --clear \
+ --checklist "\n\
+Please select desired options:" -1 -1 16 \
+PCRE "Perl Compatible Regular Expressions" OFF \
+SASL "Cyrus SASL (Simple Authentication and Security Layer)" OFF \
+DB3 "Berkeley DB3 (required if SASL also built with DB3)" OFF \
+MySQL "MySQL map lookups" OFF \
+OpenLDAP "OpenLDAP map lookups" OFF \
+Test "SMTP/LMTP test server and generator" OFF \
+TLS "Secure Sockets Layer and Transport Layer Security" OFF \
+IPv6 "IPv6 support" OFF \
+2> $tempfile
+
+ retval=$?
+
+ if [ -s $tempfile ]; then
+ set `cat $tempfile`
+ fi
+ rm -f $tempfile
+
+ case $retval in
+ 0) if [ -z "$*" ]; then
+ echo "Nothing selected"
+ fi
+ ;;
+ 1) echo "Cancel pressed."
+ exit 1
+ ;;
+ esac
+fi
+
+${MKDIR} ${WRKDIRPREFIX}${CURDIR}
+exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+
+echo "PREFIX= ${PREFIX}"
+
+SUB_PCRE="@comment "
+SUB_SASL="@comment "
+SUB_TLS="@comment "
+SUB_LDAP="@comment "
+SUB_TEST="@comment "
+
+while [ "$1" ]; do
+ case $1 in
+ \"PCRE\")
+ echo "CONF1+= pcre_table"
+ echo "CONF2+= sample-pcre.cf"
+ echo "MAN5+= pcre_table.5"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre"
+ echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a"
+ SUB_PCRE=""
+ ;;
+ \"SASL\")
+ echo "CONF2+= sample-auth.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl"
+ echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -lpam -lcrypt"
+ echo ".if exists(/usr/lib/libkrb.a)"
+ echo "POSTFIX_AUXLIBS+= -lkrb -ldes -lcom_err"
+ echo ".endif"
+ SUB_SASL=""
+ ;;
+ \"TLS\")
+ echo "CONF2+= sample-tls.cf"
+ echo "BIN1+= tlsmgr"
+ echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl"
+ echo "POSTFIX_AUXLIBS+= -lssl -lcrypto"
+ echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.7.0-20010228-0.9.6.tar.gz"
+ echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.7.0-20010228-0.9.6/pfixtls.diff"
+ echo "PATCH_STRIP= -p1"
+ SUB_TLS=""
+ ;;
+ \"DB3\")
+ echo "LIB_DEPENDS+= db3.1:\${PORTSDIR}/databases/db3"
+ echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3"
+ echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3"
+ ;;
+ \"MySQL\")
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
+ echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
+ ;;
+ \"OpenLDAP\")
+ echo "CONF2+= sample-ldap.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
+ echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
+ SUB_LDAP=""
+ ;;
+ \"Test\")
+ echo "BIN3= smtp-sink smtp-source"
+ SUB_TEST=""
+ ;;
+ \"IPv6\")
+ echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/"
+ echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}"
+ echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz"
+ echo ""
+ echo "pre-patch:"
+ echo " cd \${WRKSRC} && ln -s . postfix"
+ echo ""
+ ;;
+ *)
+ echo "Invalid option(s): $*" > /dev/stderr
+ rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+echo "PLIST_SUB+= SUB_PCRE=\"${SUB_PCRE}\""
+echo "PLIST_SUB+= SUB_SASL=\"${SUB_SASL}\""
+echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\""
+echo "PLIST_SUB+= SUB_LDAP=\"${SUB_LDAP}\""
+echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""
diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index 839c9f1819ad..9c4068489960 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -1,90 +1,82 @@
# New ports collection makefile for: postfix
-# Date created: 18 Mar 1999
+# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
PORTNAME= postfix
-PORTVERSION= 19991231.13
-PORTREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
+PORTVERSION= 20010228
+CATEGORIES= mail ipv6
+MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
+ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
ftp://ftp.tux.org/pub/net/postfix/official/ \
ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
ftp://ftp.samurai.com/pub/postfix/official/ \
- ftp://ftp.nl.uu.net/pub/unix/mail/postfix/official/ \
- ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
- ftp://ftp.mira.net/pub/unix/mail/postfix/official/ \
- ftp://coda.nctu.edu.tw/network/mail/postfix/official/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-DISTNAME= ${PORTNAME}-19991231-pl13
+MASTER_SITE_SUBDIR= . old related/postfix
+DISTNAME= release-${PORTVERSION}
MAINTAINER= blaz@amis.net
-.if !defined(DEBUG)
-MAKEFILEFLAGS+= DEBUG=
-.endif
-
-.if defined(CC)
-MAKEFILEFLAGS+= CC="${CC}"
-.endif
-
-MAKEFILEFLAGS+= OPT="${CFLAGS}"
-SCRIPTS_ENV+= MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-
MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
sendmail.1
-MAN5= access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
+MAN5= access.5 aliases.5 canonical.5 regexp_table.5 relocated.5 \
+ transport.5 virtual.5
-MAN8= bounce.8 cleanup.8 defer.8 error.8 local.8 master.8 pickup.8 \
- pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 trivial-rewrite.8
+MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
+ master.8 pickup.8 pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 \
+ spawn.8 trivial-rewrite.8
CONF1= access aliases canonical main.cf master.cf \
- relocated transport virtual
+ regexp_table relocated transport virtual
CONF2= sample-aliases.cf sample-canonical.cf sample-debug.cf \
- sample-filter.cf sample-local.cf sample-misc.cf \
+ sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
sample-rate.cf sample-regexp.cf sample-relocated.cf \
sample-resource.cf sample-rewrite.cf sample-smtp.cf \
sample-smtpd.cf sample-transport.cf sample-virtual.cf
-BIN1= bounce cleanup error local master pickup \
- pipe qmgr showq smtp smtpd trivial-rewrite
+BIN1= bounce cleanup error flush lmtp local master pickup \
+ pipe qmgr showq smtp smtpd spawn trivial-rewrite
BIN2= postalias postcat postconf postdrop postfix \
postkick postlock postlog postmap postsuper sendmail
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
-POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz
+.if defined(NOPORTDOCS)
+PLIST_SUB+= SUB_DOCS="@comment "
+.else
+PLIST_SUB+= SUB_DOCS=""
+DOCDIR= ${PREFIX}/share/doc/postfix
.endif
-.if defined(WITH_LDAP)
-CONF2+= sample-ldap.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-PLIST_SUB+= WITH_LDAP=""
-.else
-PLIST_SUB+= WITH_LDAP="@comment "
+.if !defined(DEBUG)
+MAKEFILEFLAGS+= DEBUG=
.endif
-.if defined(WITH_PCRE)
-CONF2+= sample-pcre.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libpcre.a
-PLIST_SUB+= WITH_PCRE=""
-.else
-PLIST_SUB+= WITH_PCRE="@comment "
+.if defined(CC)
+MAKEFILEFLAGS+= CC="${CC}"
+.endif
+
+MAKEFILEFLAGS+= OPT="${CFLAGS}"
+
+SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
+ PREFIX="${PREFIX}" \
+ TOUCH="${TOUCH}" \
+ MKDIR="${MKDIR}" \
+ MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
+
+pre-fetch:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
post-patch:
- (cd ${WRKSRC} && make -f Makefile.init makefiles ${MAKEFILEFLAGS} \
+ (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
${ECHO} "all: default" >> Makefile)
@@ -122,7 +114,13 @@ do-install:
.for file in ${BIN2}
@${INSTALL_PROGRAM} \
- ${WRKSRC}/${file}/${file} \
+ ${WRKSRC}/src/${file}/${file} \
+ ${PREFIX}/sbin
+.endfor
+
+.for file in ${BIN3}
+ @${INSTALL_PROGRAM} \
+ ${WRKSRC}/src/smtpstone/${file} \
${PREFIX}/sbin
.endfor
@@ -145,11 +143,9 @@ do-install:
.endfor
.if !defined(NOPORTDOCS)
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix
- @cd ${WRKSRC} && ${INSTALL_DATA} LDAP_README MYSQL_README ${PREFIX}/share/doc/postfix
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix/html
- @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${PREFIX}/share/doc/postfix/html && \
- ${ECHO_MSG} "Installed documentation in ${PREFIX}/share/doc/postfix"
+ @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCDIR}
+ @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCDIR} && \
+ ${ECHO_MSG} "Installed HTML documentation in ${DOCDIR}"
.endif
@${ECHO_MSG} '--------------------------------------------------'
@@ -160,6 +156,9 @@ do-install:
post-install:
@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+post-clean:
+ @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
.include <bsd.port.pre.mk>
replace:
@@ -170,10 +169,10 @@ replace:
${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
${ECHO} "#" >> /etc/mail/mailer.conf
- ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
+ ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
.else
@${ECHO_MSG} "===> Replacing sendmail"
@if [ -e /usr/sbin/sendmail ]; then \
diff --git a/mail/postfix20/distinfo b/mail/postfix20/distinfo
index 854fffa3294c..d6f4fd5c198a 100644
--- a/mail/postfix20/distinfo
+++ b/mail/postfix20/distinfo
@@ -1 +1,3 @@
-MD5 (postfix-19991231-pl13.tar.gz) = f119438aae0aa1346953ae326864da9e
+MD5 (release-20010228.tar.gz) = 6af46cc231ca1e09e60393542d5611bd
+MD5 (pfixtls-0.7.0-20010228-0.9.6.tar.gz) = 64699fb4f0bb4dc87ba1c6c7aef81366
+MD5 (postfix-20010225snap-v6-20010228a.diff.gz) = 8646724c2d00e4d162b63456247cf4fb
diff --git a/mail/postfix20/files/patch-ab b/mail/postfix20/files/patch-ab
index d705b8a7f594..7c81d3dc12c9 100644
--- a/mail/postfix20/files/patch-ab
+++ b/mail/postfix20/files/patch-ab
@@ -1,11 +1,11 @@
---- conf/canonical.orig Sun Sep 5 23:47:01 1999
-+++ conf/canonical Tue Nov 7 22:24:42 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix canonical table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/canonical\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- # DESCRIPTION
- # The optional \fBcanonical\fR file specifies an address mapping for
- # local and non-local addresses. The mapping is used by the
+*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000
+--- ./conf/canonical Thu Jun 1 21:53:23 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/canonical
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/canonical
+ #
diff --git a/mail/postfix20/files/patch-ac b/mail/postfix20/files/patch-ac
index 264335cb70fa..0fb2192cdd84 100644
--- a/mail/postfix20/files/patch-ac
+++ b/mail/postfix20/files/patch-ac
@@ -1,11 +1,11 @@
---- conf/access.orig Fri Dec 11 19:55:48 1998
-+++ conf/access Tue Nov 7 22:25:54 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix access table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/access\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/access\fR
- # DESCRIPTION
- # The optional \fBaccess\fR table directs the Postfix SMTP server
- # to selectively reject or accept mail from or to specific hosts,
+*** ./conf/access.orig Tue Mar 7 10:42:58 2000
+--- ./conf/access Thu Jun 1 21:53:36 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/access
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/access
+ #
diff --git a/mail/postfix20/files/patch-ad b/mail/postfix20/files/patch-ad
new file mode 100644
index 000000000000..c1b102574165
--- /dev/null
+++ b/mail/postfix20/files/patch-ad
@@ -0,0 +1,11 @@
+*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/pcre_table Thu Jun 1 22:02:08 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix20/files/patch-ae b/mail/postfix20/files/patch-ae
new file mode 100644
index 000000000000..e396dd8626db
--- /dev/null
+++ b/mail/postfix20/files/patch-ae
@@ -0,0 +1,11 @@
+*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/regexp_table Thu Jun 1 22:03:27 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix20/files/patch-af b/mail/postfix20/files/patch-af
index ec92981276c6..8fca6b208941 100644
--- a/mail/postfix20/files/patch-af
+++ b/mail/postfix20/files/patch-af
@@ -1,11 +1,11 @@
---- conf/relocated.orig Sun Sep 5 23:47:01 1999
-+++ conf/relocated Tue Nov 7 22:28:27 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix relocated table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/relocated\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- # DESCRIPTION
- # The optional \fBrelocated\fR file provides the information that is
- # used in "user has moved to \fInew_location\fR" bounce messages.
+*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000
+--- ./conf/relocated Thu Jun 1 22:03:59 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/relocated
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/relocated
+ #
diff --git a/mail/postfix20/files/patch-ag b/mail/postfix20/files/patch-ag
new file mode 100644
index 000000000000..54c0fa918d3b
--- /dev/null
+++ b/mail/postfix20/files/patch-ag
@@ -0,0 +1,15 @@
+*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000
+--- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000
+***************
+*** 91,95 ****
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in /etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:/etc/postfix/saslpass
+
+--- 91,95 ----
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass
+
diff --git a/mail/postfix20/files/patch-ao b/mail/postfix20/files/patch-ao
index 206c152728da..fd854e181601 100644
--- a/mail/postfix20/files/patch-ao
+++ b/mail/postfix20/files/patch-ao
@@ -1,11 +1,11 @@
---- conf/transport.orig Fri Dec 31 20:54:11 1999
-+++ conf/transport Tue Nov 7 22:46:59 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix transport table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/transport\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- # DESCRIPTION
- # The optional \fBtransport\fR file specifies a mapping from domain
- # hierarchies to message delivery transports and/or relay hosts. The
+*** ./conf/transport.orig Tue Mar 7 10:42:58 2000
+--- ./conf/transport Thu Jun 1 22:13:41 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/transport
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/transport
+ #
diff --git a/mail/postfix20/files/patch-ap b/mail/postfix20/files/patch-ap
index b412ce386f8d..4598192cd5c1 100644
--- a/mail/postfix20/files/patch-ap
+++ b/mail/postfix20/files/patch-ap
@@ -1,11 +1,11 @@
---- conf/virtual.orig Tue Dec 21 03:00:13 1999
-+++ conf/virtual Tue Nov 7 22:48:18 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix virtual table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/virtual\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- # DESCRIPTION
- # The optional \fBvirtual\fR table specifies redirections for local
- # and non-local recipients or domains. The redirections are used by
+*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000
+--- ./conf/virtual Thu Jun 1 22:13:54 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/virtual
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/virtual
+ #
diff --git a/mail/postfix20/files/patch-bb b/mail/postfix20/files/patch-bb
index 6444bc0d1f75..ea744664dfa7 100644
--- a/mail/postfix20/files/patch-bb
+++ b/mail/postfix20/files/patch-bb
@@ -1,11 +1,20 @@
---- html/access.5.html.orig Fri Dec 11 19:55:49 1998
-+++ html/access.5.html Tue Nov 7 22:48:47 2000
+--- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000
++++ ./html/access.5.html Tue Nov 21 21:24:34 2000
@@ -9,7 +9,7 @@
access - format of Postfix access table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/access</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b>
-
+
<b>DESCRIPTION</b>
The optional <b>access</b> table directs the Postfix SMTP server
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the
+ indexed file after changing the access table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix20/files/patch-bc b/mail/postfix20/files/patch-bc
index 4d24077b9527..e407a9650585 100644
--- a/mail/postfix20/files/patch-bc
+++ b/mail/postfix20/files/patch-bc
@@ -1,11 +1,20 @@
---- html/canonical.5.html.orig Mon Sep 6 05:13:54 1999
-+++ html/canonical.5.html Tue Nov 7 22:51:05 2000
+--- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000
++++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000
@@ -9,7 +9,7 @@
canonical - format of Postfix canonical table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/canonical</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>canonical</b> file specifies an address mapping
+ The optional <b>canonical</b> table specifies an address mapping
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix20/files/patch-bl b/mail/postfix20/files/patch-bl
new file mode 100644
index 000000000000..176c7d1b64de
--- /dev/null
+++ b/mail/postfix20/files/patch-bl
@@ -0,0 +1,11 @@
+*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000
+--- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000
+***************
+*** 11,13 ****
+ <b>SYNOPSIS</b>
+! regexp:/etc/postfix/filename
+
+--- 11,13 ----
+ <b>SYNOPSIS</b>
+! regexp:!!PREFIX!!/etc/postfix/filename
+
diff --git a/mail/postfix20/files/patch-bm b/mail/postfix20/files/patch-bm
index bc9479bea2fe..e5ccc2c50b94 100644
--- a/mail/postfix20/files/patch-bm
+++ b/mail/postfix20/files/patch-bm
@@ -1,11 +1,20 @@
---- html/relocated.5.html.orig Mon Sep 6 05:13:55 1999
-+++ html/relocated.5.html Tue Nov 7 22:52:46 2000
+--- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000
++++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000
@@ -9,7 +9,7 @@
relocated - format of Postfix relocated table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/relocated</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>relocated</b> file provides the information that
+ The optional <b>relocated</b> table provides the information that
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the
+ indexed file after changing the relocated table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix20/files/patch-bo b/mail/postfix20/files/patch-bo
index 41cbc4ca6d65..b45270be8151 100644
--- a/mail/postfix20/files/patch-bo
+++ b/mail/postfix20/files/patch-bo
@@ -1,11 +1,20 @@
---- html/transport.5.html.orig Fri Dec 31 20:54:56 1999
-+++ html/transport.5.html Tue Nov 7 22:53:50 2000
+--- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000
++++ ./html/transport.5.html Tue Nov 21 21:43:20 2000
@@ -9,7 +9,7 @@
transport - format of Postfix transport table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/transport</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>transport</b> file specifies a mapping from
+ The optional <b>transport</b> table specifies a mapping from
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the
+ indexed file after changing the transport table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix20/files/patch-bp b/mail/postfix20/files/patch-bp
index bb65bd98a7b8..5206bfd4bfd0 100644
--- a/mail/postfix20/files/patch-bp
+++ b/mail/postfix20/files/patch-bp
@@ -1,11 +1,43 @@
---- html/virtual.5.html.orig Tue Dec 21 03:00:58 1999
-+++ html/virtual.5.html Tue Nov 7 22:55:04 2000
+--- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000
++++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000
@@ -9,7 +9,7 @@
virtual - format of Postfix virtual table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/virtual</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>virtual</b> table specifies redirections for
+ The optional <b>virtual</b> table specifies address redirections
+@@ -27,7 +27,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
+@@ -52,7 +52,7 @@
+
+ Support for a Postfix-style virtual domain looks like:
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter)
+ <i>postmaster@virtual.domain</i> <i>postmaster</i>
+ <i>user1@virtual.domain</i> <i>address1</i>
+@@ -94,11 +94,11 @@
+
+ Support for a Sendmail-style virtual domain looks like:
+
+- /etc/postfix/main.cf:
++ !!PREFIX!!/etc/postfix/main.cf:
+ mydestination = $myhostname localhost.$mydomain $mydomain
+ <i>virtual.domain</i>
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>user1@virtual.domain</i> <i>address1</i>
+ <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i>
+
diff --git a/mail/postfix20/files/patch-cb b/mail/postfix20/files/patch-cb
index ef73429287d2..58559c7273d1 100644
--- a/mail/postfix20/files/patch-cb
+++ b/mail/postfix20/files/patch-cb
@@ -1,25 +1,20 @@
---- man/man1/sendmail.1.orig Thu Mar 30 17:46:10 2000
-+++ man/man1/sendmail.1 Wed Dec 20 18:37:45 2000
-@@ -61,10 +61,12 @@
- \fBjust-send-eight\fR.
- .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- The path name of the \fBsendmail.cf\fR file. Postfix configuration
--files are kept in \fB/etc/postfix\fR.
-+files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- .IP "\fB-F \fIfull_name\fR
- Set the sender full name. This is used only with messages that
- have no \fBFrom:\fR message header.
-+.IP "\fB-G\fR (ignored)"
-+Gateway (relay) submission, as opposed to initial user submission.
- .IP \fB-I\fR
- Initialize alias database. See the \fBnewaliases\fR
- command above.
-@@ -171,7 +173,7 @@
- .na
- .nf
- /var/spool/postfix, mail queue
--/etc/postfix, configuration files
-+!!PREFIX!!/etc/postfix, configuration files
- .SH CONFIGURATION PARAMETERS
- .na
- .nf
+*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000
+--- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000
+***************
+*** 63,65 ****
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+--- 63,65 ----
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+***************
+*** 173,175 ****
+ /var/spool/postfix, mail queue
+! /etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
+--- 173,175 ----
+ /var/spool/postfix, mail queue
+! !!PREFIX!!/etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
diff --git a/mail/postfix20/files/patch-cc b/mail/postfix20/files/patch-cc
new file mode 100644
index 000000000000..cd6946003217
--- /dev/null
+++ b/mail/postfix20/files/patch-cc
@@ -0,0 +1,11 @@
+*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000
+***************
+*** 10,12 ****
+ .nf
+! pcre:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! pcre:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix20/files/patch-cd b/mail/postfix20/files/patch-cd
index 36461a39bb49..b51de44d0bee 100644
--- a/mail/postfix20/files/patch-cd
+++ b/mail/postfix20/files/patch-cd
@@ -1,11 +1,20 @@
---- man/man5/access.5.orig Fri Dec 11 19:55:52 1998
-+++ man/man5/access.5 Tue Nov 7 22:56:25 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/access\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/access\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/access.5 Thu Jun 1 22:39:55 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/access\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
diff --git a/mail/postfix20/files/patch-ce b/mail/postfix20/files/patch-ce
index 0e0bd4aa1ae5..f77053f8b3aa 100644
--- a/mail/postfix20/files/patch-ce
+++ b/mail/postfix20/files/patch-ce
@@ -1,11 +1,20 @@
---- man/man5/canonical.5.orig Mon Sep 6 05:13:32 1999
-+++ man/man5/canonical.5 Tue Nov 7 22:57:40 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/canonical\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/canonical\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
diff --git a/mail/postfix20/files/patch-cf b/mail/postfix20/files/patch-cf
new file mode 100644
index 000000000000..28fb053b94a7
--- /dev/null
+++ b/mail/postfix20/files/patch-cf
@@ -0,0 +1,11 @@
+*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000
+***************
+*** 10,12 ****
+ .nf
+! regexp:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! regexp:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix20/files/patch-cg b/mail/postfix20/files/patch-cg
index cdce4aaddaf3..0ae82cc57669 100644
--- a/mail/postfix20/files/patch-cg
+++ b/mail/postfix20/files/patch-cg
@@ -1,11 +1,20 @@
---- man/man5/relocated.5.orig Mon Sep 6 05:13:33 1999
-+++ man/man5/relocated.5 Tue Nov 7 22:59:11 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/relocated\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/relocated\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ .SH DESCRIPTION
+***************
+*** 20,22 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
+--- 20,22 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
diff --git a/mail/postfix20/files/patch-ch b/mail/postfix20/files/patch-ch
index 80df028f9255..3ed047ea474c 100644
--- a/mail/postfix20/files/patch-ch
+++ b/mail/postfix20/files/patch-ch
@@ -1,11 +1,20 @@
---- man/man5/transport.5.orig Fri Dec 31 20:54:51 1999
-+++ man/man5/transport.5 Tue Nov 7 22:59:57 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/transport\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/transport\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
+--- 21,23 ----
+ for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
diff --git a/mail/postfix20/files/patch-ci b/mail/postfix20/files/patch-ci
index 889eed3f4d89..1a7cf4abbac7 100644
--- a/mail/postfix20/files/patch-ci
+++ b/mail/postfix20/files/patch-ci
@@ -1,11 +1,20 @@
---- man/man5/virtual.5.orig Tue Dec 21 03:00:51 1999
-+++ man/man5/virtual.5 Tue Nov 7 23:00:32 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/virtual\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/virtual\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ .SH DESCRIPTION
+***************
+*** 26,28 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
+--- 26,28 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
diff --git a/mail/postfix20/files/patch-da b/mail/postfix20/files/patch-da
new file mode 100644
index 000000000000..e57e31750d18
--- /dev/null
+++ b/mail/postfix20/files/patch-da
@@ -0,0 +1,11 @@
+*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000
+--- ./proto/regexp_table Thu Jun 1 22:44:43 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix20/files/patch-db b/mail/postfix20/files/patch-db
new file mode 100644
index 000000000000..7f89fb770783
--- /dev/null
+++ b/mail/postfix20/files/patch-db
@@ -0,0 +1,20 @@
+*** ./proto/access.orig Sun Apr 9 16:44:45 2000
+--- ./proto/access Thu Jun 1 22:45:05 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/access\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
diff --git a/mail/postfix20/files/patch-dc b/mail/postfix20/files/patch-dc
new file mode 100644
index 000000000000..786f2da45c32
--- /dev/null
+++ b/mail/postfix20/files/patch-dc
@@ -0,0 +1,20 @@
+*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000
+--- ./proto/canonical Thu Jun 1 22:45:28 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/canonical\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
diff --git a/mail/postfix20/files/patch-dd b/mail/postfix20/files/patch-dd
new file mode 100644
index 000000000000..b65a57ff7d57
--- /dev/null
+++ b/mail/postfix20/files/patch-dd
@@ -0,0 +1,11 @@
+*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000
+--- ./proto/pcre_table Thu Jun 1 22:45:41 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix20/files/patch-de b/mail/postfix20/files/patch-de
new file mode 100644
index 000000000000..73bb2af2261d
--- /dev/null
+++ b/mail/postfix20/files/patch-de
@@ -0,0 +1,20 @@
+*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000
+--- ./proto/relocated Thu Jun 1 22:46:02 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/relocated\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ # DESCRIPTION
+***************
+*** 14,16 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
+--- 14,16 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
diff --git a/mail/postfix20/files/patch-df b/mail/postfix20/files/patch-df
new file mode 100644
index 000000000000..8d3fba96a224
--- /dev/null
+++ b/mail/postfix20/files/patch-df
@@ -0,0 +1,20 @@
+*** ./proto/transport.orig Sun Apr 9 17:05:45 2000
+--- ./proto/transport Thu Jun 1 22:46:23 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/transport\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
+--- 15,17 ----
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
diff --git a/mail/postfix20/files/patch-dg b/mail/postfix20/files/patch-dg
new file mode 100644
index 000000000000..bff20a2cff3e
--- /dev/null
+++ b/mail/postfix20/files/patch-dg
@@ -0,0 +1,20 @@
+*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000
+--- ./proto/virtual Thu Jun 1 22:46:40 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/virtual\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ # DESCRIPTION
+***************
+*** 20,22 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
+--- 20,22 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
diff --git a/mail/postfix20/files/patch-ea b/mail/postfix20/files/patch-ea
index 80647e0b2ba0..6c3f98d2af4f 100644
--- a/mail/postfix20/files/patch-ea
+++ b/mail/postfix20/files/patch-ea
@@ -1,5 +1,5 @@
-*** ./cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
---- ./cleanup/cleanup.c Thu Jun 1 21:52:22 2000
+*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
+--- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000
***************
*** 118,121 ****
/* FILES
diff --git a/mail/postfix20/files/patch-eb b/mail/postfix20/files/patch-eb
index d576de434580..e67680963d2d 100644
--- a/mail/postfix20/files/patch-eb
+++ b/mail/postfix20/files/patch-eb
@@ -1,5 +1,5 @@
-*** ./global/mail_conf.c.orig Sun May 7 18:51:16 2000
---- ./global/mail_conf.c Thu Jun 1 22:16:29 2000
+*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000
+--- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000
***************
*** 53,55 ****
/* FILES
diff --git a/mail/postfix20/files/patch-ec b/mail/postfix20/files/patch-ec
index 74edda76007b..6d12d1ce4c17 100644
--- a/mail/postfix20/files/patch-ec
+++ b/mail/postfix20/files/patch-ec
@@ -1,5 +1,5 @@
-*** ./global/mail_params.h.orig Wed May 31 19:18:31 2000
---- ./global/mail_params.h Thu Jun 1 22:17:10 2000
+*** ./src/global/mail_params.h.orig Wed May 31 19:18:31 2000
+--- ./src/global/mail_params.h Thu Jun 1 22:17:10 2000
***************
*** 155,157 ****
#ifndef DEF_PROGRAM_DIR
diff --git a/mail/postfix20/files/patch-ed b/mail/postfix20/files/patch-ed
index b573748b45e1..f971b62720d8 100644
--- a/mail/postfix20/files/patch-ed
+++ b/mail/postfix20/files/patch-ed
@@ -1,5 +1,5 @@
-*** ./local/mailbox.c.orig Fri Apr 28 16:55:53 2000
---- ./local/mailbox.c Thu Jun 1 22:37:48 2000
+*** ./src/local/mailbox.c.orig Fri Apr 28 16:55:53 2000
+--- ./src/local/mailbox.c Thu Jun 1 22:37:48 2000
***************
*** 15,17 ****
/* suppression. The default is direct mailbox delivery to
diff --git a/mail/postfix20/files/patch-ee b/mail/postfix20/files/patch-ee
index d79219b1ba62..ef44eac24b73 100644
--- a/mail/postfix20/files/patch-ee
+++ b/mail/postfix20/files/patch-ee
@@ -1,5 +1,5 @@
-*** ./master/master.c.orig Tue Mar 7 10:25:07 2000
---- ./master/master.c Thu Jun 1 22:43:50 2000
+*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000
+--- ./src/master/master.c Thu Jun 1 22:43:50 2000
***************
*** 104,107 ****
/* FILES
diff --git a/mail/postfix20/files/patch-ef b/mail/postfix20/files/patch-ef
index 44816a063b95..586b304a103d 100644
--- a/mail/postfix20/files/patch-ef
+++ b/mail/postfix20/files/patch-ef
@@ -1,5 +1,5 @@
-*** ./postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
---- ./postdrop/postdrop.c Thu Jun 1 22:44:22 2000
+*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
+--- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000
***************
*** 39,41 ****
/* /var/spool/postfix, mail queue
diff --git a/mail/postfix20/files/patch-eg b/mail/postfix20/files/patch-eg
index 28950509870c..2983bbfd86ea 100644
--- a/mail/postfix20/files/patch-eg
+++ b/mail/postfix20/files/patch-eg
@@ -1,34 +1,20 @@
---- sendmail/sendmail.c.orig Sun Mar 26 22:51:33 2000
-+++ sendmail/sendmail.c Wed Dec 20 18:17:31 2000
-@@ -55,10 +55,12 @@
- /* \fBjust-send-eight\fR.
- /* .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
--/* files are kept in \fB/etc/postfix\fR.
-+/* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- /* .IP "\fB-F \fIfull_name\fR
- /* Set the sender full name. This is used only with messages that
- /* have no \fBFrom:\fR message header.
-+/* .IP "\fB-G \fR (ignored)"
-+/* Gateway (relay) submission, as opposed to initial user submission.
- /* .IP \fB-I\fR
- /* Initialize alias database. See the \fBnewaliases\fR
- /* command above.
-@@ -157,7 +159,7 @@
- /* \fBdebugger_command\fR configuration parameter.
- /* FILES
- /* /var/spool/postfix, mail queue
--/* /etc/postfix, configuration files
-+/* !!PREFIX!!/etc/postfix, configuration files
- /* CONFIGURATION PARAMETERS
- /* .ad
- /* .fi
-@@ -710,6 +712,8 @@
- break;
- case 'F': /* full name */
- full_name = optarg;
-+ break;
-+ case 'G': /* gateway submission */
- break;
- case 'I': /* newaliases */
- mode = SM_MODE_NEWALIAS;
+*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000
+--- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000
+***************
+*** 57,59 ****
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+--- 57,59 ----
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+***************
+*** 159,161 ****
+ /* /var/spool/postfix, mail queue
+! /* /etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
+--- 159,161 ----
+ /* /var/spool/postfix, mail queue
+! /* !!PREFIX!!/etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix20/files/patch-eh b/mail/postfix20/files/patch-eh
index f95b51423128..c104c3680d21 100644
--- a/mail/postfix20/files/patch-eh
+++ b/mail/postfix20/files/patch-eh
@@ -1,5 +1,5 @@
-*** ./trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
---- ./trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
+*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
+--- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
***************
*** 32,34 ****
/* FILES
diff --git a/mail/postfix20/files/patch-ei b/mail/postfix20/files/patch-ei
new file mode 100644
index 000000000000..3029372b746e
--- /dev/null
+++ b/mail/postfix20/files/patch-ei
@@ -0,0 +1,21 @@
+*** ./src/smtpd/smtpd.h.orig Thu Sep 14 10:17:23 2000
+--- ./src/smtpd/smtpd.h Thu Sep 14 10:17:38 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix20/files/patch-ej b/mail/postfix20/files/patch-ej
new file mode 100644
index 000000000000..6c5cf2e23758
--- /dev/null
+++ b/mail/postfix20/files/patch-ej
@@ -0,0 +1,21 @@
+*** ./src/smtp/smtp.h.orig Thu Sep 14 13:04:43 2000
+--- ./src/smtp/smtp.h Thu Sep 14 13:04:53 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix20/files/patch-fa b/mail/postfix20/files/patch-fa
deleted file mode 100644
index bc1c2dc388c2..000000000000
--- a/mail/postfix20/files/patch-fa
+++ /dev/null
@@ -1,12 +0,0 @@
---- makedefs.orig Sun Jan 23 03:04:27 2000
-+++ makedefs Mon Apr 3 08:59:17 2000
-@@ -89,6 +89,8 @@
- ;;
- FreeBSD.4*) SYSTYPE=FREEBSD4
- ;;
-+ FreeBSD.5*) SYSTYPE=FREEBSD5
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- NetBSD.1*) SYSTYPE=NETBSD1
-
diff --git a/mail/postfix20/files/patch-fb b/mail/postfix20/files/patch-fb
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix20/files/patch-fb
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
- * makedefs script, and adding a section below for the new system.
- */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+ || defined(FREEBSD5) \
- || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
- || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix20/files/patch-ga b/mail/postfix20/files/patch-ga
index 3ad7120b8322..60a6dd578564 100644
--- a/mail/postfix20/files/patch-ga
+++ b/mail/postfix20/files/patch-ga
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_MYSQL" option at compile time ("make -DWITH_MYSQL").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
[Code contributed by Scott Cotton and Joshua Marcus, IC Group, Inc.]
diff --git a/mail/postfix20/files/patch-gb b/mail/postfix20/files/patch-gb
index 312c8c60f9e5..98816d155122 100644
--- a/mail/postfix20/files/patch-gb
+++ b/mail/postfix20/files/patch-gb
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_LDAP" option at compile time ("make -DWITH_LDAP").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
BUILDING WITH LDAP SUPPORT
==========================
diff --git a/mail/postfix20/files/patch-lmtp.h b/mail/postfix20/files/patch-lmtp.h
new file mode 100644
index 000000000000..3d941c034198
--- /dev/null
+++ b/mail/postfix20/files/patch-lmtp.h
@@ -0,0 +1,13 @@
+--- ./src/lmtp/lmtp.h.orig Fri Jan 19 15:43:06 2001
++++ ./src/lmtp/lmtp.h Sat Feb 3 14:01:09 2001
+@@ -12,8 +12,8 @@
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+-#include <sasl.h>
+-#include <saslutil.h>
++#include <sasl/sasl.h>
++#include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix20/pkg-install b/mail/postfix20/pkg-install
index 933c669e6b98..0d18b67ddee3 100644
--- a/mail/postfix20/pkg-install
+++ b/mail/postfix20/pkg-install
@@ -1,4 +1,9 @@
#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
user=postfix
group=postfix
@@ -87,6 +92,5 @@ if [ x"$2" = xPOST-INSTALL ]; then
fi
/usr/sbin/chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
/bin/chmod 2555 ${PKG_PREFIX}/sbin/postdrop
- /bin/mkdir -p /var/spool/postfix
${PKG_PREFIX}/sbin/postfix check
fi
diff --git a/mail/postfix20/pkg-plist b/mail/postfix20/pkg-plist
index 5f8572883b4c..97167cb8ed15 100644
--- a/mail/postfix20/pkg-plist
+++ b/mail/postfix20/pkg-plist
@@ -5,24 +5,29 @@ etc/postfix/postfix-script
etc/postfix/sample-access
etc/postfix/sample-aliases
etc/postfix/sample-aliases.cf
+%%SUB_SASL%%etc/postfix/sample-auth.cf
etc/postfix/sample-canonical
etc/postfix/sample-canonical.cf
etc/postfix/sample-debug.cf
etc/postfix/sample-filter.cf
-%%WITH_LDAP%%etc/postfix/sample-ldap.cf
+etc/postfix/sample-flush.cf
+%%SUB_LDAP%%etc/postfix/sample-ldap.cf
etc/postfix/sample-local.cf
etc/postfix/sample-main.cf
etc/postfix/sample-master.cf
etc/postfix/sample-misc.cf
-%%WITH_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre_table
etc/postfix/sample-rate.cf
etc/postfix/sample-regexp.cf
+etc/postfix/sample-regexp_table
etc/postfix/sample-relocated
etc/postfix/sample-relocated.cf
etc/postfix/sample-resource.cf
etc/postfix/sample-rewrite.cf
etc/postfix/sample-smtp.cf
etc/postfix/sample-smtpd.cf
+%%SUB_TLS%%etc/postfix/sample-tls.cf
etc/postfix/sample-transport
etc/postfix/sample-transport.cf
etc/postfix/sample-virtual
@@ -30,6 +35,8 @@ etc/postfix/sample-virtual.cf
libexec/postfix/bounce
libexec/postfix/cleanup
libexec/postfix/error
+libexec/postfix/flush
+libexec/postfix/lmtp
libexec/postfix/local
libexec/postfix/master
libexec/postfix/pickup
@@ -38,6 +45,8 @@ libexec/postfix/qmgr
libexec/postfix/showq
libexec/postfix/smtp
libexec/postfix/smtpd
+libexec/postfix/spawn
+%%SUB_TLS%%libexec/postfix/tlsmgr
libexec/postfix/trivial-rewrite
sbin/postalias
sbin/postcat
@@ -50,62 +59,66 @@ sbin/postlog
sbin/postmap
sbin/postsuper
sbin/sendmail
-share/doc/postfix/LDAP_README
-share/doc/postfix/MYSQL_README
-share/doc/postfix/html/access.5.html
-share/doc/postfix/html/aliases.5.html
-share/doc/postfix/html/architecture.html
-share/doc/postfix/html/backstage.html
-share/doc/postfix/html/basic.html
-share/doc/postfix/html/big-picture.gif
-share/doc/postfix/html/big-picture.html
-share/doc/postfix/html/bounce.8.html
-share/doc/postfix/html/canonical.5.html
-share/doc/postfix/html/cleanup.8.html
-share/doc/postfix/html/commands.html
-share/doc/postfix/html/defer.8.html
-share/doc/postfix/html/delivering.html
-share/doc/postfix/html/error.8.html
-share/doc/postfix/html/faq.html
-share/doc/postfix/html/goals.html
-share/doc/postfix/html/inbound.gif
-share/doc/postfix/html/index.html
-share/doc/postfix/html/local.8.html
-share/doc/postfix/html/mailq.1.html
-share/doc/postfix/html/master.8.html
-share/doc/postfix/html/motivation.html
-share/doc/postfix/html/newaliases.1.html
-share/doc/postfix/html/outbound.gif
-share/doc/postfix/html/pickup.8.html
-share/doc/postfix/html/pipe.8.html
-share/doc/postfix/html/postalias.1.html
-share/doc/postfix/html/postcat.1.html
-share/doc/postfix/html/postconf.1.html
-share/doc/postfix/html/postdrop.1.html
-share/doc/postfix/html/postfix.1.html
-share/doc/postfix/html/postkick.1.html
-share/doc/postfix/html/postlock.1.html
-share/doc/postfix/html/postlog.1.html
-share/doc/postfix/html/postmap.1.html
-share/doc/postfix/html/postsuper.1.html
-share/doc/postfix/html/qmgr.8.html
-share/doc/postfix/html/queuing.html
-share/doc/postfix/html/rate.html
-share/doc/postfix/html/receiving.html
-share/doc/postfix/html/relocated.5.html
-share/doc/postfix/html/resource.html
-share/doc/postfix/html/rewrite.html
-share/doc/postfix/html/security.html
-share/doc/postfix/html/sendmail.1.html
-share/doc/postfix/html/showq.8.html
-share/doc/postfix/html/small-picture.gif
-share/doc/postfix/html/smtp.8.html
-share/doc/postfix/html/smtpd.8.html
-share/doc/postfix/html/transport.5.html
-share/doc/postfix/html/trivial-rewrite.8.html
-share/doc/postfix/html/uce.html
-share/doc/postfix/html/virtual.5.html
-@dirrm etc/postfix
+%%SUB_TEST%%sbin/smtp-sink
+%%SUB_TEST%%sbin/smtp-source
+%%SUB_DOCS%%share/doc/postfix/access.5.html
+%%SUB_DOCS%%share/doc/postfix/aliases.5.html
+%%SUB_DOCS%%share/doc/postfix/architecture.html
+%%SUB_DOCS%%share/doc/postfix/backstage.html
+%%SUB_DOCS%%share/doc/postfix/basic.html
+%%SUB_DOCS%%share/doc/postfix/big-picture.gif
+%%SUB_DOCS%%share/doc/postfix/big-picture.html
+%%SUB_DOCS%%share/doc/postfix/bounce.8.html
+%%SUB_DOCS%%share/doc/postfix/canonical.5.html
+%%SUB_DOCS%%share/doc/postfix/cleanup.8.html
+%%SUB_DOCS%%share/doc/postfix/commands.html
+%%SUB_DOCS%%share/doc/postfix/defer.8.html
+%%SUB_DOCS%%share/doc/postfix/delivering.html
+%%SUB_DOCS%%share/doc/postfix/error.8.html
+%%SUB_DOCS%%share/doc/postfix/faq.html
+%%SUB_DOCS%%share/doc/postfix/flush.8.html
+%%SUB_DOCS%%share/doc/postfix/goals.html
+%%SUB_DOCS%%share/doc/postfix/inbound.gif
+%%SUB_DOCS%%share/doc/postfix/index.html
+%%SUB_DOCS%%share/doc/postfix/lmtp.8.html
+%%SUB_DOCS%%share/doc/postfix/local.8.html
+%%SUB_DOCS%%share/doc/postfix/mailq.1.html
+%%SUB_DOCS%%share/doc/postfix/master.8.html
+%%SUB_DOCS%%share/doc/postfix/motivation.html
+%%SUB_DOCS%%share/doc/postfix/newaliases.1.html
+%%SUB_DOCS%%share/doc/postfix/outbound.gif
+%%SUB_DOCS%%share/doc/postfix/pcre_table.5.html
+%%SUB_DOCS%%share/doc/postfix/pickup.8.html
+%%SUB_DOCS%%share/doc/postfix/pipe.8.html
+%%SUB_DOCS%%share/doc/postfix/postalias.1.html
+%%SUB_DOCS%%share/doc/postfix/postcat.1.html
+%%SUB_DOCS%%share/doc/postfix/postconf.1.html
+%%SUB_DOCS%%share/doc/postfix/postdrop.1.html
+%%SUB_DOCS%%share/doc/postfix/postfix.1.html
+%%SUB_DOCS%%share/doc/postfix/postkick.1.html
+%%SUB_DOCS%%share/doc/postfix/postlock.1.html
+%%SUB_DOCS%%share/doc/postfix/postlog.1.html
+%%SUB_DOCS%%share/doc/postfix/postmap.1.html
+%%SUB_DOCS%%share/doc/postfix/postsuper.1.html
+%%SUB_DOCS%%share/doc/postfix/qmgr.8.html
+%%SUB_DOCS%%share/doc/postfix/queuing.html
+%%SUB_DOCS%%share/doc/postfix/rate.html
+%%SUB_DOCS%%share/doc/postfix/receiving.html
+%%SUB_DOCS%%share/doc/postfix/regexp_table.5.html
+%%SUB_DOCS%%share/doc/postfix/relocated.5.html
+%%SUB_DOCS%%share/doc/postfix/resource.html
+%%SUB_DOCS%%share/doc/postfix/rewrite.html
+%%SUB_DOCS%%share/doc/postfix/security.html
+%%SUB_DOCS%%share/doc/postfix/sendmail.1.html
+%%SUB_DOCS%%share/doc/postfix/showq.8.html
+%%SUB_DOCS%%share/doc/postfix/small-picture.gif
+%%SUB_DOCS%%share/doc/postfix/smtp.8.html
+%%SUB_DOCS%%share/doc/postfix/smtpd.8.html
+%%SUB_DOCS%%share/doc/postfix/spawn.8.html
+%%SUB_DOCS%%share/doc/postfix/transport.5.html
+%%SUB_DOCS%%share/doc/postfix/trivial-rewrite.8.html
+%%SUB_DOCS%%share/doc/postfix/uce.html
+%%SUB_DOCS%%share/doc/postfix/virtual.5.html
+%%SUB_DOCS%%@dirrm share/doc/postfix
@dirrm libexec/postfix
-@dirrm share/doc/postfix/html
-@dirrm share/doc/postfix
+@dirrm etc/postfix
diff --git a/mail/postfix20/scripts/configure.postfix b/mail/postfix20/scripts/configure.postfix
new file mode 100644
index 000000000000..4f3cdd31a8bf
--- /dev/null
+++ b/mail/postfix20/scripts/configure.postfix
@@ -0,0 +1,129 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.1 2001-03-04 19:35:00 sf Exp $
+
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
+ exit
+fi
+
+tempfile=`mktemp -t checklist`
+
+if [ "${BATCH}" = "yes" ]; then
+ set \"PCRE\"
+else
+ /usr/bin/dialog --title "Postfix configuration options" --clear \
+ --checklist "\n\
+Please select desired options:" -1 -1 16 \
+PCRE "Perl Compatible Regular Expressions" OFF \
+SASL "Cyrus SASL (Simple Authentication and Security Layer)" OFF \
+DB3 "Berkeley DB3 (required if SASL also built with DB3)" OFF \
+MySQL "MySQL map lookups" OFF \
+OpenLDAP "OpenLDAP map lookups" OFF \
+Test "SMTP/LMTP test server and generator" OFF \
+TLS "Secure Sockets Layer and Transport Layer Security" OFF \
+IPv6 "IPv6 support" OFF \
+2> $tempfile
+
+ retval=$?
+
+ if [ -s $tempfile ]; then
+ set `cat $tempfile`
+ fi
+ rm -f $tempfile
+
+ case $retval in
+ 0) if [ -z "$*" ]; then
+ echo "Nothing selected"
+ fi
+ ;;
+ 1) echo "Cancel pressed."
+ exit 1
+ ;;
+ esac
+fi
+
+${MKDIR} ${WRKDIRPREFIX}${CURDIR}
+exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+
+echo "PREFIX= ${PREFIX}"
+
+SUB_PCRE="@comment "
+SUB_SASL="@comment "
+SUB_TLS="@comment "
+SUB_LDAP="@comment "
+SUB_TEST="@comment "
+
+while [ "$1" ]; do
+ case $1 in
+ \"PCRE\")
+ echo "CONF1+= pcre_table"
+ echo "CONF2+= sample-pcre.cf"
+ echo "MAN5+= pcre_table.5"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre"
+ echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a"
+ SUB_PCRE=""
+ ;;
+ \"SASL\")
+ echo "CONF2+= sample-auth.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl"
+ echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -lpam -lcrypt"
+ echo ".if exists(/usr/lib/libkrb.a)"
+ echo "POSTFIX_AUXLIBS+= -lkrb -ldes -lcom_err"
+ echo ".endif"
+ SUB_SASL=""
+ ;;
+ \"TLS\")
+ echo "CONF2+= sample-tls.cf"
+ echo "BIN1+= tlsmgr"
+ echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl"
+ echo "POSTFIX_AUXLIBS+= -lssl -lcrypto"
+ echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.7.0-20010228-0.9.6.tar.gz"
+ echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.7.0-20010228-0.9.6/pfixtls.diff"
+ echo "PATCH_STRIP= -p1"
+ SUB_TLS=""
+ ;;
+ \"DB3\")
+ echo "LIB_DEPENDS+= db3.1:\${PORTSDIR}/databases/db3"
+ echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3"
+ echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3"
+ ;;
+ \"MySQL\")
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
+ echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
+ ;;
+ \"OpenLDAP\")
+ echo "CONF2+= sample-ldap.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
+ echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
+ SUB_LDAP=""
+ ;;
+ \"Test\")
+ echo "BIN3= smtp-sink smtp-source"
+ SUB_TEST=""
+ ;;
+ \"IPv6\")
+ echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/"
+ echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}"
+ echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz"
+ echo ""
+ echo "pre-patch:"
+ echo " cd \${WRKSRC} && ln -s . postfix"
+ echo ""
+ ;;
+ *)
+ echo "Invalid option(s): $*" > /dev/stderr
+ rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+echo "PLIST_SUB+= SUB_PCRE=\"${SUB_PCRE}\""
+echo "PLIST_SUB+= SUB_SASL=\"${SUB_SASL}\""
+echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\""
+echo "PLIST_SUB+= SUB_LDAP=\"${SUB_LDAP}\""
+echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index 839c9f1819ad..9c4068489960 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -1,90 +1,82 @@
# New ports collection makefile for: postfix
-# Date created: 18 Mar 1999
+# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
PORTNAME= postfix
-PORTVERSION= 19991231.13
-PORTREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
+PORTVERSION= 20010228
+CATEGORIES= mail ipv6
+MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
+ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
ftp://ftp.tux.org/pub/net/postfix/official/ \
ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
ftp://ftp.samurai.com/pub/postfix/official/ \
- ftp://ftp.nl.uu.net/pub/unix/mail/postfix/official/ \
- ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
- ftp://ftp.mira.net/pub/unix/mail/postfix/official/ \
- ftp://coda.nctu.edu.tw/network/mail/postfix/official/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-DISTNAME= ${PORTNAME}-19991231-pl13
+MASTER_SITE_SUBDIR= . old related/postfix
+DISTNAME= release-${PORTVERSION}
MAINTAINER= blaz@amis.net
-.if !defined(DEBUG)
-MAKEFILEFLAGS+= DEBUG=
-.endif
-
-.if defined(CC)
-MAKEFILEFLAGS+= CC="${CC}"
-.endif
-
-MAKEFILEFLAGS+= OPT="${CFLAGS}"
-SCRIPTS_ENV+= MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-
MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
sendmail.1
-MAN5= access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
+MAN5= access.5 aliases.5 canonical.5 regexp_table.5 relocated.5 \
+ transport.5 virtual.5
-MAN8= bounce.8 cleanup.8 defer.8 error.8 local.8 master.8 pickup.8 \
- pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 trivial-rewrite.8
+MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
+ master.8 pickup.8 pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 \
+ spawn.8 trivial-rewrite.8
CONF1= access aliases canonical main.cf master.cf \
- relocated transport virtual
+ regexp_table relocated transport virtual
CONF2= sample-aliases.cf sample-canonical.cf sample-debug.cf \
- sample-filter.cf sample-local.cf sample-misc.cf \
+ sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
sample-rate.cf sample-regexp.cf sample-relocated.cf \
sample-resource.cf sample-rewrite.cf sample-smtp.cf \
sample-smtpd.cf sample-transport.cf sample-virtual.cf
-BIN1= bounce cleanup error local master pickup \
- pipe qmgr showq smtp smtpd trivial-rewrite
+BIN1= bounce cleanup error flush lmtp local master pickup \
+ pipe qmgr showq smtp smtpd spawn trivial-rewrite
BIN2= postalias postcat postconf postdrop postfix \
postkick postlock postlog postmap postsuper sendmail
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
-POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz
+.if defined(NOPORTDOCS)
+PLIST_SUB+= SUB_DOCS="@comment "
+.else
+PLIST_SUB+= SUB_DOCS=""
+DOCDIR= ${PREFIX}/share/doc/postfix
.endif
-.if defined(WITH_LDAP)
-CONF2+= sample-ldap.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-PLIST_SUB+= WITH_LDAP=""
-.else
-PLIST_SUB+= WITH_LDAP="@comment "
+.if !defined(DEBUG)
+MAKEFILEFLAGS+= DEBUG=
.endif
-.if defined(WITH_PCRE)
-CONF2+= sample-pcre.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libpcre.a
-PLIST_SUB+= WITH_PCRE=""
-.else
-PLIST_SUB+= WITH_PCRE="@comment "
+.if defined(CC)
+MAKEFILEFLAGS+= CC="${CC}"
+.endif
+
+MAKEFILEFLAGS+= OPT="${CFLAGS}"
+
+SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
+ PREFIX="${PREFIX}" \
+ TOUCH="${TOUCH}" \
+ MKDIR="${MKDIR}" \
+ MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
+
+pre-fetch:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
post-patch:
- (cd ${WRKSRC} && make -f Makefile.init makefiles ${MAKEFILEFLAGS} \
+ (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
${ECHO} "all: default" >> Makefile)
@@ -122,7 +114,13 @@ do-install:
.for file in ${BIN2}
@${INSTALL_PROGRAM} \
- ${WRKSRC}/${file}/${file} \
+ ${WRKSRC}/src/${file}/${file} \
+ ${PREFIX}/sbin
+.endfor
+
+.for file in ${BIN3}
+ @${INSTALL_PROGRAM} \
+ ${WRKSRC}/src/smtpstone/${file} \
${PREFIX}/sbin
.endfor
@@ -145,11 +143,9 @@ do-install:
.endfor
.if !defined(NOPORTDOCS)
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix
- @cd ${WRKSRC} && ${INSTALL_DATA} LDAP_README MYSQL_README ${PREFIX}/share/doc/postfix
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix/html
- @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${PREFIX}/share/doc/postfix/html && \
- ${ECHO_MSG} "Installed documentation in ${PREFIX}/share/doc/postfix"
+ @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCDIR}
+ @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCDIR} && \
+ ${ECHO_MSG} "Installed HTML documentation in ${DOCDIR}"
.endif
@${ECHO_MSG} '--------------------------------------------------'
@@ -160,6 +156,9 @@ do-install:
post-install:
@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+post-clean:
+ @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
.include <bsd.port.pre.mk>
replace:
@@ -170,10 +169,10 @@ replace:
${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
${ECHO} "#" >> /etc/mail/mailer.conf
- ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
+ ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
.else
@${ECHO_MSG} "===> Replacing sendmail"
@if [ -e /usr/sbin/sendmail ]; then \
diff --git a/mail/postfix21/distinfo b/mail/postfix21/distinfo
index 854fffa3294c..d6f4fd5c198a 100644
--- a/mail/postfix21/distinfo
+++ b/mail/postfix21/distinfo
@@ -1 +1,3 @@
-MD5 (postfix-19991231-pl13.tar.gz) = f119438aae0aa1346953ae326864da9e
+MD5 (release-20010228.tar.gz) = 6af46cc231ca1e09e60393542d5611bd
+MD5 (pfixtls-0.7.0-20010228-0.9.6.tar.gz) = 64699fb4f0bb4dc87ba1c6c7aef81366
+MD5 (postfix-20010225snap-v6-20010228a.diff.gz) = 8646724c2d00e4d162b63456247cf4fb
diff --git a/mail/postfix21/files/patch-ab b/mail/postfix21/files/patch-ab
index d705b8a7f594..7c81d3dc12c9 100644
--- a/mail/postfix21/files/patch-ab
+++ b/mail/postfix21/files/patch-ab
@@ -1,11 +1,11 @@
---- conf/canonical.orig Sun Sep 5 23:47:01 1999
-+++ conf/canonical Tue Nov 7 22:24:42 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix canonical table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/canonical\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- # DESCRIPTION
- # The optional \fBcanonical\fR file specifies an address mapping for
- # local and non-local addresses. The mapping is used by the
+*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000
+--- ./conf/canonical Thu Jun 1 21:53:23 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/canonical
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/canonical
+ #
diff --git a/mail/postfix21/files/patch-ac b/mail/postfix21/files/patch-ac
index 264335cb70fa..0fb2192cdd84 100644
--- a/mail/postfix21/files/patch-ac
+++ b/mail/postfix21/files/patch-ac
@@ -1,11 +1,11 @@
---- conf/access.orig Fri Dec 11 19:55:48 1998
-+++ conf/access Tue Nov 7 22:25:54 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix access table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/access\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/access\fR
- # DESCRIPTION
- # The optional \fBaccess\fR table directs the Postfix SMTP server
- # to selectively reject or accept mail from or to specific hosts,
+*** ./conf/access.orig Tue Mar 7 10:42:58 2000
+--- ./conf/access Thu Jun 1 21:53:36 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/access
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/access
+ #
diff --git a/mail/postfix21/files/patch-ad b/mail/postfix21/files/patch-ad
new file mode 100644
index 000000000000..c1b102574165
--- /dev/null
+++ b/mail/postfix21/files/patch-ad
@@ -0,0 +1,11 @@
+*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/pcre_table Thu Jun 1 22:02:08 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix21/files/patch-ae b/mail/postfix21/files/patch-ae
new file mode 100644
index 000000000000..e396dd8626db
--- /dev/null
+++ b/mail/postfix21/files/patch-ae
@@ -0,0 +1,11 @@
+*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/regexp_table Thu Jun 1 22:03:27 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix21/files/patch-af b/mail/postfix21/files/patch-af
index ec92981276c6..8fca6b208941 100644
--- a/mail/postfix21/files/patch-af
+++ b/mail/postfix21/files/patch-af
@@ -1,11 +1,11 @@
---- conf/relocated.orig Sun Sep 5 23:47:01 1999
-+++ conf/relocated Tue Nov 7 22:28:27 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix relocated table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/relocated\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- # DESCRIPTION
- # The optional \fBrelocated\fR file provides the information that is
- # used in "user has moved to \fInew_location\fR" bounce messages.
+*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000
+--- ./conf/relocated Thu Jun 1 22:03:59 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/relocated
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/relocated
+ #
diff --git a/mail/postfix21/files/patch-ag b/mail/postfix21/files/patch-ag
new file mode 100644
index 000000000000..54c0fa918d3b
--- /dev/null
+++ b/mail/postfix21/files/patch-ag
@@ -0,0 +1,15 @@
+*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000
+--- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000
+***************
+*** 91,95 ****
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in /etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:/etc/postfix/saslpass
+
+--- 91,95 ----
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass
+
diff --git a/mail/postfix21/files/patch-ao b/mail/postfix21/files/patch-ao
index 206c152728da..fd854e181601 100644
--- a/mail/postfix21/files/patch-ao
+++ b/mail/postfix21/files/patch-ao
@@ -1,11 +1,11 @@
---- conf/transport.orig Fri Dec 31 20:54:11 1999
-+++ conf/transport Tue Nov 7 22:46:59 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix transport table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/transport\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- # DESCRIPTION
- # The optional \fBtransport\fR file specifies a mapping from domain
- # hierarchies to message delivery transports and/or relay hosts. The
+*** ./conf/transport.orig Tue Mar 7 10:42:58 2000
+--- ./conf/transport Thu Jun 1 22:13:41 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/transport
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/transport
+ #
diff --git a/mail/postfix21/files/patch-ap b/mail/postfix21/files/patch-ap
index b412ce386f8d..4598192cd5c1 100644
--- a/mail/postfix21/files/patch-ap
+++ b/mail/postfix21/files/patch-ap
@@ -1,11 +1,11 @@
---- conf/virtual.orig Tue Dec 21 03:00:13 1999
-+++ conf/virtual Tue Nov 7 22:48:18 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix virtual table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/virtual\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- # DESCRIPTION
- # The optional \fBvirtual\fR table specifies redirections for local
- # and non-local recipients or domains. The redirections are used by
+*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000
+--- ./conf/virtual Thu Jun 1 22:13:54 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/virtual
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/virtual
+ #
diff --git a/mail/postfix21/files/patch-bb b/mail/postfix21/files/patch-bb
index 6444bc0d1f75..ea744664dfa7 100644
--- a/mail/postfix21/files/patch-bb
+++ b/mail/postfix21/files/patch-bb
@@ -1,11 +1,20 @@
---- html/access.5.html.orig Fri Dec 11 19:55:49 1998
-+++ html/access.5.html Tue Nov 7 22:48:47 2000
+--- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000
++++ ./html/access.5.html Tue Nov 21 21:24:34 2000
@@ -9,7 +9,7 @@
access - format of Postfix access table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/access</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b>
-
+
<b>DESCRIPTION</b>
The optional <b>access</b> table directs the Postfix SMTP server
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the
+ indexed file after changing the access table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix21/files/patch-bc b/mail/postfix21/files/patch-bc
index 4d24077b9527..e407a9650585 100644
--- a/mail/postfix21/files/patch-bc
+++ b/mail/postfix21/files/patch-bc
@@ -1,11 +1,20 @@
---- html/canonical.5.html.orig Mon Sep 6 05:13:54 1999
-+++ html/canonical.5.html Tue Nov 7 22:51:05 2000
+--- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000
++++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000
@@ -9,7 +9,7 @@
canonical - format of Postfix canonical table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/canonical</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>canonical</b> file specifies an address mapping
+ The optional <b>canonical</b> table specifies an address mapping
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix21/files/patch-bl b/mail/postfix21/files/patch-bl
new file mode 100644
index 000000000000..176c7d1b64de
--- /dev/null
+++ b/mail/postfix21/files/patch-bl
@@ -0,0 +1,11 @@
+*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000
+--- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000
+***************
+*** 11,13 ****
+ <b>SYNOPSIS</b>
+! regexp:/etc/postfix/filename
+
+--- 11,13 ----
+ <b>SYNOPSIS</b>
+! regexp:!!PREFIX!!/etc/postfix/filename
+
diff --git a/mail/postfix21/files/patch-bm b/mail/postfix21/files/patch-bm
index bc9479bea2fe..e5ccc2c50b94 100644
--- a/mail/postfix21/files/patch-bm
+++ b/mail/postfix21/files/patch-bm
@@ -1,11 +1,20 @@
---- html/relocated.5.html.orig Mon Sep 6 05:13:55 1999
-+++ html/relocated.5.html Tue Nov 7 22:52:46 2000
+--- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000
++++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000
@@ -9,7 +9,7 @@
relocated - format of Postfix relocated table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/relocated</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>relocated</b> file provides the information that
+ The optional <b>relocated</b> table provides the information that
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the
+ indexed file after changing the relocated table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix21/files/patch-bo b/mail/postfix21/files/patch-bo
index 41cbc4ca6d65..b45270be8151 100644
--- a/mail/postfix21/files/patch-bo
+++ b/mail/postfix21/files/patch-bo
@@ -1,11 +1,20 @@
---- html/transport.5.html.orig Fri Dec 31 20:54:56 1999
-+++ html/transport.5.html Tue Nov 7 22:53:50 2000
+--- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000
++++ ./html/transport.5.html Tue Nov 21 21:43:20 2000
@@ -9,7 +9,7 @@
transport - format of Postfix transport table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/transport</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>transport</b> file specifies a mapping from
+ The optional <b>transport</b> table specifies a mapping from
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the
+ indexed file after changing the transport table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix21/files/patch-bp b/mail/postfix21/files/patch-bp
index bb65bd98a7b8..5206bfd4bfd0 100644
--- a/mail/postfix21/files/patch-bp
+++ b/mail/postfix21/files/patch-bp
@@ -1,11 +1,43 @@
---- html/virtual.5.html.orig Tue Dec 21 03:00:58 1999
-+++ html/virtual.5.html Tue Nov 7 22:55:04 2000
+--- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000
++++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000
@@ -9,7 +9,7 @@
virtual - format of Postfix virtual table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/virtual</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>virtual</b> table specifies redirections for
+ The optional <b>virtual</b> table specifies address redirections
+@@ -27,7 +27,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
+@@ -52,7 +52,7 @@
+
+ Support for a Postfix-style virtual domain looks like:
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter)
+ <i>postmaster@virtual.domain</i> <i>postmaster</i>
+ <i>user1@virtual.domain</i> <i>address1</i>
+@@ -94,11 +94,11 @@
+
+ Support for a Sendmail-style virtual domain looks like:
+
+- /etc/postfix/main.cf:
++ !!PREFIX!!/etc/postfix/main.cf:
+ mydestination = $myhostname localhost.$mydomain $mydomain
+ <i>virtual.domain</i>
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>user1@virtual.domain</i> <i>address1</i>
+ <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i>
+
diff --git a/mail/postfix21/files/patch-cb b/mail/postfix21/files/patch-cb
index ef73429287d2..58559c7273d1 100644
--- a/mail/postfix21/files/patch-cb
+++ b/mail/postfix21/files/patch-cb
@@ -1,25 +1,20 @@
---- man/man1/sendmail.1.orig Thu Mar 30 17:46:10 2000
-+++ man/man1/sendmail.1 Wed Dec 20 18:37:45 2000
-@@ -61,10 +61,12 @@
- \fBjust-send-eight\fR.
- .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- The path name of the \fBsendmail.cf\fR file. Postfix configuration
--files are kept in \fB/etc/postfix\fR.
-+files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- .IP "\fB-F \fIfull_name\fR
- Set the sender full name. This is used only with messages that
- have no \fBFrom:\fR message header.
-+.IP "\fB-G\fR (ignored)"
-+Gateway (relay) submission, as opposed to initial user submission.
- .IP \fB-I\fR
- Initialize alias database. See the \fBnewaliases\fR
- command above.
-@@ -171,7 +173,7 @@
- .na
- .nf
- /var/spool/postfix, mail queue
--/etc/postfix, configuration files
-+!!PREFIX!!/etc/postfix, configuration files
- .SH CONFIGURATION PARAMETERS
- .na
- .nf
+*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000
+--- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000
+***************
+*** 63,65 ****
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+--- 63,65 ----
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+***************
+*** 173,175 ****
+ /var/spool/postfix, mail queue
+! /etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
+--- 173,175 ----
+ /var/spool/postfix, mail queue
+! !!PREFIX!!/etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
diff --git a/mail/postfix21/files/patch-cc b/mail/postfix21/files/patch-cc
new file mode 100644
index 000000000000..cd6946003217
--- /dev/null
+++ b/mail/postfix21/files/patch-cc
@@ -0,0 +1,11 @@
+*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000
+***************
+*** 10,12 ****
+ .nf
+! pcre:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! pcre:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix21/files/patch-cd b/mail/postfix21/files/patch-cd
index 36461a39bb49..b51de44d0bee 100644
--- a/mail/postfix21/files/patch-cd
+++ b/mail/postfix21/files/patch-cd
@@ -1,11 +1,20 @@
---- man/man5/access.5.orig Fri Dec 11 19:55:52 1998
-+++ man/man5/access.5 Tue Nov 7 22:56:25 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/access\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/access\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/access.5 Thu Jun 1 22:39:55 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/access\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
diff --git a/mail/postfix21/files/patch-ce b/mail/postfix21/files/patch-ce
index 0e0bd4aa1ae5..f77053f8b3aa 100644
--- a/mail/postfix21/files/patch-ce
+++ b/mail/postfix21/files/patch-ce
@@ -1,11 +1,20 @@
---- man/man5/canonical.5.orig Mon Sep 6 05:13:32 1999
-+++ man/man5/canonical.5 Tue Nov 7 22:57:40 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/canonical\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/canonical\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
diff --git a/mail/postfix21/files/patch-cf b/mail/postfix21/files/patch-cf
new file mode 100644
index 000000000000..28fb053b94a7
--- /dev/null
+++ b/mail/postfix21/files/patch-cf
@@ -0,0 +1,11 @@
+*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000
+***************
+*** 10,12 ****
+ .nf
+! regexp:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! regexp:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix21/files/patch-cg b/mail/postfix21/files/patch-cg
index cdce4aaddaf3..0ae82cc57669 100644
--- a/mail/postfix21/files/patch-cg
+++ b/mail/postfix21/files/patch-cg
@@ -1,11 +1,20 @@
---- man/man5/relocated.5.orig Mon Sep 6 05:13:33 1999
-+++ man/man5/relocated.5 Tue Nov 7 22:59:11 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/relocated\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/relocated\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ .SH DESCRIPTION
+***************
+*** 20,22 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
+--- 20,22 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
diff --git a/mail/postfix21/files/patch-ch b/mail/postfix21/files/patch-ch
index 80df028f9255..3ed047ea474c 100644
--- a/mail/postfix21/files/patch-ch
+++ b/mail/postfix21/files/patch-ch
@@ -1,11 +1,20 @@
---- man/man5/transport.5.orig Fri Dec 31 20:54:51 1999
-+++ man/man5/transport.5 Tue Nov 7 22:59:57 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/transport\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/transport\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
+--- 21,23 ----
+ for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
diff --git a/mail/postfix21/files/patch-ci b/mail/postfix21/files/patch-ci
index 889eed3f4d89..1a7cf4abbac7 100644
--- a/mail/postfix21/files/patch-ci
+++ b/mail/postfix21/files/patch-ci
@@ -1,11 +1,20 @@
---- man/man5/virtual.5.orig Tue Dec 21 03:00:51 1999
-+++ man/man5/virtual.5 Tue Nov 7 23:00:32 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/virtual\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/virtual\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ .SH DESCRIPTION
+***************
+*** 26,28 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
+--- 26,28 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
diff --git a/mail/postfix21/files/patch-da b/mail/postfix21/files/patch-da
new file mode 100644
index 000000000000..e57e31750d18
--- /dev/null
+++ b/mail/postfix21/files/patch-da
@@ -0,0 +1,11 @@
+*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000
+--- ./proto/regexp_table Thu Jun 1 22:44:43 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix21/files/patch-db b/mail/postfix21/files/patch-db
new file mode 100644
index 000000000000..7f89fb770783
--- /dev/null
+++ b/mail/postfix21/files/patch-db
@@ -0,0 +1,20 @@
+*** ./proto/access.orig Sun Apr 9 16:44:45 2000
+--- ./proto/access Thu Jun 1 22:45:05 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/access\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
diff --git a/mail/postfix21/files/patch-dc b/mail/postfix21/files/patch-dc
new file mode 100644
index 000000000000..786f2da45c32
--- /dev/null
+++ b/mail/postfix21/files/patch-dc
@@ -0,0 +1,20 @@
+*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000
+--- ./proto/canonical Thu Jun 1 22:45:28 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/canonical\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
diff --git a/mail/postfix21/files/patch-dd b/mail/postfix21/files/patch-dd
new file mode 100644
index 000000000000..b65a57ff7d57
--- /dev/null
+++ b/mail/postfix21/files/patch-dd
@@ -0,0 +1,11 @@
+*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000
+--- ./proto/pcre_table Thu Jun 1 22:45:41 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix21/files/patch-de b/mail/postfix21/files/patch-de
new file mode 100644
index 000000000000..73bb2af2261d
--- /dev/null
+++ b/mail/postfix21/files/patch-de
@@ -0,0 +1,20 @@
+*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000
+--- ./proto/relocated Thu Jun 1 22:46:02 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/relocated\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ # DESCRIPTION
+***************
+*** 14,16 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
+--- 14,16 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
diff --git a/mail/postfix21/files/patch-df b/mail/postfix21/files/patch-df
new file mode 100644
index 000000000000..8d3fba96a224
--- /dev/null
+++ b/mail/postfix21/files/patch-df
@@ -0,0 +1,20 @@
+*** ./proto/transport.orig Sun Apr 9 17:05:45 2000
+--- ./proto/transport Thu Jun 1 22:46:23 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/transport\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
+--- 15,17 ----
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
diff --git a/mail/postfix21/files/patch-dg b/mail/postfix21/files/patch-dg
new file mode 100644
index 000000000000..bff20a2cff3e
--- /dev/null
+++ b/mail/postfix21/files/patch-dg
@@ -0,0 +1,20 @@
+*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000
+--- ./proto/virtual Thu Jun 1 22:46:40 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/virtual\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ # DESCRIPTION
+***************
+*** 20,22 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
+--- 20,22 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
diff --git a/mail/postfix21/files/patch-ea b/mail/postfix21/files/patch-ea
index 80647e0b2ba0..6c3f98d2af4f 100644
--- a/mail/postfix21/files/patch-ea
+++ b/mail/postfix21/files/patch-ea
@@ -1,5 +1,5 @@
-*** ./cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
---- ./cleanup/cleanup.c Thu Jun 1 21:52:22 2000
+*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
+--- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000
***************
*** 118,121 ****
/* FILES
diff --git a/mail/postfix21/files/patch-eb b/mail/postfix21/files/patch-eb
index d576de434580..e67680963d2d 100644
--- a/mail/postfix21/files/patch-eb
+++ b/mail/postfix21/files/patch-eb
@@ -1,5 +1,5 @@
-*** ./global/mail_conf.c.orig Sun May 7 18:51:16 2000
---- ./global/mail_conf.c Thu Jun 1 22:16:29 2000
+*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000
+--- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000
***************
*** 53,55 ****
/* FILES
diff --git a/mail/postfix21/files/patch-ec b/mail/postfix21/files/patch-ec
index 74edda76007b..6d12d1ce4c17 100644
--- a/mail/postfix21/files/patch-ec
+++ b/mail/postfix21/files/patch-ec
@@ -1,5 +1,5 @@
-*** ./global/mail_params.h.orig Wed May 31 19:18:31 2000
---- ./global/mail_params.h Thu Jun 1 22:17:10 2000
+*** ./src/global/mail_params.h.orig Wed May 31 19:18:31 2000
+--- ./src/global/mail_params.h Thu Jun 1 22:17:10 2000
***************
*** 155,157 ****
#ifndef DEF_PROGRAM_DIR
diff --git a/mail/postfix21/files/patch-ed b/mail/postfix21/files/patch-ed
index b573748b45e1..f971b62720d8 100644
--- a/mail/postfix21/files/patch-ed
+++ b/mail/postfix21/files/patch-ed
@@ -1,5 +1,5 @@
-*** ./local/mailbox.c.orig Fri Apr 28 16:55:53 2000
---- ./local/mailbox.c Thu Jun 1 22:37:48 2000
+*** ./src/local/mailbox.c.orig Fri Apr 28 16:55:53 2000
+--- ./src/local/mailbox.c Thu Jun 1 22:37:48 2000
***************
*** 15,17 ****
/* suppression. The default is direct mailbox delivery to
diff --git a/mail/postfix21/files/patch-ee b/mail/postfix21/files/patch-ee
index d79219b1ba62..ef44eac24b73 100644
--- a/mail/postfix21/files/patch-ee
+++ b/mail/postfix21/files/patch-ee
@@ -1,5 +1,5 @@
-*** ./master/master.c.orig Tue Mar 7 10:25:07 2000
---- ./master/master.c Thu Jun 1 22:43:50 2000
+*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000
+--- ./src/master/master.c Thu Jun 1 22:43:50 2000
***************
*** 104,107 ****
/* FILES
diff --git a/mail/postfix21/files/patch-ef b/mail/postfix21/files/patch-ef
index 44816a063b95..586b304a103d 100644
--- a/mail/postfix21/files/patch-ef
+++ b/mail/postfix21/files/patch-ef
@@ -1,5 +1,5 @@
-*** ./postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
---- ./postdrop/postdrop.c Thu Jun 1 22:44:22 2000
+*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
+--- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000
***************
*** 39,41 ****
/* /var/spool/postfix, mail queue
diff --git a/mail/postfix21/files/patch-eg b/mail/postfix21/files/patch-eg
index 28950509870c..2983bbfd86ea 100644
--- a/mail/postfix21/files/patch-eg
+++ b/mail/postfix21/files/patch-eg
@@ -1,34 +1,20 @@
---- sendmail/sendmail.c.orig Sun Mar 26 22:51:33 2000
-+++ sendmail/sendmail.c Wed Dec 20 18:17:31 2000
-@@ -55,10 +55,12 @@
- /* \fBjust-send-eight\fR.
- /* .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
--/* files are kept in \fB/etc/postfix\fR.
-+/* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- /* .IP "\fB-F \fIfull_name\fR
- /* Set the sender full name. This is used only with messages that
- /* have no \fBFrom:\fR message header.
-+/* .IP "\fB-G \fR (ignored)"
-+/* Gateway (relay) submission, as opposed to initial user submission.
- /* .IP \fB-I\fR
- /* Initialize alias database. See the \fBnewaliases\fR
- /* command above.
-@@ -157,7 +159,7 @@
- /* \fBdebugger_command\fR configuration parameter.
- /* FILES
- /* /var/spool/postfix, mail queue
--/* /etc/postfix, configuration files
-+/* !!PREFIX!!/etc/postfix, configuration files
- /* CONFIGURATION PARAMETERS
- /* .ad
- /* .fi
-@@ -710,6 +712,8 @@
- break;
- case 'F': /* full name */
- full_name = optarg;
-+ break;
-+ case 'G': /* gateway submission */
- break;
- case 'I': /* newaliases */
- mode = SM_MODE_NEWALIAS;
+*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000
+--- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000
+***************
+*** 57,59 ****
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+--- 57,59 ----
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+***************
+*** 159,161 ****
+ /* /var/spool/postfix, mail queue
+! /* /etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
+--- 159,161 ----
+ /* /var/spool/postfix, mail queue
+! /* !!PREFIX!!/etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix21/files/patch-eh b/mail/postfix21/files/patch-eh
index f95b51423128..c104c3680d21 100644
--- a/mail/postfix21/files/patch-eh
+++ b/mail/postfix21/files/patch-eh
@@ -1,5 +1,5 @@
-*** ./trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
---- ./trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
+*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
+--- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
***************
*** 32,34 ****
/* FILES
diff --git a/mail/postfix21/files/patch-ei b/mail/postfix21/files/patch-ei
new file mode 100644
index 000000000000..3029372b746e
--- /dev/null
+++ b/mail/postfix21/files/patch-ei
@@ -0,0 +1,21 @@
+*** ./src/smtpd/smtpd.h.orig Thu Sep 14 10:17:23 2000
+--- ./src/smtpd/smtpd.h Thu Sep 14 10:17:38 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix21/files/patch-ej b/mail/postfix21/files/patch-ej
new file mode 100644
index 000000000000..6c5cf2e23758
--- /dev/null
+++ b/mail/postfix21/files/patch-ej
@@ -0,0 +1,21 @@
+*** ./src/smtp/smtp.h.orig Thu Sep 14 13:04:43 2000
+--- ./src/smtp/smtp.h Thu Sep 14 13:04:53 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix21/files/patch-fa b/mail/postfix21/files/patch-fa
deleted file mode 100644
index bc1c2dc388c2..000000000000
--- a/mail/postfix21/files/patch-fa
+++ /dev/null
@@ -1,12 +0,0 @@
---- makedefs.orig Sun Jan 23 03:04:27 2000
-+++ makedefs Mon Apr 3 08:59:17 2000
-@@ -89,6 +89,8 @@
- ;;
- FreeBSD.4*) SYSTYPE=FREEBSD4
- ;;
-+ FreeBSD.5*) SYSTYPE=FREEBSD5
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- NetBSD.1*) SYSTYPE=NETBSD1
-
diff --git a/mail/postfix21/files/patch-fb b/mail/postfix21/files/patch-fb
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix21/files/patch-fb
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
- * makedefs script, and adding a section below for the new system.
- */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+ || defined(FREEBSD5) \
- || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
- || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix21/files/patch-ga b/mail/postfix21/files/patch-ga
index 3ad7120b8322..60a6dd578564 100644
--- a/mail/postfix21/files/patch-ga
+++ b/mail/postfix21/files/patch-ga
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_MYSQL" option at compile time ("make -DWITH_MYSQL").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
[Code contributed by Scott Cotton and Joshua Marcus, IC Group, Inc.]
diff --git a/mail/postfix21/files/patch-gb b/mail/postfix21/files/patch-gb
index 312c8c60f9e5..98816d155122 100644
--- a/mail/postfix21/files/patch-gb
+++ b/mail/postfix21/files/patch-gb
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_LDAP" option at compile time ("make -DWITH_LDAP").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
BUILDING WITH LDAP SUPPORT
==========================
diff --git a/mail/postfix21/files/patch-lmtp.h b/mail/postfix21/files/patch-lmtp.h
new file mode 100644
index 000000000000..3d941c034198
--- /dev/null
+++ b/mail/postfix21/files/patch-lmtp.h
@@ -0,0 +1,13 @@
+--- ./src/lmtp/lmtp.h.orig Fri Jan 19 15:43:06 2001
++++ ./src/lmtp/lmtp.h Sat Feb 3 14:01:09 2001
+@@ -12,8 +12,8 @@
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+-#include <sasl.h>
+-#include <saslutil.h>
++#include <sasl/sasl.h>
++#include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix21/pkg-install b/mail/postfix21/pkg-install
index 933c669e6b98..0d18b67ddee3 100644
--- a/mail/postfix21/pkg-install
+++ b/mail/postfix21/pkg-install
@@ -1,4 +1,9 @@
#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
user=postfix
group=postfix
@@ -87,6 +92,5 @@ if [ x"$2" = xPOST-INSTALL ]; then
fi
/usr/sbin/chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
/bin/chmod 2555 ${PKG_PREFIX}/sbin/postdrop
- /bin/mkdir -p /var/spool/postfix
${PKG_PREFIX}/sbin/postfix check
fi
diff --git a/mail/postfix21/pkg-plist b/mail/postfix21/pkg-plist
index 5f8572883b4c..97167cb8ed15 100644
--- a/mail/postfix21/pkg-plist
+++ b/mail/postfix21/pkg-plist
@@ -5,24 +5,29 @@ etc/postfix/postfix-script
etc/postfix/sample-access
etc/postfix/sample-aliases
etc/postfix/sample-aliases.cf
+%%SUB_SASL%%etc/postfix/sample-auth.cf
etc/postfix/sample-canonical
etc/postfix/sample-canonical.cf
etc/postfix/sample-debug.cf
etc/postfix/sample-filter.cf
-%%WITH_LDAP%%etc/postfix/sample-ldap.cf
+etc/postfix/sample-flush.cf
+%%SUB_LDAP%%etc/postfix/sample-ldap.cf
etc/postfix/sample-local.cf
etc/postfix/sample-main.cf
etc/postfix/sample-master.cf
etc/postfix/sample-misc.cf
-%%WITH_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre_table
etc/postfix/sample-rate.cf
etc/postfix/sample-regexp.cf
+etc/postfix/sample-regexp_table
etc/postfix/sample-relocated
etc/postfix/sample-relocated.cf
etc/postfix/sample-resource.cf
etc/postfix/sample-rewrite.cf
etc/postfix/sample-smtp.cf
etc/postfix/sample-smtpd.cf
+%%SUB_TLS%%etc/postfix/sample-tls.cf
etc/postfix/sample-transport
etc/postfix/sample-transport.cf
etc/postfix/sample-virtual
@@ -30,6 +35,8 @@ etc/postfix/sample-virtual.cf
libexec/postfix/bounce
libexec/postfix/cleanup
libexec/postfix/error
+libexec/postfix/flush
+libexec/postfix/lmtp
libexec/postfix/local
libexec/postfix/master
libexec/postfix/pickup
@@ -38,6 +45,8 @@ libexec/postfix/qmgr
libexec/postfix/showq
libexec/postfix/smtp
libexec/postfix/smtpd
+libexec/postfix/spawn
+%%SUB_TLS%%libexec/postfix/tlsmgr
libexec/postfix/trivial-rewrite
sbin/postalias
sbin/postcat
@@ -50,62 +59,66 @@ sbin/postlog
sbin/postmap
sbin/postsuper
sbin/sendmail
-share/doc/postfix/LDAP_README
-share/doc/postfix/MYSQL_README
-share/doc/postfix/html/access.5.html
-share/doc/postfix/html/aliases.5.html
-share/doc/postfix/html/architecture.html
-share/doc/postfix/html/backstage.html
-share/doc/postfix/html/basic.html
-share/doc/postfix/html/big-picture.gif
-share/doc/postfix/html/big-picture.html
-share/doc/postfix/html/bounce.8.html
-share/doc/postfix/html/canonical.5.html
-share/doc/postfix/html/cleanup.8.html
-share/doc/postfix/html/commands.html
-share/doc/postfix/html/defer.8.html
-share/doc/postfix/html/delivering.html
-share/doc/postfix/html/error.8.html
-share/doc/postfix/html/faq.html
-share/doc/postfix/html/goals.html
-share/doc/postfix/html/inbound.gif
-share/doc/postfix/html/index.html
-share/doc/postfix/html/local.8.html
-share/doc/postfix/html/mailq.1.html
-share/doc/postfix/html/master.8.html
-share/doc/postfix/html/motivation.html
-share/doc/postfix/html/newaliases.1.html
-share/doc/postfix/html/outbound.gif
-share/doc/postfix/html/pickup.8.html
-share/doc/postfix/html/pipe.8.html
-share/doc/postfix/html/postalias.1.html
-share/doc/postfix/html/postcat.1.html
-share/doc/postfix/html/postconf.1.html
-share/doc/postfix/html/postdrop.1.html
-share/doc/postfix/html/postfix.1.html
-share/doc/postfix/html/postkick.1.html
-share/doc/postfix/html/postlock.1.html
-share/doc/postfix/html/postlog.1.html
-share/doc/postfix/html/postmap.1.html
-share/doc/postfix/html/postsuper.1.html
-share/doc/postfix/html/qmgr.8.html
-share/doc/postfix/html/queuing.html
-share/doc/postfix/html/rate.html
-share/doc/postfix/html/receiving.html
-share/doc/postfix/html/relocated.5.html
-share/doc/postfix/html/resource.html
-share/doc/postfix/html/rewrite.html
-share/doc/postfix/html/security.html
-share/doc/postfix/html/sendmail.1.html
-share/doc/postfix/html/showq.8.html
-share/doc/postfix/html/small-picture.gif
-share/doc/postfix/html/smtp.8.html
-share/doc/postfix/html/smtpd.8.html
-share/doc/postfix/html/transport.5.html
-share/doc/postfix/html/trivial-rewrite.8.html
-share/doc/postfix/html/uce.html
-share/doc/postfix/html/virtual.5.html
-@dirrm etc/postfix
+%%SUB_TEST%%sbin/smtp-sink
+%%SUB_TEST%%sbin/smtp-source
+%%SUB_DOCS%%share/doc/postfix/access.5.html
+%%SUB_DOCS%%share/doc/postfix/aliases.5.html
+%%SUB_DOCS%%share/doc/postfix/architecture.html
+%%SUB_DOCS%%share/doc/postfix/backstage.html
+%%SUB_DOCS%%share/doc/postfix/basic.html
+%%SUB_DOCS%%share/doc/postfix/big-picture.gif
+%%SUB_DOCS%%share/doc/postfix/big-picture.html
+%%SUB_DOCS%%share/doc/postfix/bounce.8.html
+%%SUB_DOCS%%share/doc/postfix/canonical.5.html
+%%SUB_DOCS%%share/doc/postfix/cleanup.8.html
+%%SUB_DOCS%%share/doc/postfix/commands.html
+%%SUB_DOCS%%share/doc/postfix/defer.8.html
+%%SUB_DOCS%%share/doc/postfix/delivering.html
+%%SUB_DOCS%%share/doc/postfix/error.8.html
+%%SUB_DOCS%%share/doc/postfix/faq.html
+%%SUB_DOCS%%share/doc/postfix/flush.8.html
+%%SUB_DOCS%%share/doc/postfix/goals.html
+%%SUB_DOCS%%share/doc/postfix/inbound.gif
+%%SUB_DOCS%%share/doc/postfix/index.html
+%%SUB_DOCS%%share/doc/postfix/lmtp.8.html
+%%SUB_DOCS%%share/doc/postfix/local.8.html
+%%SUB_DOCS%%share/doc/postfix/mailq.1.html
+%%SUB_DOCS%%share/doc/postfix/master.8.html
+%%SUB_DOCS%%share/doc/postfix/motivation.html
+%%SUB_DOCS%%share/doc/postfix/newaliases.1.html
+%%SUB_DOCS%%share/doc/postfix/outbound.gif
+%%SUB_DOCS%%share/doc/postfix/pcre_table.5.html
+%%SUB_DOCS%%share/doc/postfix/pickup.8.html
+%%SUB_DOCS%%share/doc/postfix/pipe.8.html
+%%SUB_DOCS%%share/doc/postfix/postalias.1.html
+%%SUB_DOCS%%share/doc/postfix/postcat.1.html
+%%SUB_DOCS%%share/doc/postfix/postconf.1.html
+%%SUB_DOCS%%share/doc/postfix/postdrop.1.html
+%%SUB_DOCS%%share/doc/postfix/postfix.1.html
+%%SUB_DOCS%%share/doc/postfix/postkick.1.html
+%%SUB_DOCS%%share/doc/postfix/postlock.1.html
+%%SUB_DOCS%%share/doc/postfix/postlog.1.html
+%%SUB_DOCS%%share/doc/postfix/postmap.1.html
+%%SUB_DOCS%%share/doc/postfix/postsuper.1.html
+%%SUB_DOCS%%share/doc/postfix/qmgr.8.html
+%%SUB_DOCS%%share/doc/postfix/queuing.html
+%%SUB_DOCS%%share/doc/postfix/rate.html
+%%SUB_DOCS%%share/doc/postfix/receiving.html
+%%SUB_DOCS%%share/doc/postfix/regexp_table.5.html
+%%SUB_DOCS%%share/doc/postfix/relocated.5.html
+%%SUB_DOCS%%share/doc/postfix/resource.html
+%%SUB_DOCS%%share/doc/postfix/rewrite.html
+%%SUB_DOCS%%share/doc/postfix/security.html
+%%SUB_DOCS%%share/doc/postfix/sendmail.1.html
+%%SUB_DOCS%%share/doc/postfix/showq.8.html
+%%SUB_DOCS%%share/doc/postfix/small-picture.gif
+%%SUB_DOCS%%share/doc/postfix/smtp.8.html
+%%SUB_DOCS%%share/doc/postfix/smtpd.8.html
+%%SUB_DOCS%%share/doc/postfix/spawn.8.html
+%%SUB_DOCS%%share/doc/postfix/transport.5.html
+%%SUB_DOCS%%share/doc/postfix/trivial-rewrite.8.html
+%%SUB_DOCS%%share/doc/postfix/uce.html
+%%SUB_DOCS%%share/doc/postfix/virtual.5.html
+%%SUB_DOCS%%@dirrm share/doc/postfix
@dirrm libexec/postfix
-@dirrm share/doc/postfix/html
-@dirrm share/doc/postfix
+@dirrm etc/postfix
diff --git a/mail/postfix21/scripts/configure.postfix b/mail/postfix21/scripts/configure.postfix
new file mode 100644
index 000000000000..dfb8804b3cd7
--- /dev/null
+++ b/mail/postfix21/scripts/configure.postfix
@@ -0,0 +1,129 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.1 2001-03-04 19:35:00 sf Exp $
+
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
+ exit
+fi
+
+tempfile=`mktemp -t checklist`
+
+if [ "${BATCH}" = "yes" ]; then
+ set \"PCRE\"
+else
+ /usr/bin/dialog --title "Postfix configuration options" --clear \
+ --checklist "\n\
+Please select desired options:" -1 -1 16 \
+PCRE "Perl Compatible Regular Expressions" OFF \
+SASL "Cyrus SASL (Simple Authentication and Security Layer)" OFF \
+DB3 "Berkeley DB3 (required if SASL also built with DB3)" OFF \
+MySQL "MySQL map lookups" OFF \
+OpenLDAP "OpenLDAP map lookups" OFF \
+Test "SMTP/LMTP test server and generator" OFF \
+TLS "Secure Sockets Layer and Transport Layer Security" OFF \
+IPv6 "IPv6 support" OFF \
+2> $tempfile
+
+ retval=$?
+
+ if [ -s $tempfile ]; then
+ set `cat $tempfile`
+ fi
+ rm -f $tempfile
+
+ case $retval in
+ 0) if [ -z "$*" ]; then
+ echo "Nothing selected"
+ fi
+ ;;
+ 1) echo "Cancel pressed."
+ exit 1
+ ;;
+ esac
+fi
+
+${MKDIR} ${WRKDIRPREFIX}${CURDIR}
+exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+
+echo "PREFIX= ${PREFIX}"
+
+SUB_PCRE="@comment "
+SUB_SASL="@comment "
+SUB_TLS="@comment "
+SUB_LDAP="@comment "
+SUB_TEST="@comment "
+
+while [ "$1" ]; do
+ case $1 in
+ \"PCRE\")
+ echo "CONF1+= pcre_table"
+ echo "CONF2+= sample-pcre.cf"
+ echo "MAN5+= pcre_table.5"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre"
+ echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a"
+ SUB_PCRE=""
+ ;;
+ \"SASL\")
+ echo "CONF2+= sample-auth.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl"
+ echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -lpam -lcrypt"
+ echo ".if exists(/usr/lib/libkrb.a)"
+ echo "POSTFIX_AUXLIBS+= -lkrb -ldes -lcom_err"
+ echo ".endif"
+ SUB_SASL=""
+ ;;
+ \"TLS\")
+ echo "CONF2+= sample-tls.cf"
+ echo "BIN1+= tlsmgr"
+ echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl"
+ echo "POSTFIX_AUXLIBS+= -lssl -lcrypto"
+ echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.7.0-20010228-0.9.6.tar.gz"
+ echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.7.0-20010228-0.9.6/pfixtls.diff"
+ echo "PATCH_STRIP= -p1"
+ SUB_TLS=""
+ ;;
+ \"DB3\")
+ echo "LIB_DEPENDS+= db3.1:\${PORTSDIR}/databases/db3"
+ echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3"
+ echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3"
+ ;;
+ \"MySQL\")
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
+ echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
+ ;;
+ \"OpenLDAP\")
+ echo "CONF2+= sample-ldap.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
+ echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
+ SUB_LDAP=""
+ ;;
+ \"Test\")
+ echo "BIN3= smtp-sink smtp-source"
+ SUB_TEST=""
+ ;;
+ \"IPv6\")
+ echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/"
+ echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}"
+ echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz"
+ echo ""
+ echo "pre-patch:"
+ echo " cd \${WRKSRC} && ln -s . postfix"
+ echo ""
+ ;;
+ *)
+ echo "Invalid option(s): $*" > /dev/stderr
+ rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+echo "PLIST_SUB+= SUB_PCRE=\"${SUB_PCRE}\""
+echo "PLIST_SUB+= SUB_SASL=\"${SUB_SASL}\""
+echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\""
+echo "PLIST_SUB+= SUB_LDAP=\"${SUB_LDAP}\""
+echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
index 839c9f1819ad..9c4068489960 100644
--- a/mail/postfix22/Makefile
+++ b/mail/postfix22/Makefile
@@ -1,90 +1,82 @@
# New ports collection makefile for: postfix
-# Date created: 18 Mar 1999
+# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
PORTNAME= postfix
-PORTVERSION= 19991231.13
-PORTREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
+PORTVERSION= 20010228
+CATEGORIES= mail ipv6
+MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
+ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
ftp://ftp.tux.org/pub/net/postfix/official/ \
ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
ftp://ftp.samurai.com/pub/postfix/official/ \
- ftp://ftp.nl.uu.net/pub/unix/mail/postfix/official/ \
- ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
- ftp://ftp.mira.net/pub/unix/mail/postfix/official/ \
- ftp://coda.nctu.edu.tw/network/mail/postfix/official/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-DISTNAME= ${PORTNAME}-19991231-pl13
+MASTER_SITE_SUBDIR= . old related/postfix
+DISTNAME= release-${PORTVERSION}
MAINTAINER= blaz@amis.net
-.if !defined(DEBUG)
-MAKEFILEFLAGS+= DEBUG=
-.endif
-
-.if defined(CC)
-MAKEFILEFLAGS+= CC="${CC}"
-.endif
-
-MAKEFILEFLAGS+= OPT="${CFLAGS}"
-SCRIPTS_ENV+= MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-
MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
sendmail.1
-MAN5= access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
+MAN5= access.5 aliases.5 canonical.5 regexp_table.5 relocated.5 \
+ transport.5 virtual.5
-MAN8= bounce.8 cleanup.8 defer.8 error.8 local.8 master.8 pickup.8 \
- pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 trivial-rewrite.8
+MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
+ master.8 pickup.8 pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 \
+ spawn.8 trivial-rewrite.8
CONF1= access aliases canonical main.cf master.cf \
- relocated transport virtual
+ regexp_table relocated transport virtual
CONF2= sample-aliases.cf sample-canonical.cf sample-debug.cf \
- sample-filter.cf sample-local.cf sample-misc.cf \
+ sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
sample-rate.cf sample-regexp.cf sample-relocated.cf \
sample-resource.cf sample-rewrite.cf sample-smtp.cf \
sample-smtpd.cf sample-transport.cf sample-virtual.cf
-BIN1= bounce cleanup error local master pickup \
- pipe qmgr showq smtp smtpd trivial-rewrite
+BIN1= bounce cleanup error flush lmtp local master pickup \
+ pipe qmgr showq smtp smtpd spawn trivial-rewrite
BIN2= postalias postcat postconf postdrop postfix \
postkick postlock postlog postmap postsuper sendmail
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
-POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz
+.if defined(NOPORTDOCS)
+PLIST_SUB+= SUB_DOCS="@comment "
+.else
+PLIST_SUB+= SUB_DOCS=""
+DOCDIR= ${PREFIX}/share/doc/postfix
.endif
-.if defined(WITH_LDAP)
-CONF2+= sample-ldap.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-PLIST_SUB+= WITH_LDAP=""
-.else
-PLIST_SUB+= WITH_LDAP="@comment "
+.if !defined(DEBUG)
+MAKEFILEFLAGS+= DEBUG=
.endif
-.if defined(WITH_PCRE)
-CONF2+= sample-pcre.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libpcre.a
-PLIST_SUB+= WITH_PCRE=""
-.else
-PLIST_SUB+= WITH_PCRE="@comment "
+.if defined(CC)
+MAKEFILEFLAGS+= CC="${CC}"
+.endif
+
+MAKEFILEFLAGS+= OPT="${CFLAGS}"
+
+SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
+ PREFIX="${PREFIX}" \
+ TOUCH="${TOUCH}" \
+ MKDIR="${MKDIR}" \
+ MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
+
+pre-fetch:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
post-patch:
- (cd ${WRKSRC} && make -f Makefile.init makefiles ${MAKEFILEFLAGS} \
+ (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
${ECHO} "all: default" >> Makefile)
@@ -122,7 +114,13 @@ do-install:
.for file in ${BIN2}
@${INSTALL_PROGRAM} \
- ${WRKSRC}/${file}/${file} \
+ ${WRKSRC}/src/${file}/${file} \
+ ${PREFIX}/sbin
+.endfor
+
+.for file in ${BIN3}
+ @${INSTALL_PROGRAM} \
+ ${WRKSRC}/src/smtpstone/${file} \
${PREFIX}/sbin
.endfor
@@ -145,11 +143,9 @@ do-install:
.endfor
.if !defined(NOPORTDOCS)
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix
- @cd ${WRKSRC} && ${INSTALL_DATA} LDAP_README MYSQL_README ${PREFIX}/share/doc/postfix
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix/html
- @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${PREFIX}/share/doc/postfix/html && \
- ${ECHO_MSG} "Installed documentation in ${PREFIX}/share/doc/postfix"
+ @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCDIR}
+ @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCDIR} && \
+ ${ECHO_MSG} "Installed HTML documentation in ${DOCDIR}"
.endif
@${ECHO_MSG} '--------------------------------------------------'
@@ -160,6 +156,9 @@ do-install:
post-install:
@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+post-clean:
+ @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
.include <bsd.port.pre.mk>
replace:
@@ -170,10 +169,10 @@ replace:
${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
${ECHO} "#" >> /etc/mail/mailer.conf
- ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
+ ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
.else
@${ECHO_MSG} "===> Replacing sendmail"
@if [ -e /usr/sbin/sendmail ]; then \
diff --git a/mail/postfix22/distinfo b/mail/postfix22/distinfo
index 854fffa3294c..d6f4fd5c198a 100644
--- a/mail/postfix22/distinfo
+++ b/mail/postfix22/distinfo
@@ -1 +1,3 @@
-MD5 (postfix-19991231-pl13.tar.gz) = f119438aae0aa1346953ae326864da9e
+MD5 (release-20010228.tar.gz) = 6af46cc231ca1e09e60393542d5611bd
+MD5 (pfixtls-0.7.0-20010228-0.9.6.tar.gz) = 64699fb4f0bb4dc87ba1c6c7aef81366
+MD5 (postfix-20010225snap-v6-20010228a.diff.gz) = 8646724c2d00e4d162b63456247cf4fb
diff --git a/mail/postfix22/files/patch-ab b/mail/postfix22/files/patch-ab
index d705b8a7f594..7c81d3dc12c9 100644
--- a/mail/postfix22/files/patch-ab
+++ b/mail/postfix22/files/patch-ab
@@ -1,11 +1,11 @@
---- conf/canonical.orig Sun Sep 5 23:47:01 1999
-+++ conf/canonical Tue Nov 7 22:24:42 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix canonical table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/canonical\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- # DESCRIPTION
- # The optional \fBcanonical\fR file specifies an address mapping for
- # local and non-local addresses. The mapping is used by the
+*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000
+--- ./conf/canonical Thu Jun 1 21:53:23 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/canonical
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/canonical
+ #
diff --git a/mail/postfix22/files/patch-ac b/mail/postfix22/files/patch-ac
index 264335cb70fa..0fb2192cdd84 100644
--- a/mail/postfix22/files/patch-ac
+++ b/mail/postfix22/files/patch-ac
@@ -1,11 +1,11 @@
---- conf/access.orig Fri Dec 11 19:55:48 1998
-+++ conf/access Tue Nov 7 22:25:54 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix access table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/access\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/access\fR
- # DESCRIPTION
- # The optional \fBaccess\fR table directs the Postfix SMTP server
- # to selectively reject or accept mail from or to specific hosts,
+*** ./conf/access.orig Tue Mar 7 10:42:58 2000
+--- ./conf/access Thu Jun 1 21:53:36 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/access
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/access
+ #
diff --git a/mail/postfix22/files/patch-ad b/mail/postfix22/files/patch-ad
new file mode 100644
index 000000000000..c1b102574165
--- /dev/null
+++ b/mail/postfix22/files/patch-ad
@@ -0,0 +1,11 @@
+*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/pcre_table Thu Jun 1 22:02:08 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix22/files/patch-ae b/mail/postfix22/files/patch-ae
new file mode 100644
index 000000000000..e396dd8626db
--- /dev/null
+++ b/mail/postfix22/files/patch-ae
@@ -0,0 +1,11 @@
+*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/regexp_table Thu Jun 1 22:03:27 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix22/files/patch-af b/mail/postfix22/files/patch-af
index ec92981276c6..8fca6b208941 100644
--- a/mail/postfix22/files/patch-af
+++ b/mail/postfix22/files/patch-af
@@ -1,11 +1,11 @@
---- conf/relocated.orig Sun Sep 5 23:47:01 1999
-+++ conf/relocated Tue Nov 7 22:28:27 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix relocated table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/relocated\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- # DESCRIPTION
- # The optional \fBrelocated\fR file provides the information that is
- # used in "user has moved to \fInew_location\fR" bounce messages.
+*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000
+--- ./conf/relocated Thu Jun 1 22:03:59 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/relocated
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/relocated
+ #
diff --git a/mail/postfix22/files/patch-ag b/mail/postfix22/files/patch-ag
new file mode 100644
index 000000000000..54c0fa918d3b
--- /dev/null
+++ b/mail/postfix22/files/patch-ag
@@ -0,0 +1,15 @@
+*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000
+--- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000
+***************
+*** 91,95 ****
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in /etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:/etc/postfix/saslpass
+
+--- 91,95 ----
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass
+
diff --git a/mail/postfix22/files/patch-ao b/mail/postfix22/files/patch-ao
index 206c152728da..fd854e181601 100644
--- a/mail/postfix22/files/patch-ao
+++ b/mail/postfix22/files/patch-ao
@@ -1,11 +1,11 @@
---- conf/transport.orig Fri Dec 31 20:54:11 1999
-+++ conf/transport Tue Nov 7 22:46:59 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix transport table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/transport\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- # DESCRIPTION
- # The optional \fBtransport\fR file specifies a mapping from domain
- # hierarchies to message delivery transports and/or relay hosts. The
+*** ./conf/transport.orig Tue Mar 7 10:42:58 2000
+--- ./conf/transport Thu Jun 1 22:13:41 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/transport
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/transport
+ #
diff --git a/mail/postfix22/files/patch-ap b/mail/postfix22/files/patch-ap
index b412ce386f8d..4598192cd5c1 100644
--- a/mail/postfix22/files/patch-ap
+++ b/mail/postfix22/files/patch-ap
@@ -1,11 +1,11 @@
---- conf/virtual.orig Tue Dec 21 03:00:13 1999
-+++ conf/virtual Tue Nov 7 22:48:18 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix virtual table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/virtual\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- # DESCRIPTION
- # The optional \fBvirtual\fR table specifies redirections for local
- # and non-local recipients or domains. The redirections are used by
+*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000
+--- ./conf/virtual Thu Jun 1 22:13:54 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/virtual
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/virtual
+ #
diff --git a/mail/postfix22/files/patch-bb b/mail/postfix22/files/patch-bb
index 6444bc0d1f75..ea744664dfa7 100644
--- a/mail/postfix22/files/patch-bb
+++ b/mail/postfix22/files/patch-bb
@@ -1,11 +1,20 @@
---- html/access.5.html.orig Fri Dec 11 19:55:49 1998
-+++ html/access.5.html Tue Nov 7 22:48:47 2000
+--- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000
++++ ./html/access.5.html Tue Nov 21 21:24:34 2000
@@ -9,7 +9,7 @@
access - format of Postfix access table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/access</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b>
-
+
<b>DESCRIPTION</b>
The optional <b>access</b> table directs the Postfix SMTP server
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the
+ indexed file after changing the access table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix22/files/patch-bc b/mail/postfix22/files/patch-bc
index 4d24077b9527..e407a9650585 100644
--- a/mail/postfix22/files/patch-bc
+++ b/mail/postfix22/files/patch-bc
@@ -1,11 +1,20 @@
---- html/canonical.5.html.orig Mon Sep 6 05:13:54 1999
-+++ html/canonical.5.html Tue Nov 7 22:51:05 2000
+--- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000
++++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000
@@ -9,7 +9,7 @@
canonical - format of Postfix canonical table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/canonical</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>canonical</b> file specifies an address mapping
+ The optional <b>canonical</b> table specifies an address mapping
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix22/files/patch-bl b/mail/postfix22/files/patch-bl
new file mode 100644
index 000000000000..176c7d1b64de
--- /dev/null
+++ b/mail/postfix22/files/patch-bl
@@ -0,0 +1,11 @@
+*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000
+--- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000
+***************
+*** 11,13 ****
+ <b>SYNOPSIS</b>
+! regexp:/etc/postfix/filename
+
+--- 11,13 ----
+ <b>SYNOPSIS</b>
+! regexp:!!PREFIX!!/etc/postfix/filename
+
diff --git a/mail/postfix22/files/patch-bm b/mail/postfix22/files/patch-bm
index bc9479bea2fe..e5ccc2c50b94 100644
--- a/mail/postfix22/files/patch-bm
+++ b/mail/postfix22/files/patch-bm
@@ -1,11 +1,20 @@
---- html/relocated.5.html.orig Mon Sep 6 05:13:55 1999
-+++ html/relocated.5.html Tue Nov 7 22:52:46 2000
+--- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000
++++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000
@@ -9,7 +9,7 @@
relocated - format of Postfix relocated table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/relocated</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>relocated</b> file provides the information that
+ The optional <b>relocated</b> table provides the information that
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the
+ indexed file after changing the relocated table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix22/files/patch-bo b/mail/postfix22/files/patch-bo
index 41cbc4ca6d65..b45270be8151 100644
--- a/mail/postfix22/files/patch-bo
+++ b/mail/postfix22/files/patch-bo
@@ -1,11 +1,20 @@
---- html/transport.5.html.orig Fri Dec 31 20:54:56 1999
-+++ html/transport.5.html Tue Nov 7 22:53:50 2000
+--- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000
++++ ./html/transport.5.html Tue Nov 21 21:43:20 2000
@@ -9,7 +9,7 @@
transport - format of Postfix transport table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/transport</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>transport</b> file specifies a mapping from
+ The optional <b>transport</b> table specifies a mapping from
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the
+ indexed file after changing the transport table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix22/files/patch-bp b/mail/postfix22/files/patch-bp
index bb65bd98a7b8..5206bfd4bfd0 100644
--- a/mail/postfix22/files/patch-bp
+++ b/mail/postfix22/files/patch-bp
@@ -1,11 +1,43 @@
---- html/virtual.5.html.orig Tue Dec 21 03:00:58 1999
-+++ html/virtual.5.html Tue Nov 7 22:55:04 2000
+--- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000
++++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000
@@ -9,7 +9,7 @@
virtual - format of Postfix virtual table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/virtual</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>virtual</b> table specifies redirections for
+ The optional <b>virtual</b> table specifies address redirections
+@@ -27,7 +27,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
+@@ -52,7 +52,7 @@
+
+ Support for a Postfix-style virtual domain looks like:
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter)
+ <i>postmaster@virtual.domain</i> <i>postmaster</i>
+ <i>user1@virtual.domain</i> <i>address1</i>
+@@ -94,11 +94,11 @@
+
+ Support for a Sendmail-style virtual domain looks like:
+
+- /etc/postfix/main.cf:
++ !!PREFIX!!/etc/postfix/main.cf:
+ mydestination = $myhostname localhost.$mydomain $mydomain
+ <i>virtual.domain</i>
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>user1@virtual.domain</i> <i>address1</i>
+ <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i>
+
diff --git a/mail/postfix22/files/patch-cb b/mail/postfix22/files/patch-cb
index ef73429287d2..58559c7273d1 100644
--- a/mail/postfix22/files/patch-cb
+++ b/mail/postfix22/files/patch-cb
@@ -1,25 +1,20 @@
---- man/man1/sendmail.1.orig Thu Mar 30 17:46:10 2000
-+++ man/man1/sendmail.1 Wed Dec 20 18:37:45 2000
-@@ -61,10 +61,12 @@
- \fBjust-send-eight\fR.
- .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- The path name of the \fBsendmail.cf\fR file. Postfix configuration
--files are kept in \fB/etc/postfix\fR.
-+files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- .IP "\fB-F \fIfull_name\fR
- Set the sender full name. This is used only with messages that
- have no \fBFrom:\fR message header.
-+.IP "\fB-G\fR (ignored)"
-+Gateway (relay) submission, as opposed to initial user submission.
- .IP \fB-I\fR
- Initialize alias database. See the \fBnewaliases\fR
- command above.
-@@ -171,7 +173,7 @@
- .na
- .nf
- /var/spool/postfix, mail queue
--/etc/postfix, configuration files
-+!!PREFIX!!/etc/postfix, configuration files
- .SH CONFIGURATION PARAMETERS
- .na
- .nf
+*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000
+--- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000
+***************
+*** 63,65 ****
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+--- 63,65 ----
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+***************
+*** 173,175 ****
+ /var/spool/postfix, mail queue
+! /etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
+--- 173,175 ----
+ /var/spool/postfix, mail queue
+! !!PREFIX!!/etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
diff --git a/mail/postfix22/files/patch-cc b/mail/postfix22/files/patch-cc
new file mode 100644
index 000000000000..cd6946003217
--- /dev/null
+++ b/mail/postfix22/files/patch-cc
@@ -0,0 +1,11 @@
+*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000
+***************
+*** 10,12 ****
+ .nf
+! pcre:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! pcre:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix22/files/patch-cd b/mail/postfix22/files/patch-cd
index 36461a39bb49..b51de44d0bee 100644
--- a/mail/postfix22/files/patch-cd
+++ b/mail/postfix22/files/patch-cd
@@ -1,11 +1,20 @@
---- man/man5/access.5.orig Fri Dec 11 19:55:52 1998
-+++ man/man5/access.5 Tue Nov 7 22:56:25 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/access\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/access\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/access.5 Thu Jun 1 22:39:55 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/access\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
diff --git a/mail/postfix22/files/patch-ce b/mail/postfix22/files/patch-ce
index 0e0bd4aa1ae5..f77053f8b3aa 100644
--- a/mail/postfix22/files/patch-ce
+++ b/mail/postfix22/files/patch-ce
@@ -1,11 +1,20 @@
---- man/man5/canonical.5.orig Mon Sep 6 05:13:32 1999
-+++ man/man5/canonical.5 Tue Nov 7 22:57:40 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/canonical\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/canonical\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
diff --git a/mail/postfix22/files/patch-cf b/mail/postfix22/files/patch-cf
new file mode 100644
index 000000000000..28fb053b94a7
--- /dev/null
+++ b/mail/postfix22/files/patch-cf
@@ -0,0 +1,11 @@
+*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000
+***************
+*** 10,12 ****
+ .nf
+! regexp:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! regexp:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix22/files/patch-cg b/mail/postfix22/files/patch-cg
index cdce4aaddaf3..0ae82cc57669 100644
--- a/mail/postfix22/files/patch-cg
+++ b/mail/postfix22/files/patch-cg
@@ -1,11 +1,20 @@
---- man/man5/relocated.5.orig Mon Sep 6 05:13:33 1999
-+++ man/man5/relocated.5 Tue Nov 7 22:59:11 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/relocated\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/relocated\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ .SH DESCRIPTION
+***************
+*** 20,22 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
+--- 20,22 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
diff --git a/mail/postfix22/files/patch-ch b/mail/postfix22/files/patch-ch
index 80df028f9255..3ed047ea474c 100644
--- a/mail/postfix22/files/patch-ch
+++ b/mail/postfix22/files/patch-ch
@@ -1,11 +1,20 @@
---- man/man5/transport.5.orig Fri Dec 31 20:54:51 1999
-+++ man/man5/transport.5 Tue Nov 7 22:59:57 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/transport\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/transport\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
+--- 21,23 ----
+ for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
diff --git a/mail/postfix22/files/patch-ci b/mail/postfix22/files/patch-ci
index 889eed3f4d89..1a7cf4abbac7 100644
--- a/mail/postfix22/files/patch-ci
+++ b/mail/postfix22/files/patch-ci
@@ -1,11 +1,20 @@
---- man/man5/virtual.5.orig Tue Dec 21 03:00:51 1999
-+++ man/man5/virtual.5 Tue Nov 7 23:00:32 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/virtual\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/virtual\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ .SH DESCRIPTION
+***************
+*** 26,28 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
+--- 26,28 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
diff --git a/mail/postfix22/files/patch-da b/mail/postfix22/files/patch-da
new file mode 100644
index 000000000000..e57e31750d18
--- /dev/null
+++ b/mail/postfix22/files/patch-da
@@ -0,0 +1,11 @@
+*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000
+--- ./proto/regexp_table Thu Jun 1 22:44:43 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix22/files/patch-db b/mail/postfix22/files/patch-db
new file mode 100644
index 000000000000..7f89fb770783
--- /dev/null
+++ b/mail/postfix22/files/patch-db
@@ -0,0 +1,20 @@
+*** ./proto/access.orig Sun Apr 9 16:44:45 2000
+--- ./proto/access Thu Jun 1 22:45:05 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/access\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
diff --git a/mail/postfix22/files/patch-dc b/mail/postfix22/files/patch-dc
new file mode 100644
index 000000000000..786f2da45c32
--- /dev/null
+++ b/mail/postfix22/files/patch-dc
@@ -0,0 +1,20 @@
+*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000
+--- ./proto/canonical Thu Jun 1 22:45:28 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/canonical\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
diff --git a/mail/postfix22/files/patch-dd b/mail/postfix22/files/patch-dd
new file mode 100644
index 000000000000..b65a57ff7d57
--- /dev/null
+++ b/mail/postfix22/files/patch-dd
@@ -0,0 +1,11 @@
+*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000
+--- ./proto/pcre_table Thu Jun 1 22:45:41 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix22/files/patch-de b/mail/postfix22/files/patch-de
new file mode 100644
index 000000000000..73bb2af2261d
--- /dev/null
+++ b/mail/postfix22/files/patch-de
@@ -0,0 +1,20 @@
+*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000
+--- ./proto/relocated Thu Jun 1 22:46:02 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/relocated\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ # DESCRIPTION
+***************
+*** 14,16 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
+--- 14,16 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
diff --git a/mail/postfix22/files/patch-df b/mail/postfix22/files/patch-df
new file mode 100644
index 000000000000..8d3fba96a224
--- /dev/null
+++ b/mail/postfix22/files/patch-df
@@ -0,0 +1,20 @@
+*** ./proto/transport.orig Sun Apr 9 17:05:45 2000
+--- ./proto/transport Thu Jun 1 22:46:23 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/transport\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
+--- 15,17 ----
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
diff --git a/mail/postfix22/files/patch-dg b/mail/postfix22/files/patch-dg
new file mode 100644
index 000000000000..bff20a2cff3e
--- /dev/null
+++ b/mail/postfix22/files/patch-dg
@@ -0,0 +1,20 @@
+*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000
+--- ./proto/virtual Thu Jun 1 22:46:40 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/virtual\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ # DESCRIPTION
+***************
+*** 20,22 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
+--- 20,22 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
diff --git a/mail/postfix22/files/patch-ea b/mail/postfix22/files/patch-ea
index 80647e0b2ba0..6c3f98d2af4f 100644
--- a/mail/postfix22/files/patch-ea
+++ b/mail/postfix22/files/patch-ea
@@ -1,5 +1,5 @@
-*** ./cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
---- ./cleanup/cleanup.c Thu Jun 1 21:52:22 2000
+*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
+--- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000
***************
*** 118,121 ****
/* FILES
diff --git a/mail/postfix22/files/patch-eb b/mail/postfix22/files/patch-eb
index d576de434580..e67680963d2d 100644
--- a/mail/postfix22/files/patch-eb
+++ b/mail/postfix22/files/patch-eb
@@ -1,5 +1,5 @@
-*** ./global/mail_conf.c.orig Sun May 7 18:51:16 2000
---- ./global/mail_conf.c Thu Jun 1 22:16:29 2000
+*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000
+--- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000
***************
*** 53,55 ****
/* FILES
diff --git a/mail/postfix22/files/patch-ec b/mail/postfix22/files/patch-ec
index 74edda76007b..6d12d1ce4c17 100644
--- a/mail/postfix22/files/patch-ec
+++ b/mail/postfix22/files/patch-ec
@@ -1,5 +1,5 @@
-*** ./global/mail_params.h.orig Wed May 31 19:18:31 2000
---- ./global/mail_params.h Thu Jun 1 22:17:10 2000
+*** ./src/global/mail_params.h.orig Wed May 31 19:18:31 2000
+--- ./src/global/mail_params.h Thu Jun 1 22:17:10 2000
***************
*** 155,157 ****
#ifndef DEF_PROGRAM_DIR
diff --git a/mail/postfix22/files/patch-ed b/mail/postfix22/files/patch-ed
index b573748b45e1..f971b62720d8 100644
--- a/mail/postfix22/files/patch-ed
+++ b/mail/postfix22/files/patch-ed
@@ -1,5 +1,5 @@
-*** ./local/mailbox.c.orig Fri Apr 28 16:55:53 2000
---- ./local/mailbox.c Thu Jun 1 22:37:48 2000
+*** ./src/local/mailbox.c.orig Fri Apr 28 16:55:53 2000
+--- ./src/local/mailbox.c Thu Jun 1 22:37:48 2000
***************
*** 15,17 ****
/* suppression. The default is direct mailbox delivery to
diff --git a/mail/postfix22/files/patch-ee b/mail/postfix22/files/patch-ee
index d79219b1ba62..ef44eac24b73 100644
--- a/mail/postfix22/files/patch-ee
+++ b/mail/postfix22/files/patch-ee
@@ -1,5 +1,5 @@
-*** ./master/master.c.orig Tue Mar 7 10:25:07 2000
---- ./master/master.c Thu Jun 1 22:43:50 2000
+*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000
+--- ./src/master/master.c Thu Jun 1 22:43:50 2000
***************
*** 104,107 ****
/* FILES
diff --git a/mail/postfix22/files/patch-ef b/mail/postfix22/files/patch-ef
index 44816a063b95..586b304a103d 100644
--- a/mail/postfix22/files/patch-ef
+++ b/mail/postfix22/files/patch-ef
@@ -1,5 +1,5 @@
-*** ./postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
---- ./postdrop/postdrop.c Thu Jun 1 22:44:22 2000
+*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
+--- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000
***************
*** 39,41 ****
/* /var/spool/postfix, mail queue
diff --git a/mail/postfix22/files/patch-eg b/mail/postfix22/files/patch-eg
index 28950509870c..2983bbfd86ea 100644
--- a/mail/postfix22/files/patch-eg
+++ b/mail/postfix22/files/patch-eg
@@ -1,34 +1,20 @@
---- sendmail/sendmail.c.orig Sun Mar 26 22:51:33 2000
-+++ sendmail/sendmail.c Wed Dec 20 18:17:31 2000
-@@ -55,10 +55,12 @@
- /* \fBjust-send-eight\fR.
- /* .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
--/* files are kept in \fB/etc/postfix\fR.
-+/* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- /* .IP "\fB-F \fIfull_name\fR
- /* Set the sender full name. This is used only with messages that
- /* have no \fBFrom:\fR message header.
-+/* .IP "\fB-G \fR (ignored)"
-+/* Gateway (relay) submission, as opposed to initial user submission.
- /* .IP \fB-I\fR
- /* Initialize alias database. See the \fBnewaliases\fR
- /* command above.
-@@ -157,7 +159,7 @@
- /* \fBdebugger_command\fR configuration parameter.
- /* FILES
- /* /var/spool/postfix, mail queue
--/* /etc/postfix, configuration files
-+/* !!PREFIX!!/etc/postfix, configuration files
- /* CONFIGURATION PARAMETERS
- /* .ad
- /* .fi
-@@ -710,6 +712,8 @@
- break;
- case 'F': /* full name */
- full_name = optarg;
-+ break;
-+ case 'G': /* gateway submission */
- break;
- case 'I': /* newaliases */
- mode = SM_MODE_NEWALIAS;
+*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000
+--- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000
+***************
+*** 57,59 ****
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+--- 57,59 ----
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+***************
+*** 159,161 ****
+ /* /var/spool/postfix, mail queue
+! /* /etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
+--- 159,161 ----
+ /* /var/spool/postfix, mail queue
+! /* !!PREFIX!!/etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix22/files/patch-eh b/mail/postfix22/files/patch-eh
index f95b51423128..c104c3680d21 100644
--- a/mail/postfix22/files/patch-eh
+++ b/mail/postfix22/files/patch-eh
@@ -1,5 +1,5 @@
-*** ./trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
---- ./trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
+*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
+--- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
***************
*** 32,34 ****
/* FILES
diff --git a/mail/postfix22/files/patch-ei b/mail/postfix22/files/patch-ei
new file mode 100644
index 000000000000..3029372b746e
--- /dev/null
+++ b/mail/postfix22/files/patch-ei
@@ -0,0 +1,21 @@
+*** ./src/smtpd/smtpd.h.orig Thu Sep 14 10:17:23 2000
+--- ./src/smtpd/smtpd.h Thu Sep 14 10:17:38 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix22/files/patch-ej b/mail/postfix22/files/patch-ej
new file mode 100644
index 000000000000..6c5cf2e23758
--- /dev/null
+++ b/mail/postfix22/files/patch-ej
@@ -0,0 +1,21 @@
+*** ./src/smtp/smtp.h.orig Thu Sep 14 13:04:43 2000
+--- ./src/smtp/smtp.h Thu Sep 14 13:04:53 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix22/files/patch-fa b/mail/postfix22/files/patch-fa
deleted file mode 100644
index bc1c2dc388c2..000000000000
--- a/mail/postfix22/files/patch-fa
+++ /dev/null
@@ -1,12 +0,0 @@
---- makedefs.orig Sun Jan 23 03:04:27 2000
-+++ makedefs Mon Apr 3 08:59:17 2000
-@@ -89,6 +89,8 @@
- ;;
- FreeBSD.4*) SYSTYPE=FREEBSD4
- ;;
-+ FreeBSD.5*) SYSTYPE=FREEBSD5
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- NetBSD.1*) SYSTYPE=NETBSD1
-
diff --git a/mail/postfix22/files/patch-fb b/mail/postfix22/files/patch-fb
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix22/files/patch-fb
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
- * makedefs script, and adding a section below for the new system.
- */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+ || defined(FREEBSD5) \
- || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
- || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix22/files/patch-ga b/mail/postfix22/files/patch-ga
index 3ad7120b8322..60a6dd578564 100644
--- a/mail/postfix22/files/patch-ga
+++ b/mail/postfix22/files/patch-ga
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_MYSQL" option at compile time ("make -DWITH_MYSQL").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
[Code contributed by Scott Cotton and Joshua Marcus, IC Group, Inc.]
diff --git a/mail/postfix22/files/patch-gb b/mail/postfix22/files/patch-gb
index 312c8c60f9e5..98816d155122 100644
--- a/mail/postfix22/files/patch-gb
+++ b/mail/postfix22/files/patch-gb
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_LDAP" option at compile time ("make -DWITH_LDAP").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
BUILDING WITH LDAP SUPPORT
==========================
diff --git a/mail/postfix22/files/patch-lmtp.h b/mail/postfix22/files/patch-lmtp.h
new file mode 100644
index 000000000000..3d941c034198
--- /dev/null
+++ b/mail/postfix22/files/patch-lmtp.h
@@ -0,0 +1,13 @@
+--- ./src/lmtp/lmtp.h.orig Fri Jan 19 15:43:06 2001
++++ ./src/lmtp/lmtp.h Sat Feb 3 14:01:09 2001
+@@ -12,8 +12,8 @@
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+-#include <sasl.h>
+-#include <saslutil.h>
++#include <sasl/sasl.h>
++#include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix22/pkg-install b/mail/postfix22/pkg-install
index 933c669e6b98..0d18b67ddee3 100644
--- a/mail/postfix22/pkg-install
+++ b/mail/postfix22/pkg-install
@@ -1,4 +1,9 @@
#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
user=postfix
group=postfix
@@ -87,6 +92,5 @@ if [ x"$2" = xPOST-INSTALL ]; then
fi
/usr/sbin/chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
/bin/chmod 2555 ${PKG_PREFIX}/sbin/postdrop
- /bin/mkdir -p /var/spool/postfix
${PKG_PREFIX}/sbin/postfix check
fi
diff --git a/mail/postfix22/pkg-plist b/mail/postfix22/pkg-plist
index 5f8572883b4c..97167cb8ed15 100644
--- a/mail/postfix22/pkg-plist
+++ b/mail/postfix22/pkg-plist
@@ -5,24 +5,29 @@ etc/postfix/postfix-script
etc/postfix/sample-access
etc/postfix/sample-aliases
etc/postfix/sample-aliases.cf
+%%SUB_SASL%%etc/postfix/sample-auth.cf
etc/postfix/sample-canonical
etc/postfix/sample-canonical.cf
etc/postfix/sample-debug.cf
etc/postfix/sample-filter.cf
-%%WITH_LDAP%%etc/postfix/sample-ldap.cf
+etc/postfix/sample-flush.cf
+%%SUB_LDAP%%etc/postfix/sample-ldap.cf
etc/postfix/sample-local.cf
etc/postfix/sample-main.cf
etc/postfix/sample-master.cf
etc/postfix/sample-misc.cf
-%%WITH_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre_table
etc/postfix/sample-rate.cf
etc/postfix/sample-regexp.cf
+etc/postfix/sample-regexp_table
etc/postfix/sample-relocated
etc/postfix/sample-relocated.cf
etc/postfix/sample-resource.cf
etc/postfix/sample-rewrite.cf
etc/postfix/sample-smtp.cf
etc/postfix/sample-smtpd.cf
+%%SUB_TLS%%etc/postfix/sample-tls.cf
etc/postfix/sample-transport
etc/postfix/sample-transport.cf
etc/postfix/sample-virtual
@@ -30,6 +35,8 @@ etc/postfix/sample-virtual.cf
libexec/postfix/bounce
libexec/postfix/cleanup
libexec/postfix/error
+libexec/postfix/flush
+libexec/postfix/lmtp
libexec/postfix/local
libexec/postfix/master
libexec/postfix/pickup
@@ -38,6 +45,8 @@ libexec/postfix/qmgr
libexec/postfix/showq
libexec/postfix/smtp
libexec/postfix/smtpd
+libexec/postfix/spawn
+%%SUB_TLS%%libexec/postfix/tlsmgr
libexec/postfix/trivial-rewrite
sbin/postalias
sbin/postcat
@@ -50,62 +59,66 @@ sbin/postlog
sbin/postmap
sbin/postsuper
sbin/sendmail
-share/doc/postfix/LDAP_README
-share/doc/postfix/MYSQL_README
-share/doc/postfix/html/access.5.html
-share/doc/postfix/html/aliases.5.html
-share/doc/postfix/html/architecture.html
-share/doc/postfix/html/backstage.html
-share/doc/postfix/html/basic.html
-share/doc/postfix/html/big-picture.gif
-share/doc/postfix/html/big-picture.html
-share/doc/postfix/html/bounce.8.html
-share/doc/postfix/html/canonical.5.html
-share/doc/postfix/html/cleanup.8.html
-share/doc/postfix/html/commands.html
-share/doc/postfix/html/defer.8.html
-share/doc/postfix/html/delivering.html
-share/doc/postfix/html/error.8.html
-share/doc/postfix/html/faq.html
-share/doc/postfix/html/goals.html
-share/doc/postfix/html/inbound.gif
-share/doc/postfix/html/index.html
-share/doc/postfix/html/local.8.html
-share/doc/postfix/html/mailq.1.html
-share/doc/postfix/html/master.8.html
-share/doc/postfix/html/motivation.html
-share/doc/postfix/html/newaliases.1.html
-share/doc/postfix/html/outbound.gif
-share/doc/postfix/html/pickup.8.html
-share/doc/postfix/html/pipe.8.html
-share/doc/postfix/html/postalias.1.html
-share/doc/postfix/html/postcat.1.html
-share/doc/postfix/html/postconf.1.html
-share/doc/postfix/html/postdrop.1.html
-share/doc/postfix/html/postfix.1.html
-share/doc/postfix/html/postkick.1.html
-share/doc/postfix/html/postlock.1.html
-share/doc/postfix/html/postlog.1.html
-share/doc/postfix/html/postmap.1.html
-share/doc/postfix/html/postsuper.1.html
-share/doc/postfix/html/qmgr.8.html
-share/doc/postfix/html/queuing.html
-share/doc/postfix/html/rate.html
-share/doc/postfix/html/receiving.html
-share/doc/postfix/html/relocated.5.html
-share/doc/postfix/html/resource.html
-share/doc/postfix/html/rewrite.html
-share/doc/postfix/html/security.html
-share/doc/postfix/html/sendmail.1.html
-share/doc/postfix/html/showq.8.html
-share/doc/postfix/html/small-picture.gif
-share/doc/postfix/html/smtp.8.html
-share/doc/postfix/html/smtpd.8.html
-share/doc/postfix/html/transport.5.html
-share/doc/postfix/html/trivial-rewrite.8.html
-share/doc/postfix/html/uce.html
-share/doc/postfix/html/virtual.5.html
-@dirrm etc/postfix
+%%SUB_TEST%%sbin/smtp-sink
+%%SUB_TEST%%sbin/smtp-source
+%%SUB_DOCS%%share/doc/postfix/access.5.html
+%%SUB_DOCS%%share/doc/postfix/aliases.5.html
+%%SUB_DOCS%%share/doc/postfix/architecture.html
+%%SUB_DOCS%%share/doc/postfix/backstage.html
+%%SUB_DOCS%%share/doc/postfix/basic.html
+%%SUB_DOCS%%share/doc/postfix/big-picture.gif
+%%SUB_DOCS%%share/doc/postfix/big-picture.html
+%%SUB_DOCS%%share/doc/postfix/bounce.8.html
+%%SUB_DOCS%%share/doc/postfix/canonical.5.html
+%%SUB_DOCS%%share/doc/postfix/cleanup.8.html
+%%SUB_DOCS%%share/doc/postfix/commands.html
+%%SUB_DOCS%%share/doc/postfix/defer.8.html
+%%SUB_DOCS%%share/doc/postfix/delivering.html
+%%SUB_DOCS%%share/doc/postfix/error.8.html
+%%SUB_DOCS%%share/doc/postfix/faq.html
+%%SUB_DOCS%%share/doc/postfix/flush.8.html
+%%SUB_DOCS%%share/doc/postfix/goals.html
+%%SUB_DOCS%%share/doc/postfix/inbound.gif
+%%SUB_DOCS%%share/doc/postfix/index.html
+%%SUB_DOCS%%share/doc/postfix/lmtp.8.html
+%%SUB_DOCS%%share/doc/postfix/local.8.html
+%%SUB_DOCS%%share/doc/postfix/mailq.1.html
+%%SUB_DOCS%%share/doc/postfix/master.8.html
+%%SUB_DOCS%%share/doc/postfix/motivation.html
+%%SUB_DOCS%%share/doc/postfix/newaliases.1.html
+%%SUB_DOCS%%share/doc/postfix/outbound.gif
+%%SUB_DOCS%%share/doc/postfix/pcre_table.5.html
+%%SUB_DOCS%%share/doc/postfix/pickup.8.html
+%%SUB_DOCS%%share/doc/postfix/pipe.8.html
+%%SUB_DOCS%%share/doc/postfix/postalias.1.html
+%%SUB_DOCS%%share/doc/postfix/postcat.1.html
+%%SUB_DOCS%%share/doc/postfix/postconf.1.html
+%%SUB_DOCS%%share/doc/postfix/postdrop.1.html
+%%SUB_DOCS%%share/doc/postfix/postfix.1.html
+%%SUB_DOCS%%share/doc/postfix/postkick.1.html
+%%SUB_DOCS%%share/doc/postfix/postlock.1.html
+%%SUB_DOCS%%share/doc/postfix/postlog.1.html
+%%SUB_DOCS%%share/doc/postfix/postmap.1.html
+%%SUB_DOCS%%share/doc/postfix/postsuper.1.html
+%%SUB_DOCS%%share/doc/postfix/qmgr.8.html
+%%SUB_DOCS%%share/doc/postfix/queuing.html
+%%SUB_DOCS%%share/doc/postfix/rate.html
+%%SUB_DOCS%%share/doc/postfix/receiving.html
+%%SUB_DOCS%%share/doc/postfix/regexp_table.5.html
+%%SUB_DOCS%%share/doc/postfix/relocated.5.html
+%%SUB_DOCS%%share/doc/postfix/resource.html
+%%SUB_DOCS%%share/doc/postfix/rewrite.html
+%%SUB_DOCS%%share/doc/postfix/security.html
+%%SUB_DOCS%%share/doc/postfix/sendmail.1.html
+%%SUB_DOCS%%share/doc/postfix/showq.8.html
+%%SUB_DOCS%%share/doc/postfix/small-picture.gif
+%%SUB_DOCS%%share/doc/postfix/smtp.8.html
+%%SUB_DOCS%%share/doc/postfix/smtpd.8.html
+%%SUB_DOCS%%share/doc/postfix/spawn.8.html
+%%SUB_DOCS%%share/doc/postfix/transport.5.html
+%%SUB_DOCS%%share/doc/postfix/trivial-rewrite.8.html
+%%SUB_DOCS%%share/doc/postfix/uce.html
+%%SUB_DOCS%%share/doc/postfix/virtual.5.html
+%%SUB_DOCS%%@dirrm share/doc/postfix
@dirrm libexec/postfix
-@dirrm share/doc/postfix/html
-@dirrm share/doc/postfix
+@dirrm etc/postfix
diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix
new file mode 100644
index 000000000000..23c3ea828c70
--- /dev/null
+++ b/mail/postfix22/scripts/configure.postfix
@@ -0,0 +1,129 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.1 2001-03-04 19:35:00 sf Exp $
+
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
+ exit
+fi
+
+tempfile=`mktemp -t checklist`
+
+if [ "${BATCH}" = "yes" ]; then
+ set \"PCRE\"
+else
+ /usr/bin/dialog --title "Postfix configuration options" --clear \
+ --checklist "\n\
+Please select desired options:" -1 -1 16 \
+PCRE "Perl Compatible Regular Expressions" OFF \
+SASL "Cyrus SASL (Simple Authentication and Security Layer)" OFF \
+DB3 "Berkeley DB3 (required if SASL also built with DB3)" OFF \
+MySQL "MySQL map lookups" OFF \
+OpenLDAP "OpenLDAP map lookups" OFF \
+Test "SMTP/LMTP test server and generator" OFF \
+TLS "Secure Sockets Layer and Transport Layer Security" OFF \
+IPv6 "IPv6 support" OFF \
+2> $tempfile
+
+ retval=$?
+
+ if [ -s $tempfile ]; then
+ set `cat $tempfile`
+ fi
+ rm -f $tempfile
+
+ case $retval in
+ 0) if [ -z "$*" ]; then
+ echo "Nothing selected"
+ fi
+ ;;
+ 1) echo "Cancel pressed."
+ exit 1
+ ;;
+ esac
+fi
+
+${MKDIR} ${WRKDIRPREFIX}${CURDIR}
+exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+
+echo "PREFIX= ${PREFIX}"
+
+SUB_PCRE="@comment "
+SUB_SASL="@comment "
+SUB_TLS="@comment "
+SUB_LDAP="@comment "
+SUB_TEST="@comment "
+
+while [ "$1" ]; do
+ case $1 in
+ \"PCRE\")
+ echo "CONF1+= pcre_table"
+ echo "CONF2+= sample-pcre.cf"
+ echo "MAN5+= pcre_table.5"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre"
+ echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a"
+ SUB_PCRE=""
+ ;;
+ \"SASL\")
+ echo "CONF2+= sample-auth.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl"
+ echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -lpam -lcrypt"
+ echo ".if exists(/usr/lib/libkrb.a)"
+ echo "POSTFIX_AUXLIBS+= -lkrb -ldes -lcom_err"
+ echo ".endif"
+ SUB_SASL=""
+ ;;
+ \"TLS\")
+ echo "CONF2+= sample-tls.cf"
+ echo "BIN1+= tlsmgr"
+ echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl"
+ echo "POSTFIX_AUXLIBS+= -lssl -lcrypto"
+ echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.7.0-20010228-0.9.6.tar.gz"
+ echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.7.0-20010228-0.9.6/pfixtls.diff"
+ echo "PATCH_STRIP= -p1"
+ SUB_TLS=""
+ ;;
+ \"DB3\")
+ echo "LIB_DEPENDS+= db3.1:\${PORTSDIR}/databases/db3"
+ echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3"
+ echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3"
+ ;;
+ \"MySQL\")
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
+ echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
+ ;;
+ \"OpenLDAP\")
+ echo "CONF2+= sample-ldap.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
+ echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
+ SUB_LDAP=""
+ ;;
+ \"Test\")
+ echo "BIN3= smtp-sink smtp-source"
+ SUB_TEST=""
+ ;;
+ \"IPv6\")
+ echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/"
+ echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}"
+ echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz"
+ echo ""
+ echo "pre-patch:"
+ echo " cd \${WRKSRC} && ln -s . postfix"
+ echo ""
+ ;;
+ *)
+ echo "Invalid option(s): $*" > /dev/stderr
+ rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+echo "PLIST_SUB+= SUB_PCRE=\"${SUB_PCRE}\""
+echo "PLIST_SUB+= SUB_SASL=\"${SUB_SASL}\""
+echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\""
+echo "PLIST_SUB+= SUB_LDAP=\"${SUB_LDAP}\""
+echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index 839c9f1819ad..9c4068489960 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -1,90 +1,82 @@
# New ports collection makefile for: postfix
-# Date created: 18 Mar 1999
+# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
PORTNAME= postfix
-PORTVERSION= 19991231.13
-PORTREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
+PORTVERSION= 20010228
+CATEGORIES= mail ipv6
+MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
+ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
ftp://ftp.tux.org/pub/net/postfix/official/ \
ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
ftp://ftp.samurai.com/pub/postfix/official/ \
- ftp://ftp.nl.uu.net/pub/unix/mail/postfix/official/ \
- ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
- ftp://ftp.mira.net/pub/unix/mail/postfix/official/ \
- ftp://coda.nctu.edu.tw/network/mail/postfix/official/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-DISTNAME= ${PORTNAME}-19991231-pl13
+MASTER_SITE_SUBDIR= . old related/postfix
+DISTNAME= release-${PORTVERSION}
MAINTAINER= blaz@amis.net
-.if !defined(DEBUG)
-MAKEFILEFLAGS+= DEBUG=
-.endif
-
-.if defined(CC)
-MAKEFILEFLAGS+= CC="${CC}"
-.endif
-
-MAKEFILEFLAGS+= OPT="${CFLAGS}"
-SCRIPTS_ENV+= MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-
MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
sendmail.1
-MAN5= access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
+MAN5= access.5 aliases.5 canonical.5 regexp_table.5 relocated.5 \
+ transport.5 virtual.5
-MAN8= bounce.8 cleanup.8 defer.8 error.8 local.8 master.8 pickup.8 \
- pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 trivial-rewrite.8
+MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
+ master.8 pickup.8 pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 \
+ spawn.8 trivial-rewrite.8
CONF1= access aliases canonical main.cf master.cf \
- relocated transport virtual
+ regexp_table relocated transport virtual
CONF2= sample-aliases.cf sample-canonical.cf sample-debug.cf \
- sample-filter.cf sample-local.cf sample-misc.cf \
+ sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
sample-rate.cf sample-regexp.cf sample-relocated.cf \
sample-resource.cf sample-rewrite.cf sample-smtp.cf \
sample-smtpd.cf sample-transport.cf sample-virtual.cf
-BIN1= bounce cleanup error local master pickup \
- pipe qmgr showq smtp smtpd trivial-rewrite
+BIN1= bounce cleanup error flush lmtp local master pickup \
+ pipe qmgr showq smtp smtpd spawn trivial-rewrite
BIN2= postalias postcat postconf postdrop postfix \
postkick postlock postlog postmap postsuper sendmail
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
-POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz
+.if defined(NOPORTDOCS)
+PLIST_SUB+= SUB_DOCS="@comment "
+.else
+PLIST_SUB+= SUB_DOCS=""
+DOCDIR= ${PREFIX}/share/doc/postfix
.endif
-.if defined(WITH_LDAP)
-CONF2+= sample-ldap.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-PLIST_SUB+= WITH_LDAP=""
-.else
-PLIST_SUB+= WITH_LDAP="@comment "
+.if !defined(DEBUG)
+MAKEFILEFLAGS+= DEBUG=
.endif
-.if defined(WITH_PCRE)
-CONF2+= sample-pcre.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libpcre.a
-PLIST_SUB+= WITH_PCRE=""
-.else
-PLIST_SUB+= WITH_PCRE="@comment "
+.if defined(CC)
+MAKEFILEFLAGS+= CC="${CC}"
+.endif
+
+MAKEFILEFLAGS+= OPT="${CFLAGS}"
+
+SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
+ PREFIX="${PREFIX}" \
+ TOUCH="${TOUCH}" \
+ MKDIR="${MKDIR}" \
+ MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
+
+pre-fetch:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
post-patch:
- (cd ${WRKSRC} && make -f Makefile.init makefiles ${MAKEFILEFLAGS} \
+ (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
${ECHO} "all: default" >> Makefile)
@@ -122,7 +114,13 @@ do-install:
.for file in ${BIN2}
@${INSTALL_PROGRAM} \
- ${WRKSRC}/${file}/${file} \
+ ${WRKSRC}/src/${file}/${file} \
+ ${PREFIX}/sbin
+.endfor
+
+.for file in ${BIN3}
+ @${INSTALL_PROGRAM} \
+ ${WRKSRC}/src/smtpstone/${file} \
${PREFIX}/sbin
.endfor
@@ -145,11 +143,9 @@ do-install:
.endfor
.if !defined(NOPORTDOCS)
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix
- @cd ${WRKSRC} && ${INSTALL_DATA} LDAP_README MYSQL_README ${PREFIX}/share/doc/postfix
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix/html
- @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${PREFIX}/share/doc/postfix/html && \
- ${ECHO_MSG} "Installed documentation in ${PREFIX}/share/doc/postfix"
+ @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCDIR}
+ @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCDIR} && \
+ ${ECHO_MSG} "Installed HTML documentation in ${DOCDIR}"
.endif
@${ECHO_MSG} '--------------------------------------------------'
@@ -160,6 +156,9 @@ do-install:
post-install:
@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+post-clean:
+ @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
.include <bsd.port.pre.mk>
replace:
@@ -170,10 +169,10 @@ replace:
${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
${ECHO} "#" >> /etc/mail/mailer.conf
- ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
+ ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
.else
@${ECHO_MSG} "===> Replacing sendmail"
@if [ -e /usr/sbin/sendmail ]; then \
diff --git a/mail/postfix23/distinfo b/mail/postfix23/distinfo
index 854fffa3294c..d6f4fd5c198a 100644
--- a/mail/postfix23/distinfo
+++ b/mail/postfix23/distinfo
@@ -1 +1,3 @@
-MD5 (postfix-19991231-pl13.tar.gz) = f119438aae0aa1346953ae326864da9e
+MD5 (release-20010228.tar.gz) = 6af46cc231ca1e09e60393542d5611bd
+MD5 (pfixtls-0.7.0-20010228-0.9.6.tar.gz) = 64699fb4f0bb4dc87ba1c6c7aef81366
+MD5 (postfix-20010225snap-v6-20010228a.diff.gz) = 8646724c2d00e4d162b63456247cf4fb
diff --git a/mail/postfix23/files/patch-ab b/mail/postfix23/files/patch-ab
index d705b8a7f594..7c81d3dc12c9 100644
--- a/mail/postfix23/files/patch-ab
+++ b/mail/postfix23/files/patch-ab
@@ -1,11 +1,11 @@
---- conf/canonical.orig Sun Sep 5 23:47:01 1999
-+++ conf/canonical Tue Nov 7 22:24:42 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix canonical table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/canonical\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- # DESCRIPTION
- # The optional \fBcanonical\fR file specifies an address mapping for
- # local and non-local addresses. The mapping is used by the
+*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000
+--- ./conf/canonical Thu Jun 1 21:53:23 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/canonical
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/canonical
+ #
diff --git a/mail/postfix23/files/patch-ac b/mail/postfix23/files/patch-ac
index 264335cb70fa..0fb2192cdd84 100644
--- a/mail/postfix23/files/patch-ac
+++ b/mail/postfix23/files/patch-ac
@@ -1,11 +1,11 @@
---- conf/access.orig Fri Dec 11 19:55:48 1998
-+++ conf/access Tue Nov 7 22:25:54 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix access table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/access\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/access\fR
- # DESCRIPTION
- # The optional \fBaccess\fR table directs the Postfix SMTP server
- # to selectively reject or accept mail from or to specific hosts,
+*** ./conf/access.orig Tue Mar 7 10:42:58 2000
+--- ./conf/access Thu Jun 1 21:53:36 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/access
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/access
+ #
diff --git a/mail/postfix23/files/patch-ad b/mail/postfix23/files/patch-ad
new file mode 100644
index 000000000000..c1b102574165
--- /dev/null
+++ b/mail/postfix23/files/patch-ad
@@ -0,0 +1,11 @@
+*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/pcre_table Thu Jun 1 22:02:08 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix23/files/patch-ae b/mail/postfix23/files/patch-ae
new file mode 100644
index 000000000000..e396dd8626db
--- /dev/null
+++ b/mail/postfix23/files/patch-ae
@@ -0,0 +1,11 @@
+*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/regexp_table Thu Jun 1 22:03:27 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix23/files/patch-af b/mail/postfix23/files/patch-af
index ec92981276c6..8fca6b208941 100644
--- a/mail/postfix23/files/patch-af
+++ b/mail/postfix23/files/patch-af
@@ -1,11 +1,11 @@
---- conf/relocated.orig Sun Sep 5 23:47:01 1999
-+++ conf/relocated Tue Nov 7 22:28:27 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix relocated table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/relocated\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- # DESCRIPTION
- # The optional \fBrelocated\fR file provides the information that is
- # used in "user has moved to \fInew_location\fR" bounce messages.
+*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000
+--- ./conf/relocated Thu Jun 1 22:03:59 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/relocated
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/relocated
+ #
diff --git a/mail/postfix23/files/patch-ag b/mail/postfix23/files/patch-ag
new file mode 100644
index 000000000000..54c0fa918d3b
--- /dev/null
+++ b/mail/postfix23/files/patch-ag
@@ -0,0 +1,15 @@
+*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000
+--- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000
+***************
+*** 91,95 ****
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in /etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:/etc/postfix/saslpass
+
+--- 91,95 ----
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass
+
diff --git a/mail/postfix23/files/patch-ao b/mail/postfix23/files/patch-ao
index 206c152728da..fd854e181601 100644
--- a/mail/postfix23/files/patch-ao
+++ b/mail/postfix23/files/patch-ao
@@ -1,11 +1,11 @@
---- conf/transport.orig Fri Dec 31 20:54:11 1999
-+++ conf/transport Tue Nov 7 22:46:59 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix transport table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/transport\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- # DESCRIPTION
- # The optional \fBtransport\fR file specifies a mapping from domain
- # hierarchies to message delivery transports and/or relay hosts. The
+*** ./conf/transport.orig Tue Mar 7 10:42:58 2000
+--- ./conf/transport Thu Jun 1 22:13:41 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/transport
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/transport
+ #
diff --git a/mail/postfix23/files/patch-ap b/mail/postfix23/files/patch-ap
index b412ce386f8d..4598192cd5c1 100644
--- a/mail/postfix23/files/patch-ap
+++ b/mail/postfix23/files/patch-ap
@@ -1,11 +1,11 @@
---- conf/virtual.orig Tue Dec 21 03:00:13 1999
-+++ conf/virtual Tue Nov 7 22:48:18 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix virtual table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/virtual\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- # DESCRIPTION
- # The optional \fBvirtual\fR table specifies redirections for local
- # and non-local recipients or domains. The redirections are used by
+*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000
+--- ./conf/virtual Thu Jun 1 22:13:54 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/virtual
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/virtual
+ #
diff --git a/mail/postfix23/files/patch-bb b/mail/postfix23/files/patch-bb
index 6444bc0d1f75..ea744664dfa7 100644
--- a/mail/postfix23/files/patch-bb
+++ b/mail/postfix23/files/patch-bb
@@ -1,11 +1,20 @@
---- html/access.5.html.orig Fri Dec 11 19:55:49 1998
-+++ html/access.5.html Tue Nov 7 22:48:47 2000
+--- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000
++++ ./html/access.5.html Tue Nov 21 21:24:34 2000
@@ -9,7 +9,7 @@
access - format of Postfix access table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/access</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b>
-
+
<b>DESCRIPTION</b>
The optional <b>access</b> table directs the Postfix SMTP server
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the
+ indexed file after changing the access table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix23/files/patch-bc b/mail/postfix23/files/patch-bc
index 4d24077b9527..e407a9650585 100644
--- a/mail/postfix23/files/patch-bc
+++ b/mail/postfix23/files/patch-bc
@@ -1,11 +1,20 @@
---- html/canonical.5.html.orig Mon Sep 6 05:13:54 1999
-+++ html/canonical.5.html Tue Nov 7 22:51:05 2000
+--- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000
++++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000
@@ -9,7 +9,7 @@
canonical - format of Postfix canonical table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/canonical</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>canonical</b> file specifies an address mapping
+ The optional <b>canonical</b> table specifies an address mapping
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix23/files/patch-bl b/mail/postfix23/files/patch-bl
new file mode 100644
index 000000000000..176c7d1b64de
--- /dev/null
+++ b/mail/postfix23/files/patch-bl
@@ -0,0 +1,11 @@
+*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000
+--- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000
+***************
+*** 11,13 ****
+ <b>SYNOPSIS</b>
+! regexp:/etc/postfix/filename
+
+--- 11,13 ----
+ <b>SYNOPSIS</b>
+! regexp:!!PREFIX!!/etc/postfix/filename
+
diff --git a/mail/postfix23/files/patch-bm b/mail/postfix23/files/patch-bm
index bc9479bea2fe..e5ccc2c50b94 100644
--- a/mail/postfix23/files/patch-bm
+++ b/mail/postfix23/files/patch-bm
@@ -1,11 +1,20 @@
---- html/relocated.5.html.orig Mon Sep 6 05:13:55 1999
-+++ html/relocated.5.html Tue Nov 7 22:52:46 2000
+--- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000
++++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000
@@ -9,7 +9,7 @@
relocated - format of Postfix relocated table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/relocated</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>relocated</b> file provides the information that
+ The optional <b>relocated</b> table provides the information that
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the
+ indexed file after changing the relocated table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix23/files/patch-bo b/mail/postfix23/files/patch-bo
index 41cbc4ca6d65..b45270be8151 100644
--- a/mail/postfix23/files/patch-bo
+++ b/mail/postfix23/files/patch-bo
@@ -1,11 +1,20 @@
---- html/transport.5.html.orig Fri Dec 31 20:54:56 1999
-+++ html/transport.5.html Tue Nov 7 22:53:50 2000
+--- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000
++++ ./html/transport.5.html Tue Nov 21 21:43:20 2000
@@ -9,7 +9,7 @@
transport - format of Postfix transport table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/transport</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>transport</b> file specifies a mapping from
+ The optional <b>transport</b> table specifies a mapping from
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the
+ indexed file after changing the transport table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix23/files/patch-bp b/mail/postfix23/files/patch-bp
index bb65bd98a7b8..5206bfd4bfd0 100644
--- a/mail/postfix23/files/patch-bp
+++ b/mail/postfix23/files/patch-bp
@@ -1,11 +1,43 @@
---- html/virtual.5.html.orig Tue Dec 21 03:00:58 1999
-+++ html/virtual.5.html Tue Nov 7 22:55:04 2000
+--- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000
++++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000
@@ -9,7 +9,7 @@
virtual - format of Postfix virtual table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/virtual</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>virtual</b> table specifies redirections for
+ The optional <b>virtual</b> table specifies address redirections
+@@ -27,7 +27,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
+@@ -52,7 +52,7 @@
+
+ Support for a Postfix-style virtual domain looks like:
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter)
+ <i>postmaster@virtual.domain</i> <i>postmaster</i>
+ <i>user1@virtual.domain</i> <i>address1</i>
+@@ -94,11 +94,11 @@
+
+ Support for a Sendmail-style virtual domain looks like:
+
+- /etc/postfix/main.cf:
++ !!PREFIX!!/etc/postfix/main.cf:
+ mydestination = $myhostname localhost.$mydomain $mydomain
+ <i>virtual.domain</i>
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>user1@virtual.domain</i> <i>address1</i>
+ <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i>
+
diff --git a/mail/postfix23/files/patch-cb b/mail/postfix23/files/patch-cb
index ef73429287d2..58559c7273d1 100644
--- a/mail/postfix23/files/patch-cb
+++ b/mail/postfix23/files/patch-cb
@@ -1,25 +1,20 @@
---- man/man1/sendmail.1.orig Thu Mar 30 17:46:10 2000
-+++ man/man1/sendmail.1 Wed Dec 20 18:37:45 2000
-@@ -61,10 +61,12 @@
- \fBjust-send-eight\fR.
- .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- The path name of the \fBsendmail.cf\fR file. Postfix configuration
--files are kept in \fB/etc/postfix\fR.
-+files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- .IP "\fB-F \fIfull_name\fR
- Set the sender full name. This is used only with messages that
- have no \fBFrom:\fR message header.
-+.IP "\fB-G\fR (ignored)"
-+Gateway (relay) submission, as opposed to initial user submission.
- .IP \fB-I\fR
- Initialize alias database. See the \fBnewaliases\fR
- command above.
-@@ -171,7 +173,7 @@
- .na
- .nf
- /var/spool/postfix, mail queue
--/etc/postfix, configuration files
-+!!PREFIX!!/etc/postfix, configuration files
- .SH CONFIGURATION PARAMETERS
- .na
- .nf
+*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000
+--- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000
+***************
+*** 63,65 ****
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+--- 63,65 ----
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+***************
+*** 173,175 ****
+ /var/spool/postfix, mail queue
+! /etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
+--- 173,175 ----
+ /var/spool/postfix, mail queue
+! !!PREFIX!!/etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
diff --git a/mail/postfix23/files/patch-cc b/mail/postfix23/files/patch-cc
new file mode 100644
index 000000000000..cd6946003217
--- /dev/null
+++ b/mail/postfix23/files/patch-cc
@@ -0,0 +1,11 @@
+*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000
+***************
+*** 10,12 ****
+ .nf
+! pcre:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! pcre:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix23/files/patch-cd b/mail/postfix23/files/patch-cd
index 36461a39bb49..b51de44d0bee 100644
--- a/mail/postfix23/files/patch-cd
+++ b/mail/postfix23/files/patch-cd
@@ -1,11 +1,20 @@
---- man/man5/access.5.orig Fri Dec 11 19:55:52 1998
-+++ man/man5/access.5 Tue Nov 7 22:56:25 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/access\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/access\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/access.5 Thu Jun 1 22:39:55 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/access\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
diff --git a/mail/postfix23/files/patch-ce b/mail/postfix23/files/patch-ce
index 0e0bd4aa1ae5..f77053f8b3aa 100644
--- a/mail/postfix23/files/patch-ce
+++ b/mail/postfix23/files/patch-ce
@@ -1,11 +1,20 @@
---- man/man5/canonical.5.orig Mon Sep 6 05:13:32 1999
-+++ man/man5/canonical.5 Tue Nov 7 22:57:40 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/canonical\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/canonical\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
diff --git a/mail/postfix23/files/patch-cf b/mail/postfix23/files/patch-cf
new file mode 100644
index 000000000000..28fb053b94a7
--- /dev/null
+++ b/mail/postfix23/files/patch-cf
@@ -0,0 +1,11 @@
+*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000
+***************
+*** 10,12 ****
+ .nf
+! regexp:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! regexp:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix23/files/patch-cg b/mail/postfix23/files/patch-cg
index cdce4aaddaf3..0ae82cc57669 100644
--- a/mail/postfix23/files/patch-cg
+++ b/mail/postfix23/files/patch-cg
@@ -1,11 +1,20 @@
---- man/man5/relocated.5.orig Mon Sep 6 05:13:33 1999
-+++ man/man5/relocated.5 Tue Nov 7 22:59:11 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/relocated\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/relocated\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ .SH DESCRIPTION
+***************
+*** 20,22 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
+--- 20,22 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
diff --git a/mail/postfix23/files/patch-ch b/mail/postfix23/files/patch-ch
index 80df028f9255..3ed047ea474c 100644
--- a/mail/postfix23/files/patch-ch
+++ b/mail/postfix23/files/patch-ch
@@ -1,11 +1,20 @@
---- man/man5/transport.5.orig Fri Dec 31 20:54:51 1999
-+++ man/man5/transport.5 Tue Nov 7 22:59:57 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/transport\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/transport\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
+--- 21,23 ----
+ for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
diff --git a/mail/postfix23/files/patch-ci b/mail/postfix23/files/patch-ci
index 889eed3f4d89..1a7cf4abbac7 100644
--- a/mail/postfix23/files/patch-ci
+++ b/mail/postfix23/files/patch-ci
@@ -1,11 +1,20 @@
---- man/man5/virtual.5.orig Tue Dec 21 03:00:51 1999
-+++ man/man5/virtual.5 Tue Nov 7 23:00:32 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/virtual\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/virtual\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ .SH DESCRIPTION
+***************
+*** 26,28 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
+--- 26,28 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
diff --git a/mail/postfix23/files/patch-da b/mail/postfix23/files/patch-da
new file mode 100644
index 000000000000..e57e31750d18
--- /dev/null
+++ b/mail/postfix23/files/patch-da
@@ -0,0 +1,11 @@
+*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000
+--- ./proto/regexp_table Thu Jun 1 22:44:43 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix23/files/patch-db b/mail/postfix23/files/patch-db
new file mode 100644
index 000000000000..7f89fb770783
--- /dev/null
+++ b/mail/postfix23/files/patch-db
@@ -0,0 +1,20 @@
+*** ./proto/access.orig Sun Apr 9 16:44:45 2000
+--- ./proto/access Thu Jun 1 22:45:05 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/access\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
diff --git a/mail/postfix23/files/patch-dc b/mail/postfix23/files/patch-dc
new file mode 100644
index 000000000000..786f2da45c32
--- /dev/null
+++ b/mail/postfix23/files/patch-dc
@@ -0,0 +1,20 @@
+*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000
+--- ./proto/canonical Thu Jun 1 22:45:28 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/canonical\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
diff --git a/mail/postfix23/files/patch-dd b/mail/postfix23/files/patch-dd
new file mode 100644
index 000000000000..b65a57ff7d57
--- /dev/null
+++ b/mail/postfix23/files/patch-dd
@@ -0,0 +1,11 @@
+*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000
+--- ./proto/pcre_table Thu Jun 1 22:45:41 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix23/files/patch-de b/mail/postfix23/files/patch-de
new file mode 100644
index 000000000000..73bb2af2261d
--- /dev/null
+++ b/mail/postfix23/files/patch-de
@@ -0,0 +1,20 @@
+*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000
+--- ./proto/relocated Thu Jun 1 22:46:02 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/relocated\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ # DESCRIPTION
+***************
+*** 14,16 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
+--- 14,16 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
diff --git a/mail/postfix23/files/patch-df b/mail/postfix23/files/patch-df
new file mode 100644
index 000000000000..8d3fba96a224
--- /dev/null
+++ b/mail/postfix23/files/patch-df
@@ -0,0 +1,20 @@
+*** ./proto/transport.orig Sun Apr 9 17:05:45 2000
+--- ./proto/transport Thu Jun 1 22:46:23 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/transport\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
+--- 15,17 ----
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
diff --git a/mail/postfix23/files/patch-dg b/mail/postfix23/files/patch-dg
new file mode 100644
index 000000000000..bff20a2cff3e
--- /dev/null
+++ b/mail/postfix23/files/patch-dg
@@ -0,0 +1,20 @@
+*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000
+--- ./proto/virtual Thu Jun 1 22:46:40 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/virtual\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ # DESCRIPTION
+***************
+*** 20,22 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
+--- 20,22 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
diff --git a/mail/postfix23/files/patch-ea b/mail/postfix23/files/patch-ea
index 80647e0b2ba0..6c3f98d2af4f 100644
--- a/mail/postfix23/files/patch-ea
+++ b/mail/postfix23/files/patch-ea
@@ -1,5 +1,5 @@
-*** ./cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
---- ./cleanup/cleanup.c Thu Jun 1 21:52:22 2000
+*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
+--- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000
***************
*** 118,121 ****
/* FILES
diff --git a/mail/postfix23/files/patch-eb b/mail/postfix23/files/patch-eb
index d576de434580..e67680963d2d 100644
--- a/mail/postfix23/files/patch-eb
+++ b/mail/postfix23/files/patch-eb
@@ -1,5 +1,5 @@
-*** ./global/mail_conf.c.orig Sun May 7 18:51:16 2000
---- ./global/mail_conf.c Thu Jun 1 22:16:29 2000
+*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000
+--- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000
***************
*** 53,55 ****
/* FILES
diff --git a/mail/postfix23/files/patch-ec b/mail/postfix23/files/patch-ec
index 74edda76007b..6d12d1ce4c17 100644
--- a/mail/postfix23/files/patch-ec
+++ b/mail/postfix23/files/patch-ec
@@ -1,5 +1,5 @@
-*** ./global/mail_params.h.orig Wed May 31 19:18:31 2000
---- ./global/mail_params.h Thu Jun 1 22:17:10 2000
+*** ./src/global/mail_params.h.orig Wed May 31 19:18:31 2000
+--- ./src/global/mail_params.h Thu Jun 1 22:17:10 2000
***************
*** 155,157 ****
#ifndef DEF_PROGRAM_DIR
diff --git a/mail/postfix23/files/patch-ed b/mail/postfix23/files/patch-ed
index b573748b45e1..f971b62720d8 100644
--- a/mail/postfix23/files/patch-ed
+++ b/mail/postfix23/files/patch-ed
@@ -1,5 +1,5 @@
-*** ./local/mailbox.c.orig Fri Apr 28 16:55:53 2000
---- ./local/mailbox.c Thu Jun 1 22:37:48 2000
+*** ./src/local/mailbox.c.orig Fri Apr 28 16:55:53 2000
+--- ./src/local/mailbox.c Thu Jun 1 22:37:48 2000
***************
*** 15,17 ****
/* suppression. The default is direct mailbox delivery to
diff --git a/mail/postfix23/files/patch-ee b/mail/postfix23/files/patch-ee
index d79219b1ba62..ef44eac24b73 100644
--- a/mail/postfix23/files/patch-ee
+++ b/mail/postfix23/files/patch-ee
@@ -1,5 +1,5 @@
-*** ./master/master.c.orig Tue Mar 7 10:25:07 2000
---- ./master/master.c Thu Jun 1 22:43:50 2000
+*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000
+--- ./src/master/master.c Thu Jun 1 22:43:50 2000
***************
*** 104,107 ****
/* FILES
diff --git a/mail/postfix23/files/patch-ef b/mail/postfix23/files/patch-ef
index 44816a063b95..586b304a103d 100644
--- a/mail/postfix23/files/patch-ef
+++ b/mail/postfix23/files/patch-ef
@@ -1,5 +1,5 @@
-*** ./postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
---- ./postdrop/postdrop.c Thu Jun 1 22:44:22 2000
+*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
+--- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000
***************
*** 39,41 ****
/* /var/spool/postfix, mail queue
diff --git a/mail/postfix23/files/patch-eg b/mail/postfix23/files/patch-eg
index 28950509870c..2983bbfd86ea 100644
--- a/mail/postfix23/files/patch-eg
+++ b/mail/postfix23/files/patch-eg
@@ -1,34 +1,20 @@
---- sendmail/sendmail.c.orig Sun Mar 26 22:51:33 2000
-+++ sendmail/sendmail.c Wed Dec 20 18:17:31 2000
-@@ -55,10 +55,12 @@
- /* \fBjust-send-eight\fR.
- /* .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
--/* files are kept in \fB/etc/postfix\fR.
-+/* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- /* .IP "\fB-F \fIfull_name\fR
- /* Set the sender full name. This is used only with messages that
- /* have no \fBFrom:\fR message header.
-+/* .IP "\fB-G \fR (ignored)"
-+/* Gateway (relay) submission, as opposed to initial user submission.
- /* .IP \fB-I\fR
- /* Initialize alias database. See the \fBnewaliases\fR
- /* command above.
-@@ -157,7 +159,7 @@
- /* \fBdebugger_command\fR configuration parameter.
- /* FILES
- /* /var/spool/postfix, mail queue
--/* /etc/postfix, configuration files
-+/* !!PREFIX!!/etc/postfix, configuration files
- /* CONFIGURATION PARAMETERS
- /* .ad
- /* .fi
-@@ -710,6 +712,8 @@
- break;
- case 'F': /* full name */
- full_name = optarg;
-+ break;
-+ case 'G': /* gateway submission */
- break;
- case 'I': /* newaliases */
- mode = SM_MODE_NEWALIAS;
+*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000
+--- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000
+***************
+*** 57,59 ****
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+--- 57,59 ----
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+***************
+*** 159,161 ****
+ /* /var/spool/postfix, mail queue
+! /* /etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
+--- 159,161 ----
+ /* /var/spool/postfix, mail queue
+! /* !!PREFIX!!/etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix23/files/patch-eh b/mail/postfix23/files/patch-eh
index f95b51423128..c104c3680d21 100644
--- a/mail/postfix23/files/patch-eh
+++ b/mail/postfix23/files/patch-eh
@@ -1,5 +1,5 @@
-*** ./trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
---- ./trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
+*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
+--- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
***************
*** 32,34 ****
/* FILES
diff --git a/mail/postfix23/files/patch-ei b/mail/postfix23/files/patch-ei
new file mode 100644
index 000000000000..3029372b746e
--- /dev/null
+++ b/mail/postfix23/files/patch-ei
@@ -0,0 +1,21 @@
+*** ./src/smtpd/smtpd.h.orig Thu Sep 14 10:17:23 2000
+--- ./src/smtpd/smtpd.h Thu Sep 14 10:17:38 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix23/files/patch-ej b/mail/postfix23/files/patch-ej
new file mode 100644
index 000000000000..6c5cf2e23758
--- /dev/null
+++ b/mail/postfix23/files/patch-ej
@@ -0,0 +1,21 @@
+*** ./src/smtp/smtp.h.orig Thu Sep 14 13:04:43 2000
+--- ./src/smtp/smtp.h Thu Sep 14 13:04:53 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix23/files/patch-fa b/mail/postfix23/files/patch-fa
deleted file mode 100644
index bc1c2dc388c2..000000000000
--- a/mail/postfix23/files/patch-fa
+++ /dev/null
@@ -1,12 +0,0 @@
---- makedefs.orig Sun Jan 23 03:04:27 2000
-+++ makedefs Mon Apr 3 08:59:17 2000
-@@ -89,6 +89,8 @@
- ;;
- FreeBSD.4*) SYSTYPE=FREEBSD4
- ;;
-+ FreeBSD.5*) SYSTYPE=FREEBSD5
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- NetBSD.1*) SYSTYPE=NETBSD1
-
diff --git a/mail/postfix23/files/patch-fb b/mail/postfix23/files/patch-fb
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix23/files/patch-fb
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
- * makedefs script, and adding a section below for the new system.
- */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+ || defined(FREEBSD5) \
- || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
- || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix23/files/patch-ga b/mail/postfix23/files/patch-ga
index 3ad7120b8322..60a6dd578564 100644
--- a/mail/postfix23/files/patch-ga
+++ b/mail/postfix23/files/patch-ga
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_MYSQL" option at compile time ("make -DWITH_MYSQL").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
[Code contributed by Scott Cotton and Joshua Marcus, IC Group, Inc.]
diff --git a/mail/postfix23/files/patch-gb b/mail/postfix23/files/patch-gb
index 312c8c60f9e5..98816d155122 100644
--- a/mail/postfix23/files/patch-gb
+++ b/mail/postfix23/files/patch-gb
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_LDAP" option at compile time ("make -DWITH_LDAP").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
BUILDING WITH LDAP SUPPORT
==========================
diff --git a/mail/postfix23/files/patch-lmtp.h b/mail/postfix23/files/patch-lmtp.h
new file mode 100644
index 000000000000..3d941c034198
--- /dev/null
+++ b/mail/postfix23/files/patch-lmtp.h
@@ -0,0 +1,13 @@
+--- ./src/lmtp/lmtp.h.orig Fri Jan 19 15:43:06 2001
++++ ./src/lmtp/lmtp.h Sat Feb 3 14:01:09 2001
+@@ -12,8 +12,8 @@
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+-#include <sasl.h>
+-#include <saslutil.h>
++#include <sasl/sasl.h>
++#include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix23/pkg-install b/mail/postfix23/pkg-install
index 933c669e6b98..0d18b67ddee3 100644
--- a/mail/postfix23/pkg-install
+++ b/mail/postfix23/pkg-install
@@ -1,4 +1,9 @@
#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
user=postfix
group=postfix
@@ -87,6 +92,5 @@ if [ x"$2" = xPOST-INSTALL ]; then
fi
/usr/sbin/chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
/bin/chmod 2555 ${PKG_PREFIX}/sbin/postdrop
- /bin/mkdir -p /var/spool/postfix
${PKG_PREFIX}/sbin/postfix check
fi
diff --git a/mail/postfix23/pkg-plist b/mail/postfix23/pkg-plist
index 5f8572883b4c..97167cb8ed15 100644
--- a/mail/postfix23/pkg-plist
+++ b/mail/postfix23/pkg-plist
@@ -5,24 +5,29 @@ etc/postfix/postfix-script
etc/postfix/sample-access
etc/postfix/sample-aliases
etc/postfix/sample-aliases.cf
+%%SUB_SASL%%etc/postfix/sample-auth.cf
etc/postfix/sample-canonical
etc/postfix/sample-canonical.cf
etc/postfix/sample-debug.cf
etc/postfix/sample-filter.cf
-%%WITH_LDAP%%etc/postfix/sample-ldap.cf
+etc/postfix/sample-flush.cf
+%%SUB_LDAP%%etc/postfix/sample-ldap.cf
etc/postfix/sample-local.cf
etc/postfix/sample-main.cf
etc/postfix/sample-master.cf
etc/postfix/sample-misc.cf
-%%WITH_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre_table
etc/postfix/sample-rate.cf
etc/postfix/sample-regexp.cf
+etc/postfix/sample-regexp_table
etc/postfix/sample-relocated
etc/postfix/sample-relocated.cf
etc/postfix/sample-resource.cf
etc/postfix/sample-rewrite.cf
etc/postfix/sample-smtp.cf
etc/postfix/sample-smtpd.cf
+%%SUB_TLS%%etc/postfix/sample-tls.cf
etc/postfix/sample-transport
etc/postfix/sample-transport.cf
etc/postfix/sample-virtual
@@ -30,6 +35,8 @@ etc/postfix/sample-virtual.cf
libexec/postfix/bounce
libexec/postfix/cleanup
libexec/postfix/error
+libexec/postfix/flush
+libexec/postfix/lmtp
libexec/postfix/local
libexec/postfix/master
libexec/postfix/pickup
@@ -38,6 +45,8 @@ libexec/postfix/qmgr
libexec/postfix/showq
libexec/postfix/smtp
libexec/postfix/smtpd
+libexec/postfix/spawn
+%%SUB_TLS%%libexec/postfix/tlsmgr
libexec/postfix/trivial-rewrite
sbin/postalias
sbin/postcat
@@ -50,62 +59,66 @@ sbin/postlog
sbin/postmap
sbin/postsuper
sbin/sendmail
-share/doc/postfix/LDAP_README
-share/doc/postfix/MYSQL_README
-share/doc/postfix/html/access.5.html
-share/doc/postfix/html/aliases.5.html
-share/doc/postfix/html/architecture.html
-share/doc/postfix/html/backstage.html
-share/doc/postfix/html/basic.html
-share/doc/postfix/html/big-picture.gif
-share/doc/postfix/html/big-picture.html
-share/doc/postfix/html/bounce.8.html
-share/doc/postfix/html/canonical.5.html
-share/doc/postfix/html/cleanup.8.html
-share/doc/postfix/html/commands.html
-share/doc/postfix/html/defer.8.html
-share/doc/postfix/html/delivering.html
-share/doc/postfix/html/error.8.html
-share/doc/postfix/html/faq.html
-share/doc/postfix/html/goals.html
-share/doc/postfix/html/inbound.gif
-share/doc/postfix/html/index.html
-share/doc/postfix/html/local.8.html
-share/doc/postfix/html/mailq.1.html
-share/doc/postfix/html/master.8.html
-share/doc/postfix/html/motivation.html
-share/doc/postfix/html/newaliases.1.html
-share/doc/postfix/html/outbound.gif
-share/doc/postfix/html/pickup.8.html
-share/doc/postfix/html/pipe.8.html
-share/doc/postfix/html/postalias.1.html
-share/doc/postfix/html/postcat.1.html
-share/doc/postfix/html/postconf.1.html
-share/doc/postfix/html/postdrop.1.html
-share/doc/postfix/html/postfix.1.html
-share/doc/postfix/html/postkick.1.html
-share/doc/postfix/html/postlock.1.html
-share/doc/postfix/html/postlog.1.html
-share/doc/postfix/html/postmap.1.html
-share/doc/postfix/html/postsuper.1.html
-share/doc/postfix/html/qmgr.8.html
-share/doc/postfix/html/queuing.html
-share/doc/postfix/html/rate.html
-share/doc/postfix/html/receiving.html
-share/doc/postfix/html/relocated.5.html
-share/doc/postfix/html/resource.html
-share/doc/postfix/html/rewrite.html
-share/doc/postfix/html/security.html
-share/doc/postfix/html/sendmail.1.html
-share/doc/postfix/html/showq.8.html
-share/doc/postfix/html/small-picture.gif
-share/doc/postfix/html/smtp.8.html
-share/doc/postfix/html/smtpd.8.html
-share/doc/postfix/html/transport.5.html
-share/doc/postfix/html/trivial-rewrite.8.html
-share/doc/postfix/html/uce.html
-share/doc/postfix/html/virtual.5.html
-@dirrm etc/postfix
+%%SUB_TEST%%sbin/smtp-sink
+%%SUB_TEST%%sbin/smtp-source
+%%SUB_DOCS%%share/doc/postfix/access.5.html
+%%SUB_DOCS%%share/doc/postfix/aliases.5.html
+%%SUB_DOCS%%share/doc/postfix/architecture.html
+%%SUB_DOCS%%share/doc/postfix/backstage.html
+%%SUB_DOCS%%share/doc/postfix/basic.html
+%%SUB_DOCS%%share/doc/postfix/big-picture.gif
+%%SUB_DOCS%%share/doc/postfix/big-picture.html
+%%SUB_DOCS%%share/doc/postfix/bounce.8.html
+%%SUB_DOCS%%share/doc/postfix/canonical.5.html
+%%SUB_DOCS%%share/doc/postfix/cleanup.8.html
+%%SUB_DOCS%%share/doc/postfix/commands.html
+%%SUB_DOCS%%share/doc/postfix/defer.8.html
+%%SUB_DOCS%%share/doc/postfix/delivering.html
+%%SUB_DOCS%%share/doc/postfix/error.8.html
+%%SUB_DOCS%%share/doc/postfix/faq.html
+%%SUB_DOCS%%share/doc/postfix/flush.8.html
+%%SUB_DOCS%%share/doc/postfix/goals.html
+%%SUB_DOCS%%share/doc/postfix/inbound.gif
+%%SUB_DOCS%%share/doc/postfix/index.html
+%%SUB_DOCS%%share/doc/postfix/lmtp.8.html
+%%SUB_DOCS%%share/doc/postfix/local.8.html
+%%SUB_DOCS%%share/doc/postfix/mailq.1.html
+%%SUB_DOCS%%share/doc/postfix/master.8.html
+%%SUB_DOCS%%share/doc/postfix/motivation.html
+%%SUB_DOCS%%share/doc/postfix/newaliases.1.html
+%%SUB_DOCS%%share/doc/postfix/outbound.gif
+%%SUB_DOCS%%share/doc/postfix/pcre_table.5.html
+%%SUB_DOCS%%share/doc/postfix/pickup.8.html
+%%SUB_DOCS%%share/doc/postfix/pipe.8.html
+%%SUB_DOCS%%share/doc/postfix/postalias.1.html
+%%SUB_DOCS%%share/doc/postfix/postcat.1.html
+%%SUB_DOCS%%share/doc/postfix/postconf.1.html
+%%SUB_DOCS%%share/doc/postfix/postdrop.1.html
+%%SUB_DOCS%%share/doc/postfix/postfix.1.html
+%%SUB_DOCS%%share/doc/postfix/postkick.1.html
+%%SUB_DOCS%%share/doc/postfix/postlock.1.html
+%%SUB_DOCS%%share/doc/postfix/postlog.1.html
+%%SUB_DOCS%%share/doc/postfix/postmap.1.html
+%%SUB_DOCS%%share/doc/postfix/postsuper.1.html
+%%SUB_DOCS%%share/doc/postfix/qmgr.8.html
+%%SUB_DOCS%%share/doc/postfix/queuing.html
+%%SUB_DOCS%%share/doc/postfix/rate.html
+%%SUB_DOCS%%share/doc/postfix/receiving.html
+%%SUB_DOCS%%share/doc/postfix/regexp_table.5.html
+%%SUB_DOCS%%share/doc/postfix/relocated.5.html
+%%SUB_DOCS%%share/doc/postfix/resource.html
+%%SUB_DOCS%%share/doc/postfix/rewrite.html
+%%SUB_DOCS%%share/doc/postfix/security.html
+%%SUB_DOCS%%share/doc/postfix/sendmail.1.html
+%%SUB_DOCS%%share/doc/postfix/showq.8.html
+%%SUB_DOCS%%share/doc/postfix/small-picture.gif
+%%SUB_DOCS%%share/doc/postfix/smtp.8.html
+%%SUB_DOCS%%share/doc/postfix/smtpd.8.html
+%%SUB_DOCS%%share/doc/postfix/spawn.8.html
+%%SUB_DOCS%%share/doc/postfix/transport.5.html
+%%SUB_DOCS%%share/doc/postfix/trivial-rewrite.8.html
+%%SUB_DOCS%%share/doc/postfix/uce.html
+%%SUB_DOCS%%share/doc/postfix/virtual.5.html
+%%SUB_DOCS%%@dirrm share/doc/postfix
@dirrm libexec/postfix
-@dirrm share/doc/postfix/html
-@dirrm share/doc/postfix
+@dirrm etc/postfix
diff --git a/mail/postfix23/scripts/configure.postfix b/mail/postfix23/scripts/configure.postfix
new file mode 100644
index 000000000000..55674b52a336
--- /dev/null
+++ b/mail/postfix23/scripts/configure.postfix
@@ -0,0 +1,129 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.1 2001-03-04 19:35:00 sf Exp $
+
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
+ exit
+fi
+
+tempfile=`mktemp -t checklist`
+
+if [ "${BATCH}" = "yes" ]; then
+ set \"PCRE\"
+else
+ /usr/bin/dialog --title "Postfix configuration options" --clear \
+ --checklist "\n\
+Please select desired options:" -1 -1 16 \
+PCRE "Perl Compatible Regular Expressions" OFF \
+SASL "Cyrus SASL (Simple Authentication and Security Layer)" OFF \
+DB3 "Berkeley DB3 (required if SASL also built with DB3)" OFF \
+MySQL "MySQL map lookups" OFF \
+OpenLDAP "OpenLDAP map lookups" OFF \
+Test "SMTP/LMTP test server and generator" OFF \
+TLS "Secure Sockets Layer and Transport Layer Security" OFF \
+IPv6 "IPv6 support" OFF \
+2> $tempfile
+
+ retval=$?
+
+ if [ -s $tempfile ]; then
+ set `cat $tempfile`
+ fi
+ rm -f $tempfile
+
+ case $retval in
+ 0) if [ -z "$*" ]; then
+ echo "Nothing selected"
+ fi
+ ;;
+ 1) echo "Cancel pressed."
+ exit 1
+ ;;
+ esac
+fi
+
+${MKDIR} ${WRKDIRPREFIX}${CURDIR}
+exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+
+echo "PREFIX= ${PREFIX}"
+
+SUB_PCRE="@comment "
+SUB_SASL="@comment "
+SUB_TLS="@comment "
+SUB_LDAP="@comment "
+SUB_TEST="@comment "
+
+while [ "$1" ]; do
+ case $1 in
+ \"PCRE\")
+ echo "CONF1+= pcre_table"
+ echo "CONF2+= sample-pcre.cf"
+ echo "MAN5+= pcre_table.5"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre"
+ echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a"
+ SUB_PCRE=""
+ ;;
+ \"SASL\")
+ echo "CONF2+= sample-auth.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl"
+ echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -lpam -lcrypt"
+ echo ".if exists(/usr/lib/libkrb.a)"
+ echo "POSTFIX_AUXLIBS+= -lkrb -ldes -lcom_err"
+ echo ".endif"
+ SUB_SASL=""
+ ;;
+ \"TLS\")
+ echo "CONF2+= sample-tls.cf"
+ echo "BIN1+= tlsmgr"
+ echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl"
+ echo "POSTFIX_AUXLIBS+= -lssl -lcrypto"
+ echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.7.0-20010228-0.9.6.tar.gz"
+ echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.7.0-20010228-0.9.6/pfixtls.diff"
+ echo "PATCH_STRIP= -p1"
+ SUB_TLS=""
+ ;;
+ \"DB3\")
+ echo "LIB_DEPENDS+= db3.1:\${PORTSDIR}/databases/db3"
+ echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3"
+ echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3"
+ ;;
+ \"MySQL\")
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
+ echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
+ ;;
+ \"OpenLDAP\")
+ echo "CONF2+= sample-ldap.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
+ echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
+ SUB_LDAP=""
+ ;;
+ \"Test\")
+ echo "BIN3= smtp-sink smtp-source"
+ SUB_TEST=""
+ ;;
+ \"IPv6\")
+ echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/"
+ echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}"
+ echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz"
+ echo ""
+ echo "pre-patch:"
+ echo " cd \${WRKSRC} && ln -s . postfix"
+ echo ""
+ ;;
+ *)
+ echo "Invalid option(s): $*" > /dev/stderr
+ rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+echo "PLIST_SUB+= SUB_PCRE=\"${SUB_PCRE}\""
+echo "PLIST_SUB+= SUB_SASL=\"${SUB_SASL}\""
+echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\""
+echo "PLIST_SUB+= SUB_LDAP=\"${SUB_LDAP}\""
+echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index 839c9f1819ad..9c4068489960 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -1,90 +1,82 @@
# New ports collection makefile for: postfix
-# Date created: 18 Mar 1999
+# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
PORTNAME= postfix
-PORTVERSION= 19991231.13
-PORTREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
+PORTVERSION= 20010228
+CATEGORIES= mail ipv6
+MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
+ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
ftp://ftp.tux.org/pub/net/postfix/official/ \
ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
ftp://ftp.samurai.com/pub/postfix/official/ \
- ftp://ftp.nl.uu.net/pub/unix/mail/postfix/official/ \
- ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
- ftp://ftp.mira.net/pub/unix/mail/postfix/official/ \
- ftp://coda.nctu.edu.tw/network/mail/postfix/official/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-DISTNAME= ${PORTNAME}-19991231-pl13
+MASTER_SITE_SUBDIR= . old related/postfix
+DISTNAME= release-${PORTVERSION}
MAINTAINER= blaz@amis.net
-.if !defined(DEBUG)
-MAKEFILEFLAGS+= DEBUG=
-.endif
-
-.if defined(CC)
-MAKEFILEFLAGS+= CC="${CC}"
-.endif
-
-MAKEFILEFLAGS+= OPT="${CFLAGS}"
-SCRIPTS_ENV+= MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-
MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
sendmail.1
-MAN5= access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
+MAN5= access.5 aliases.5 canonical.5 regexp_table.5 relocated.5 \
+ transport.5 virtual.5
-MAN8= bounce.8 cleanup.8 defer.8 error.8 local.8 master.8 pickup.8 \
- pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 trivial-rewrite.8
+MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
+ master.8 pickup.8 pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 \
+ spawn.8 trivial-rewrite.8
CONF1= access aliases canonical main.cf master.cf \
- relocated transport virtual
+ regexp_table relocated transport virtual
CONF2= sample-aliases.cf sample-canonical.cf sample-debug.cf \
- sample-filter.cf sample-local.cf sample-misc.cf \
+ sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
sample-rate.cf sample-regexp.cf sample-relocated.cf \
sample-resource.cf sample-rewrite.cf sample-smtp.cf \
sample-smtpd.cf sample-transport.cf sample-virtual.cf
-BIN1= bounce cleanup error local master pickup \
- pipe qmgr showq smtp smtpd trivial-rewrite
+BIN1= bounce cleanup error flush lmtp local master pickup \
+ pipe qmgr showq smtp smtpd spawn trivial-rewrite
BIN2= postalias postcat postconf postdrop postfix \
postkick postlock postlog postmap postsuper sendmail
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
-POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz
+.if defined(NOPORTDOCS)
+PLIST_SUB+= SUB_DOCS="@comment "
+.else
+PLIST_SUB+= SUB_DOCS=""
+DOCDIR= ${PREFIX}/share/doc/postfix
.endif
-.if defined(WITH_LDAP)
-CONF2+= sample-ldap.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-PLIST_SUB+= WITH_LDAP=""
-.else
-PLIST_SUB+= WITH_LDAP="@comment "
+.if !defined(DEBUG)
+MAKEFILEFLAGS+= DEBUG=
.endif
-.if defined(WITH_PCRE)
-CONF2+= sample-pcre.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libpcre.a
-PLIST_SUB+= WITH_PCRE=""
-.else
-PLIST_SUB+= WITH_PCRE="@comment "
+.if defined(CC)
+MAKEFILEFLAGS+= CC="${CC}"
+.endif
+
+MAKEFILEFLAGS+= OPT="${CFLAGS}"
+
+SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
+ PREFIX="${PREFIX}" \
+ TOUCH="${TOUCH}" \
+ MKDIR="${MKDIR}" \
+ MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
+
+pre-fetch:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
post-patch:
- (cd ${WRKSRC} && make -f Makefile.init makefiles ${MAKEFILEFLAGS} \
+ (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
${ECHO} "all: default" >> Makefile)
@@ -122,7 +114,13 @@ do-install:
.for file in ${BIN2}
@${INSTALL_PROGRAM} \
- ${WRKSRC}/${file}/${file} \
+ ${WRKSRC}/src/${file}/${file} \
+ ${PREFIX}/sbin
+.endfor
+
+.for file in ${BIN3}
+ @${INSTALL_PROGRAM} \
+ ${WRKSRC}/src/smtpstone/${file} \
${PREFIX}/sbin
.endfor
@@ -145,11 +143,9 @@ do-install:
.endfor
.if !defined(NOPORTDOCS)
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix
- @cd ${WRKSRC} && ${INSTALL_DATA} LDAP_README MYSQL_README ${PREFIX}/share/doc/postfix
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix/html
- @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${PREFIX}/share/doc/postfix/html && \
- ${ECHO_MSG} "Installed documentation in ${PREFIX}/share/doc/postfix"
+ @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCDIR}
+ @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCDIR} && \
+ ${ECHO_MSG} "Installed HTML documentation in ${DOCDIR}"
.endif
@${ECHO_MSG} '--------------------------------------------------'
@@ -160,6 +156,9 @@ do-install:
post-install:
@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+post-clean:
+ @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
.include <bsd.port.pre.mk>
replace:
@@ -170,10 +169,10 @@ replace:
${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
${ECHO} "#" >> /etc/mail/mailer.conf
- ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
+ ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
.else
@${ECHO_MSG} "===> Replacing sendmail"
@if [ -e /usr/sbin/sendmail ]; then \
diff --git a/mail/postfix24/distinfo b/mail/postfix24/distinfo
index 854fffa3294c..d6f4fd5c198a 100644
--- a/mail/postfix24/distinfo
+++ b/mail/postfix24/distinfo
@@ -1 +1,3 @@
-MD5 (postfix-19991231-pl13.tar.gz) = f119438aae0aa1346953ae326864da9e
+MD5 (release-20010228.tar.gz) = 6af46cc231ca1e09e60393542d5611bd
+MD5 (pfixtls-0.7.0-20010228-0.9.6.tar.gz) = 64699fb4f0bb4dc87ba1c6c7aef81366
+MD5 (postfix-20010225snap-v6-20010228a.diff.gz) = 8646724c2d00e4d162b63456247cf4fb
diff --git a/mail/postfix24/files/patch-ab b/mail/postfix24/files/patch-ab
index d705b8a7f594..7c81d3dc12c9 100644
--- a/mail/postfix24/files/patch-ab
+++ b/mail/postfix24/files/patch-ab
@@ -1,11 +1,11 @@
---- conf/canonical.orig Sun Sep 5 23:47:01 1999
-+++ conf/canonical Tue Nov 7 22:24:42 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix canonical table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/canonical\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- # DESCRIPTION
- # The optional \fBcanonical\fR file specifies an address mapping for
- # local and non-local addresses. The mapping is used by the
+*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000
+--- ./conf/canonical Thu Jun 1 21:53:23 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/canonical
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/canonical
+ #
diff --git a/mail/postfix24/files/patch-ac b/mail/postfix24/files/patch-ac
index 264335cb70fa..0fb2192cdd84 100644
--- a/mail/postfix24/files/patch-ac
+++ b/mail/postfix24/files/patch-ac
@@ -1,11 +1,11 @@
---- conf/access.orig Fri Dec 11 19:55:48 1998
-+++ conf/access Tue Nov 7 22:25:54 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix access table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/access\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/access\fR
- # DESCRIPTION
- # The optional \fBaccess\fR table directs the Postfix SMTP server
- # to selectively reject or accept mail from or to specific hosts,
+*** ./conf/access.orig Tue Mar 7 10:42:58 2000
+--- ./conf/access Thu Jun 1 21:53:36 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/access
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/access
+ #
diff --git a/mail/postfix24/files/patch-ad b/mail/postfix24/files/patch-ad
new file mode 100644
index 000000000000..c1b102574165
--- /dev/null
+++ b/mail/postfix24/files/patch-ad
@@ -0,0 +1,11 @@
+*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/pcre_table Thu Jun 1 22:02:08 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix24/files/patch-ae b/mail/postfix24/files/patch-ae
new file mode 100644
index 000000000000..e396dd8626db
--- /dev/null
+++ b/mail/postfix24/files/patch-ae
@@ -0,0 +1,11 @@
+*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/regexp_table Thu Jun 1 22:03:27 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix24/files/patch-af b/mail/postfix24/files/patch-af
index ec92981276c6..8fca6b208941 100644
--- a/mail/postfix24/files/patch-af
+++ b/mail/postfix24/files/patch-af
@@ -1,11 +1,11 @@
---- conf/relocated.orig Sun Sep 5 23:47:01 1999
-+++ conf/relocated Tue Nov 7 22:28:27 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix relocated table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/relocated\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- # DESCRIPTION
- # The optional \fBrelocated\fR file provides the information that is
- # used in "user has moved to \fInew_location\fR" bounce messages.
+*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000
+--- ./conf/relocated Thu Jun 1 22:03:59 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/relocated
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/relocated
+ #
diff --git a/mail/postfix24/files/patch-ag b/mail/postfix24/files/patch-ag
new file mode 100644
index 000000000000..54c0fa918d3b
--- /dev/null
+++ b/mail/postfix24/files/patch-ag
@@ -0,0 +1,15 @@
+*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000
+--- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000
+***************
+*** 91,95 ****
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in /etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:/etc/postfix/saslpass
+
+--- 91,95 ----
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass
+
diff --git a/mail/postfix24/files/patch-ao b/mail/postfix24/files/patch-ao
index 206c152728da..fd854e181601 100644
--- a/mail/postfix24/files/patch-ao
+++ b/mail/postfix24/files/patch-ao
@@ -1,11 +1,11 @@
---- conf/transport.orig Fri Dec 31 20:54:11 1999
-+++ conf/transport Tue Nov 7 22:46:59 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix transport table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/transport\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- # DESCRIPTION
- # The optional \fBtransport\fR file specifies a mapping from domain
- # hierarchies to message delivery transports and/or relay hosts. The
+*** ./conf/transport.orig Tue Mar 7 10:42:58 2000
+--- ./conf/transport Thu Jun 1 22:13:41 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/transport
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/transport
+ #
diff --git a/mail/postfix24/files/patch-ap b/mail/postfix24/files/patch-ap
index b412ce386f8d..4598192cd5c1 100644
--- a/mail/postfix24/files/patch-ap
+++ b/mail/postfix24/files/patch-ap
@@ -1,11 +1,11 @@
---- conf/virtual.orig Tue Dec 21 03:00:13 1999
-+++ conf/virtual Tue Nov 7 22:48:18 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix virtual table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/virtual\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- # DESCRIPTION
- # The optional \fBvirtual\fR table specifies redirections for local
- # and non-local recipients or domains. The redirections are used by
+*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000
+--- ./conf/virtual Thu Jun 1 22:13:54 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/virtual
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/virtual
+ #
diff --git a/mail/postfix24/files/patch-bb b/mail/postfix24/files/patch-bb
index 6444bc0d1f75..ea744664dfa7 100644
--- a/mail/postfix24/files/patch-bb
+++ b/mail/postfix24/files/patch-bb
@@ -1,11 +1,20 @@
---- html/access.5.html.orig Fri Dec 11 19:55:49 1998
-+++ html/access.5.html Tue Nov 7 22:48:47 2000
+--- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000
++++ ./html/access.5.html Tue Nov 21 21:24:34 2000
@@ -9,7 +9,7 @@
access - format of Postfix access table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/access</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b>
-
+
<b>DESCRIPTION</b>
The optional <b>access</b> table directs the Postfix SMTP server
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the
+ indexed file after changing the access table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix24/files/patch-bc b/mail/postfix24/files/patch-bc
index 4d24077b9527..e407a9650585 100644
--- a/mail/postfix24/files/patch-bc
+++ b/mail/postfix24/files/patch-bc
@@ -1,11 +1,20 @@
---- html/canonical.5.html.orig Mon Sep 6 05:13:54 1999
-+++ html/canonical.5.html Tue Nov 7 22:51:05 2000
+--- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000
++++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000
@@ -9,7 +9,7 @@
canonical - format of Postfix canonical table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/canonical</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>canonical</b> file specifies an address mapping
+ The optional <b>canonical</b> table specifies an address mapping
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix24/files/patch-bl b/mail/postfix24/files/patch-bl
new file mode 100644
index 000000000000..176c7d1b64de
--- /dev/null
+++ b/mail/postfix24/files/patch-bl
@@ -0,0 +1,11 @@
+*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000
+--- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000
+***************
+*** 11,13 ****
+ <b>SYNOPSIS</b>
+! regexp:/etc/postfix/filename
+
+--- 11,13 ----
+ <b>SYNOPSIS</b>
+! regexp:!!PREFIX!!/etc/postfix/filename
+
diff --git a/mail/postfix24/files/patch-bm b/mail/postfix24/files/patch-bm
index bc9479bea2fe..e5ccc2c50b94 100644
--- a/mail/postfix24/files/patch-bm
+++ b/mail/postfix24/files/patch-bm
@@ -1,11 +1,20 @@
---- html/relocated.5.html.orig Mon Sep 6 05:13:55 1999
-+++ html/relocated.5.html Tue Nov 7 22:52:46 2000
+--- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000
++++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000
@@ -9,7 +9,7 @@
relocated - format of Postfix relocated table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/relocated</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>relocated</b> file provides the information that
+ The optional <b>relocated</b> table provides the information that
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the
+ indexed file after changing the relocated table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix24/files/patch-bo b/mail/postfix24/files/patch-bo
index 41cbc4ca6d65..b45270be8151 100644
--- a/mail/postfix24/files/patch-bo
+++ b/mail/postfix24/files/patch-bo
@@ -1,11 +1,20 @@
---- html/transport.5.html.orig Fri Dec 31 20:54:56 1999
-+++ html/transport.5.html Tue Nov 7 22:53:50 2000
+--- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000
++++ ./html/transport.5.html Tue Nov 21 21:43:20 2000
@@ -9,7 +9,7 @@
transport - format of Postfix transport table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/transport</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>transport</b> file specifies a mapping from
+ The optional <b>transport</b> table specifies a mapping from
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the
+ indexed file after changing the transport table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix24/files/patch-bp b/mail/postfix24/files/patch-bp
index bb65bd98a7b8..5206bfd4bfd0 100644
--- a/mail/postfix24/files/patch-bp
+++ b/mail/postfix24/files/patch-bp
@@ -1,11 +1,43 @@
---- html/virtual.5.html.orig Tue Dec 21 03:00:58 1999
-+++ html/virtual.5.html Tue Nov 7 22:55:04 2000
+--- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000
++++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000
@@ -9,7 +9,7 @@
virtual - format of Postfix virtual table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/virtual</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>virtual</b> table specifies redirections for
+ The optional <b>virtual</b> table specifies address redirections
+@@ -27,7 +27,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
+@@ -52,7 +52,7 @@
+
+ Support for a Postfix-style virtual domain looks like:
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter)
+ <i>postmaster@virtual.domain</i> <i>postmaster</i>
+ <i>user1@virtual.domain</i> <i>address1</i>
+@@ -94,11 +94,11 @@
+
+ Support for a Sendmail-style virtual domain looks like:
+
+- /etc/postfix/main.cf:
++ !!PREFIX!!/etc/postfix/main.cf:
+ mydestination = $myhostname localhost.$mydomain $mydomain
+ <i>virtual.domain</i>
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>user1@virtual.domain</i> <i>address1</i>
+ <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i>
+
diff --git a/mail/postfix24/files/patch-cb b/mail/postfix24/files/patch-cb
index ef73429287d2..58559c7273d1 100644
--- a/mail/postfix24/files/patch-cb
+++ b/mail/postfix24/files/patch-cb
@@ -1,25 +1,20 @@
---- man/man1/sendmail.1.orig Thu Mar 30 17:46:10 2000
-+++ man/man1/sendmail.1 Wed Dec 20 18:37:45 2000
-@@ -61,10 +61,12 @@
- \fBjust-send-eight\fR.
- .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- The path name of the \fBsendmail.cf\fR file. Postfix configuration
--files are kept in \fB/etc/postfix\fR.
-+files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- .IP "\fB-F \fIfull_name\fR
- Set the sender full name. This is used only with messages that
- have no \fBFrom:\fR message header.
-+.IP "\fB-G\fR (ignored)"
-+Gateway (relay) submission, as opposed to initial user submission.
- .IP \fB-I\fR
- Initialize alias database. See the \fBnewaliases\fR
- command above.
-@@ -171,7 +173,7 @@
- .na
- .nf
- /var/spool/postfix, mail queue
--/etc/postfix, configuration files
-+!!PREFIX!!/etc/postfix, configuration files
- .SH CONFIGURATION PARAMETERS
- .na
- .nf
+*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000
+--- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000
+***************
+*** 63,65 ****
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+--- 63,65 ----
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+***************
+*** 173,175 ****
+ /var/spool/postfix, mail queue
+! /etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
+--- 173,175 ----
+ /var/spool/postfix, mail queue
+! !!PREFIX!!/etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
diff --git a/mail/postfix24/files/patch-cc b/mail/postfix24/files/patch-cc
new file mode 100644
index 000000000000..cd6946003217
--- /dev/null
+++ b/mail/postfix24/files/patch-cc
@@ -0,0 +1,11 @@
+*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000
+***************
+*** 10,12 ****
+ .nf
+! pcre:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! pcre:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix24/files/patch-cd b/mail/postfix24/files/patch-cd
index 36461a39bb49..b51de44d0bee 100644
--- a/mail/postfix24/files/patch-cd
+++ b/mail/postfix24/files/patch-cd
@@ -1,11 +1,20 @@
---- man/man5/access.5.orig Fri Dec 11 19:55:52 1998
-+++ man/man5/access.5 Tue Nov 7 22:56:25 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/access\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/access\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/access.5 Thu Jun 1 22:39:55 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/access\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
diff --git a/mail/postfix24/files/patch-ce b/mail/postfix24/files/patch-ce
index 0e0bd4aa1ae5..f77053f8b3aa 100644
--- a/mail/postfix24/files/patch-ce
+++ b/mail/postfix24/files/patch-ce
@@ -1,11 +1,20 @@
---- man/man5/canonical.5.orig Mon Sep 6 05:13:32 1999
-+++ man/man5/canonical.5 Tue Nov 7 22:57:40 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/canonical\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/canonical\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
diff --git a/mail/postfix24/files/patch-cf b/mail/postfix24/files/patch-cf
new file mode 100644
index 000000000000..28fb053b94a7
--- /dev/null
+++ b/mail/postfix24/files/patch-cf
@@ -0,0 +1,11 @@
+*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000
+***************
+*** 10,12 ****
+ .nf
+! regexp:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! regexp:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix24/files/patch-cg b/mail/postfix24/files/patch-cg
index cdce4aaddaf3..0ae82cc57669 100644
--- a/mail/postfix24/files/patch-cg
+++ b/mail/postfix24/files/patch-cg
@@ -1,11 +1,20 @@
---- man/man5/relocated.5.orig Mon Sep 6 05:13:33 1999
-+++ man/man5/relocated.5 Tue Nov 7 22:59:11 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/relocated\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/relocated\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ .SH DESCRIPTION
+***************
+*** 20,22 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
+--- 20,22 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
diff --git a/mail/postfix24/files/patch-ch b/mail/postfix24/files/patch-ch
index 80df028f9255..3ed047ea474c 100644
--- a/mail/postfix24/files/patch-ch
+++ b/mail/postfix24/files/patch-ch
@@ -1,11 +1,20 @@
---- man/man5/transport.5.orig Fri Dec 31 20:54:51 1999
-+++ man/man5/transport.5 Tue Nov 7 22:59:57 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/transport\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/transport\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
+--- 21,23 ----
+ for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
diff --git a/mail/postfix24/files/patch-ci b/mail/postfix24/files/patch-ci
index 889eed3f4d89..1a7cf4abbac7 100644
--- a/mail/postfix24/files/patch-ci
+++ b/mail/postfix24/files/patch-ci
@@ -1,11 +1,20 @@
---- man/man5/virtual.5.orig Tue Dec 21 03:00:51 1999
-+++ man/man5/virtual.5 Tue Nov 7 23:00:32 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/virtual\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/virtual\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ .SH DESCRIPTION
+***************
+*** 26,28 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
+--- 26,28 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
diff --git a/mail/postfix24/files/patch-da b/mail/postfix24/files/patch-da
new file mode 100644
index 000000000000..e57e31750d18
--- /dev/null
+++ b/mail/postfix24/files/patch-da
@@ -0,0 +1,11 @@
+*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000
+--- ./proto/regexp_table Thu Jun 1 22:44:43 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix24/files/patch-db b/mail/postfix24/files/patch-db
new file mode 100644
index 000000000000..7f89fb770783
--- /dev/null
+++ b/mail/postfix24/files/patch-db
@@ -0,0 +1,20 @@
+*** ./proto/access.orig Sun Apr 9 16:44:45 2000
+--- ./proto/access Thu Jun 1 22:45:05 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/access\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
diff --git a/mail/postfix24/files/patch-dc b/mail/postfix24/files/patch-dc
new file mode 100644
index 000000000000..786f2da45c32
--- /dev/null
+++ b/mail/postfix24/files/patch-dc
@@ -0,0 +1,20 @@
+*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000
+--- ./proto/canonical Thu Jun 1 22:45:28 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/canonical\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
diff --git a/mail/postfix24/files/patch-dd b/mail/postfix24/files/patch-dd
new file mode 100644
index 000000000000..b65a57ff7d57
--- /dev/null
+++ b/mail/postfix24/files/patch-dd
@@ -0,0 +1,11 @@
+*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000
+--- ./proto/pcre_table Thu Jun 1 22:45:41 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix24/files/patch-de b/mail/postfix24/files/patch-de
new file mode 100644
index 000000000000..73bb2af2261d
--- /dev/null
+++ b/mail/postfix24/files/patch-de
@@ -0,0 +1,20 @@
+*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000
+--- ./proto/relocated Thu Jun 1 22:46:02 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/relocated\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ # DESCRIPTION
+***************
+*** 14,16 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
+--- 14,16 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
diff --git a/mail/postfix24/files/patch-df b/mail/postfix24/files/patch-df
new file mode 100644
index 000000000000..8d3fba96a224
--- /dev/null
+++ b/mail/postfix24/files/patch-df
@@ -0,0 +1,20 @@
+*** ./proto/transport.orig Sun Apr 9 17:05:45 2000
+--- ./proto/transport Thu Jun 1 22:46:23 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/transport\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
+--- 15,17 ----
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
diff --git a/mail/postfix24/files/patch-dg b/mail/postfix24/files/patch-dg
new file mode 100644
index 000000000000..bff20a2cff3e
--- /dev/null
+++ b/mail/postfix24/files/patch-dg
@@ -0,0 +1,20 @@
+*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000
+--- ./proto/virtual Thu Jun 1 22:46:40 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/virtual\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ # DESCRIPTION
+***************
+*** 20,22 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
+--- 20,22 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
diff --git a/mail/postfix24/files/patch-ea b/mail/postfix24/files/patch-ea
index 80647e0b2ba0..6c3f98d2af4f 100644
--- a/mail/postfix24/files/patch-ea
+++ b/mail/postfix24/files/patch-ea
@@ -1,5 +1,5 @@
-*** ./cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
---- ./cleanup/cleanup.c Thu Jun 1 21:52:22 2000
+*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
+--- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000
***************
*** 118,121 ****
/* FILES
diff --git a/mail/postfix24/files/patch-eb b/mail/postfix24/files/patch-eb
index d576de434580..e67680963d2d 100644
--- a/mail/postfix24/files/patch-eb
+++ b/mail/postfix24/files/patch-eb
@@ -1,5 +1,5 @@
-*** ./global/mail_conf.c.orig Sun May 7 18:51:16 2000
---- ./global/mail_conf.c Thu Jun 1 22:16:29 2000
+*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000
+--- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000
***************
*** 53,55 ****
/* FILES
diff --git a/mail/postfix24/files/patch-ec b/mail/postfix24/files/patch-ec
index 74edda76007b..6d12d1ce4c17 100644
--- a/mail/postfix24/files/patch-ec
+++ b/mail/postfix24/files/patch-ec
@@ -1,5 +1,5 @@
-*** ./global/mail_params.h.orig Wed May 31 19:18:31 2000
---- ./global/mail_params.h Thu Jun 1 22:17:10 2000
+*** ./src/global/mail_params.h.orig Wed May 31 19:18:31 2000
+--- ./src/global/mail_params.h Thu Jun 1 22:17:10 2000
***************
*** 155,157 ****
#ifndef DEF_PROGRAM_DIR
diff --git a/mail/postfix24/files/patch-ed b/mail/postfix24/files/patch-ed
index b573748b45e1..f971b62720d8 100644
--- a/mail/postfix24/files/patch-ed
+++ b/mail/postfix24/files/patch-ed
@@ -1,5 +1,5 @@
-*** ./local/mailbox.c.orig Fri Apr 28 16:55:53 2000
---- ./local/mailbox.c Thu Jun 1 22:37:48 2000
+*** ./src/local/mailbox.c.orig Fri Apr 28 16:55:53 2000
+--- ./src/local/mailbox.c Thu Jun 1 22:37:48 2000
***************
*** 15,17 ****
/* suppression. The default is direct mailbox delivery to
diff --git a/mail/postfix24/files/patch-ee b/mail/postfix24/files/patch-ee
index d79219b1ba62..ef44eac24b73 100644
--- a/mail/postfix24/files/patch-ee
+++ b/mail/postfix24/files/patch-ee
@@ -1,5 +1,5 @@
-*** ./master/master.c.orig Tue Mar 7 10:25:07 2000
---- ./master/master.c Thu Jun 1 22:43:50 2000
+*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000
+--- ./src/master/master.c Thu Jun 1 22:43:50 2000
***************
*** 104,107 ****
/* FILES
diff --git a/mail/postfix24/files/patch-ef b/mail/postfix24/files/patch-ef
index 44816a063b95..586b304a103d 100644
--- a/mail/postfix24/files/patch-ef
+++ b/mail/postfix24/files/patch-ef
@@ -1,5 +1,5 @@
-*** ./postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
---- ./postdrop/postdrop.c Thu Jun 1 22:44:22 2000
+*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
+--- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000
***************
*** 39,41 ****
/* /var/spool/postfix, mail queue
diff --git a/mail/postfix24/files/patch-eg b/mail/postfix24/files/patch-eg
index 28950509870c..2983bbfd86ea 100644
--- a/mail/postfix24/files/patch-eg
+++ b/mail/postfix24/files/patch-eg
@@ -1,34 +1,20 @@
---- sendmail/sendmail.c.orig Sun Mar 26 22:51:33 2000
-+++ sendmail/sendmail.c Wed Dec 20 18:17:31 2000
-@@ -55,10 +55,12 @@
- /* \fBjust-send-eight\fR.
- /* .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
--/* files are kept in \fB/etc/postfix\fR.
-+/* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- /* .IP "\fB-F \fIfull_name\fR
- /* Set the sender full name. This is used only with messages that
- /* have no \fBFrom:\fR message header.
-+/* .IP "\fB-G \fR (ignored)"
-+/* Gateway (relay) submission, as opposed to initial user submission.
- /* .IP \fB-I\fR
- /* Initialize alias database. See the \fBnewaliases\fR
- /* command above.
-@@ -157,7 +159,7 @@
- /* \fBdebugger_command\fR configuration parameter.
- /* FILES
- /* /var/spool/postfix, mail queue
--/* /etc/postfix, configuration files
-+/* !!PREFIX!!/etc/postfix, configuration files
- /* CONFIGURATION PARAMETERS
- /* .ad
- /* .fi
-@@ -710,6 +712,8 @@
- break;
- case 'F': /* full name */
- full_name = optarg;
-+ break;
-+ case 'G': /* gateway submission */
- break;
- case 'I': /* newaliases */
- mode = SM_MODE_NEWALIAS;
+*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000
+--- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000
+***************
+*** 57,59 ****
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+--- 57,59 ----
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+***************
+*** 159,161 ****
+ /* /var/spool/postfix, mail queue
+! /* /etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
+--- 159,161 ----
+ /* /var/spool/postfix, mail queue
+! /* !!PREFIX!!/etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix24/files/patch-eh b/mail/postfix24/files/patch-eh
index f95b51423128..c104c3680d21 100644
--- a/mail/postfix24/files/patch-eh
+++ b/mail/postfix24/files/patch-eh
@@ -1,5 +1,5 @@
-*** ./trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
---- ./trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
+*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
+--- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
***************
*** 32,34 ****
/* FILES
diff --git a/mail/postfix24/files/patch-ei b/mail/postfix24/files/patch-ei
new file mode 100644
index 000000000000..3029372b746e
--- /dev/null
+++ b/mail/postfix24/files/patch-ei
@@ -0,0 +1,21 @@
+*** ./src/smtpd/smtpd.h.orig Thu Sep 14 10:17:23 2000
+--- ./src/smtpd/smtpd.h Thu Sep 14 10:17:38 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix24/files/patch-ej b/mail/postfix24/files/patch-ej
new file mode 100644
index 000000000000..6c5cf2e23758
--- /dev/null
+++ b/mail/postfix24/files/patch-ej
@@ -0,0 +1,21 @@
+*** ./src/smtp/smtp.h.orig Thu Sep 14 13:04:43 2000
+--- ./src/smtp/smtp.h Thu Sep 14 13:04:53 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix24/files/patch-fa b/mail/postfix24/files/patch-fa
deleted file mode 100644
index bc1c2dc388c2..000000000000
--- a/mail/postfix24/files/patch-fa
+++ /dev/null
@@ -1,12 +0,0 @@
---- makedefs.orig Sun Jan 23 03:04:27 2000
-+++ makedefs Mon Apr 3 08:59:17 2000
-@@ -89,6 +89,8 @@
- ;;
- FreeBSD.4*) SYSTYPE=FREEBSD4
- ;;
-+ FreeBSD.5*) SYSTYPE=FREEBSD5
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- NetBSD.1*) SYSTYPE=NETBSD1
-
diff --git a/mail/postfix24/files/patch-fb b/mail/postfix24/files/patch-fb
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix24/files/patch-fb
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
- * makedefs script, and adding a section below for the new system.
- */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+ || defined(FREEBSD5) \
- || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
- || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix24/files/patch-ga b/mail/postfix24/files/patch-ga
index 3ad7120b8322..60a6dd578564 100644
--- a/mail/postfix24/files/patch-ga
+++ b/mail/postfix24/files/patch-ga
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_MYSQL" option at compile time ("make -DWITH_MYSQL").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
[Code contributed by Scott Cotton and Joshua Marcus, IC Group, Inc.]
diff --git a/mail/postfix24/files/patch-gb b/mail/postfix24/files/patch-gb
index 312c8c60f9e5..98816d155122 100644
--- a/mail/postfix24/files/patch-gb
+++ b/mail/postfix24/files/patch-gb
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_LDAP" option at compile time ("make -DWITH_LDAP").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
BUILDING WITH LDAP SUPPORT
==========================
diff --git a/mail/postfix24/files/patch-lmtp.h b/mail/postfix24/files/patch-lmtp.h
new file mode 100644
index 000000000000..3d941c034198
--- /dev/null
+++ b/mail/postfix24/files/patch-lmtp.h
@@ -0,0 +1,13 @@
+--- ./src/lmtp/lmtp.h.orig Fri Jan 19 15:43:06 2001
++++ ./src/lmtp/lmtp.h Sat Feb 3 14:01:09 2001
+@@ -12,8 +12,8 @@
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+-#include <sasl.h>
+-#include <saslutil.h>
++#include <sasl/sasl.h>
++#include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix24/pkg-install b/mail/postfix24/pkg-install
index 933c669e6b98..0d18b67ddee3 100644
--- a/mail/postfix24/pkg-install
+++ b/mail/postfix24/pkg-install
@@ -1,4 +1,9 @@
#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
user=postfix
group=postfix
@@ -87,6 +92,5 @@ if [ x"$2" = xPOST-INSTALL ]; then
fi
/usr/sbin/chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
/bin/chmod 2555 ${PKG_PREFIX}/sbin/postdrop
- /bin/mkdir -p /var/spool/postfix
${PKG_PREFIX}/sbin/postfix check
fi
diff --git a/mail/postfix24/pkg-plist b/mail/postfix24/pkg-plist
index 5f8572883b4c..97167cb8ed15 100644
--- a/mail/postfix24/pkg-plist
+++ b/mail/postfix24/pkg-plist
@@ -5,24 +5,29 @@ etc/postfix/postfix-script
etc/postfix/sample-access
etc/postfix/sample-aliases
etc/postfix/sample-aliases.cf
+%%SUB_SASL%%etc/postfix/sample-auth.cf
etc/postfix/sample-canonical
etc/postfix/sample-canonical.cf
etc/postfix/sample-debug.cf
etc/postfix/sample-filter.cf
-%%WITH_LDAP%%etc/postfix/sample-ldap.cf
+etc/postfix/sample-flush.cf
+%%SUB_LDAP%%etc/postfix/sample-ldap.cf
etc/postfix/sample-local.cf
etc/postfix/sample-main.cf
etc/postfix/sample-master.cf
etc/postfix/sample-misc.cf
-%%WITH_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre_table
etc/postfix/sample-rate.cf
etc/postfix/sample-regexp.cf
+etc/postfix/sample-regexp_table
etc/postfix/sample-relocated
etc/postfix/sample-relocated.cf
etc/postfix/sample-resource.cf
etc/postfix/sample-rewrite.cf
etc/postfix/sample-smtp.cf
etc/postfix/sample-smtpd.cf
+%%SUB_TLS%%etc/postfix/sample-tls.cf
etc/postfix/sample-transport
etc/postfix/sample-transport.cf
etc/postfix/sample-virtual
@@ -30,6 +35,8 @@ etc/postfix/sample-virtual.cf
libexec/postfix/bounce
libexec/postfix/cleanup
libexec/postfix/error
+libexec/postfix/flush
+libexec/postfix/lmtp
libexec/postfix/local
libexec/postfix/master
libexec/postfix/pickup
@@ -38,6 +45,8 @@ libexec/postfix/qmgr
libexec/postfix/showq
libexec/postfix/smtp
libexec/postfix/smtpd
+libexec/postfix/spawn
+%%SUB_TLS%%libexec/postfix/tlsmgr
libexec/postfix/trivial-rewrite
sbin/postalias
sbin/postcat
@@ -50,62 +59,66 @@ sbin/postlog
sbin/postmap
sbin/postsuper
sbin/sendmail
-share/doc/postfix/LDAP_README
-share/doc/postfix/MYSQL_README
-share/doc/postfix/html/access.5.html
-share/doc/postfix/html/aliases.5.html
-share/doc/postfix/html/architecture.html
-share/doc/postfix/html/backstage.html
-share/doc/postfix/html/basic.html
-share/doc/postfix/html/big-picture.gif
-share/doc/postfix/html/big-picture.html
-share/doc/postfix/html/bounce.8.html
-share/doc/postfix/html/canonical.5.html
-share/doc/postfix/html/cleanup.8.html
-share/doc/postfix/html/commands.html
-share/doc/postfix/html/defer.8.html
-share/doc/postfix/html/delivering.html
-share/doc/postfix/html/error.8.html
-share/doc/postfix/html/faq.html
-share/doc/postfix/html/goals.html
-share/doc/postfix/html/inbound.gif
-share/doc/postfix/html/index.html
-share/doc/postfix/html/local.8.html
-share/doc/postfix/html/mailq.1.html
-share/doc/postfix/html/master.8.html
-share/doc/postfix/html/motivation.html
-share/doc/postfix/html/newaliases.1.html
-share/doc/postfix/html/outbound.gif
-share/doc/postfix/html/pickup.8.html
-share/doc/postfix/html/pipe.8.html
-share/doc/postfix/html/postalias.1.html
-share/doc/postfix/html/postcat.1.html
-share/doc/postfix/html/postconf.1.html
-share/doc/postfix/html/postdrop.1.html
-share/doc/postfix/html/postfix.1.html
-share/doc/postfix/html/postkick.1.html
-share/doc/postfix/html/postlock.1.html
-share/doc/postfix/html/postlog.1.html
-share/doc/postfix/html/postmap.1.html
-share/doc/postfix/html/postsuper.1.html
-share/doc/postfix/html/qmgr.8.html
-share/doc/postfix/html/queuing.html
-share/doc/postfix/html/rate.html
-share/doc/postfix/html/receiving.html
-share/doc/postfix/html/relocated.5.html
-share/doc/postfix/html/resource.html
-share/doc/postfix/html/rewrite.html
-share/doc/postfix/html/security.html
-share/doc/postfix/html/sendmail.1.html
-share/doc/postfix/html/showq.8.html
-share/doc/postfix/html/small-picture.gif
-share/doc/postfix/html/smtp.8.html
-share/doc/postfix/html/smtpd.8.html
-share/doc/postfix/html/transport.5.html
-share/doc/postfix/html/trivial-rewrite.8.html
-share/doc/postfix/html/uce.html
-share/doc/postfix/html/virtual.5.html
-@dirrm etc/postfix
+%%SUB_TEST%%sbin/smtp-sink
+%%SUB_TEST%%sbin/smtp-source
+%%SUB_DOCS%%share/doc/postfix/access.5.html
+%%SUB_DOCS%%share/doc/postfix/aliases.5.html
+%%SUB_DOCS%%share/doc/postfix/architecture.html
+%%SUB_DOCS%%share/doc/postfix/backstage.html
+%%SUB_DOCS%%share/doc/postfix/basic.html
+%%SUB_DOCS%%share/doc/postfix/big-picture.gif
+%%SUB_DOCS%%share/doc/postfix/big-picture.html
+%%SUB_DOCS%%share/doc/postfix/bounce.8.html
+%%SUB_DOCS%%share/doc/postfix/canonical.5.html
+%%SUB_DOCS%%share/doc/postfix/cleanup.8.html
+%%SUB_DOCS%%share/doc/postfix/commands.html
+%%SUB_DOCS%%share/doc/postfix/defer.8.html
+%%SUB_DOCS%%share/doc/postfix/delivering.html
+%%SUB_DOCS%%share/doc/postfix/error.8.html
+%%SUB_DOCS%%share/doc/postfix/faq.html
+%%SUB_DOCS%%share/doc/postfix/flush.8.html
+%%SUB_DOCS%%share/doc/postfix/goals.html
+%%SUB_DOCS%%share/doc/postfix/inbound.gif
+%%SUB_DOCS%%share/doc/postfix/index.html
+%%SUB_DOCS%%share/doc/postfix/lmtp.8.html
+%%SUB_DOCS%%share/doc/postfix/local.8.html
+%%SUB_DOCS%%share/doc/postfix/mailq.1.html
+%%SUB_DOCS%%share/doc/postfix/master.8.html
+%%SUB_DOCS%%share/doc/postfix/motivation.html
+%%SUB_DOCS%%share/doc/postfix/newaliases.1.html
+%%SUB_DOCS%%share/doc/postfix/outbound.gif
+%%SUB_DOCS%%share/doc/postfix/pcre_table.5.html
+%%SUB_DOCS%%share/doc/postfix/pickup.8.html
+%%SUB_DOCS%%share/doc/postfix/pipe.8.html
+%%SUB_DOCS%%share/doc/postfix/postalias.1.html
+%%SUB_DOCS%%share/doc/postfix/postcat.1.html
+%%SUB_DOCS%%share/doc/postfix/postconf.1.html
+%%SUB_DOCS%%share/doc/postfix/postdrop.1.html
+%%SUB_DOCS%%share/doc/postfix/postfix.1.html
+%%SUB_DOCS%%share/doc/postfix/postkick.1.html
+%%SUB_DOCS%%share/doc/postfix/postlock.1.html
+%%SUB_DOCS%%share/doc/postfix/postlog.1.html
+%%SUB_DOCS%%share/doc/postfix/postmap.1.html
+%%SUB_DOCS%%share/doc/postfix/postsuper.1.html
+%%SUB_DOCS%%share/doc/postfix/qmgr.8.html
+%%SUB_DOCS%%share/doc/postfix/queuing.html
+%%SUB_DOCS%%share/doc/postfix/rate.html
+%%SUB_DOCS%%share/doc/postfix/receiving.html
+%%SUB_DOCS%%share/doc/postfix/regexp_table.5.html
+%%SUB_DOCS%%share/doc/postfix/relocated.5.html
+%%SUB_DOCS%%share/doc/postfix/resource.html
+%%SUB_DOCS%%share/doc/postfix/rewrite.html
+%%SUB_DOCS%%share/doc/postfix/security.html
+%%SUB_DOCS%%share/doc/postfix/sendmail.1.html
+%%SUB_DOCS%%share/doc/postfix/showq.8.html
+%%SUB_DOCS%%share/doc/postfix/small-picture.gif
+%%SUB_DOCS%%share/doc/postfix/smtp.8.html
+%%SUB_DOCS%%share/doc/postfix/smtpd.8.html
+%%SUB_DOCS%%share/doc/postfix/spawn.8.html
+%%SUB_DOCS%%share/doc/postfix/transport.5.html
+%%SUB_DOCS%%share/doc/postfix/trivial-rewrite.8.html
+%%SUB_DOCS%%share/doc/postfix/uce.html
+%%SUB_DOCS%%share/doc/postfix/virtual.5.html
+%%SUB_DOCS%%@dirrm share/doc/postfix
@dirrm libexec/postfix
-@dirrm share/doc/postfix/html
-@dirrm share/doc/postfix
+@dirrm etc/postfix
diff --git a/mail/postfix24/scripts/configure.postfix b/mail/postfix24/scripts/configure.postfix
new file mode 100644
index 000000000000..fd76aa8e88f0
--- /dev/null
+++ b/mail/postfix24/scripts/configure.postfix
@@ -0,0 +1,129 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.1 2001-03-04 19:35:00 sf Exp $
+
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
+ exit
+fi
+
+tempfile=`mktemp -t checklist`
+
+if [ "${BATCH}" = "yes" ]; then
+ set \"PCRE\"
+else
+ /usr/bin/dialog --title "Postfix configuration options" --clear \
+ --checklist "\n\
+Please select desired options:" -1 -1 16 \
+PCRE "Perl Compatible Regular Expressions" OFF \
+SASL "Cyrus SASL (Simple Authentication and Security Layer)" OFF \
+DB3 "Berkeley DB3 (required if SASL also built with DB3)" OFF \
+MySQL "MySQL map lookups" OFF \
+OpenLDAP "OpenLDAP map lookups" OFF \
+Test "SMTP/LMTP test server and generator" OFF \
+TLS "Secure Sockets Layer and Transport Layer Security" OFF \
+IPv6 "IPv6 support" OFF \
+2> $tempfile
+
+ retval=$?
+
+ if [ -s $tempfile ]; then
+ set `cat $tempfile`
+ fi
+ rm -f $tempfile
+
+ case $retval in
+ 0) if [ -z "$*" ]; then
+ echo "Nothing selected"
+ fi
+ ;;
+ 1) echo "Cancel pressed."
+ exit 1
+ ;;
+ esac
+fi
+
+${MKDIR} ${WRKDIRPREFIX}${CURDIR}
+exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+
+echo "PREFIX= ${PREFIX}"
+
+SUB_PCRE="@comment "
+SUB_SASL="@comment "
+SUB_TLS="@comment "
+SUB_LDAP="@comment "
+SUB_TEST="@comment "
+
+while [ "$1" ]; do
+ case $1 in
+ \"PCRE\")
+ echo "CONF1+= pcre_table"
+ echo "CONF2+= sample-pcre.cf"
+ echo "MAN5+= pcre_table.5"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre"
+ echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a"
+ SUB_PCRE=""
+ ;;
+ \"SASL\")
+ echo "CONF2+= sample-auth.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl"
+ echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -lpam -lcrypt"
+ echo ".if exists(/usr/lib/libkrb.a)"
+ echo "POSTFIX_AUXLIBS+= -lkrb -ldes -lcom_err"
+ echo ".endif"
+ SUB_SASL=""
+ ;;
+ \"TLS\")
+ echo "CONF2+= sample-tls.cf"
+ echo "BIN1+= tlsmgr"
+ echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl"
+ echo "POSTFIX_AUXLIBS+= -lssl -lcrypto"
+ echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.7.0-20010228-0.9.6.tar.gz"
+ echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.7.0-20010228-0.9.6/pfixtls.diff"
+ echo "PATCH_STRIP= -p1"
+ SUB_TLS=""
+ ;;
+ \"DB3\")
+ echo "LIB_DEPENDS+= db3.1:\${PORTSDIR}/databases/db3"
+ echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3"
+ echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3"
+ ;;
+ \"MySQL\")
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
+ echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
+ ;;
+ \"OpenLDAP\")
+ echo "CONF2+= sample-ldap.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
+ echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
+ SUB_LDAP=""
+ ;;
+ \"Test\")
+ echo "BIN3= smtp-sink smtp-source"
+ SUB_TEST=""
+ ;;
+ \"IPv6\")
+ echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/"
+ echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}"
+ echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz"
+ echo ""
+ echo "pre-patch:"
+ echo " cd \${WRKSRC} && ln -s . postfix"
+ echo ""
+ ;;
+ *)
+ echo "Invalid option(s): $*" > /dev/stderr
+ rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+echo "PLIST_SUB+= SUB_PCRE=\"${SUB_PCRE}\""
+echo "PLIST_SUB+= SUB_SASL=\"${SUB_SASL}\""
+echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\""
+echo "PLIST_SUB+= SUB_LDAP=\"${SUB_LDAP}\""
+echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index 839c9f1819ad..9c4068489960 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -1,90 +1,82 @@
# New ports collection makefile for: postfix
-# Date created: 18 Mar 1999
+# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
PORTNAME= postfix
-PORTVERSION= 19991231.13
-PORTREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
+PORTVERSION= 20010228
+CATEGORIES= mail ipv6
+MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
+ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
ftp://ftp.tux.org/pub/net/postfix/official/ \
ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
ftp://ftp.samurai.com/pub/postfix/official/ \
- ftp://ftp.nl.uu.net/pub/unix/mail/postfix/official/ \
- ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
- ftp://ftp.mira.net/pub/unix/mail/postfix/official/ \
- ftp://coda.nctu.edu.tw/network/mail/postfix/official/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-DISTNAME= ${PORTNAME}-19991231-pl13
+MASTER_SITE_SUBDIR= . old related/postfix
+DISTNAME= release-${PORTVERSION}
MAINTAINER= blaz@amis.net
-.if !defined(DEBUG)
-MAKEFILEFLAGS+= DEBUG=
-.endif
-
-.if defined(CC)
-MAKEFILEFLAGS+= CC="${CC}"
-.endif
-
-MAKEFILEFLAGS+= OPT="${CFLAGS}"
-SCRIPTS_ENV+= MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-
MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
sendmail.1
-MAN5= access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
+MAN5= access.5 aliases.5 canonical.5 regexp_table.5 relocated.5 \
+ transport.5 virtual.5
-MAN8= bounce.8 cleanup.8 defer.8 error.8 local.8 master.8 pickup.8 \
- pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 trivial-rewrite.8
+MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
+ master.8 pickup.8 pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 \
+ spawn.8 trivial-rewrite.8
CONF1= access aliases canonical main.cf master.cf \
- relocated transport virtual
+ regexp_table relocated transport virtual
CONF2= sample-aliases.cf sample-canonical.cf sample-debug.cf \
- sample-filter.cf sample-local.cf sample-misc.cf \
+ sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
sample-rate.cf sample-regexp.cf sample-relocated.cf \
sample-resource.cf sample-rewrite.cf sample-smtp.cf \
sample-smtpd.cf sample-transport.cf sample-virtual.cf
-BIN1= bounce cleanup error local master pickup \
- pipe qmgr showq smtp smtpd trivial-rewrite
+BIN1= bounce cleanup error flush lmtp local master pickup \
+ pipe qmgr showq smtp smtpd spawn trivial-rewrite
BIN2= postalias postcat postconf postdrop postfix \
postkick postlock postlog postmap postsuper sendmail
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
-POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz
+.if defined(NOPORTDOCS)
+PLIST_SUB+= SUB_DOCS="@comment "
+.else
+PLIST_SUB+= SUB_DOCS=""
+DOCDIR= ${PREFIX}/share/doc/postfix
.endif
-.if defined(WITH_LDAP)
-CONF2+= sample-ldap.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-PLIST_SUB+= WITH_LDAP=""
-.else
-PLIST_SUB+= WITH_LDAP="@comment "
+.if !defined(DEBUG)
+MAKEFILEFLAGS+= DEBUG=
.endif
-.if defined(WITH_PCRE)
-CONF2+= sample-pcre.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libpcre.a
-PLIST_SUB+= WITH_PCRE=""
-.else
-PLIST_SUB+= WITH_PCRE="@comment "
+.if defined(CC)
+MAKEFILEFLAGS+= CC="${CC}"
+.endif
+
+MAKEFILEFLAGS+= OPT="${CFLAGS}"
+
+SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
+ PREFIX="${PREFIX}" \
+ TOUCH="${TOUCH}" \
+ MKDIR="${MKDIR}" \
+ MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
+
+pre-fetch:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
post-patch:
- (cd ${WRKSRC} && make -f Makefile.init makefiles ${MAKEFILEFLAGS} \
+ (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
${ECHO} "all: default" >> Makefile)
@@ -122,7 +114,13 @@ do-install:
.for file in ${BIN2}
@${INSTALL_PROGRAM} \
- ${WRKSRC}/${file}/${file} \
+ ${WRKSRC}/src/${file}/${file} \
+ ${PREFIX}/sbin
+.endfor
+
+.for file in ${BIN3}
+ @${INSTALL_PROGRAM} \
+ ${WRKSRC}/src/smtpstone/${file} \
${PREFIX}/sbin
.endfor
@@ -145,11 +143,9 @@ do-install:
.endfor
.if !defined(NOPORTDOCS)
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix
- @cd ${WRKSRC} && ${INSTALL_DATA} LDAP_README MYSQL_README ${PREFIX}/share/doc/postfix
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix/html
- @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${PREFIX}/share/doc/postfix/html && \
- ${ECHO_MSG} "Installed documentation in ${PREFIX}/share/doc/postfix"
+ @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCDIR}
+ @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCDIR} && \
+ ${ECHO_MSG} "Installed HTML documentation in ${DOCDIR}"
.endif
@${ECHO_MSG} '--------------------------------------------------'
@@ -160,6 +156,9 @@ do-install:
post-install:
@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+post-clean:
+ @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
.include <bsd.port.pre.mk>
replace:
@@ -170,10 +169,10 @@ replace:
${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
${ECHO} "#" >> /etc/mail/mailer.conf
- ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
+ ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
.else
@${ECHO_MSG} "===> Replacing sendmail"
@if [ -e /usr/sbin/sendmail ]; then \
diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo
index 854fffa3294c..d6f4fd5c198a 100644
--- a/mail/postfix25/distinfo
+++ b/mail/postfix25/distinfo
@@ -1 +1,3 @@
-MD5 (postfix-19991231-pl13.tar.gz) = f119438aae0aa1346953ae326864da9e
+MD5 (release-20010228.tar.gz) = 6af46cc231ca1e09e60393542d5611bd
+MD5 (pfixtls-0.7.0-20010228-0.9.6.tar.gz) = 64699fb4f0bb4dc87ba1c6c7aef81366
+MD5 (postfix-20010225snap-v6-20010228a.diff.gz) = 8646724c2d00e4d162b63456247cf4fb
diff --git a/mail/postfix25/files/patch-ab b/mail/postfix25/files/patch-ab
index d705b8a7f594..7c81d3dc12c9 100644
--- a/mail/postfix25/files/patch-ab
+++ b/mail/postfix25/files/patch-ab
@@ -1,11 +1,11 @@
---- conf/canonical.orig Sun Sep 5 23:47:01 1999
-+++ conf/canonical Tue Nov 7 22:24:42 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix canonical table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/canonical\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- # DESCRIPTION
- # The optional \fBcanonical\fR file specifies an address mapping for
- # local and non-local addresses. The mapping is used by the
+*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000
+--- ./conf/canonical Thu Jun 1 21:53:23 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/canonical
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/canonical
+ #
diff --git a/mail/postfix25/files/patch-ac b/mail/postfix25/files/patch-ac
index 264335cb70fa..0fb2192cdd84 100644
--- a/mail/postfix25/files/patch-ac
+++ b/mail/postfix25/files/patch-ac
@@ -1,11 +1,11 @@
---- conf/access.orig Fri Dec 11 19:55:48 1998
-+++ conf/access Tue Nov 7 22:25:54 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix access table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/access\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/access\fR
- # DESCRIPTION
- # The optional \fBaccess\fR table directs the Postfix SMTP server
- # to selectively reject or accept mail from or to specific hosts,
+*** ./conf/access.orig Tue Mar 7 10:42:58 2000
+--- ./conf/access Thu Jun 1 21:53:36 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/access
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/access
+ #
diff --git a/mail/postfix25/files/patch-ad b/mail/postfix25/files/patch-ad
new file mode 100644
index 000000000000..c1b102574165
--- /dev/null
+++ b/mail/postfix25/files/patch-ad
@@ -0,0 +1,11 @@
+*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/pcre_table Thu Jun 1 22:02:08 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix25/files/patch-ae b/mail/postfix25/files/patch-ae
new file mode 100644
index 000000000000..e396dd8626db
--- /dev/null
+++ b/mail/postfix25/files/patch-ae
@@ -0,0 +1,11 @@
+*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/regexp_table Thu Jun 1 22:03:27 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix25/files/patch-af b/mail/postfix25/files/patch-af
index ec92981276c6..8fca6b208941 100644
--- a/mail/postfix25/files/patch-af
+++ b/mail/postfix25/files/patch-af
@@ -1,11 +1,11 @@
---- conf/relocated.orig Sun Sep 5 23:47:01 1999
-+++ conf/relocated Tue Nov 7 22:28:27 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix relocated table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/relocated\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- # DESCRIPTION
- # The optional \fBrelocated\fR file provides the information that is
- # used in "user has moved to \fInew_location\fR" bounce messages.
+*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000
+--- ./conf/relocated Thu Jun 1 22:03:59 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/relocated
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/relocated
+ #
diff --git a/mail/postfix25/files/patch-ag b/mail/postfix25/files/patch-ag
new file mode 100644
index 000000000000..54c0fa918d3b
--- /dev/null
+++ b/mail/postfix25/files/patch-ag
@@ -0,0 +1,15 @@
+*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000
+--- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000
+***************
+*** 91,95 ****
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in /etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:/etc/postfix/saslpass
+
+--- 91,95 ----
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass
+
diff --git a/mail/postfix25/files/patch-ao b/mail/postfix25/files/patch-ao
index 206c152728da..fd854e181601 100644
--- a/mail/postfix25/files/patch-ao
+++ b/mail/postfix25/files/patch-ao
@@ -1,11 +1,11 @@
---- conf/transport.orig Fri Dec 31 20:54:11 1999
-+++ conf/transport Tue Nov 7 22:46:59 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix transport table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/transport\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- # DESCRIPTION
- # The optional \fBtransport\fR file specifies a mapping from domain
- # hierarchies to message delivery transports and/or relay hosts. The
+*** ./conf/transport.orig Tue Mar 7 10:42:58 2000
+--- ./conf/transport Thu Jun 1 22:13:41 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/transport
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/transport
+ #
diff --git a/mail/postfix25/files/patch-ap b/mail/postfix25/files/patch-ap
index b412ce386f8d..4598192cd5c1 100644
--- a/mail/postfix25/files/patch-ap
+++ b/mail/postfix25/files/patch-ap
@@ -1,11 +1,11 @@
---- conf/virtual.orig Tue Dec 21 03:00:13 1999
-+++ conf/virtual Tue Nov 7 22:48:18 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix virtual table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/virtual\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- # DESCRIPTION
- # The optional \fBvirtual\fR table specifies redirections for local
- # and non-local recipients or domains. The redirections are used by
+*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000
+--- ./conf/virtual Thu Jun 1 22:13:54 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/virtual
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/virtual
+ #
diff --git a/mail/postfix25/files/patch-bb b/mail/postfix25/files/patch-bb
index 6444bc0d1f75..ea744664dfa7 100644
--- a/mail/postfix25/files/patch-bb
+++ b/mail/postfix25/files/patch-bb
@@ -1,11 +1,20 @@
---- html/access.5.html.orig Fri Dec 11 19:55:49 1998
-+++ html/access.5.html Tue Nov 7 22:48:47 2000
+--- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000
++++ ./html/access.5.html Tue Nov 21 21:24:34 2000
@@ -9,7 +9,7 @@
access - format of Postfix access table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/access</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b>
-
+
<b>DESCRIPTION</b>
The optional <b>access</b> table directs the Postfix SMTP server
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the
+ indexed file after changing the access table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix25/files/patch-bc b/mail/postfix25/files/patch-bc
index 4d24077b9527..e407a9650585 100644
--- a/mail/postfix25/files/patch-bc
+++ b/mail/postfix25/files/patch-bc
@@ -1,11 +1,20 @@
---- html/canonical.5.html.orig Mon Sep 6 05:13:54 1999
-+++ html/canonical.5.html Tue Nov 7 22:51:05 2000
+--- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000
++++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000
@@ -9,7 +9,7 @@
canonical - format of Postfix canonical table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/canonical</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>canonical</b> file specifies an address mapping
+ The optional <b>canonical</b> table specifies an address mapping
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix25/files/patch-bl b/mail/postfix25/files/patch-bl
new file mode 100644
index 000000000000..176c7d1b64de
--- /dev/null
+++ b/mail/postfix25/files/patch-bl
@@ -0,0 +1,11 @@
+*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000
+--- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000
+***************
+*** 11,13 ****
+ <b>SYNOPSIS</b>
+! regexp:/etc/postfix/filename
+
+--- 11,13 ----
+ <b>SYNOPSIS</b>
+! regexp:!!PREFIX!!/etc/postfix/filename
+
diff --git a/mail/postfix25/files/patch-bm b/mail/postfix25/files/patch-bm
index bc9479bea2fe..e5ccc2c50b94 100644
--- a/mail/postfix25/files/patch-bm
+++ b/mail/postfix25/files/patch-bm
@@ -1,11 +1,20 @@
---- html/relocated.5.html.orig Mon Sep 6 05:13:55 1999
-+++ html/relocated.5.html Tue Nov 7 22:52:46 2000
+--- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000
++++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000
@@ -9,7 +9,7 @@
relocated - format of Postfix relocated table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/relocated</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>relocated</b> file provides the information that
+ The optional <b>relocated</b> table provides the information that
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the
+ indexed file after changing the relocated table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix25/files/patch-bo b/mail/postfix25/files/patch-bo
index 41cbc4ca6d65..b45270be8151 100644
--- a/mail/postfix25/files/patch-bo
+++ b/mail/postfix25/files/patch-bo
@@ -1,11 +1,20 @@
---- html/transport.5.html.orig Fri Dec 31 20:54:56 1999
-+++ html/transport.5.html Tue Nov 7 22:53:50 2000
+--- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000
++++ ./html/transport.5.html Tue Nov 21 21:43:20 2000
@@ -9,7 +9,7 @@
transport - format of Postfix transport table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/transport</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>transport</b> file specifies a mapping from
+ The optional <b>transport</b> table specifies a mapping from
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the
+ indexed file after changing the transport table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix25/files/patch-bp b/mail/postfix25/files/patch-bp
index bb65bd98a7b8..5206bfd4bfd0 100644
--- a/mail/postfix25/files/patch-bp
+++ b/mail/postfix25/files/patch-bp
@@ -1,11 +1,43 @@
---- html/virtual.5.html.orig Tue Dec 21 03:00:58 1999
-+++ html/virtual.5.html Tue Nov 7 22:55:04 2000
+--- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000
++++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000
@@ -9,7 +9,7 @@
virtual - format of Postfix virtual table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/virtual</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>virtual</b> table specifies redirections for
+ The optional <b>virtual</b> table specifies address redirections
+@@ -27,7 +27,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
+@@ -52,7 +52,7 @@
+
+ Support for a Postfix-style virtual domain looks like:
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter)
+ <i>postmaster@virtual.domain</i> <i>postmaster</i>
+ <i>user1@virtual.domain</i> <i>address1</i>
+@@ -94,11 +94,11 @@
+
+ Support for a Sendmail-style virtual domain looks like:
+
+- /etc/postfix/main.cf:
++ !!PREFIX!!/etc/postfix/main.cf:
+ mydestination = $myhostname localhost.$mydomain $mydomain
+ <i>virtual.domain</i>
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>user1@virtual.domain</i> <i>address1</i>
+ <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i>
+
diff --git a/mail/postfix25/files/patch-cb b/mail/postfix25/files/patch-cb
index ef73429287d2..58559c7273d1 100644
--- a/mail/postfix25/files/patch-cb
+++ b/mail/postfix25/files/patch-cb
@@ -1,25 +1,20 @@
---- man/man1/sendmail.1.orig Thu Mar 30 17:46:10 2000
-+++ man/man1/sendmail.1 Wed Dec 20 18:37:45 2000
-@@ -61,10 +61,12 @@
- \fBjust-send-eight\fR.
- .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- The path name of the \fBsendmail.cf\fR file. Postfix configuration
--files are kept in \fB/etc/postfix\fR.
-+files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- .IP "\fB-F \fIfull_name\fR
- Set the sender full name. This is used only with messages that
- have no \fBFrom:\fR message header.
-+.IP "\fB-G\fR (ignored)"
-+Gateway (relay) submission, as opposed to initial user submission.
- .IP \fB-I\fR
- Initialize alias database. See the \fBnewaliases\fR
- command above.
-@@ -171,7 +173,7 @@
- .na
- .nf
- /var/spool/postfix, mail queue
--/etc/postfix, configuration files
-+!!PREFIX!!/etc/postfix, configuration files
- .SH CONFIGURATION PARAMETERS
- .na
- .nf
+*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000
+--- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000
+***************
+*** 63,65 ****
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+--- 63,65 ----
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+***************
+*** 173,175 ****
+ /var/spool/postfix, mail queue
+! /etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
+--- 173,175 ----
+ /var/spool/postfix, mail queue
+! !!PREFIX!!/etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
diff --git a/mail/postfix25/files/patch-cc b/mail/postfix25/files/patch-cc
new file mode 100644
index 000000000000..cd6946003217
--- /dev/null
+++ b/mail/postfix25/files/patch-cc
@@ -0,0 +1,11 @@
+*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000
+***************
+*** 10,12 ****
+ .nf
+! pcre:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! pcre:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix25/files/patch-cd b/mail/postfix25/files/patch-cd
index 36461a39bb49..b51de44d0bee 100644
--- a/mail/postfix25/files/patch-cd
+++ b/mail/postfix25/files/patch-cd
@@ -1,11 +1,20 @@
---- man/man5/access.5.orig Fri Dec 11 19:55:52 1998
-+++ man/man5/access.5 Tue Nov 7 22:56:25 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/access\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/access\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/access.5 Thu Jun 1 22:39:55 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/access\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
diff --git a/mail/postfix25/files/patch-ce b/mail/postfix25/files/patch-ce
index 0e0bd4aa1ae5..f77053f8b3aa 100644
--- a/mail/postfix25/files/patch-ce
+++ b/mail/postfix25/files/patch-ce
@@ -1,11 +1,20 @@
---- man/man5/canonical.5.orig Mon Sep 6 05:13:32 1999
-+++ man/man5/canonical.5 Tue Nov 7 22:57:40 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/canonical\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/canonical\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
diff --git a/mail/postfix25/files/patch-cf b/mail/postfix25/files/patch-cf
new file mode 100644
index 000000000000..28fb053b94a7
--- /dev/null
+++ b/mail/postfix25/files/patch-cf
@@ -0,0 +1,11 @@
+*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000
+***************
+*** 10,12 ****
+ .nf
+! regexp:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! regexp:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix25/files/patch-cg b/mail/postfix25/files/patch-cg
index cdce4aaddaf3..0ae82cc57669 100644
--- a/mail/postfix25/files/patch-cg
+++ b/mail/postfix25/files/patch-cg
@@ -1,11 +1,20 @@
---- man/man5/relocated.5.orig Mon Sep 6 05:13:33 1999
-+++ man/man5/relocated.5 Tue Nov 7 22:59:11 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/relocated\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/relocated\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ .SH DESCRIPTION
+***************
+*** 20,22 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
+--- 20,22 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
diff --git a/mail/postfix25/files/patch-ch b/mail/postfix25/files/patch-ch
index 80df028f9255..3ed047ea474c 100644
--- a/mail/postfix25/files/patch-ch
+++ b/mail/postfix25/files/patch-ch
@@ -1,11 +1,20 @@
---- man/man5/transport.5.orig Fri Dec 31 20:54:51 1999
-+++ man/man5/transport.5 Tue Nov 7 22:59:57 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/transport\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/transport\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
+--- 21,23 ----
+ for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
diff --git a/mail/postfix25/files/patch-ci b/mail/postfix25/files/patch-ci
index 889eed3f4d89..1a7cf4abbac7 100644
--- a/mail/postfix25/files/patch-ci
+++ b/mail/postfix25/files/patch-ci
@@ -1,11 +1,20 @@
---- man/man5/virtual.5.orig Tue Dec 21 03:00:51 1999
-+++ man/man5/virtual.5 Tue Nov 7 23:00:32 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/virtual\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/virtual\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ .SH DESCRIPTION
+***************
+*** 26,28 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
+--- 26,28 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
diff --git a/mail/postfix25/files/patch-da b/mail/postfix25/files/patch-da
new file mode 100644
index 000000000000..e57e31750d18
--- /dev/null
+++ b/mail/postfix25/files/patch-da
@@ -0,0 +1,11 @@
+*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000
+--- ./proto/regexp_table Thu Jun 1 22:44:43 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix25/files/patch-db b/mail/postfix25/files/patch-db
new file mode 100644
index 000000000000..7f89fb770783
--- /dev/null
+++ b/mail/postfix25/files/patch-db
@@ -0,0 +1,20 @@
+*** ./proto/access.orig Sun Apr 9 16:44:45 2000
+--- ./proto/access Thu Jun 1 22:45:05 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/access\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
diff --git a/mail/postfix25/files/patch-dc b/mail/postfix25/files/patch-dc
new file mode 100644
index 000000000000..786f2da45c32
--- /dev/null
+++ b/mail/postfix25/files/patch-dc
@@ -0,0 +1,20 @@
+*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000
+--- ./proto/canonical Thu Jun 1 22:45:28 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/canonical\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
diff --git a/mail/postfix25/files/patch-dd b/mail/postfix25/files/patch-dd
new file mode 100644
index 000000000000..b65a57ff7d57
--- /dev/null
+++ b/mail/postfix25/files/patch-dd
@@ -0,0 +1,11 @@
+*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000
+--- ./proto/pcre_table Thu Jun 1 22:45:41 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix25/files/patch-de b/mail/postfix25/files/patch-de
new file mode 100644
index 000000000000..73bb2af2261d
--- /dev/null
+++ b/mail/postfix25/files/patch-de
@@ -0,0 +1,20 @@
+*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000
+--- ./proto/relocated Thu Jun 1 22:46:02 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/relocated\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ # DESCRIPTION
+***************
+*** 14,16 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
+--- 14,16 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
diff --git a/mail/postfix25/files/patch-df b/mail/postfix25/files/patch-df
new file mode 100644
index 000000000000..8d3fba96a224
--- /dev/null
+++ b/mail/postfix25/files/patch-df
@@ -0,0 +1,20 @@
+*** ./proto/transport.orig Sun Apr 9 17:05:45 2000
+--- ./proto/transport Thu Jun 1 22:46:23 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/transport\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
+--- 15,17 ----
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
diff --git a/mail/postfix25/files/patch-dg b/mail/postfix25/files/patch-dg
new file mode 100644
index 000000000000..bff20a2cff3e
--- /dev/null
+++ b/mail/postfix25/files/patch-dg
@@ -0,0 +1,20 @@
+*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000
+--- ./proto/virtual Thu Jun 1 22:46:40 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/virtual\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ # DESCRIPTION
+***************
+*** 20,22 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
+--- 20,22 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
diff --git a/mail/postfix25/files/patch-ea b/mail/postfix25/files/patch-ea
index 80647e0b2ba0..6c3f98d2af4f 100644
--- a/mail/postfix25/files/patch-ea
+++ b/mail/postfix25/files/patch-ea
@@ -1,5 +1,5 @@
-*** ./cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
---- ./cleanup/cleanup.c Thu Jun 1 21:52:22 2000
+*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
+--- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000
***************
*** 118,121 ****
/* FILES
diff --git a/mail/postfix25/files/patch-eb b/mail/postfix25/files/patch-eb
index d576de434580..e67680963d2d 100644
--- a/mail/postfix25/files/patch-eb
+++ b/mail/postfix25/files/patch-eb
@@ -1,5 +1,5 @@
-*** ./global/mail_conf.c.orig Sun May 7 18:51:16 2000
---- ./global/mail_conf.c Thu Jun 1 22:16:29 2000
+*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000
+--- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000
***************
*** 53,55 ****
/* FILES
diff --git a/mail/postfix25/files/patch-ec b/mail/postfix25/files/patch-ec
index 74edda76007b..6d12d1ce4c17 100644
--- a/mail/postfix25/files/patch-ec
+++ b/mail/postfix25/files/patch-ec
@@ -1,5 +1,5 @@
-*** ./global/mail_params.h.orig Wed May 31 19:18:31 2000
---- ./global/mail_params.h Thu Jun 1 22:17:10 2000
+*** ./src/global/mail_params.h.orig Wed May 31 19:18:31 2000
+--- ./src/global/mail_params.h Thu Jun 1 22:17:10 2000
***************
*** 155,157 ****
#ifndef DEF_PROGRAM_DIR
diff --git a/mail/postfix25/files/patch-ed b/mail/postfix25/files/patch-ed
index b573748b45e1..f971b62720d8 100644
--- a/mail/postfix25/files/patch-ed
+++ b/mail/postfix25/files/patch-ed
@@ -1,5 +1,5 @@
-*** ./local/mailbox.c.orig Fri Apr 28 16:55:53 2000
---- ./local/mailbox.c Thu Jun 1 22:37:48 2000
+*** ./src/local/mailbox.c.orig Fri Apr 28 16:55:53 2000
+--- ./src/local/mailbox.c Thu Jun 1 22:37:48 2000
***************
*** 15,17 ****
/* suppression. The default is direct mailbox delivery to
diff --git a/mail/postfix25/files/patch-ee b/mail/postfix25/files/patch-ee
index d79219b1ba62..ef44eac24b73 100644
--- a/mail/postfix25/files/patch-ee
+++ b/mail/postfix25/files/patch-ee
@@ -1,5 +1,5 @@
-*** ./master/master.c.orig Tue Mar 7 10:25:07 2000
---- ./master/master.c Thu Jun 1 22:43:50 2000
+*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000
+--- ./src/master/master.c Thu Jun 1 22:43:50 2000
***************
*** 104,107 ****
/* FILES
diff --git a/mail/postfix25/files/patch-ef b/mail/postfix25/files/patch-ef
index 44816a063b95..586b304a103d 100644
--- a/mail/postfix25/files/patch-ef
+++ b/mail/postfix25/files/patch-ef
@@ -1,5 +1,5 @@
-*** ./postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
---- ./postdrop/postdrop.c Thu Jun 1 22:44:22 2000
+*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
+--- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000
***************
*** 39,41 ****
/* /var/spool/postfix, mail queue
diff --git a/mail/postfix25/files/patch-eg b/mail/postfix25/files/patch-eg
index 28950509870c..2983bbfd86ea 100644
--- a/mail/postfix25/files/patch-eg
+++ b/mail/postfix25/files/patch-eg
@@ -1,34 +1,20 @@
---- sendmail/sendmail.c.orig Sun Mar 26 22:51:33 2000
-+++ sendmail/sendmail.c Wed Dec 20 18:17:31 2000
-@@ -55,10 +55,12 @@
- /* \fBjust-send-eight\fR.
- /* .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
--/* files are kept in \fB/etc/postfix\fR.
-+/* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- /* .IP "\fB-F \fIfull_name\fR
- /* Set the sender full name. This is used only with messages that
- /* have no \fBFrom:\fR message header.
-+/* .IP "\fB-G \fR (ignored)"
-+/* Gateway (relay) submission, as opposed to initial user submission.
- /* .IP \fB-I\fR
- /* Initialize alias database. See the \fBnewaliases\fR
- /* command above.
-@@ -157,7 +159,7 @@
- /* \fBdebugger_command\fR configuration parameter.
- /* FILES
- /* /var/spool/postfix, mail queue
--/* /etc/postfix, configuration files
-+/* !!PREFIX!!/etc/postfix, configuration files
- /* CONFIGURATION PARAMETERS
- /* .ad
- /* .fi
-@@ -710,6 +712,8 @@
- break;
- case 'F': /* full name */
- full_name = optarg;
-+ break;
-+ case 'G': /* gateway submission */
- break;
- case 'I': /* newaliases */
- mode = SM_MODE_NEWALIAS;
+*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000
+--- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000
+***************
+*** 57,59 ****
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+--- 57,59 ----
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+***************
+*** 159,161 ****
+ /* /var/spool/postfix, mail queue
+! /* /etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
+--- 159,161 ----
+ /* /var/spool/postfix, mail queue
+! /* !!PREFIX!!/etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix25/files/patch-eh b/mail/postfix25/files/patch-eh
index f95b51423128..c104c3680d21 100644
--- a/mail/postfix25/files/patch-eh
+++ b/mail/postfix25/files/patch-eh
@@ -1,5 +1,5 @@
-*** ./trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
---- ./trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
+*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
+--- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
***************
*** 32,34 ****
/* FILES
diff --git a/mail/postfix25/files/patch-ei b/mail/postfix25/files/patch-ei
new file mode 100644
index 000000000000..3029372b746e
--- /dev/null
+++ b/mail/postfix25/files/patch-ei
@@ -0,0 +1,21 @@
+*** ./src/smtpd/smtpd.h.orig Thu Sep 14 10:17:23 2000
+--- ./src/smtpd/smtpd.h Thu Sep 14 10:17:38 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix25/files/patch-ej b/mail/postfix25/files/patch-ej
new file mode 100644
index 000000000000..6c5cf2e23758
--- /dev/null
+++ b/mail/postfix25/files/patch-ej
@@ -0,0 +1,21 @@
+*** ./src/smtp/smtp.h.orig Thu Sep 14 13:04:43 2000
+--- ./src/smtp/smtp.h Thu Sep 14 13:04:53 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix25/files/patch-fa b/mail/postfix25/files/patch-fa
deleted file mode 100644
index bc1c2dc388c2..000000000000
--- a/mail/postfix25/files/patch-fa
+++ /dev/null
@@ -1,12 +0,0 @@
---- makedefs.orig Sun Jan 23 03:04:27 2000
-+++ makedefs Mon Apr 3 08:59:17 2000
-@@ -89,6 +89,8 @@
- ;;
- FreeBSD.4*) SYSTYPE=FREEBSD4
- ;;
-+ FreeBSD.5*) SYSTYPE=FREEBSD5
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- NetBSD.1*) SYSTYPE=NETBSD1
-
diff --git a/mail/postfix25/files/patch-fb b/mail/postfix25/files/patch-fb
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix25/files/patch-fb
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
- * makedefs script, and adding a section below for the new system.
- */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+ || defined(FREEBSD5) \
- || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
- || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix25/files/patch-ga b/mail/postfix25/files/patch-ga
index 3ad7120b8322..60a6dd578564 100644
--- a/mail/postfix25/files/patch-ga
+++ b/mail/postfix25/files/patch-ga
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_MYSQL" option at compile time ("make -DWITH_MYSQL").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
[Code contributed by Scott Cotton and Joshua Marcus, IC Group, Inc.]
diff --git a/mail/postfix25/files/patch-gb b/mail/postfix25/files/patch-gb
index 312c8c60f9e5..98816d155122 100644
--- a/mail/postfix25/files/patch-gb
+++ b/mail/postfix25/files/patch-gb
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_LDAP" option at compile time ("make -DWITH_LDAP").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
BUILDING WITH LDAP SUPPORT
==========================
diff --git a/mail/postfix25/files/patch-lmtp.h b/mail/postfix25/files/patch-lmtp.h
new file mode 100644
index 000000000000..3d941c034198
--- /dev/null
+++ b/mail/postfix25/files/patch-lmtp.h
@@ -0,0 +1,13 @@
+--- ./src/lmtp/lmtp.h.orig Fri Jan 19 15:43:06 2001
++++ ./src/lmtp/lmtp.h Sat Feb 3 14:01:09 2001
+@@ -12,8 +12,8 @@
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+-#include <sasl.h>
+-#include <saslutil.h>
++#include <sasl/sasl.h>
++#include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix25/pkg-install b/mail/postfix25/pkg-install
index 933c669e6b98..0d18b67ddee3 100644
--- a/mail/postfix25/pkg-install
+++ b/mail/postfix25/pkg-install
@@ -1,4 +1,9 @@
#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
user=postfix
group=postfix
@@ -87,6 +92,5 @@ if [ x"$2" = xPOST-INSTALL ]; then
fi
/usr/sbin/chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
/bin/chmod 2555 ${PKG_PREFIX}/sbin/postdrop
- /bin/mkdir -p /var/spool/postfix
${PKG_PREFIX}/sbin/postfix check
fi
diff --git a/mail/postfix25/pkg-plist b/mail/postfix25/pkg-plist
index 5f8572883b4c..97167cb8ed15 100644
--- a/mail/postfix25/pkg-plist
+++ b/mail/postfix25/pkg-plist
@@ -5,24 +5,29 @@ etc/postfix/postfix-script
etc/postfix/sample-access
etc/postfix/sample-aliases
etc/postfix/sample-aliases.cf
+%%SUB_SASL%%etc/postfix/sample-auth.cf
etc/postfix/sample-canonical
etc/postfix/sample-canonical.cf
etc/postfix/sample-debug.cf
etc/postfix/sample-filter.cf
-%%WITH_LDAP%%etc/postfix/sample-ldap.cf
+etc/postfix/sample-flush.cf
+%%SUB_LDAP%%etc/postfix/sample-ldap.cf
etc/postfix/sample-local.cf
etc/postfix/sample-main.cf
etc/postfix/sample-master.cf
etc/postfix/sample-misc.cf
-%%WITH_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre_table
etc/postfix/sample-rate.cf
etc/postfix/sample-regexp.cf
+etc/postfix/sample-regexp_table
etc/postfix/sample-relocated
etc/postfix/sample-relocated.cf
etc/postfix/sample-resource.cf
etc/postfix/sample-rewrite.cf
etc/postfix/sample-smtp.cf
etc/postfix/sample-smtpd.cf
+%%SUB_TLS%%etc/postfix/sample-tls.cf
etc/postfix/sample-transport
etc/postfix/sample-transport.cf
etc/postfix/sample-virtual
@@ -30,6 +35,8 @@ etc/postfix/sample-virtual.cf
libexec/postfix/bounce
libexec/postfix/cleanup
libexec/postfix/error
+libexec/postfix/flush
+libexec/postfix/lmtp
libexec/postfix/local
libexec/postfix/master
libexec/postfix/pickup
@@ -38,6 +45,8 @@ libexec/postfix/qmgr
libexec/postfix/showq
libexec/postfix/smtp
libexec/postfix/smtpd
+libexec/postfix/spawn
+%%SUB_TLS%%libexec/postfix/tlsmgr
libexec/postfix/trivial-rewrite
sbin/postalias
sbin/postcat
@@ -50,62 +59,66 @@ sbin/postlog
sbin/postmap
sbin/postsuper
sbin/sendmail
-share/doc/postfix/LDAP_README
-share/doc/postfix/MYSQL_README
-share/doc/postfix/html/access.5.html
-share/doc/postfix/html/aliases.5.html
-share/doc/postfix/html/architecture.html
-share/doc/postfix/html/backstage.html
-share/doc/postfix/html/basic.html
-share/doc/postfix/html/big-picture.gif
-share/doc/postfix/html/big-picture.html
-share/doc/postfix/html/bounce.8.html
-share/doc/postfix/html/canonical.5.html
-share/doc/postfix/html/cleanup.8.html
-share/doc/postfix/html/commands.html
-share/doc/postfix/html/defer.8.html
-share/doc/postfix/html/delivering.html
-share/doc/postfix/html/error.8.html
-share/doc/postfix/html/faq.html
-share/doc/postfix/html/goals.html
-share/doc/postfix/html/inbound.gif
-share/doc/postfix/html/index.html
-share/doc/postfix/html/local.8.html
-share/doc/postfix/html/mailq.1.html
-share/doc/postfix/html/master.8.html
-share/doc/postfix/html/motivation.html
-share/doc/postfix/html/newaliases.1.html
-share/doc/postfix/html/outbound.gif
-share/doc/postfix/html/pickup.8.html
-share/doc/postfix/html/pipe.8.html
-share/doc/postfix/html/postalias.1.html
-share/doc/postfix/html/postcat.1.html
-share/doc/postfix/html/postconf.1.html
-share/doc/postfix/html/postdrop.1.html
-share/doc/postfix/html/postfix.1.html
-share/doc/postfix/html/postkick.1.html
-share/doc/postfix/html/postlock.1.html
-share/doc/postfix/html/postlog.1.html
-share/doc/postfix/html/postmap.1.html
-share/doc/postfix/html/postsuper.1.html
-share/doc/postfix/html/qmgr.8.html
-share/doc/postfix/html/queuing.html
-share/doc/postfix/html/rate.html
-share/doc/postfix/html/receiving.html
-share/doc/postfix/html/relocated.5.html
-share/doc/postfix/html/resource.html
-share/doc/postfix/html/rewrite.html
-share/doc/postfix/html/security.html
-share/doc/postfix/html/sendmail.1.html
-share/doc/postfix/html/showq.8.html
-share/doc/postfix/html/small-picture.gif
-share/doc/postfix/html/smtp.8.html
-share/doc/postfix/html/smtpd.8.html
-share/doc/postfix/html/transport.5.html
-share/doc/postfix/html/trivial-rewrite.8.html
-share/doc/postfix/html/uce.html
-share/doc/postfix/html/virtual.5.html
-@dirrm etc/postfix
+%%SUB_TEST%%sbin/smtp-sink
+%%SUB_TEST%%sbin/smtp-source
+%%SUB_DOCS%%share/doc/postfix/access.5.html
+%%SUB_DOCS%%share/doc/postfix/aliases.5.html
+%%SUB_DOCS%%share/doc/postfix/architecture.html
+%%SUB_DOCS%%share/doc/postfix/backstage.html
+%%SUB_DOCS%%share/doc/postfix/basic.html
+%%SUB_DOCS%%share/doc/postfix/big-picture.gif
+%%SUB_DOCS%%share/doc/postfix/big-picture.html
+%%SUB_DOCS%%share/doc/postfix/bounce.8.html
+%%SUB_DOCS%%share/doc/postfix/canonical.5.html
+%%SUB_DOCS%%share/doc/postfix/cleanup.8.html
+%%SUB_DOCS%%share/doc/postfix/commands.html
+%%SUB_DOCS%%share/doc/postfix/defer.8.html
+%%SUB_DOCS%%share/doc/postfix/delivering.html
+%%SUB_DOCS%%share/doc/postfix/error.8.html
+%%SUB_DOCS%%share/doc/postfix/faq.html
+%%SUB_DOCS%%share/doc/postfix/flush.8.html
+%%SUB_DOCS%%share/doc/postfix/goals.html
+%%SUB_DOCS%%share/doc/postfix/inbound.gif
+%%SUB_DOCS%%share/doc/postfix/index.html
+%%SUB_DOCS%%share/doc/postfix/lmtp.8.html
+%%SUB_DOCS%%share/doc/postfix/local.8.html
+%%SUB_DOCS%%share/doc/postfix/mailq.1.html
+%%SUB_DOCS%%share/doc/postfix/master.8.html
+%%SUB_DOCS%%share/doc/postfix/motivation.html
+%%SUB_DOCS%%share/doc/postfix/newaliases.1.html
+%%SUB_DOCS%%share/doc/postfix/outbound.gif
+%%SUB_DOCS%%share/doc/postfix/pcre_table.5.html
+%%SUB_DOCS%%share/doc/postfix/pickup.8.html
+%%SUB_DOCS%%share/doc/postfix/pipe.8.html
+%%SUB_DOCS%%share/doc/postfix/postalias.1.html
+%%SUB_DOCS%%share/doc/postfix/postcat.1.html
+%%SUB_DOCS%%share/doc/postfix/postconf.1.html
+%%SUB_DOCS%%share/doc/postfix/postdrop.1.html
+%%SUB_DOCS%%share/doc/postfix/postfix.1.html
+%%SUB_DOCS%%share/doc/postfix/postkick.1.html
+%%SUB_DOCS%%share/doc/postfix/postlock.1.html
+%%SUB_DOCS%%share/doc/postfix/postlog.1.html
+%%SUB_DOCS%%share/doc/postfix/postmap.1.html
+%%SUB_DOCS%%share/doc/postfix/postsuper.1.html
+%%SUB_DOCS%%share/doc/postfix/qmgr.8.html
+%%SUB_DOCS%%share/doc/postfix/queuing.html
+%%SUB_DOCS%%share/doc/postfix/rate.html
+%%SUB_DOCS%%share/doc/postfix/receiving.html
+%%SUB_DOCS%%share/doc/postfix/regexp_table.5.html
+%%SUB_DOCS%%share/doc/postfix/relocated.5.html
+%%SUB_DOCS%%share/doc/postfix/resource.html
+%%SUB_DOCS%%share/doc/postfix/rewrite.html
+%%SUB_DOCS%%share/doc/postfix/security.html
+%%SUB_DOCS%%share/doc/postfix/sendmail.1.html
+%%SUB_DOCS%%share/doc/postfix/showq.8.html
+%%SUB_DOCS%%share/doc/postfix/small-picture.gif
+%%SUB_DOCS%%share/doc/postfix/smtp.8.html
+%%SUB_DOCS%%share/doc/postfix/smtpd.8.html
+%%SUB_DOCS%%share/doc/postfix/spawn.8.html
+%%SUB_DOCS%%share/doc/postfix/transport.5.html
+%%SUB_DOCS%%share/doc/postfix/trivial-rewrite.8.html
+%%SUB_DOCS%%share/doc/postfix/uce.html
+%%SUB_DOCS%%share/doc/postfix/virtual.5.html
+%%SUB_DOCS%%@dirrm share/doc/postfix
@dirrm libexec/postfix
-@dirrm share/doc/postfix/html
-@dirrm share/doc/postfix
+@dirrm etc/postfix
diff --git a/mail/postfix25/scripts/configure.postfix b/mail/postfix25/scripts/configure.postfix
new file mode 100644
index 000000000000..a58699f6f336
--- /dev/null
+++ b/mail/postfix25/scripts/configure.postfix
@@ -0,0 +1,129 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.1 2001-03-04 19:35:00 sf Exp $
+
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
+ exit
+fi
+
+tempfile=`mktemp -t checklist`
+
+if [ "${BATCH}" = "yes" ]; then
+ set \"PCRE\"
+else
+ /usr/bin/dialog --title "Postfix configuration options" --clear \
+ --checklist "\n\
+Please select desired options:" -1 -1 16 \
+PCRE "Perl Compatible Regular Expressions" OFF \
+SASL "Cyrus SASL (Simple Authentication and Security Layer)" OFF \
+DB3 "Berkeley DB3 (required if SASL also built with DB3)" OFF \
+MySQL "MySQL map lookups" OFF \
+OpenLDAP "OpenLDAP map lookups" OFF \
+Test "SMTP/LMTP test server and generator" OFF \
+TLS "Secure Sockets Layer and Transport Layer Security" OFF \
+IPv6 "IPv6 support" OFF \
+2> $tempfile
+
+ retval=$?
+
+ if [ -s $tempfile ]; then
+ set `cat $tempfile`
+ fi
+ rm -f $tempfile
+
+ case $retval in
+ 0) if [ -z "$*" ]; then
+ echo "Nothing selected"
+ fi
+ ;;
+ 1) echo "Cancel pressed."
+ exit 1
+ ;;
+ esac
+fi
+
+${MKDIR} ${WRKDIRPREFIX}${CURDIR}
+exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+
+echo "PREFIX= ${PREFIX}"
+
+SUB_PCRE="@comment "
+SUB_SASL="@comment "
+SUB_TLS="@comment "
+SUB_LDAP="@comment "
+SUB_TEST="@comment "
+
+while [ "$1" ]; do
+ case $1 in
+ \"PCRE\")
+ echo "CONF1+= pcre_table"
+ echo "CONF2+= sample-pcre.cf"
+ echo "MAN5+= pcre_table.5"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre"
+ echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a"
+ SUB_PCRE=""
+ ;;
+ \"SASL\")
+ echo "CONF2+= sample-auth.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl"
+ echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -lpam -lcrypt"
+ echo ".if exists(/usr/lib/libkrb.a)"
+ echo "POSTFIX_AUXLIBS+= -lkrb -ldes -lcom_err"
+ echo ".endif"
+ SUB_SASL=""
+ ;;
+ \"TLS\")
+ echo "CONF2+= sample-tls.cf"
+ echo "BIN1+= tlsmgr"
+ echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl"
+ echo "POSTFIX_AUXLIBS+= -lssl -lcrypto"
+ echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.7.0-20010228-0.9.6.tar.gz"
+ echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.7.0-20010228-0.9.6/pfixtls.diff"
+ echo "PATCH_STRIP= -p1"
+ SUB_TLS=""
+ ;;
+ \"DB3\")
+ echo "LIB_DEPENDS+= db3.1:\${PORTSDIR}/databases/db3"
+ echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3"
+ echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3"
+ ;;
+ \"MySQL\")
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
+ echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
+ ;;
+ \"OpenLDAP\")
+ echo "CONF2+= sample-ldap.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
+ echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
+ SUB_LDAP=""
+ ;;
+ \"Test\")
+ echo "BIN3= smtp-sink smtp-source"
+ SUB_TEST=""
+ ;;
+ \"IPv6\")
+ echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/"
+ echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}"
+ echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz"
+ echo ""
+ echo "pre-patch:"
+ echo " cd \${WRKSRC} && ln -s . postfix"
+ echo ""
+ ;;
+ *)
+ echo "Invalid option(s): $*" > /dev/stderr
+ rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+echo "PLIST_SUB+= SUB_PCRE=\"${SUB_PCRE}\""
+echo "PLIST_SUB+= SUB_SASL=\"${SUB_SASL}\""
+echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\""
+echo "PLIST_SUB+= SUB_LDAP=\"${SUB_LDAP}\""
+echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index 839c9f1819ad..9c4068489960 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -1,90 +1,82 @@
# New ports collection makefile for: postfix
-# Date created: 18 Mar 1999
+# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
PORTNAME= postfix
-PORTVERSION= 19991231.13
-PORTREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
+PORTVERSION= 20010228
+CATEGORIES= mail ipv6
+MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
+ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
ftp://ftp.tux.org/pub/net/postfix/official/ \
ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
ftp://ftp.samurai.com/pub/postfix/official/ \
- ftp://ftp.nl.uu.net/pub/unix/mail/postfix/official/ \
- ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
- ftp://ftp.mira.net/pub/unix/mail/postfix/official/ \
- ftp://coda.nctu.edu.tw/network/mail/postfix/official/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-DISTNAME= ${PORTNAME}-19991231-pl13
+MASTER_SITE_SUBDIR= . old related/postfix
+DISTNAME= release-${PORTVERSION}
MAINTAINER= blaz@amis.net
-.if !defined(DEBUG)
-MAKEFILEFLAGS+= DEBUG=
-.endif
-
-.if defined(CC)
-MAKEFILEFLAGS+= CC="${CC}"
-.endif
-
-MAKEFILEFLAGS+= OPT="${CFLAGS}"
-SCRIPTS_ENV+= MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-
MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
sendmail.1
-MAN5= access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
+MAN5= access.5 aliases.5 canonical.5 regexp_table.5 relocated.5 \
+ transport.5 virtual.5
-MAN8= bounce.8 cleanup.8 defer.8 error.8 local.8 master.8 pickup.8 \
- pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 trivial-rewrite.8
+MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
+ master.8 pickup.8 pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 \
+ spawn.8 trivial-rewrite.8
CONF1= access aliases canonical main.cf master.cf \
- relocated transport virtual
+ regexp_table relocated transport virtual
CONF2= sample-aliases.cf sample-canonical.cf sample-debug.cf \
- sample-filter.cf sample-local.cf sample-misc.cf \
+ sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
sample-rate.cf sample-regexp.cf sample-relocated.cf \
sample-resource.cf sample-rewrite.cf sample-smtp.cf \
sample-smtpd.cf sample-transport.cf sample-virtual.cf
-BIN1= bounce cleanup error local master pickup \
- pipe qmgr showq smtp smtpd trivial-rewrite
+BIN1= bounce cleanup error flush lmtp local master pickup \
+ pipe qmgr showq smtp smtpd spawn trivial-rewrite
BIN2= postalias postcat postconf postdrop postfix \
postkick postlock postlog postmap postsuper sendmail
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
-POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz
+.if defined(NOPORTDOCS)
+PLIST_SUB+= SUB_DOCS="@comment "
+.else
+PLIST_SUB+= SUB_DOCS=""
+DOCDIR= ${PREFIX}/share/doc/postfix
.endif
-.if defined(WITH_LDAP)
-CONF2+= sample-ldap.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-PLIST_SUB+= WITH_LDAP=""
-.else
-PLIST_SUB+= WITH_LDAP="@comment "
+.if !defined(DEBUG)
+MAKEFILEFLAGS+= DEBUG=
.endif
-.if defined(WITH_PCRE)
-CONF2+= sample-pcre.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libpcre.a
-PLIST_SUB+= WITH_PCRE=""
-.else
-PLIST_SUB+= WITH_PCRE="@comment "
+.if defined(CC)
+MAKEFILEFLAGS+= CC="${CC}"
+.endif
+
+MAKEFILEFLAGS+= OPT="${CFLAGS}"
+
+SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
+ PREFIX="${PREFIX}" \
+ TOUCH="${TOUCH}" \
+ MKDIR="${MKDIR}" \
+ MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
+
+pre-fetch:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
post-patch:
- (cd ${WRKSRC} && make -f Makefile.init makefiles ${MAKEFILEFLAGS} \
+ (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
${ECHO} "all: default" >> Makefile)
@@ -122,7 +114,13 @@ do-install:
.for file in ${BIN2}
@${INSTALL_PROGRAM} \
- ${WRKSRC}/${file}/${file} \
+ ${WRKSRC}/src/${file}/${file} \
+ ${PREFIX}/sbin
+.endfor
+
+.for file in ${BIN3}
+ @${INSTALL_PROGRAM} \
+ ${WRKSRC}/src/smtpstone/${file} \
${PREFIX}/sbin
.endfor
@@ -145,11 +143,9 @@ do-install:
.endfor
.if !defined(NOPORTDOCS)
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix
- @cd ${WRKSRC} && ${INSTALL_DATA} LDAP_README MYSQL_README ${PREFIX}/share/doc/postfix
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix/html
- @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${PREFIX}/share/doc/postfix/html && \
- ${ECHO_MSG} "Installed documentation in ${PREFIX}/share/doc/postfix"
+ @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCDIR}
+ @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCDIR} && \
+ ${ECHO_MSG} "Installed HTML documentation in ${DOCDIR}"
.endif
@${ECHO_MSG} '--------------------------------------------------'
@@ -160,6 +156,9 @@ do-install:
post-install:
@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+post-clean:
+ @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
.include <bsd.port.pre.mk>
replace:
@@ -170,10 +169,10 @@ replace:
${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
${ECHO} "#" >> /etc/mail/mailer.conf
- ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
+ ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
.else
@${ECHO_MSG} "===> Replacing sendmail"
@if [ -e /usr/sbin/sendmail ]; then \
diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo
index 854fffa3294c..d6f4fd5c198a 100644
--- a/mail/postfix26/distinfo
+++ b/mail/postfix26/distinfo
@@ -1 +1,3 @@
-MD5 (postfix-19991231-pl13.tar.gz) = f119438aae0aa1346953ae326864da9e
+MD5 (release-20010228.tar.gz) = 6af46cc231ca1e09e60393542d5611bd
+MD5 (pfixtls-0.7.0-20010228-0.9.6.tar.gz) = 64699fb4f0bb4dc87ba1c6c7aef81366
+MD5 (postfix-20010225snap-v6-20010228a.diff.gz) = 8646724c2d00e4d162b63456247cf4fb
diff --git a/mail/postfix26/files/patch-ab b/mail/postfix26/files/patch-ab
index d705b8a7f594..7c81d3dc12c9 100644
--- a/mail/postfix26/files/patch-ab
+++ b/mail/postfix26/files/patch-ab
@@ -1,11 +1,11 @@
---- conf/canonical.orig Sun Sep 5 23:47:01 1999
-+++ conf/canonical Tue Nov 7 22:24:42 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix canonical table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/canonical\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- # DESCRIPTION
- # The optional \fBcanonical\fR file specifies an address mapping for
- # local and non-local addresses. The mapping is used by the
+*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000
+--- ./conf/canonical Thu Jun 1 21:53:23 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/canonical
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/canonical
+ #
diff --git a/mail/postfix26/files/patch-ac b/mail/postfix26/files/patch-ac
index 264335cb70fa..0fb2192cdd84 100644
--- a/mail/postfix26/files/patch-ac
+++ b/mail/postfix26/files/patch-ac
@@ -1,11 +1,11 @@
---- conf/access.orig Fri Dec 11 19:55:48 1998
-+++ conf/access Tue Nov 7 22:25:54 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix access table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/access\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/access\fR
- # DESCRIPTION
- # The optional \fBaccess\fR table directs the Postfix SMTP server
- # to selectively reject or accept mail from or to specific hosts,
+*** ./conf/access.orig Tue Mar 7 10:42:58 2000
+--- ./conf/access Thu Jun 1 21:53:36 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/access
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/access
+ #
diff --git a/mail/postfix26/files/patch-ad b/mail/postfix26/files/patch-ad
new file mode 100644
index 000000000000..c1b102574165
--- /dev/null
+++ b/mail/postfix26/files/patch-ad
@@ -0,0 +1,11 @@
+*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/pcre_table Thu Jun 1 22:02:08 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix26/files/patch-ae b/mail/postfix26/files/patch-ae
new file mode 100644
index 000000000000..e396dd8626db
--- /dev/null
+++ b/mail/postfix26/files/patch-ae
@@ -0,0 +1,11 @@
+*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/regexp_table Thu Jun 1 22:03:27 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix26/files/patch-af b/mail/postfix26/files/patch-af
index ec92981276c6..8fca6b208941 100644
--- a/mail/postfix26/files/patch-af
+++ b/mail/postfix26/files/patch-af
@@ -1,11 +1,11 @@
---- conf/relocated.orig Sun Sep 5 23:47:01 1999
-+++ conf/relocated Tue Nov 7 22:28:27 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix relocated table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/relocated\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- # DESCRIPTION
- # The optional \fBrelocated\fR file provides the information that is
- # used in "user has moved to \fInew_location\fR" bounce messages.
+*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000
+--- ./conf/relocated Thu Jun 1 22:03:59 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/relocated
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/relocated
+ #
diff --git a/mail/postfix26/files/patch-ag b/mail/postfix26/files/patch-ag
new file mode 100644
index 000000000000..54c0fa918d3b
--- /dev/null
+++ b/mail/postfix26/files/patch-ag
@@ -0,0 +1,15 @@
+*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000
+--- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000
+***************
+*** 91,95 ****
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in /etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:/etc/postfix/saslpass
+
+--- 91,95 ----
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass
+
diff --git a/mail/postfix26/files/patch-ao b/mail/postfix26/files/patch-ao
index 206c152728da..fd854e181601 100644
--- a/mail/postfix26/files/patch-ao
+++ b/mail/postfix26/files/patch-ao
@@ -1,11 +1,11 @@
---- conf/transport.orig Fri Dec 31 20:54:11 1999
-+++ conf/transport Tue Nov 7 22:46:59 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix transport table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/transport\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- # DESCRIPTION
- # The optional \fBtransport\fR file specifies a mapping from domain
- # hierarchies to message delivery transports and/or relay hosts. The
+*** ./conf/transport.orig Tue Mar 7 10:42:58 2000
+--- ./conf/transport Thu Jun 1 22:13:41 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/transport
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/transport
+ #
diff --git a/mail/postfix26/files/patch-ap b/mail/postfix26/files/patch-ap
index b412ce386f8d..4598192cd5c1 100644
--- a/mail/postfix26/files/patch-ap
+++ b/mail/postfix26/files/patch-ap
@@ -1,11 +1,11 @@
---- conf/virtual.orig Tue Dec 21 03:00:13 1999
-+++ conf/virtual Tue Nov 7 22:48:18 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix virtual table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/virtual\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- # DESCRIPTION
- # The optional \fBvirtual\fR table specifies redirections for local
- # and non-local recipients or domains. The redirections are used by
+*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000
+--- ./conf/virtual Thu Jun 1 22:13:54 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/virtual
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/virtual
+ #
diff --git a/mail/postfix26/files/patch-bb b/mail/postfix26/files/patch-bb
index 6444bc0d1f75..ea744664dfa7 100644
--- a/mail/postfix26/files/patch-bb
+++ b/mail/postfix26/files/patch-bb
@@ -1,11 +1,20 @@
---- html/access.5.html.orig Fri Dec 11 19:55:49 1998
-+++ html/access.5.html Tue Nov 7 22:48:47 2000
+--- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000
++++ ./html/access.5.html Tue Nov 21 21:24:34 2000
@@ -9,7 +9,7 @@
access - format of Postfix access table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/access</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b>
-
+
<b>DESCRIPTION</b>
The optional <b>access</b> table directs the Postfix SMTP server
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the
+ indexed file after changing the access table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix26/files/patch-bc b/mail/postfix26/files/patch-bc
index 4d24077b9527..e407a9650585 100644
--- a/mail/postfix26/files/patch-bc
+++ b/mail/postfix26/files/patch-bc
@@ -1,11 +1,20 @@
---- html/canonical.5.html.orig Mon Sep 6 05:13:54 1999
-+++ html/canonical.5.html Tue Nov 7 22:51:05 2000
+--- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000
++++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000
@@ -9,7 +9,7 @@
canonical - format of Postfix canonical table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/canonical</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>canonical</b> file specifies an address mapping
+ The optional <b>canonical</b> table specifies an address mapping
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix26/files/patch-bl b/mail/postfix26/files/patch-bl
new file mode 100644
index 000000000000..176c7d1b64de
--- /dev/null
+++ b/mail/postfix26/files/patch-bl
@@ -0,0 +1,11 @@
+*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000
+--- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000
+***************
+*** 11,13 ****
+ <b>SYNOPSIS</b>
+! regexp:/etc/postfix/filename
+
+--- 11,13 ----
+ <b>SYNOPSIS</b>
+! regexp:!!PREFIX!!/etc/postfix/filename
+
diff --git a/mail/postfix26/files/patch-bm b/mail/postfix26/files/patch-bm
index bc9479bea2fe..e5ccc2c50b94 100644
--- a/mail/postfix26/files/patch-bm
+++ b/mail/postfix26/files/patch-bm
@@ -1,11 +1,20 @@
---- html/relocated.5.html.orig Mon Sep 6 05:13:55 1999
-+++ html/relocated.5.html Tue Nov 7 22:52:46 2000
+--- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000
++++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000
@@ -9,7 +9,7 @@
relocated - format of Postfix relocated table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/relocated</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>relocated</b> file provides the information that
+ The optional <b>relocated</b> table provides the information that
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the
+ indexed file after changing the relocated table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix26/files/patch-bo b/mail/postfix26/files/patch-bo
index 41cbc4ca6d65..b45270be8151 100644
--- a/mail/postfix26/files/patch-bo
+++ b/mail/postfix26/files/patch-bo
@@ -1,11 +1,20 @@
---- html/transport.5.html.orig Fri Dec 31 20:54:56 1999
-+++ html/transport.5.html Tue Nov 7 22:53:50 2000
+--- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000
++++ ./html/transport.5.html Tue Nov 21 21:43:20 2000
@@ -9,7 +9,7 @@
transport - format of Postfix transport table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/transport</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>transport</b> file specifies a mapping from
+ The optional <b>transport</b> table specifies a mapping from
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the
+ indexed file after changing the transport table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix26/files/patch-bp b/mail/postfix26/files/patch-bp
index bb65bd98a7b8..5206bfd4bfd0 100644
--- a/mail/postfix26/files/patch-bp
+++ b/mail/postfix26/files/patch-bp
@@ -1,11 +1,43 @@
---- html/virtual.5.html.orig Tue Dec 21 03:00:58 1999
-+++ html/virtual.5.html Tue Nov 7 22:55:04 2000
+--- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000
++++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000
@@ -9,7 +9,7 @@
virtual - format of Postfix virtual table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/virtual</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>virtual</b> table specifies redirections for
+ The optional <b>virtual</b> table specifies address redirections
+@@ -27,7 +27,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
+@@ -52,7 +52,7 @@
+
+ Support for a Postfix-style virtual domain looks like:
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter)
+ <i>postmaster@virtual.domain</i> <i>postmaster</i>
+ <i>user1@virtual.domain</i> <i>address1</i>
+@@ -94,11 +94,11 @@
+
+ Support for a Sendmail-style virtual domain looks like:
+
+- /etc/postfix/main.cf:
++ !!PREFIX!!/etc/postfix/main.cf:
+ mydestination = $myhostname localhost.$mydomain $mydomain
+ <i>virtual.domain</i>
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>user1@virtual.domain</i> <i>address1</i>
+ <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i>
+
diff --git a/mail/postfix26/files/patch-cb b/mail/postfix26/files/patch-cb
index ef73429287d2..58559c7273d1 100644
--- a/mail/postfix26/files/patch-cb
+++ b/mail/postfix26/files/patch-cb
@@ -1,25 +1,20 @@
---- man/man1/sendmail.1.orig Thu Mar 30 17:46:10 2000
-+++ man/man1/sendmail.1 Wed Dec 20 18:37:45 2000
-@@ -61,10 +61,12 @@
- \fBjust-send-eight\fR.
- .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- The path name of the \fBsendmail.cf\fR file. Postfix configuration
--files are kept in \fB/etc/postfix\fR.
-+files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- .IP "\fB-F \fIfull_name\fR
- Set the sender full name. This is used only with messages that
- have no \fBFrom:\fR message header.
-+.IP "\fB-G\fR (ignored)"
-+Gateway (relay) submission, as opposed to initial user submission.
- .IP \fB-I\fR
- Initialize alias database. See the \fBnewaliases\fR
- command above.
-@@ -171,7 +173,7 @@
- .na
- .nf
- /var/spool/postfix, mail queue
--/etc/postfix, configuration files
-+!!PREFIX!!/etc/postfix, configuration files
- .SH CONFIGURATION PARAMETERS
- .na
- .nf
+*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000
+--- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000
+***************
+*** 63,65 ****
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+--- 63,65 ----
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+***************
+*** 173,175 ****
+ /var/spool/postfix, mail queue
+! /etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
+--- 173,175 ----
+ /var/spool/postfix, mail queue
+! !!PREFIX!!/etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
diff --git a/mail/postfix26/files/patch-cc b/mail/postfix26/files/patch-cc
new file mode 100644
index 000000000000..cd6946003217
--- /dev/null
+++ b/mail/postfix26/files/patch-cc
@@ -0,0 +1,11 @@
+*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000
+***************
+*** 10,12 ****
+ .nf
+! pcre:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! pcre:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix26/files/patch-cd b/mail/postfix26/files/patch-cd
index 36461a39bb49..b51de44d0bee 100644
--- a/mail/postfix26/files/patch-cd
+++ b/mail/postfix26/files/patch-cd
@@ -1,11 +1,20 @@
---- man/man5/access.5.orig Fri Dec 11 19:55:52 1998
-+++ man/man5/access.5 Tue Nov 7 22:56:25 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/access\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/access\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/access.5 Thu Jun 1 22:39:55 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/access\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
diff --git a/mail/postfix26/files/patch-ce b/mail/postfix26/files/patch-ce
index 0e0bd4aa1ae5..f77053f8b3aa 100644
--- a/mail/postfix26/files/patch-ce
+++ b/mail/postfix26/files/patch-ce
@@ -1,11 +1,20 @@
---- man/man5/canonical.5.orig Mon Sep 6 05:13:32 1999
-+++ man/man5/canonical.5 Tue Nov 7 22:57:40 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/canonical\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/canonical\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
diff --git a/mail/postfix26/files/patch-cf b/mail/postfix26/files/patch-cf
new file mode 100644
index 000000000000..28fb053b94a7
--- /dev/null
+++ b/mail/postfix26/files/patch-cf
@@ -0,0 +1,11 @@
+*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000
+***************
+*** 10,12 ****
+ .nf
+! regexp:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! regexp:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix26/files/patch-cg b/mail/postfix26/files/patch-cg
index cdce4aaddaf3..0ae82cc57669 100644
--- a/mail/postfix26/files/patch-cg
+++ b/mail/postfix26/files/patch-cg
@@ -1,11 +1,20 @@
---- man/man5/relocated.5.orig Mon Sep 6 05:13:33 1999
-+++ man/man5/relocated.5 Tue Nov 7 22:59:11 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/relocated\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/relocated\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ .SH DESCRIPTION
+***************
+*** 20,22 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
+--- 20,22 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
diff --git a/mail/postfix26/files/patch-ch b/mail/postfix26/files/patch-ch
index 80df028f9255..3ed047ea474c 100644
--- a/mail/postfix26/files/patch-ch
+++ b/mail/postfix26/files/patch-ch
@@ -1,11 +1,20 @@
---- man/man5/transport.5.orig Fri Dec 31 20:54:51 1999
-+++ man/man5/transport.5 Tue Nov 7 22:59:57 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/transport\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/transport\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
+--- 21,23 ----
+ for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
diff --git a/mail/postfix26/files/patch-ci b/mail/postfix26/files/patch-ci
index 889eed3f4d89..1a7cf4abbac7 100644
--- a/mail/postfix26/files/patch-ci
+++ b/mail/postfix26/files/patch-ci
@@ -1,11 +1,20 @@
---- man/man5/virtual.5.orig Tue Dec 21 03:00:51 1999
-+++ man/man5/virtual.5 Tue Nov 7 23:00:32 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/virtual\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/virtual\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ .SH DESCRIPTION
+***************
+*** 26,28 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
+--- 26,28 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
diff --git a/mail/postfix26/files/patch-da b/mail/postfix26/files/patch-da
new file mode 100644
index 000000000000..e57e31750d18
--- /dev/null
+++ b/mail/postfix26/files/patch-da
@@ -0,0 +1,11 @@
+*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000
+--- ./proto/regexp_table Thu Jun 1 22:44:43 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix26/files/patch-db b/mail/postfix26/files/patch-db
new file mode 100644
index 000000000000..7f89fb770783
--- /dev/null
+++ b/mail/postfix26/files/patch-db
@@ -0,0 +1,20 @@
+*** ./proto/access.orig Sun Apr 9 16:44:45 2000
+--- ./proto/access Thu Jun 1 22:45:05 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/access\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
diff --git a/mail/postfix26/files/patch-dc b/mail/postfix26/files/patch-dc
new file mode 100644
index 000000000000..786f2da45c32
--- /dev/null
+++ b/mail/postfix26/files/patch-dc
@@ -0,0 +1,20 @@
+*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000
+--- ./proto/canonical Thu Jun 1 22:45:28 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/canonical\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
diff --git a/mail/postfix26/files/patch-dd b/mail/postfix26/files/patch-dd
new file mode 100644
index 000000000000..b65a57ff7d57
--- /dev/null
+++ b/mail/postfix26/files/patch-dd
@@ -0,0 +1,11 @@
+*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000
+--- ./proto/pcre_table Thu Jun 1 22:45:41 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix26/files/patch-de b/mail/postfix26/files/patch-de
new file mode 100644
index 000000000000..73bb2af2261d
--- /dev/null
+++ b/mail/postfix26/files/patch-de
@@ -0,0 +1,20 @@
+*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000
+--- ./proto/relocated Thu Jun 1 22:46:02 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/relocated\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ # DESCRIPTION
+***************
+*** 14,16 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
+--- 14,16 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
diff --git a/mail/postfix26/files/patch-df b/mail/postfix26/files/patch-df
new file mode 100644
index 000000000000..8d3fba96a224
--- /dev/null
+++ b/mail/postfix26/files/patch-df
@@ -0,0 +1,20 @@
+*** ./proto/transport.orig Sun Apr 9 17:05:45 2000
+--- ./proto/transport Thu Jun 1 22:46:23 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/transport\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
+--- 15,17 ----
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
diff --git a/mail/postfix26/files/patch-dg b/mail/postfix26/files/patch-dg
new file mode 100644
index 000000000000..bff20a2cff3e
--- /dev/null
+++ b/mail/postfix26/files/patch-dg
@@ -0,0 +1,20 @@
+*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000
+--- ./proto/virtual Thu Jun 1 22:46:40 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/virtual\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ # DESCRIPTION
+***************
+*** 20,22 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
+--- 20,22 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
diff --git a/mail/postfix26/files/patch-ea b/mail/postfix26/files/patch-ea
index 80647e0b2ba0..6c3f98d2af4f 100644
--- a/mail/postfix26/files/patch-ea
+++ b/mail/postfix26/files/patch-ea
@@ -1,5 +1,5 @@
-*** ./cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
---- ./cleanup/cleanup.c Thu Jun 1 21:52:22 2000
+*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
+--- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000
***************
*** 118,121 ****
/* FILES
diff --git a/mail/postfix26/files/patch-eb b/mail/postfix26/files/patch-eb
index d576de434580..e67680963d2d 100644
--- a/mail/postfix26/files/patch-eb
+++ b/mail/postfix26/files/patch-eb
@@ -1,5 +1,5 @@
-*** ./global/mail_conf.c.orig Sun May 7 18:51:16 2000
---- ./global/mail_conf.c Thu Jun 1 22:16:29 2000
+*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000
+--- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000
***************
*** 53,55 ****
/* FILES
diff --git a/mail/postfix26/files/patch-ec b/mail/postfix26/files/patch-ec
index 74edda76007b..6d12d1ce4c17 100644
--- a/mail/postfix26/files/patch-ec
+++ b/mail/postfix26/files/patch-ec
@@ -1,5 +1,5 @@
-*** ./global/mail_params.h.orig Wed May 31 19:18:31 2000
---- ./global/mail_params.h Thu Jun 1 22:17:10 2000
+*** ./src/global/mail_params.h.orig Wed May 31 19:18:31 2000
+--- ./src/global/mail_params.h Thu Jun 1 22:17:10 2000
***************
*** 155,157 ****
#ifndef DEF_PROGRAM_DIR
diff --git a/mail/postfix26/files/patch-ed b/mail/postfix26/files/patch-ed
index b573748b45e1..f971b62720d8 100644
--- a/mail/postfix26/files/patch-ed
+++ b/mail/postfix26/files/patch-ed
@@ -1,5 +1,5 @@
-*** ./local/mailbox.c.orig Fri Apr 28 16:55:53 2000
---- ./local/mailbox.c Thu Jun 1 22:37:48 2000
+*** ./src/local/mailbox.c.orig Fri Apr 28 16:55:53 2000
+--- ./src/local/mailbox.c Thu Jun 1 22:37:48 2000
***************
*** 15,17 ****
/* suppression. The default is direct mailbox delivery to
diff --git a/mail/postfix26/files/patch-ee b/mail/postfix26/files/patch-ee
index d79219b1ba62..ef44eac24b73 100644
--- a/mail/postfix26/files/patch-ee
+++ b/mail/postfix26/files/patch-ee
@@ -1,5 +1,5 @@
-*** ./master/master.c.orig Tue Mar 7 10:25:07 2000
---- ./master/master.c Thu Jun 1 22:43:50 2000
+*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000
+--- ./src/master/master.c Thu Jun 1 22:43:50 2000
***************
*** 104,107 ****
/* FILES
diff --git a/mail/postfix26/files/patch-ef b/mail/postfix26/files/patch-ef
index 44816a063b95..586b304a103d 100644
--- a/mail/postfix26/files/patch-ef
+++ b/mail/postfix26/files/patch-ef
@@ -1,5 +1,5 @@
-*** ./postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
---- ./postdrop/postdrop.c Thu Jun 1 22:44:22 2000
+*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
+--- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000
***************
*** 39,41 ****
/* /var/spool/postfix, mail queue
diff --git a/mail/postfix26/files/patch-eg b/mail/postfix26/files/patch-eg
index 28950509870c..2983bbfd86ea 100644
--- a/mail/postfix26/files/patch-eg
+++ b/mail/postfix26/files/patch-eg
@@ -1,34 +1,20 @@
---- sendmail/sendmail.c.orig Sun Mar 26 22:51:33 2000
-+++ sendmail/sendmail.c Wed Dec 20 18:17:31 2000
-@@ -55,10 +55,12 @@
- /* \fBjust-send-eight\fR.
- /* .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
--/* files are kept in \fB/etc/postfix\fR.
-+/* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- /* .IP "\fB-F \fIfull_name\fR
- /* Set the sender full name. This is used only with messages that
- /* have no \fBFrom:\fR message header.
-+/* .IP "\fB-G \fR (ignored)"
-+/* Gateway (relay) submission, as opposed to initial user submission.
- /* .IP \fB-I\fR
- /* Initialize alias database. See the \fBnewaliases\fR
- /* command above.
-@@ -157,7 +159,7 @@
- /* \fBdebugger_command\fR configuration parameter.
- /* FILES
- /* /var/spool/postfix, mail queue
--/* /etc/postfix, configuration files
-+/* !!PREFIX!!/etc/postfix, configuration files
- /* CONFIGURATION PARAMETERS
- /* .ad
- /* .fi
-@@ -710,6 +712,8 @@
- break;
- case 'F': /* full name */
- full_name = optarg;
-+ break;
-+ case 'G': /* gateway submission */
- break;
- case 'I': /* newaliases */
- mode = SM_MODE_NEWALIAS;
+*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000
+--- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000
+***************
+*** 57,59 ****
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+--- 57,59 ----
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+***************
+*** 159,161 ****
+ /* /var/spool/postfix, mail queue
+! /* /etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
+--- 159,161 ----
+ /* /var/spool/postfix, mail queue
+! /* !!PREFIX!!/etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix26/files/patch-eh b/mail/postfix26/files/patch-eh
index f95b51423128..c104c3680d21 100644
--- a/mail/postfix26/files/patch-eh
+++ b/mail/postfix26/files/patch-eh
@@ -1,5 +1,5 @@
-*** ./trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
---- ./trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
+*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
+--- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
***************
*** 32,34 ****
/* FILES
diff --git a/mail/postfix26/files/patch-ei b/mail/postfix26/files/patch-ei
new file mode 100644
index 000000000000..3029372b746e
--- /dev/null
+++ b/mail/postfix26/files/patch-ei
@@ -0,0 +1,21 @@
+*** ./src/smtpd/smtpd.h.orig Thu Sep 14 10:17:23 2000
+--- ./src/smtpd/smtpd.h Thu Sep 14 10:17:38 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix26/files/patch-ej b/mail/postfix26/files/patch-ej
new file mode 100644
index 000000000000..6c5cf2e23758
--- /dev/null
+++ b/mail/postfix26/files/patch-ej
@@ -0,0 +1,21 @@
+*** ./src/smtp/smtp.h.orig Thu Sep 14 13:04:43 2000
+--- ./src/smtp/smtp.h Thu Sep 14 13:04:53 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix26/files/patch-fa b/mail/postfix26/files/patch-fa
deleted file mode 100644
index bc1c2dc388c2..000000000000
--- a/mail/postfix26/files/patch-fa
+++ /dev/null
@@ -1,12 +0,0 @@
---- makedefs.orig Sun Jan 23 03:04:27 2000
-+++ makedefs Mon Apr 3 08:59:17 2000
-@@ -89,6 +89,8 @@
- ;;
- FreeBSD.4*) SYSTYPE=FREEBSD4
- ;;
-+ FreeBSD.5*) SYSTYPE=FREEBSD5
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- NetBSD.1*) SYSTYPE=NETBSD1
-
diff --git a/mail/postfix26/files/patch-fb b/mail/postfix26/files/patch-fb
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix26/files/patch-fb
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
- * makedefs script, and adding a section below for the new system.
- */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+ || defined(FREEBSD5) \
- || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
- || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix26/files/patch-ga b/mail/postfix26/files/patch-ga
index 3ad7120b8322..60a6dd578564 100644
--- a/mail/postfix26/files/patch-ga
+++ b/mail/postfix26/files/patch-ga
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_MYSQL" option at compile time ("make -DWITH_MYSQL").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
[Code contributed by Scott Cotton and Joshua Marcus, IC Group, Inc.]
diff --git a/mail/postfix26/files/patch-gb b/mail/postfix26/files/patch-gb
index 312c8c60f9e5..98816d155122 100644
--- a/mail/postfix26/files/patch-gb
+++ b/mail/postfix26/files/patch-gb
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_LDAP" option at compile time ("make -DWITH_LDAP").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
BUILDING WITH LDAP SUPPORT
==========================
diff --git a/mail/postfix26/files/patch-lmtp.h b/mail/postfix26/files/patch-lmtp.h
new file mode 100644
index 000000000000..3d941c034198
--- /dev/null
+++ b/mail/postfix26/files/patch-lmtp.h
@@ -0,0 +1,13 @@
+--- ./src/lmtp/lmtp.h.orig Fri Jan 19 15:43:06 2001
++++ ./src/lmtp/lmtp.h Sat Feb 3 14:01:09 2001
+@@ -12,8 +12,8 @@
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+-#include <sasl.h>
+-#include <saslutil.h>
++#include <sasl/sasl.h>
++#include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix26/pkg-install b/mail/postfix26/pkg-install
index 933c669e6b98..0d18b67ddee3 100644
--- a/mail/postfix26/pkg-install
+++ b/mail/postfix26/pkg-install
@@ -1,4 +1,9 @@
#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
user=postfix
group=postfix
@@ -87,6 +92,5 @@ if [ x"$2" = xPOST-INSTALL ]; then
fi
/usr/sbin/chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
/bin/chmod 2555 ${PKG_PREFIX}/sbin/postdrop
- /bin/mkdir -p /var/spool/postfix
${PKG_PREFIX}/sbin/postfix check
fi
diff --git a/mail/postfix26/pkg-plist b/mail/postfix26/pkg-plist
index 5f8572883b4c..97167cb8ed15 100644
--- a/mail/postfix26/pkg-plist
+++ b/mail/postfix26/pkg-plist
@@ -5,24 +5,29 @@ etc/postfix/postfix-script
etc/postfix/sample-access
etc/postfix/sample-aliases
etc/postfix/sample-aliases.cf
+%%SUB_SASL%%etc/postfix/sample-auth.cf
etc/postfix/sample-canonical
etc/postfix/sample-canonical.cf
etc/postfix/sample-debug.cf
etc/postfix/sample-filter.cf
-%%WITH_LDAP%%etc/postfix/sample-ldap.cf
+etc/postfix/sample-flush.cf
+%%SUB_LDAP%%etc/postfix/sample-ldap.cf
etc/postfix/sample-local.cf
etc/postfix/sample-main.cf
etc/postfix/sample-master.cf
etc/postfix/sample-misc.cf
-%%WITH_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre_table
etc/postfix/sample-rate.cf
etc/postfix/sample-regexp.cf
+etc/postfix/sample-regexp_table
etc/postfix/sample-relocated
etc/postfix/sample-relocated.cf
etc/postfix/sample-resource.cf
etc/postfix/sample-rewrite.cf
etc/postfix/sample-smtp.cf
etc/postfix/sample-smtpd.cf
+%%SUB_TLS%%etc/postfix/sample-tls.cf
etc/postfix/sample-transport
etc/postfix/sample-transport.cf
etc/postfix/sample-virtual
@@ -30,6 +35,8 @@ etc/postfix/sample-virtual.cf
libexec/postfix/bounce
libexec/postfix/cleanup
libexec/postfix/error
+libexec/postfix/flush
+libexec/postfix/lmtp
libexec/postfix/local
libexec/postfix/master
libexec/postfix/pickup
@@ -38,6 +45,8 @@ libexec/postfix/qmgr
libexec/postfix/showq
libexec/postfix/smtp
libexec/postfix/smtpd
+libexec/postfix/spawn
+%%SUB_TLS%%libexec/postfix/tlsmgr
libexec/postfix/trivial-rewrite
sbin/postalias
sbin/postcat
@@ -50,62 +59,66 @@ sbin/postlog
sbin/postmap
sbin/postsuper
sbin/sendmail
-share/doc/postfix/LDAP_README
-share/doc/postfix/MYSQL_README
-share/doc/postfix/html/access.5.html
-share/doc/postfix/html/aliases.5.html
-share/doc/postfix/html/architecture.html
-share/doc/postfix/html/backstage.html
-share/doc/postfix/html/basic.html
-share/doc/postfix/html/big-picture.gif
-share/doc/postfix/html/big-picture.html
-share/doc/postfix/html/bounce.8.html
-share/doc/postfix/html/canonical.5.html
-share/doc/postfix/html/cleanup.8.html
-share/doc/postfix/html/commands.html
-share/doc/postfix/html/defer.8.html
-share/doc/postfix/html/delivering.html
-share/doc/postfix/html/error.8.html
-share/doc/postfix/html/faq.html
-share/doc/postfix/html/goals.html
-share/doc/postfix/html/inbound.gif
-share/doc/postfix/html/index.html
-share/doc/postfix/html/local.8.html
-share/doc/postfix/html/mailq.1.html
-share/doc/postfix/html/master.8.html
-share/doc/postfix/html/motivation.html
-share/doc/postfix/html/newaliases.1.html
-share/doc/postfix/html/outbound.gif
-share/doc/postfix/html/pickup.8.html
-share/doc/postfix/html/pipe.8.html
-share/doc/postfix/html/postalias.1.html
-share/doc/postfix/html/postcat.1.html
-share/doc/postfix/html/postconf.1.html
-share/doc/postfix/html/postdrop.1.html
-share/doc/postfix/html/postfix.1.html
-share/doc/postfix/html/postkick.1.html
-share/doc/postfix/html/postlock.1.html
-share/doc/postfix/html/postlog.1.html
-share/doc/postfix/html/postmap.1.html
-share/doc/postfix/html/postsuper.1.html
-share/doc/postfix/html/qmgr.8.html
-share/doc/postfix/html/queuing.html
-share/doc/postfix/html/rate.html
-share/doc/postfix/html/receiving.html
-share/doc/postfix/html/relocated.5.html
-share/doc/postfix/html/resource.html
-share/doc/postfix/html/rewrite.html
-share/doc/postfix/html/security.html
-share/doc/postfix/html/sendmail.1.html
-share/doc/postfix/html/showq.8.html
-share/doc/postfix/html/small-picture.gif
-share/doc/postfix/html/smtp.8.html
-share/doc/postfix/html/smtpd.8.html
-share/doc/postfix/html/transport.5.html
-share/doc/postfix/html/trivial-rewrite.8.html
-share/doc/postfix/html/uce.html
-share/doc/postfix/html/virtual.5.html
-@dirrm etc/postfix
+%%SUB_TEST%%sbin/smtp-sink
+%%SUB_TEST%%sbin/smtp-source
+%%SUB_DOCS%%share/doc/postfix/access.5.html
+%%SUB_DOCS%%share/doc/postfix/aliases.5.html
+%%SUB_DOCS%%share/doc/postfix/architecture.html
+%%SUB_DOCS%%share/doc/postfix/backstage.html
+%%SUB_DOCS%%share/doc/postfix/basic.html
+%%SUB_DOCS%%share/doc/postfix/big-picture.gif
+%%SUB_DOCS%%share/doc/postfix/big-picture.html
+%%SUB_DOCS%%share/doc/postfix/bounce.8.html
+%%SUB_DOCS%%share/doc/postfix/canonical.5.html
+%%SUB_DOCS%%share/doc/postfix/cleanup.8.html
+%%SUB_DOCS%%share/doc/postfix/commands.html
+%%SUB_DOCS%%share/doc/postfix/defer.8.html
+%%SUB_DOCS%%share/doc/postfix/delivering.html
+%%SUB_DOCS%%share/doc/postfix/error.8.html
+%%SUB_DOCS%%share/doc/postfix/faq.html
+%%SUB_DOCS%%share/doc/postfix/flush.8.html
+%%SUB_DOCS%%share/doc/postfix/goals.html
+%%SUB_DOCS%%share/doc/postfix/inbound.gif
+%%SUB_DOCS%%share/doc/postfix/index.html
+%%SUB_DOCS%%share/doc/postfix/lmtp.8.html
+%%SUB_DOCS%%share/doc/postfix/local.8.html
+%%SUB_DOCS%%share/doc/postfix/mailq.1.html
+%%SUB_DOCS%%share/doc/postfix/master.8.html
+%%SUB_DOCS%%share/doc/postfix/motivation.html
+%%SUB_DOCS%%share/doc/postfix/newaliases.1.html
+%%SUB_DOCS%%share/doc/postfix/outbound.gif
+%%SUB_DOCS%%share/doc/postfix/pcre_table.5.html
+%%SUB_DOCS%%share/doc/postfix/pickup.8.html
+%%SUB_DOCS%%share/doc/postfix/pipe.8.html
+%%SUB_DOCS%%share/doc/postfix/postalias.1.html
+%%SUB_DOCS%%share/doc/postfix/postcat.1.html
+%%SUB_DOCS%%share/doc/postfix/postconf.1.html
+%%SUB_DOCS%%share/doc/postfix/postdrop.1.html
+%%SUB_DOCS%%share/doc/postfix/postfix.1.html
+%%SUB_DOCS%%share/doc/postfix/postkick.1.html
+%%SUB_DOCS%%share/doc/postfix/postlock.1.html
+%%SUB_DOCS%%share/doc/postfix/postlog.1.html
+%%SUB_DOCS%%share/doc/postfix/postmap.1.html
+%%SUB_DOCS%%share/doc/postfix/postsuper.1.html
+%%SUB_DOCS%%share/doc/postfix/qmgr.8.html
+%%SUB_DOCS%%share/doc/postfix/queuing.html
+%%SUB_DOCS%%share/doc/postfix/rate.html
+%%SUB_DOCS%%share/doc/postfix/receiving.html
+%%SUB_DOCS%%share/doc/postfix/regexp_table.5.html
+%%SUB_DOCS%%share/doc/postfix/relocated.5.html
+%%SUB_DOCS%%share/doc/postfix/resource.html
+%%SUB_DOCS%%share/doc/postfix/rewrite.html
+%%SUB_DOCS%%share/doc/postfix/security.html
+%%SUB_DOCS%%share/doc/postfix/sendmail.1.html
+%%SUB_DOCS%%share/doc/postfix/showq.8.html
+%%SUB_DOCS%%share/doc/postfix/small-picture.gif
+%%SUB_DOCS%%share/doc/postfix/smtp.8.html
+%%SUB_DOCS%%share/doc/postfix/smtpd.8.html
+%%SUB_DOCS%%share/doc/postfix/spawn.8.html
+%%SUB_DOCS%%share/doc/postfix/transport.5.html
+%%SUB_DOCS%%share/doc/postfix/trivial-rewrite.8.html
+%%SUB_DOCS%%share/doc/postfix/uce.html
+%%SUB_DOCS%%share/doc/postfix/virtual.5.html
+%%SUB_DOCS%%@dirrm share/doc/postfix
@dirrm libexec/postfix
-@dirrm share/doc/postfix/html
-@dirrm share/doc/postfix
+@dirrm etc/postfix
diff --git a/mail/postfix26/scripts/configure.postfix b/mail/postfix26/scripts/configure.postfix
new file mode 100644
index 000000000000..3fcb45c8e089
--- /dev/null
+++ b/mail/postfix26/scripts/configure.postfix
@@ -0,0 +1,129 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.1 2001-03-04 19:35:00 sf Exp $
+
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
+ exit
+fi
+
+tempfile=`mktemp -t checklist`
+
+if [ "${BATCH}" = "yes" ]; then
+ set \"PCRE\"
+else
+ /usr/bin/dialog --title "Postfix configuration options" --clear \
+ --checklist "\n\
+Please select desired options:" -1 -1 16 \
+PCRE "Perl Compatible Regular Expressions" OFF \
+SASL "Cyrus SASL (Simple Authentication and Security Layer)" OFF \
+DB3 "Berkeley DB3 (required if SASL also built with DB3)" OFF \
+MySQL "MySQL map lookups" OFF \
+OpenLDAP "OpenLDAP map lookups" OFF \
+Test "SMTP/LMTP test server and generator" OFF \
+TLS "Secure Sockets Layer and Transport Layer Security" OFF \
+IPv6 "IPv6 support" OFF \
+2> $tempfile
+
+ retval=$?
+
+ if [ -s $tempfile ]; then
+ set `cat $tempfile`
+ fi
+ rm -f $tempfile
+
+ case $retval in
+ 0) if [ -z "$*" ]; then
+ echo "Nothing selected"
+ fi
+ ;;
+ 1) echo "Cancel pressed."
+ exit 1
+ ;;
+ esac
+fi
+
+${MKDIR} ${WRKDIRPREFIX}${CURDIR}
+exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+
+echo "PREFIX= ${PREFIX}"
+
+SUB_PCRE="@comment "
+SUB_SASL="@comment "
+SUB_TLS="@comment "
+SUB_LDAP="@comment "
+SUB_TEST="@comment "
+
+while [ "$1" ]; do
+ case $1 in
+ \"PCRE\")
+ echo "CONF1+= pcre_table"
+ echo "CONF2+= sample-pcre.cf"
+ echo "MAN5+= pcre_table.5"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre"
+ echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a"
+ SUB_PCRE=""
+ ;;
+ \"SASL\")
+ echo "CONF2+= sample-auth.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl"
+ echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -lpam -lcrypt"
+ echo ".if exists(/usr/lib/libkrb.a)"
+ echo "POSTFIX_AUXLIBS+= -lkrb -ldes -lcom_err"
+ echo ".endif"
+ SUB_SASL=""
+ ;;
+ \"TLS\")
+ echo "CONF2+= sample-tls.cf"
+ echo "BIN1+= tlsmgr"
+ echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl"
+ echo "POSTFIX_AUXLIBS+= -lssl -lcrypto"
+ echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.7.0-20010228-0.9.6.tar.gz"
+ echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.7.0-20010228-0.9.6/pfixtls.diff"
+ echo "PATCH_STRIP= -p1"
+ SUB_TLS=""
+ ;;
+ \"DB3\")
+ echo "LIB_DEPENDS+= db3.1:\${PORTSDIR}/databases/db3"
+ echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3"
+ echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3"
+ ;;
+ \"MySQL\")
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
+ echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
+ ;;
+ \"OpenLDAP\")
+ echo "CONF2+= sample-ldap.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
+ echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
+ SUB_LDAP=""
+ ;;
+ \"Test\")
+ echo "BIN3= smtp-sink smtp-source"
+ SUB_TEST=""
+ ;;
+ \"IPv6\")
+ echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/"
+ echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}"
+ echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz"
+ echo ""
+ echo "pre-patch:"
+ echo " cd \${WRKSRC} && ln -s . postfix"
+ echo ""
+ ;;
+ *)
+ echo "Invalid option(s): $*" > /dev/stderr
+ rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+echo "PLIST_SUB+= SUB_PCRE=\"${SUB_PCRE}\""
+echo "PLIST_SUB+= SUB_SASL=\"${SUB_SASL}\""
+echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\""
+echo "PLIST_SUB+= SUB_LDAP=\"${SUB_LDAP}\""
+echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index 839c9f1819ad..9c4068489960 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -1,90 +1,82 @@
# New ports collection makefile for: postfix
-# Date created: 18 Mar 1999
+# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
PORTNAME= postfix
-PORTVERSION= 19991231.13
-PORTREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
+PORTVERSION= 20010228
+CATEGORIES= mail ipv6
+MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
+ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
ftp://ftp.tux.org/pub/net/postfix/official/ \
ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
ftp://ftp.samurai.com/pub/postfix/official/ \
- ftp://ftp.nl.uu.net/pub/unix/mail/postfix/official/ \
- ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
- ftp://ftp.mira.net/pub/unix/mail/postfix/official/ \
- ftp://coda.nctu.edu.tw/network/mail/postfix/official/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-DISTNAME= ${PORTNAME}-19991231-pl13
+MASTER_SITE_SUBDIR= . old related/postfix
+DISTNAME= release-${PORTVERSION}
MAINTAINER= blaz@amis.net
-.if !defined(DEBUG)
-MAKEFILEFLAGS+= DEBUG=
-.endif
-
-.if defined(CC)
-MAKEFILEFLAGS+= CC="${CC}"
-.endif
-
-MAKEFILEFLAGS+= OPT="${CFLAGS}"
-SCRIPTS_ENV+= MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-
MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
sendmail.1
-MAN5= access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
+MAN5= access.5 aliases.5 canonical.5 regexp_table.5 relocated.5 \
+ transport.5 virtual.5
-MAN8= bounce.8 cleanup.8 defer.8 error.8 local.8 master.8 pickup.8 \
- pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 trivial-rewrite.8
+MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
+ master.8 pickup.8 pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 \
+ spawn.8 trivial-rewrite.8
CONF1= access aliases canonical main.cf master.cf \
- relocated transport virtual
+ regexp_table relocated transport virtual
CONF2= sample-aliases.cf sample-canonical.cf sample-debug.cf \
- sample-filter.cf sample-local.cf sample-misc.cf \
+ sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
sample-rate.cf sample-regexp.cf sample-relocated.cf \
sample-resource.cf sample-rewrite.cf sample-smtp.cf \
sample-smtpd.cf sample-transport.cf sample-virtual.cf
-BIN1= bounce cleanup error local master pickup \
- pipe qmgr showq smtp smtpd trivial-rewrite
+BIN1= bounce cleanup error flush lmtp local master pickup \
+ pipe qmgr showq smtp smtpd spawn trivial-rewrite
BIN2= postalias postcat postconf postdrop postfix \
postkick postlock postlog postmap postsuper sendmail
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
-POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz
+.if defined(NOPORTDOCS)
+PLIST_SUB+= SUB_DOCS="@comment "
+.else
+PLIST_SUB+= SUB_DOCS=""
+DOCDIR= ${PREFIX}/share/doc/postfix
.endif
-.if defined(WITH_LDAP)
-CONF2+= sample-ldap.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-PLIST_SUB+= WITH_LDAP=""
-.else
-PLIST_SUB+= WITH_LDAP="@comment "
+.if !defined(DEBUG)
+MAKEFILEFLAGS+= DEBUG=
.endif
-.if defined(WITH_PCRE)
-CONF2+= sample-pcre.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libpcre.a
-PLIST_SUB+= WITH_PCRE=""
-.else
-PLIST_SUB+= WITH_PCRE="@comment "
+.if defined(CC)
+MAKEFILEFLAGS+= CC="${CC}"
+.endif
+
+MAKEFILEFLAGS+= OPT="${CFLAGS}"
+
+SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
+ PREFIX="${PREFIX}" \
+ TOUCH="${TOUCH}" \
+ MKDIR="${MKDIR}" \
+ MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
+
+pre-fetch:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
post-patch:
- (cd ${WRKSRC} && make -f Makefile.init makefiles ${MAKEFILEFLAGS} \
+ (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
${ECHO} "all: default" >> Makefile)
@@ -122,7 +114,13 @@ do-install:
.for file in ${BIN2}
@${INSTALL_PROGRAM} \
- ${WRKSRC}/${file}/${file} \
+ ${WRKSRC}/src/${file}/${file} \
+ ${PREFIX}/sbin
+.endfor
+
+.for file in ${BIN3}
+ @${INSTALL_PROGRAM} \
+ ${WRKSRC}/src/smtpstone/${file} \
${PREFIX}/sbin
.endfor
@@ -145,11 +143,9 @@ do-install:
.endfor
.if !defined(NOPORTDOCS)
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix
- @cd ${WRKSRC} && ${INSTALL_DATA} LDAP_README MYSQL_README ${PREFIX}/share/doc/postfix
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix/html
- @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${PREFIX}/share/doc/postfix/html && \
- ${ECHO_MSG} "Installed documentation in ${PREFIX}/share/doc/postfix"
+ @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCDIR}
+ @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCDIR} && \
+ ${ECHO_MSG} "Installed HTML documentation in ${DOCDIR}"
.endif
@${ECHO_MSG} '--------------------------------------------------'
@@ -160,6 +156,9 @@ do-install:
post-install:
@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+post-clean:
+ @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
.include <bsd.port.pre.mk>
replace:
@@ -170,10 +169,10 @@ replace:
${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
${ECHO} "#" >> /etc/mail/mailer.conf
- ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
+ ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
.else
@${ECHO_MSG} "===> Replacing sendmail"
@if [ -e /usr/sbin/sendmail ]; then \
diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo
index 854fffa3294c..d6f4fd5c198a 100644
--- a/mail/postfix27/distinfo
+++ b/mail/postfix27/distinfo
@@ -1 +1,3 @@
-MD5 (postfix-19991231-pl13.tar.gz) = f119438aae0aa1346953ae326864da9e
+MD5 (release-20010228.tar.gz) = 6af46cc231ca1e09e60393542d5611bd
+MD5 (pfixtls-0.7.0-20010228-0.9.6.tar.gz) = 64699fb4f0bb4dc87ba1c6c7aef81366
+MD5 (postfix-20010225snap-v6-20010228a.diff.gz) = 8646724c2d00e4d162b63456247cf4fb
diff --git a/mail/postfix27/files/patch-ab b/mail/postfix27/files/patch-ab
index d705b8a7f594..7c81d3dc12c9 100644
--- a/mail/postfix27/files/patch-ab
+++ b/mail/postfix27/files/patch-ab
@@ -1,11 +1,11 @@
---- conf/canonical.orig Sun Sep 5 23:47:01 1999
-+++ conf/canonical Tue Nov 7 22:24:42 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix canonical table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/canonical\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- # DESCRIPTION
- # The optional \fBcanonical\fR file specifies an address mapping for
- # local and non-local addresses. The mapping is used by the
+*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000
+--- ./conf/canonical Thu Jun 1 21:53:23 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/canonical
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/canonical
+ #
diff --git a/mail/postfix27/files/patch-ac b/mail/postfix27/files/patch-ac
index 264335cb70fa..0fb2192cdd84 100644
--- a/mail/postfix27/files/patch-ac
+++ b/mail/postfix27/files/patch-ac
@@ -1,11 +1,11 @@
---- conf/access.orig Fri Dec 11 19:55:48 1998
-+++ conf/access Tue Nov 7 22:25:54 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix access table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/access\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/access\fR
- # DESCRIPTION
- # The optional \fBaccess\fR table directs the Postfix SMTP server
- # to selectively reject or accept mail from or to specific hosts,
+*** ./conf/access.orig Tue Mar 7 10:42:58 2000
+--- ./conf/access Thu Jun 1 21:53:36 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/access
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/access
+ #
diff --git a/mail/postfix27/files/patch-ad b/mail/postfix27/files/patch-ad
new file mode 100644
index 000000000000..c1b102574165
--- /dev/null
+++ b/mail/postfix27/files/patch-ad
@@ -0,0 +1,11 @@
+*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/pcre_table Thu Jun 1 22:02:08 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix27/files/patch-ae b/mail/postfix27/files/patch-ae
new file mode 100644
index 000000000000..e396dd8626db
--- /dev/null
+++ b/mail/postfix27/files/patch-ae
@@ -0,0 +1,11 @@
+*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/regexp_table Thu Jun 1 22:03:27 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix27/files/patch-af b/mail/postfix27/files/patch-af
index ec92981276c6..8fca6b208941 100644
--- a/mail/postfix27/files/patch-af
+++ b/mail/postfix27/files/patch-af
@@ -1,11 +1,11 @@
---- conf/relocated.orig Sun Sep 5 23:47:01 1999
-+++ conf/relocated Tue Nov 7 22:28:27 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix relocated table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/relocated\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- # DESCRIPTION
- # The optional \fBrelocated\fR file provides the information that is
- # used in "user has moved to \fInew_location\fR" bounce messages.
+*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000
+--- ./conf/relocated Thu Jun 1 22:03:59 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/relocated
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/relocated
+ #
diff --git a/mail/postfix27/files/patch-ag b/mail/postfix27/files/patch-ag
new file mode 100644
index 000000000000..54c0fa918d3b
--- /dev/null
+++ b/mail/postfix27/files/patch-ag
@@ -0,0 +1,15 @@
+*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000
+--- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000
+***************
+*** 91,95 ****
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in /etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:/etc/postfix/saslpass
+
+--- 91,95 ----
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass
+
diff --git a/mail/postfix27/files/patch-ao b/mail/postfix27/files/patch-ao
index 206c152728da..fd854e181601 100644
--- a/mail/postfix27/files/patch-ao
+++ b/mail/postfix27/files/patch-ao
@@ -1,11 +1,11 @@
---- conf/transport.orig Fri Dec 31 20:54:11 1999
-+++ conf/transport Tue Nov 7 22:46:59 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix transport table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/transport\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- # DESCRIPTION
- # The optional \fBtransport\fR file specifies a mapping from domain
- # hierarchies to message delivery transports and/or relay hosts. The
+*** ./conf/transport.orig Tue Mar 7 10:42:58 2000
+--- ./conf/transport Thu Jun 1 22:13:41 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/transport
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/transport
+ #
diff --git a/mail/postfix27/files/patch-ap b/mail/postfix27/files/patch-ap
index b412ce386f8d..4598192cd5c1 100644
--- a/mail/postfix27/files/patch-ap
+++ b/mail/postfix27/files/patch-ap
@@ -1,11 +1,11 @@
---- conf/virtual.orig Tue Dec 21 03:00:13 1999
-+++ conf/virtual Tue Nov 7 22:48:18 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix virtual table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/virtual\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- # DESCRIPTION
- # The optional \fBvirtual\fR table specifies redirections for local
- # and non-local recipients or domains. The redirections are used by
+*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000
+--- ./conf/virtual Thu Jun 1 22:13:54 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/virtual
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/virtual
+ #
diff --git a/mail/postfix27/files/patch-bb b/mail/postfix27/files/patch-bb
index 6444bc0d1f75..ea744664dfa7 100644
--- a/mail/postfix27/files/patch-bb
+++ b/mail/postfix27/files/patch-bb
@@ -1,11 +1,20 @@
---- html/access.5.html.orig Fri Dec 11 19:55:49 1998
-+++ html/access.5.html Tue Nov 7 22:48:47 2000
+--- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000
++++ ./html/access.5.html Tue Nov 21 21:24:34 2000
@@ -9,7 +9,7 @@
access - format of Postfix access table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/access</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b>
-
+
<b>DESCRIPTION</b>
The optional <b>access</b> table directs the Postfix SMTP server
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the
+ indexed file after changing the access table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix27/files/patch-bc b/mail/postfix27/files/patch-bc
index 4d24077b9527..e407a9650585 100644
--- a/mail/postfix27/files/patch-bc
+++ b/mail/postfix27/files/patch-bc
@@ -1,11 +1,20 @@
---- html/canonical.5.html.orig Mon Sep 6 05:13:54 1999
-+++ html/canonical.5.html Tue Nov 7 22:51:05 2000
+--- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000
++++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000
@@ -9,7 +9,7 @@
canonical - format of Postfix canonical table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/canonical</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>canonical</b> file specifies an address mapping
+ The optional <b>canonical</b> table specifies an address mapping
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix27/files/patch-bl b/mail/postfix27/files/patch-bl
new file mode 100644
index 000000000000..176c7d1b64de
--- /dev/null
+++ b/mail/postfix27/files/patch-bl
@@ -0,0 +1,11 @@
+*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000
+--- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000
+***************
+*** 11,13 ****
+ <b>SYNOPSIS</b>
+! regexp:/etc/postfix/filename
+
+--- 11,13 ----
+ <b>SYNOPSIS</b>
+! regexp:!!PREFIX!!/etc/postfix/filename
+
diff --git a/mail/postfix27/files/patch-bm b/mail/postfix27/files/patch-bm
index bc9479bea2fe..e5ccc2c50b94 100644
--- a/mail/postfix27/files/patch-bm
+++ b/mail/postfix27/files/patch-bm
@@ -1,11 +1,20 @@
---- html/relocated.5.html.orig Mon Sep 6 05:13:55 1999
-+++ html/relocated.5.html Tue Nov 7 22:52:46 2000
+--- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000
++++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000
@@ -9,7 +9,7 @@
relocated - format of Postfix relocated table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/relocated</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>relocated</b> file provides the information that
+ The optional <b>relocated</b> table provides the information that
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the
+ indexed file after changing the relocated table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix27/files/patch-bo b/mail/postfix27/files/patch-bo
index 41cbc4ca6d65..b45270be8151 100644
--- a/mail/postfix27/files/patch-bo
+++ b/mail/postfix27/files/patch-bo
@@ -1,11 +1,20 @@
---- html/transport.5.html.orig Fri Dec 31 20:54:56 1999
-+++ html/transport.5.html Tue Nov 7 22:53:50 2000
+--- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000
++++ ./html/transport.5.html Tue Nov 21 21:43:20 2000
@@ -9,7 +9,7 @@
transport - format of Postfix transport table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/transport</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>transport</b> file specifies a mapping from
+ The optional <b>transport</b> table specifies a mapping from
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the
+ indexed file after changing the transport table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix27/files/patch-bp b/mail/postfix27/files/patch-bp
index bb65bd98a7b8..5206bfd4bfd0 100644
--- a/mail/postfix27/files/patch-bp
+++ b/mail/postfix27/files/patch-bp
@@ -1,11 +1,43 @@
---- html/virtual.5.html.orig Tue Dec 21 03:00:58 1999
-+++ html/virtual.5.html Tue Nov 7 22:55:04 2000
+--- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000
++++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000
@@ -9,7 +9,7 @@
virtual - format of Postfix virtual table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/virtual</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>virtual</b> table specifies redirections for
+ The optional <b>virtual</b> table specifies address redirections
+@@ -27,7 +27,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
+@@ -52,7 +52,7 @@
+
+ Support for a Postfix-style virtual domain looks like:
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter)
+ <i>postmaster@virtual.domain</i> <i>postmaster</i>
+ <i>user1@virtual.domain</i> <i>address1</i>
+@@ -94,11 +94,11 @@
+
+ Support for a Sendmail-style virtual domain looks like:
+
+- /etc/postfix/main.cf:
++ !!PREFIX!!/etc/postfix/main.cf:
+ mydestination = $myhostname localhost.$mydomain $mydomain
+ <i>virtual.domain</i>
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>user1@virtual.domain</i> <i>address1</i>
+ <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i>
+
diff --git a/mail/postfix27/files/patch-cb b/mail/postfix27/files/patch-cb
index ef73429287d2..58559c7273d1 100644
--- a/mail/postfix27/files/patch-cb
+++ b/mail/postfix27/files/patch-cb
@@ -1,25 +1,20 @@
---- man/man1/sendmail.1.orig Thu Mar 30 17:46:10 2000
-+++ man/man1/sendmail.1 Wed Dec 20 18:37:45 2000
-@@ -61,10 +61,12 @@
- \fBjust-send-eight\fR.
- .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- The path name of the \fBsendmail.cf\fR file. Postfix configuration
--files are kept in \fB/etc/postfix\fR.
-+files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- .IP "\fB-F \fIfull_name\fR
- Set the sender full name. This is used only with messages that
- have no \fBFrom:\fR message header.
-+.IP "\fB-G\fR (ignored)"
-+Gateway (relay) submission, as opposed to initial user submission.
- .IP \fB-I\fR
- Initialize alias database. See the \fBnewaliases\fR
- command above.
-@@ -171,7 +173,7 @@
- .na
- .nf
- /var/spool/postfix, mail queue
--/etc/postfix, configuration files
-+!!PREFIX!!/etc/postfix, configuration files
- .SH CONFIGURATION PARAMETERS
- .na
- .nf
+*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000
+--- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000
+***************
+*** 63,65 ****
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+--- 63,65 ----
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+***************
+*** 173,175 ****
+ /var/spool/postfix, mail queue
+! /etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
+--- 173,175 ----
+ /var/spool/postfix, mail queue
+! !!PREFIX!!/etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
diff --git a/mail/postfix27/files/patch-cc b/mail/postfix27/files/patch-cc
new file mode 100644
index 000000000000..cd6946003217
--- /dev/null
+++ b/mail/postfix27/files/patch-cc
@@ -0,0 +1,11 @@
+*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000
+***************
+*** 10,12 ****
+ .nf
+! pcre:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! pcre:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix27/files/patch-cd b/mail/postfix27/files/patch-cd
index 36461a39bb49..b51de44d0bee 100644
--- a/mail/postfix27/files/patch-cd
+++ b/mail/postfix27/files/patch-cd
@@ -1,11 +1,20 @@
---- man/man5/access.5.orig Fri Dec 11 19:55:52 1998
-+++ man/man5/access.5 Tue Nov 7 22:56:25 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/access\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/access\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/access.5 Thu Jun 1 22:39:55 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/access\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
diff --git a/mail/postfix27/files/patch-ce b/mail/postfix27/files/patch-ce
index 0e0bd4aa1ae5..f77053f8b3aa 100644
--- a/mail/postfix27/files/patch-ce
+++ b/mail/postfix27/files/patch-ce
@@ -1,11 +1,20 @@
---- man/man5/canonical.5.orig Mon Sep 6 05:13:32 1999
-+++ man/man5/canonical.5 Tue Nov 7 22:57:40 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/canonical\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/canonical\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
diff --git a/mail/postfix27/files/patch-cf b/mail/postfix27/files/patch-cf
new file mode 100644
index 000000000000..28fb053b94a7
--- /dev/null
+++ b/mail/postfix27/files/patch-cf
@@ -0,0 +1,11 @@
+*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000
+***************
+*** 10,12 ****
+ .nf
+! regexp:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! regexp:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix27/files/patch-cg b/mail/postfix27/files/patch-cg
index cdce4aaddaf3..0ae82cc57669 100644
--- a/mail/postfix27/files/patch-cg
+++ b/mail/postfix27/files/patch-cg
@@ -1,11 +1,20 @@
---- man/man5/relocated.5.orig Mon Sep 6 05:13:33 1999
-+++ man/man5/relocated.5 Tue Nov 7 22:59:11 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/relocated\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/relocated\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ .SH DESCRIPTION
+***************
+*** 20,22 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
+--- 20,22 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
diff --git a/mail/postfix27/files/patch-ch b/mail/postfix27/files/patch-ch
index 80df028f9255..3ed047ea474c 100644
--- a/mail/postfix27/files/patch-ch
+++ b/mail/postfix27/files/patch-ch
@@ -1,11 +1,20 @@
---- man/man5/transport.5.orig Fri Dec 31 20:54:51 1999
-+++ man/man5/transport.5 Tue Nov 7 22:59:57 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/transport\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/transport\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
+--- 21,23 ----
+ for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
diff --git a/mail/postfix27/files/patch-ci b/mail/postfix27/files/patch-ci
index 889eed3f4d89..1a7cf4abbac7 100644
--- a/mail/postfix27/files/patch-ci
+++ b/mail/postfix27/files/patch-ci
@@ -1,11 +1,20 @@
---- man/man5/virtual.5.orig Tue Dec 21 03:00:51 1999
-+++ man/man5/virtual.5 Tue Nov 7 23:00:32 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/virtual\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/virtual\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ .SH DESCRIPTION
+***************
+*** 26,28 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
+--- 26,28 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
diff --git a/mail/postfix27/files/patch-da b/mail/postfix27/files/patch-da
new file mode 100644
index 000000000000..e57e31750d18
--- /dev/null
+++ b/mail/postfix27/files/patch-da
@@ -0,0 +1,11 @@
+*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000
+--- ./proto/regexp_table Thu Jun 1 22:44:43 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix27/files/patch-db b/mail/postfix27/files/patch-db
new file mode 100644
index 000000000000..7f89fb770783
--- /dev/null
+++ b/mail/postfix27/files/patch-db
@@ -0,0 +1,20 @@
+*** ./proto/access.orig Sun Apr 9 16:44:45 2000
+--- ./proto/access Thu Jun 1 22:45:05 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/access\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
diff --git a/mail/postfix27/files/patch-dc b/mail/postfix27/files/patch-dc
new file mode 100644
index 000000000000..786f2da45c32
--- /dev/null
+++ b/mail/postfix27/files/patch-dc
@@ -0,0 +1,20 @@
+*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000
+--- ./proto/canonical Thu Jun 1 22:45:28 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/canonical\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
diff --git a/mail/postfix27/files/patch-dd b/mail/postfix27/files/patch-dd
new file mode 100644
index 000000000000..b65a57ff7d57
--- /dev/null
+++ b/mail/postfix27/files/patch-dd
@@ -0,0 +1,11 @@
+*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000
+--- ./proto/pcre_table Thu Jun 1 22:45:41 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix27/files/patch-de b/mail/postfix27/files/patch-de
new file mode 100644
index 000000000000..73bb2af2261d
--- /dev/null
+++ b/mail/postfix27/files/patch-de
@@ -0,0 +1,20 @@
+*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000
+--- ./proto/relocated Thu Jun 1 22:46:02 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/relocated\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ # DESCRIPTION
+***************
+*** 14,16 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
+--- 14,16 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
diff --git a/mail/postfix27/files/patch-df b/mail/postfix27/files/patch-df
new file mode 100644
index 000000000000..8d3fba96a224
--- /dev/null
+++ b/mail/postfix27/files/patch-df
@@ -0,0 +1,20 @@
+*** ./proto/transport.orig Sun Apr 9 17:05:45 2000
+--- ./proto/transport Thu Jun 1 22:46:23 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/transport\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
+--- 15,17 ----
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
diff --git a/mail/postfix27/files/patch-dg b/mail/postfix27/files/patch-dg
new file mode 100644
index 000000000000..bff20a2cff3e
--- /dev/null
+++ b/mail/postfix27/files/patch-dg
@@ -0,0 +1,20 @@
+*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000
+--- ./proto/virtual Thu Jun 1 22:46:40 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/virtual\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ # DESCRIPTION
+***************
+*** 20,22 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
+--- 20,22 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
diff --git a/mail/postfix27/files/patch-ea b/mail/postfix27/files/patch-ea
index 80647e0b2ba0..6c3f98d2af4f 100644
--- a/mail/postfix27/files/patch-ea
+++ b/mail/postfix27/files/patch-ea
@@ -1,5 +1,5 @@
-*** ./cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
---- ./cleanup/cleanup.c Thu Jun 1 21:52:22 2000
+*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
+--- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000
***************
*** 118,121 ****
/* FILES
diff --git a/mail/postfix27/files/patch-eb b/mail/postfix27/files/patch-eb
index d576de434580..e67680963d2d 100644
--- a/mail/postfix27/files/patch-eb
+++ b/mail/postfix27/files/patch-eb
@@ -1,5 +1,5 @@
-*** ./global/mail_conf.c.orig Sun May 7 18:51:16 2000
---- ./global/mail_conf.c Thu Jun 1 22:16:29 2000
+*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000
+--- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000
***************
*** 53,55 ****
/* FILES
diff --git a/mail/postfix27/files/patch-ec b/mail/postfix27/files/patch-ec
index 74edda76007b..6d12d1ce4c17 100644
--- a/mail/postfix27/files/patch-ec
+++ b/mail/postfix27/files/patch-ec
@@ -1,5 +1,5 @@
-*** ./global/mail_params.h.orig Wed May 31 19:18:31 2000
---- ./global/mail_params.h Thu Jun 1 22:17:10 2000
+*** ./src/global/mail_params.h.orig Wed May 31 19:18:31 2000
+--- ./src/global/mail_params.h Thu Jun 1 22:17:10 2000
***************
*** 155,157 ****
#ifndef DEF_PROGRAM_DIR
diff --git a/mail/postfix27/files/patch-ed b/mail/postfix27/files/patch-ed
index b573748b45e1..f971b62720d8 100644
--- a/mail/postfix27/files/patch-ed
+++ b/mail/postfix27/files/patch-ed
@@ -1,5 +1,5 @@
-*** ./local/mailbox.c.orig Fri Apr 28 16:55:53 2000
---- ./local/mailbox.c Thu Jun 1 22:37:48 2000
+*** ./src/local/mailbox.c.orig Fri Apr 28 16:55:53 2000
+--- ./src/local/mailbox.c Thu Jun 1 22:37:48 2000
***************
*** 15,17 ****
/* suppression. The default is direct mailbox delivery to
diff --git a/mail/postfix27/files/patch-ee b/mail/postfix27/files/patch-ee
index d79219b1ba62..ef44eac24b73 100644
--- a/mail/postfix27/files/patch-ee
+++ b/mail/postfix27/files/patch-ee
@@ -1,5 +1,5 @@
-*** ./master/master.c.orig Tue Mar 7 10:25:07 2000
---- ./master/master.c Thu Jun 1 22:43:50 2000
+*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000
+--- ./src/master/master.c Thu Jun 1 22:43:50 2000
***************
*** 104,107 ****
/* FILES
diff --git a/mail/postfix27/files/patch-ef b/mail/postfix27/files/patch-ef
index 44816a063b95..586b304a103d 100644
--- a/mail/postfix27/files/patch-ef
+++ b/mail/postfix27/files/patch-ef
@@ -1,5 +1,5 @@
-*** ./postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
---- ./postdrop/postdrop.c Thu Jun 1 22:44:22 2000
+*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
+--- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000
***************
*** 39,41 ****
/* /var/spool/postfix, mail queue
diff --git a/mail/postfix27/files/patch-eg b/mail/postfix27/files/patch-eg
index 28950509870c..2983bbfd86ea 100644
--- a/mail/postfix27/files/patch-eg
+++ b/mail/postfix27/files/patch-eg
@@ -1,34 +1,20 @@
---- sendmail/sendmail.c.orig Sun Mar 26 22:51:33 2000
-+++ sendmail/sendmail.c Wed Dec 20 18:17:31 2000
-@@ -55,10 +55,12 @@
- /* \fBjust-send-eight\fR.
- /* .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
--/* files are kept in \fB/etc/postfix\fR.
-+/* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- /* .IP "\fB-F \fIfull_name\fR
- /* Set the sender full name. This is used only with messages that
- /* have no \fBFrom:\fR message header.
-+/* .IP "\fB-G \fR (ignored)"
-+/* Gateway (relay) submission, as opposed to initial user submission.
- /* .IP \fB-I\fR
- /* Initialize alias database. See the \fBnewaliases\fR
- /* command above.
-@@ -157,7 +159,7 @@
- /* \fBdebugger_command\fR configuration parameter.
- /* FILES
- /* /var/spool/postfix, mail queue
--/* /etc/postfix, configuration files
-+/* !!PREFIX!!/etc/postfix, configuration files
- /* CONFIGURATION PARAMETERS
- /* .ad
- /* .fi
-@@ -710,6 +712,8 @@
- break;
- case 'F': /* full name */
- full_name = optarg;
-+ break;
-+ case 'G': /* gateway submission */
- break;
- case 'I': /* newaliases */
- mode = SM_MODE_NEWALIAS;
+*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000
+--- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000
+***************
+*** 57,59 ****
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+--- 57,59 ----
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+***************
+*** 159,161 ****
+ /* /var/spool/postfix, mail queue
+! /* /etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
+--- 159,161 ----
+ /* /var/spool/postfix, mail queue
+! /* !!PREFIX!!/etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix27/files/patch-eh b/mail/postfix27/files/patch-eh
index f95b51423128..c104c3680d21 100644
--- a/mail/postfix27/files/patch-eh
+++ b/mail/postfix27/files/patch-eh
@@ -1,5 +1,5 @@
-*** ./trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
---- ./trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
+*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
+--- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
***************
*** 32,34 ****
/* FILES
diff --git a/mail/postfix27/files/patch-ei b/mail/postfix27/files/patch-ei
new file mode 100644
index 000000000000..3029372b746e
--- /dev/null
+++ b/mail/postfix27/files/patch-ei
@@ -0,0 +1,21 @@
+*** ./src/smtpd/smtpd.h.orig Thu Sep 14 10:17:23 2000
+--- ./src/smtpd/smtpd.h Thu Sep 14 10:17:38 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix27/files/patch-ej b/mail/postfix27/files/patch-ej
new file mode 100644
index 000000000000..6c5cf2e23758
--- /dev/null
+++ b/mail/postfix27/files/patch-ej
@@ -0,0 +1,21 @@
+*** ./src/smtp/smtp.h.orig Thu Sep 14 13:04:43 2000
+--- ./src/smtp/smtp.h Thu Sep 14 13:04:53 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix27/files/patch-fa b/mail/postfix27/files/patch-fa
deleted file mode 100644
index bc1c2dc388c2..000000000000
--- a/mail/postfix27/files/patch-fa
+++ /dev/null
@@ -1,12 +0,0 @@
---- makedefs.orig Sun Jan 23 03:04:27 2000
-+++ makedefs Mon Apr 3 08:59:17 2000
-@@ -89,6 +89,8 @@
- ;;
- FreeBSD.4*) SYSTYPE=FREEBSD4
- ;;
-+ FreeBSD.5*) SYSTYPE=FREEBSD5
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- NetBSD.1*) SYSTYPE=NETBSD1
-
diff --git a/mail/postfix27/files/patch-fb b/mail/postfix27/files/patch-fb
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix27/files/patch-fb
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
- * makedefs script, and adding a section below for the new system.
- */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+ || defined(FREEBSD5) \
- || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
- || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix27/files/patch-ga b/mail/postfix27/files/patch-ga
index 3ad7120b8322..60a6dd578564 100644
--- a/mail/postfix27/files/patch-ga
+++ b/mail/postfix27/files/patch-ga
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_MYSQL" option at compile time ("make -DWITH_MYSQL").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
[Code contributed by Scott Cotton and Joshua Marcus, IC Group, Inc.]
diff --git a/mail/postfix27/files/patch-gb b/mail/postfix27/files/patch-gb
index 312c8c60f9e5..98816d155122 100644
--- a/mail/postfix27/files/patch-gb
+++ b/mail/postfix27/files/patch-gb
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_LDAP" option at compile time ("make -DWITH_LDAP").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
BUILDING WITH LDAP SUPPORT
==========================
diff --git a/mail/postfix27/files/patch-lmtp.h b/mail/postfix27/files/patch-lmtp.h
new file mode 100644
index 000000000000..3d941c034198
--- /dev/null
+++ b/mail/postfix27/files/patch-lmtp.h
@@ -0,0 +1,13 @@
+--- ./src/lmtp/lmtp.h.orig Fri Jan 19 15:43:06 2001
++++ ./src/lmtp/lmtp.h Sat Feb 3 14:01:09 2001
+@@ -12,8 +12,8 @@
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+-#include <sasl.h>
+-#include <saslutil.h>
++#include <sasl/sasl.h>
++#include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix27/pkg-install b/mail/postfix27/pkg-install
index 933c669e6b98..0d18b67ddee3 100644
--- a/mail/postfix27/pkg-install
+++ b/mail/postfix27/pkg-install
@@ -1,4 +1,9 @@
#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
user=postfix
group=postfix
@@ -87,6 +92,5 @@ if [ x"$2" = xPOST-INSTALL ]; then
fi
/usr/sbin/chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
/bin/chmod 2555 ${PKG_PREFIX}/sbin/postdrop
- /bin/mkdir -p /var/spool/postfix
${PKG_PREFIX}/sbin/postfix check
fi
diff --git a/mail/postfix27/pkg-plist b/mail/postfix27/pkg-plist
index 5f8572883b4c..97167cb8ed15 100644
--- a/mail/postfix27/pkg-plist
+++ b/mail/postfix27/pkg-plist
@@ -5,24 +5,29 @@ etc/postfix/postfix-script
etc/postfix/sample-access
etc/postfix/sample-aliases
etc/postfix/sample-aliases.cf
+%%SUB_SASL%%etc/postfix/sample-auth.cf
etc/postfix/sample-canonical
etc/postfix/sample-canonical.cf
etc/postfix/sample-debug.cf
etc/postfix/sample-filter.cf
-%%WITH_LDAP%%etc/postfix/sample-ldap.cf
+etc/postfix/sample-flush.cf
+%%SUB_LDAP%%etc/postfix/sample-ldap.cf
etc/postfix/sample-local.cf
etc/postfix/sample-main.cf
etc/postfix/sample-master.cf
etc/postfix/sample-misc.cf
-%%WITH_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre_table
etc/postfix/sample-rate.cf
etc/postfix/sample-regexp.cf
+etc/postfix/sample-regexp_table
etc/postfix/sample-relocated
etc/postfix/sample-relocated.cf
etc/postfix/sample-resource.cf
etc/postfix/sample-rewrite.cf
etc/postfix/sample-smtp.cf
etc/postfix/sample-smtpd.cf
+%%SUB_TLS%%etc/postfix/sample-tls.cf
etc/postfix/sample-transport
etc/postfix/sample-transport.cf
etc/postfix/sample-virtual
@@ -30,6 +35,8 @@ etc/postfix/sample-virtual.cf
libexec/postfix/bounce
libexec/postfix/cleanup
libexec/postfix/error
+libexec/postfix/flush
+libexec/postfix/lmtp
libexec/postfix/local
libexec/postfix/master
libexec/postfix/pickup
@@ -38,6 +45,8 @@ libexec/postfix/qmgr
libexec/postfix/showq
libexec/postfix/smtp
libexec/postfix/smtpd
+libexec/postfix/spawn
+%%SUB_TLS%%libexec/postfix/tlsmgr
libexec/postfix/trivial-rewrite
sbin/postalias
sbin/postcat
@@ -50,62 +59,66 @@ sbin/postlog
sbin/postmap
sbin/postsuper
sbin/sendmail
-share/doc/postfix/LDAP_README
-share/doc/postfix/MYSQL_README
-share/doc/postfix/html/access.5.html
-share/doc/postfix/html/aliases.5.html
-share/doc/postfix/html/architecture.html
-share/doc/postfix/html/backstage.html
-share/doc/postfix/html/basic.html
-share/doc/postfix/html/big-picture.gif
-share/doc/postfix/html/big-picture.html
-share/doc/postfix/html/bounce.8.html
-share/doc/postfix/html/canonical.5.html
-share/doc/postfix/html/cleanup.8.html
-share/doc/postfix/html/commands.html
-share/doc/postfix/html/defer.8.html
-share/doc/postfix/html/delivering.html
-share/doc/postfix/html/error.8.html
-share/doc/postfix/html/faq.html
-share/doc/postfix/html/goals.html
-share/doc/postfix/html/inbound.gif
-share/doc/postfix/html/index.html
-share/doc/postfix/html/local.8.html
-share/doc/postfix/html/mailq.1.html
-share/doc/postfix/html/master.8.html
-share/doc/postfix/html/motivation.html
-share/doc/postfix/html/newaliases.1.html
-share/doc/postfix/html/outbound.gif
-share/doc/postfix/html/pickup.8.html
-share/doc/postfix/html/pipe.8.html
-share/doc/postfix/html/postalias.1.html
-share/doc/postfix/html/postcat.1.html
-share/doc/postfix/html/postconf.1.html
-share/doc/postfix/html/postdrop.1.html
-share/doc/postfix/html/postfix.1.html
-share/doc/postfix/html/postkick.1.html
-share/doc/postfix/html/postlock.1.html
-share/doc/postfix/html/postlog.1.html
-share/doc/postfix/html/postmap.1.html
-share/doc/postfix/html/postsuper.1.html
-share/doc/postfix/html/qmgr.8.html
-share/doc/postfix/html/queuing.html
-share/doc/postfix/html/rate.html
-share/doc/postfix/html/receiving.html
-share/doc/postfix/html/relocated.5.html
-share/doc/postfix/html/resource.html
-share/doc/postfix/html/rewrite.html
-share/doc/postfix/html/security.html
-share/doc/postfix/html/sendmail.1.html
-share/doc/postfix/html/showq.8.html
-share/doc/postfix/html/small-picture.gif
-share/doc/postfix/html/smtp.8.html
-share/doc/postfix/html/smtpd.8.html
-share/doc/postfix/html/transport.5.html
-share/doc/postfix/html/trivial-rewrite.8.html
-share/doc/postfix/html/uce.html
-share/doc/postfix/html/virtual.5.html
-@dirrm etc/postfix
+%%SUB_TEST%%sbin/smtp-sink
+%%SUB_TEST%%sbin/smtp-source
+%%SUB_DOCS%%share/doc/postfix/access.5.html
+%%SUB_DOCS%%share/doc/postfix/aliases.5.html
+%%SUB_DOCS%%share/doc/postfix/architecture.html
+%%SUB_DOCS%%share/doc/postfix/backstage.html
+%%SUB_DOCS%%share/doc/postfix/basic.html
+%%SUB_DOCS%%share/doc/postfix/big-picture.gif
+%%SUB_DOCS%%share/doc/postfix/big-picture.html
+%%SUB_DOCS%%share/doc/postfix/bounce.8.html
+%%SUB_DOCS%%share/doc/postfix/canonical.5.html
+%%SUB_DOCS%%share/doc/postfix/cleanup.8.html
+%%SUB_DOCS%%share/doc/postfix/commands.html
+%%SUB_DOCS%%share/doc/postfix/defer.8.html
+%%SUB_DOCS%%share/doc/postfix/delivering.html
+%%SUB_DOCS%%share/doc/postfix/error.8.html
+%%SUB_DOCS%%share/doc/postfix/faq.html
+%%SUB_DOCS%%share/doc/postfix/flush.8.html
+%%SUB_DOCS%%share/doc/postfix/goals.html
+%%SUB_DOCS%%share/doc/postfix/inbound.gif
+%%SUB_DOCS%%share/doc/postfix/index.html
+%%SUB_DOCS%%share/doc/postfix/lmtp.8.html
+%%SUB_DOCS%%share/doc/postfix/local.8.html
+%%SUB_DOCS%%share/doc/postfix/mailq.1.html
+%%SUB_DOCS%%share/doc/postfix/master.8.html
+%%SUB_DOCS%%share/doc/postfix/motivation.html
+%%SUB_DOCS%%share/doc/postfix/newaliases.1.html
+%%SUB_DOCS%%share/doc/postfix/outbound.gif
+%%SUB_DOCS%%share/doc/postfix/pcre_table.5.html
+%%SUB_DOCS%%share/doc/postfix/pickup.8.html
+%%SUB_DOCS%%share/doc/postfix/pipe.8.html
+%%SUB_DOCS%%share/doc/postfix/postalias.1.html
+%%SUB_DOCS%%share/doc/postfix/postcat.1.html
+%%SUB_DOCS%%share/doc/postfix/postconf.1.html
+%%SUB_DOCS%%share/doc/postfix/postdrop.1.html
+%%SUB_DOCS%%share/doc/postfix/postfix.1.html
+%%SUB_DOCS%%share/doc/postfix/postkick.1.html
+%%SUB_DOCS%%share/doc/postfix/postlock.1.html
+%%SUB_DOCS%%share/doc/postfix/postlog.1.html
+%%SUB_DOCS%%share/doc/postfix/postmap.1.html
+%%SUB_DOCS%%share/doc/postfix/postsuper.1.html
+%%SUB_DOCS%%share/doc/postfix/qmgr.8.html
+%%SUB_DOCS%%share/doc/postfix/queuing.html
+%%SUB_DOCS%%share/doc/postfix/rate.html
+%%SUB_DOCS%%share/doc/postfix/receiving.html
+%%SUB_DOCS%%share/doc/postfix/regexp_table.5.html
+%%SUB_DOCS%%share/doc/postfix/relocated.5.html
+%%SUB_DOCS%%share/doc/postfix/resource.html
+%%SUB_DOCS%%share/doc/postfix/rewrite.html
+%%SUB_DOCS%%share/doc/postfix/security.html
+%%SUB_DOCS%%share/doc/postfix/sendmail.1.html
+%%SUB_DOCS%%share/doc/postfix/showq.8.html
+%%SUB_DOCS%%share/doc/postfix/small-picture.gif
+%%SUB_DOCS%%share/doc/postfix/smtp.8.html
+%%SUB_DOCS%%share/doc/postfix/smtpd.8.html
+%%SUB_DOCS%%share/doc/postfix/spawn.8.html
+%%SUB_DOCS%%share/doc/postfix/transport.5.html
+%%SUB_DOCS%%share/doc/postfix/trivial-rewrite.8.html
+%%SUB_DOCS%%share/doc/postfix/uce.html
+%%SUB_DOCS%%share/doc/postfix/virtual.5.html
+%%SUB_DOCS%%@dirrm share/doc/postfix
@dirrm libexec/postfix
-@dirrm share/doc/postfix/html
-@dirrm share/doc/postfix
+@dirrm etc/postfix
diff --git a/mail/postfix27/scripts/configure.postfix b/mail/postfix27/scripts/configure.postfix
new file mode 100644
index 000000000000..326814d92d31
--- /dev/null
+++ b/mail/postfix27/scripts/configure.postfix
@@ -0,0 +1,129 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.1 2001-03-04 19:35:00 sf Exp $
+
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
+ exit
+fi
+
+tempfile=`mktemp -t checklist`
+
+if [ "${BATCH}" = "yes" ]; then
+ set \"PCRE\"
+else
+ /usr/bin/dialog --title "Postfix configuration options" --clear \
+ --checklist "\n\
+Please select desired options:" -1 -1 16 \
+PCRE "Perl Compatible Regular Expressions" OFF \
+SASL "Cyrus SASL (Simple Authentication and Security Layer)" OFF \
+DB3 "Berkeley DB3 (required if SASL also built with DB3)" OFF \
+MySQL "MySQL map lookups" OFF \
+OpenLDAP "OpenLDAP map lookups" OFF \
+Test "SMTP/LMTP test server and generator" OFF \
+TLS "Secure Sockets Layer and Transport Layer Security" OFF \
+IPv6 "IPv6 support" OFF \
+2> $tempfile
+
+ retval=$?
+
+ if [ -s $tempfile ]; then
+ set `cat $tempfile`
+ fi
+ rm -f $tempfile
+
+ case $retval in
+ 0) if [ -z "$*" ]; then
+ echo "Nothing selected"
+ fi
+ ;;
+ 1) echo "Cancel pressed."
+ exit 1
+ ;;
+ esac
+fi
+
+${MKDIR} ${WRKDIRPREFIX}${CURDIR}
+exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+
+echo "PREFIX= ${PREFIX}"
+
+SUB_PCRE="@comment "
+SUB_SASL="@comment "
+SUB_TLS="@comment "
+SUB_LDAP="@comment "
+SUB_TEST="@comment "
+
+while [ "$1" ]; do
+ case $1 in
+ \"PCRE\")
+ echo "CONF1+= pcre_table"
+ echo "CONF2+= sample-pcre.cf"
+ echo "MAN5+= pcre_table.5"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre"
+ echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a"
+ SUB_PCRE=""
+ ;;
+ \"SASL\")
+ echo "CONF2+= sample-auth.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl"
+ echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -lpam -lcrypt"
+ echo ".if exists(/usr/lib/libkrb.a)"
+ echo "POSTFIX_AUXLIBS+= -lkrb -ldes -lcom_err"
+ echo ".endif"
+ SUB_SASL=""
+ ;;
+ \"TLS\")
+ echo "CONF2+= sample-tls.cf"
+ echo "BIN1+= tlsmgr"
+ echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl"
+ echo "POSTFIX_AUXLIBS+= -lssl -lcrypto"
+ echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.7.0-20010228-0.9.6.tar.gz"
+ echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.7.0-20010228-0.9.6/pfixtls.diff"
+ echo "PATCH_STRIP= -p1"
+ SUB_TLS=""
+ ;;
+ \"DB3\")
+ echo "LIB_DEPENDS+= db3.1:\${PORTSDIR}/databases/db3"
+ echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3"
+ echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3"
+ ;;
+ \"MySQL\")
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
+ echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
+ ;;
+ \"OpenLDAP\")
+ echo "CONF2+= sample-ldap.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
+ echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
+ SUB_LDAP=""
+ ;;
+ \"Test\")
+ echo "BIN3= smtp-sink smtp-source"
+ SUB_TEST=""
+ ;;
+ \"IPv6\")
+ echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/"
+ echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}"
+ echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz"
+ echo ""
+ echo "pre-patch:"
+ echo " cd \${WRKSRC} && ln -s . postfix"
+ echo ""
+ ;;
+ *)
+ echo "Invalid option(s): $*" > /dev/stderr
+ rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+echo "PLIST_SUB+= SUB_PCRE=\"${SUB_PCRE}\""
+echo "PLIST_SUB+= SUB_SASL=\"${SUB_SASL}\""
+echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\""
+echo "PLIST_SUB+= SUB_LDAP=\"${SUB_LDAP}\""
+echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index 839c9f1819ad..9c4068489960 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -1,90 +1,82 @@
# New ports collection makefile for: postfix
-# Date created: 18 Mar 1999
+# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
PORTNAME= postfix
-PORTVERSION= 19991231.13
-PORTREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
+PORTVERSION= 20010228
+CATEGORIES= mail ipv6
+MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
+ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
ftp://ftp.tux.org/pub/net/postfix/official/ \
ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
ftp://ftp.samurai.com/pub/postfix/official/ \
- ftp://ftp.nl.uu.net/pub/unix/mail/postfix/official/ \
- ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
- ftp://ftp.mira.net/pub/unix/mail/postfix/official/ \
- ftp://coda.nctu.edu.tw/network/mail/postfix/official/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-DISTNAME= ${PORTNAME}-19991231-pl13
+MASTER_SITE_SUBDIR= . old related/postfix
+DISTNAME= release-${PORTVERSION}
MAINTAINER= blaz@amis.net
-.if !defined(DEBUG)
-MAKEFILEFLAGS+= DEBUG=
-.endif
-
-.if defined(CC)
-MAKEFILEFLAGS+= CC="${CC}"
-.endif
-
-MAKEFILEFLAGS+= OPT="${CFLAGS}"
-SCRIPTS_ENV+= MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-
MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
sendmail.1
-MAN5= access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
+MAN5= access.5 aliases.5 canonical.5 regexp_table.5 relocated.5 \
+ transport.5 virtual.5
-MAN8= bounce.8 cleanup.8 defer.8 error.8 local.8 master.8 pickup.8 \
- pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 trivial-rewrite.8
+MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
+ master.8 pickup.8 pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 \
+ spawn.8 trivial-rewrite.8
CONF1= access aliases canonical main.cf master.cf \
- relocated transport virtual
+ regexp_table relocated transport virtual
CONF2= sample-aliases.cf sample-canonical.cf sample-debug.cf \
- sample-filter.cf sample-local.cf sample-misc.cf \
+ sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
sample-rate.cf sample-regexp.cf sample-relocated.cf \
sample-resource.cf sample-rewrite.cf sample-smtp.cf \
sample-smtpd.cf sample-transport.cf sample-virtual.cf
-BIN1= bounce cleanup error local master pickup \
- pipe qmgr showq smtp smtpd trivial-rewrite
+BIN1= bounce cleanup error flush lmtp local master pickup \
+ pipe qmgr showq smtp smtpd spawn trivial-rewrite
BIN2= postalias postcat postconf postdrop postfix \
postkick postlock postlog postmap postsuper sendmail
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
-POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz
+.if defined(NOPORTDOCS)
+PLIST_SUB+= SUB_DOCS="@comment "
+.else
+PLIST_SUB+= SUB_DOCS=""
+DOCDIR= ${PREFIX}/share/doc/postfix
.endif
-.if defined(WITH_LDAP)
-CONF2+= sample-ldap.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-PLIST_SUB+= WITH_LDAP=""
-.else
-PLIST_SUB+= WITH_LDAP="@comment "
+.if !defined(DEBUG)
+MAKEFILEFLAGS+= DEBUG=
.endif
-.if defined(WITH_PCRE)
-CONF2+= sample-pcre.cf
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= ${LOCALBASE}/lib/libpcre.a
-PLIST_SUB+= WITH_PCRE=""
-.else
-PLIST_SUB+= WITH_PCRE="@comment "
+.if defined(CC)
+MAKEFILEFLAGS+= CC="${CC}"
+.endif
+
+MAKEFILEFLAGS+= OPT="${CFLAGS}"
+
+SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
+ PREFIX="${PREFIX}" \
+ TOUCH="${TOUCH}" \
+ MKDIR="${MKDIR}" \
+ MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
+
+pre-fetch:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
post-patch:
- (cd ${WRKSRC} && make -f Makefile.init makefiles ${MAKEFILEFLAGS} \
+ (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
${ECHO} "all: default" >> Makefile)
@@ -122,7 +114,13 @@ do-install:
.for file in ${BIN2}
@${INSTALL_PROGRAM} \
- ${WRKSRC}/${file}/${file} \
+ ${WRKSRC}/src/${file}/${file} \
+ ${PREFIX}/sbin
+.endfor
+
+.for file in ${BIN3}
+ @${INSTALL_PROGRAM} \
+ ${WRKSRC}/src/smtpstone/${file} \
${PREFIX}/sbin
.endfor
@@ -145,11 +143,9 @@ do-install:
.endfor
.if !defined(NOPORTDOCS)
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix
- @cd ${WRKSRC} && ${INSTALL_DATA} LDAP_README MYSQL_README ${PREFIX}/share/doc/postfix
- @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${PREFIX}/share/doc/postfix/html
- @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${PREFIX}/share/doc/postfix/html && \
- ${ECHO_MSG} "Installed documentation in ${PREFIX}/share/doc/postfix"
+ @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCDIR}
+ @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCDIR} && \
+ ${ECHO_MSG} "Installed HTML documentation in ${DOCDIR}"
.endif
@${ECHO_MSG} '--------------------------------------------------'
@@ -160,6 +156,9 @@ do-install:
post-install:
@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+post-clean:
+ @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
.include <bsd.port.pre.mk>
replace:
@@ -170,10 +169,10 @@ replace:
${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
${ECHO} "#" >> /etc/mail/mailer.conf
- ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
- ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf
+ ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+ ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
.else
@${ECHO_MSG} "===> Replacing sendmail"
@if [ -e /usr/sbin/sendmail ]; then \
diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo
index 854fffa3294c..d6f4fd5c198a 100644
--- a/mail/postfix28/distinfo
+++ b/mail/postfix28/distinfo
@@ -1 +1,3 @@
-MD5 (postfix-19991231-pl13.tar.gz) = f119438aae0aa1346953ae326864da9e
+MD5 (release-20010228.tar.gz) = 6af46cc231ca1e09e60393542d5611bd
+MD5 (pfixtls-0.7.0-20010228-0.9.6.tar.gz) = 64699fb4f0bb4dc87ba1c6c7aef81366
+MD5 (postfix-20010225snap-v6-20010228a.diff.gz) = 8646724c2d00e4d162b63456247cf4fb
diff --git a/mail/postfix28/files/patch-ab b/mail/postfix28/files/patch-ab
index d705b8a7f594..7c81d3dc12c9 100644
--- a/mail/postfix28/files/patch-ab
+++ b/mail/postfix28/files/patch-ab
@@ -1,11 +1,11 @@
---- conf/canonical.orig Sun Sep 5 23:47:01 1999
-+++ conf/canonical Tue Nov 7 22:24:42 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix canonical table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/canonical\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- # DESCRIPTION
- # The optional \fBcanonical\fR file specifies an address mapping for
- # local and non-local addresses. The mapping is used by the
+*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000
+--- ./conf/canonical Thu Jun 1 21:53:23 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/canonical
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/canonical
+ #
diff --git a/mail/postfix28/files/patch-ac b/mail/postfix28/files/patch-ac
index 264335cb70fa..0fb2192cdd84 100644
--- a/mail/postfix28/files/patch-ac
+++ b/mail/postfix28/files/patch-ac
@@ -1,11 +1,11 @@
---- conf/access.orig Fri Dec 11 19:55:48 1998
-+++ conf/access Tue Nov 7 22:25:54 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix access table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/access\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/access\fR
- # DESCRIPTION
- # The optional \fBaccess\fR table directs the Postfix SMTP server
- # to selectively reject or accept mail from or to specific hosts,
+*** ./conf/access.orig Tue Mar 7 10:42:58 2000
+--- ./conf/access Thu Jun 1 21:53:36 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/access
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/access
+ #
diff --git a/mail/postfix28/files/patch-ad b/mail/postfix28/files/patch-ad
new file mode 100644
index 000000000000..c1b102574165
--- /dev/null
+++ b/mail/postfix28/files/patch-ad
@@ -0,0 +1,11 @@
+*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/pcre_table Thu Jun 1 22:02:08 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix28/files/patch-ae b/mail/postfix28/files/patch-ae
new file mode 100644
index 000000000000..e396dd8626db
--- /dev/null
+++ b/mail/postfix28/files/patch-ae
@@ -0,0 +1,11 @@
+*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000
+--- ./conf/regexp_table Thu Jun 1 22:03:27 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ #
diff --git a/mail/postfix28/files/patch-af b/mail/postfix28/files/patch-af
index ec92981276c6..8fca6b208941 100644
--- a/mail/postfix28/files/patch-af
+++ b/mail/postfix28/files/patch-af
@@ -1,11 +1,11 @@
---- conf/relocated.orig Sun Sep 5 23:47:01 1999
-+++ conf/relocated Tue Nov 7 22:28:27 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix relocated table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/relocated\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- # DESCRIPTION
- # The optional \fBrelocated\fR file provides the information that is
- # used in "user has moved to \fInew_location\fR" bounce messages.
+*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000
+--- ./conf/relocated Thu Jun 1 22:03:59 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/relocated
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/relocated
+ #
diff --git a/mail/postfix28/files/patch-ag b/mail/postfix28/files/patch-ag
new file mode 100644
index 000000000000..54c0fa918d3b
--- /dev/null
+++ b/mail/postfix28/files/patch-ag
@@ -0,0 +1,15 @@
+*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000
+--- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000
+***************
+*** 91,95 ****
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in /etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:/etc/postfix/saslpass
+
+--- 91,95 ----
+ # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix.
+ #
+! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass
+
diff --git a/mail/postfix28/files/patch-ao b/mail/postfix28/files/patch-ao
index 206c152728da..fd854e181601 100644
--- a/mail/postfix28/files/patch-ao
+++ b/mail/postfix28/files/patch-ao
@@ -1,11 +1,11 @@
---- conf/transport.orig Fri Dec 31 20:54:11 1999
-+++ conf/transport Tue Nov 7 22:46:59 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix transport table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/transport\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- # DESCRIPTION
- # The optional \fBtransport\fR file specifies a mapping from domain
- # hierarchies to message delivery transports and/or relay hosts. The
+*** ./conf/transport.orig Tue Mar 7 10:42:58 2000
+--- ./conf/transport Thu Jun 1 22:13:41 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/transport
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/transport
+ #
diff --git a/mail/postfix28/files/patch-ap b/mail/postfix28/files/patch-ap
index b412ce386f8d..4598192cd5c1 100644
--- a/mail/postfix28/files/patch-ap
+++ b/mail/postfix28/files/patch-ap
@@ -1,11 +1,11 @@
---- conf/virtual.orig Tue Dec 21 03:00:13 1999
-+++ conf/virtual Tue Nov 7 22:48:18 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix virtual table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/virtual\fR
-+# \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- # DESCRIPTION
- # The optional \fBvirtual\fR table specifies redirections for local
- # and non-local recipients or domains. The redirections are used by
+*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000
+--- ./conf/virtual Thu Jun 1 22:13:54 2000
+***************
+*** 7,9 ****
+ # SYNOPSIS
+! # postmap /etc/postfix/virtual
+ #
+--- 7,9 ----
+ # SYNOPSIS
+! # postmap !!PREFIX!!/etc/postfix/virtual
+ #
diff --git a/mail/postfix28/files/patch-bb b/mail/postfix28/files/patch-bb
index 6444bc0d1f75..ea744664dfa7 100644
--- a/mail/postfix28/files/patch-bb
+++ b/mail/postfix28/files/patch-bb
@@ -1,11 +1,20 @@
---- html/access.5.html.orig Fri Dec 11 19:55:49 1998
-+++ html/access.5.html Tue Nov 7 22:48:47 2000
+--- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000
++++ ./html/access.5.html Tue Nov 21 21:24:34 2000
@@ -9,7 +9,7 @@
access - format of Postfix access table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/access</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b>
-
+
<b>DESCRIPTION</b>
The optional <b>access</b> table directs the Postfix SMTP server
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the
+ indexed file after changing the access table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix28/files/patch-bc b/mail/postfix28/files/patch-bc
index 4d24077b9527..e407a9650585 100644
--- a/mail/postfix28/files/patch-bc
+++ b/mail/postfix28/files/patch-bc
@@ -1,11 +1,20 @@
---- html/canonical.5.html.orig Mon Sep 6 05:13:54 1999
-+++ html/canonical.5.html Tue Nov 7 22:51:05 2000
+--- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000
++++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000
@@ -9,7 +9,7 @@
canonical - format of Postfix canonical table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/canonical</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>canonical</b> file specifies an address mapping
+ The optional <b>canonical</b> table specifies an address mapping
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix28/files/patch-bl b/mail/postfix28/files/patch-bl
new file mode 100644
index 000000000000..176c7d1b64de
--- /dev/null
+++ b/mail/postfix28/files/patch-bl
@@ -0,0 +1,11 @@
+*** ./html/regexp_table.5.html.orig Sat Apr 22 20:28:38 2000
+--- ./html/regexp_table.5.html Thu Jun 1 22:32:44 2000
+***************
+*** 11,13 ****
+ <b>SYNOPSIS</b>
+! regexp:/etc/postfix/filename
+
+--- 11,13 ----
+ <b>SYNOPSIS</b>
+! regexp:!!PREFIX!!/etc/postfix/filename
+
diff --git a/mail/postfix28/files/patch-bm b/mail/postfix28/files/patch-bm
index bc9479bea2fe..e5ccc2c50b94 100644
--- a/mail/postfix28/files/patch-bm
+++ b/mail/postfix28/files/patch-bm
@@ -1,11 +1,20 @@
---- html/relocated.5.html.orig Mon Sep 6 05:13:55 1999
-+++ html/relocated.5.html Tue Nov 7 22:52:46 2000
+--- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000
++++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000
@@ -9,7 +9,7 @@
relocated - format of Postfix relocated table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/relocated</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>relocated</b> file provides the information that
+ The optional <b>relocated</b> table provides the information that
+@@ -20,7 +20,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the
+ indexed file after changing the relocated table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix28/files/patch-bo b/mail/postfix28/files/patch-bo
index 41cbc4ca6d65..b45270be8151 100644
--- a/mail/postfix28/files/patch-bo
+++ b/mail/postfix28/files/patch-bo
@@ -1,11 +1,20 @@
---- html/transport.5.html.orig Fri Dec 31 20:54:56 1999
-+++ html/transport.5.html Tue Nov 7 22:53:50 2000
+--- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000
++++ ./html/transport.5.html Tue Nov 21 21:43:20 2000
@@ -9,7 +9,7 @@
transport - format of Postfix transport table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/transport</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>transport</b> file specifies a mapping from
+ The optional <b>transport</b> table specifies a mapping from
+@@ -21,7 +21,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the
+ indexed file after changing the transport table.
+
+ When the table is provided via other means such as NIS,
diff --git a/mail/postfix28/files/patch-bp b/mail/postfix28/files/patch-bp
index bb65bd98a7b8..5206bfd4bfd0 100644
--- a/mail/postfix28/files/patch-bp
+++ b/mail/postfix28/files/patch-bp
@@ -1,11 +1,43 @@
---- html/virtual.5.html.orig Tue Dec 21 03:00:58 1999
-+++ html/virtual.5.html Tue Nov 7 22:55:04 2000
+--- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000
++++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000
@@ -9,7 +9,7 @@
virtual - format of Postfix virtual table
-
+
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/virtual</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b>
-
+
<b>DESCRIPTION</b>
- The optional <b>virtual</b> table specifies redirections for
+ The optional <b>virtual</b> table specifies address redirections
+@@ -27,7 +27,7 @@
+ that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
+ result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
+ fast searching by the mail system. Execute the command
+- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the
++ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the
+ indexed file after changing the text file.
+
+ When the table is provided via other means such as NIS,
+@@ -52,7 +52,7 @@
+
+ Support for a Postfix-style virtual domain looks like:
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>virtual.domain</i> <i>anything</i> (right-hand content does not matter)
+ <i>postmaster@virtual.domain</i> <i>postmaster</i>
+ <i>user1@virtual.domain</i> <i>address1</i>
+@@ -94,11 +94,11 @@
+
+ Support for a Sendmail-style virtual domain looks like:
+
+- /etc/postfix/main.cf:
++ !!PREFIX!!/etc/postfix/main.cf:
+ mydestination = $myhostname localhost.$mydomain $mydomain
+ <i>virtual.domain</i>
+
+- /etc/postfix/virtual:
++ !!PREFIX!!/etc/postfix/virtual:
+ <i>user1@virtual.domain</i> <i>address1</i>
+ <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i>
+
diff --git a/mail/postfix28/files/patch-cb b/mail/postfix28/files/patch-cb
index ef73429287d2..58559c7273d1 100644
--- a/mail/postfix28/files/patch-cb
+++ b/mail/postfix28/files/patch-cb
@@ -1,25 +1,20 @@
---- man/man1/sendmail.1.orig Thu Mar 30 17:46:10 2000
-+++ man/man1/sendmail.1 Wed Dec 20 18:37:45 2000
-@@ -61,10 +61,12 @@
- \fBjust-send-eight\fR.
- .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- The path name of the \fBsendmail.cf\fR file. Postfix configuration
--files are kept in \fB/etc/postfix\fR.
-+files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- .IP "\fB-F \fIfull_name\fR
- Set the sender full name. This is used only with messages that
- have no \fBFrom:\fR message header.
-+.IP "\fB-G\fR (ignored)"
-+Gateway (relay) submission, as opposed to initial user submission.
- .IP \fB-I\fR
- Initialize alias database. See the \fBnewaliases\fR
- command above.
-@@ -171,7 +173,7 @@
- .na
- .nf
- /var/spool/postfix, mail queue
--/etc/postfix, configuration files
-+!!PREFIX!!/etc/postfix, configuration files
- .SH CONFIGURATION PARAMETERS
- .na
- .nf
+*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000
+--- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000
+***************
+*** 63,65 ****
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+--- 63,65 ----
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+***************
+*** 173,175 ****
+ /var/spool/postfix, mail queue
+! /etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
+--- 173,175 ----
+ /var/spool/postfix, mail queue
+! !!PREFIX!!/etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
diff --git a/mail/postfix28/files/patch-cc b/mail/postfix28/files/patch-cc
new file mode 100644
index 000000000000..cd6946003217
--- /dev/null
+++ b/mail/postfix28/files/patch-cc
@@ -0,0 +1,11 @@
+*** ./man/man5/pcre_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/pcre_table.5 Thu Jun 1 22:39:34 2000
+***************
+*** 10,12 ****
+ .nf
+! pcre:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! pcre:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix28/files/patch-cd b/mail/postfix28/files/patch-cd
index 36461a39bb49..b51de44d0bee 100644
--- a/mail/postfix28/files/patch-cd
+++ b/mail/postfix28/files/patch-cd
@@ -1,11 +1,20 @@
---- man/man5/access.5.orig Fri Dec 11 19:55:52 1998
-+++ man/man5/access.5 Tue Nov 7 22:56:25 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/access\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/access\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/access.5 Thu Jun 1 22:39:55 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/access\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ file after changing the access table.
diff --git a/mail/postfix28/files/patch-ce b/mail/postfix28/files/patch-ce
index 0e0bd4aa1ae5..f77053f8b3aa 100644
--- a/mail/postfix28/files/patch-ce
+++ b/mail/postfix28/files/patch-ce
@@ -1,11 +1,20 @@
---- man/man5/canonical.5.orig Mon Sep 6 05:13:32 1999
-+++ man/man5/canonical.5 Tue Nov 7 22:57:40 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/canonical\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000
+--- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/canonical\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
+--- 21,23 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ file after changing the canonical table.
diff --git a/mail/postfix28/files/patch-cf b/mail/postfix28/files/patch-cf
new file mode 100644
index 000000000000..28fb053b94a7
--- /dev/null
+++ b/mail/postfix28/files/patch-cf
@@ -0,0 +1,11 @@
+*** ./man/man5/regexp_table.5.orig Thu Mar 30 14:05:28 2000
+--- ./man/man5/regexp_table.5 Thu Jun 1 22:40:43 2000
+***************
+*** 10,12 ****
+ .nf
+! regexp:/etc/postfix/filename
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! regexp:!!PREFIX!!/etc/postfix/filename
+ .SH DESCRIPTION
diff --git a/mail/postfix28/files/patch-cg b/mail/postfix28/files/patch-cg
index cdce4aaddaf3..0ae82cc57669 100644
--- a/mail/postfix28/files/patch-cg
+++ b/mail/postfix28/files/patch-cg
@@ -1,11 +1,20 @@
---- man/man5/relocated.5.orig Mon Sep 6 05:13:33 1999
-+++ man/man5/relocated.5 Tue Nov 7 22:59:11 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/relocated\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/relocated\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ .SH DESCRIPTION
+***************
+*** 20,22 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
+--- 20,22 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
diff --git a/mail/postfix28/files/patch-ch b/mail/postfix28/files/patch-ch
index 80df028f9255..3ed047ea474c 100644
--- a/mail/postfix28/files/patch-ch
+++ b/mail/postfix28/files/patch-ch
@@ -1,11 +1,20 @@
---- man/man5/transport.5.orig Fri Dec 31 20:54:51 1999
-+++ man/man5/transport.5 Tue Nov 7 22:59:57 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/transport\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/transport\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ .SH DESCRIPTION
+***************
+*** 21,23 ****
+ for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
+--- 21,23 ----
+ for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
diff --git a/mail/postfix28/files/patch-ci b/mail/postfix28/files/patch-ci
index 889eed3f4d89..1a7cf4abbac7 100644
--- a/mail/postfix28/files/patch-ci
+++ b/mail/postfix28/files/patch-ci
@@ -1,11 +1,20 @@
---- man/man5/virtual.5.orig Tue Dec 21 03:00:51 1999
-+++ man/man5/virtual.5 Tue Nov 7 23:00:32 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/virtual\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000
+--- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000
+***************
+*** 10,12 ****
+ .nf
+! \fBpostmap /etc/postfix/virtual\fR
+ .SH DESCRIPTION
+--- 10,12 ----
+ .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ .SH DESCRIPTION
+***************
+*** 26,28 ****
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
+--- 26,28 ----
+ is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ file after changing the virtual table.
diff --git a/mail/postfix28/files/patch-da b/mail/postfix28/files/patch-da
new file mode 100644
index 000000000000..e57e31750d18
--- /dev/null
+++ b/mail/postfix28/files/patch-da
@@ -0,0 +1,11 @@
+*** ./proto/regexp_table.orig Wed Mar 8 19:18:20 2000
+--- ./proto/regexp_table Thu Jun 1 22:44:43 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # regexp:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # regexp:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix28/files/patch-db b/mail/postfix28/files/patch-db
new file mode 100644
index 000000000000..7f89fb770783
--- /dev/null
+++ b/mail/postfix28/files/patch-db
@@ -0,0 +1,20 @@
+*** ./proto/access.orig Sun Apr 9 16:44:45 2000
+--- ./proto/access Thu Jun 1 22:45:05 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/access\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+ # file after changing the access table.
diff --git a/mail/postfix28/files/patch-dc b/mail/postfix28/files/patch-dc
new file mode 100644
index 000000000000..786f2da45c32
--- /dev/null
+++ b/mail/postfix28/files/patch-dc
@@ -0,0 +1,20 @@
+*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000
+--- ./proto/canonical Thu Jun 1 22:45:28 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/canonical\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
+--- 15,17 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+ # file after changing the canonical table.
diff --git a/mail/postfix28/files/patch-dd b/mail/postfix28/files/patch-dd
new file mode 100644
index 000000000000..b65a57ff7d57
--- /dev/null
+++ b/mail/postfix28/files/patch-dd
@@ -0,0 +1,11 @@
+*** ./proto/pcre_table.orig Wed Mar 8 19:18:11 2000
+--- ./proto/pcre_table Thu Jun 1 22:45:41 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # pcre:/etc/postfix/filename
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # pcre:!!PREFIX!!/etc/postfix/filename
+ # DESCRIPTION
diff --git a/mail/postfix28/files/patch-de b/mail/postfix28/files/patch-de
new file mode 100644
index 000000000000..73bb2af2261d
--- /dev/null
+++ b/mail/postfix28/files/patch-de
@@ -0,0 +1,20 @@
+*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000
+--- ./proto/relocated Thu Jun 1 22:46:02 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/relocated\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ # DESCRIPTION
+***************
+*** 14,16 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
+--- 14,16 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+ # file after changing the relocated table.
diff --git a/mail/postfix28/files/patch-df b/mail/postfix28/files/patch-df
new file mode 100644
index 000000000000..8d3fba96a224
--- /dev/null
+++ b/mail/postfix28/files/patch-df
@@ -0,0 +1,20 @@
+*** ./proto/transport.orig Sun Apr 9 17:05:45 2000
+--- ./proto/transport Thu Jun 1 22:46:23 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/transport\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+ # DESCRIPTION
+***************
+*** 15,17 ****
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
+--- 15,17 ----
+ # for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+ # file after changing the transport table.
diff --git a/mail/postfix28/files/patch-dg b/mail/postfix28/files/patch-dg
new file mode 100644
index 000000000000..bff20a2cff3e
--- /dev/null
+++ b/mail/postfix28/files/patch-dg
@@ -0,0 +1,20 @@
+*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000
+--- ./proto/virtual Thu Jun 1 22:46:40 2000
+***************
+*** 6,8 ****
+ # SYNOPSIS
+! # \fBpostmap /etc/postfix/virtual\fR
+ # DESCRIPTION
+--- 6,8 ----
+ # SYNOPSIS
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ # DESCRIPTION
+***************
+*** 20,22 ****
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
+--- 20,22 ----
+ # is used for fast searching by the mail system. Execute the command
+! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+ # file after changing the virtual table.
diff --git a/mail/postfix28/files/patch-ea b/mail/postfix28/files/patch-ea
index 80647e0b2ba0..6c3f98d2af4f 100644
--- a/mail/postfix28/files/patch-ea
+++ b/mail/postfix28/files/patch-ea
@@ -1,5 +1,5 @@
-*** ./cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
---- ./cleanup/cleanup.c Thu Jun 1 21:52:22 2000
+*** ./src/cleanup/cleanup.c.orig Sun May 28 18:33:41 2000
+--- ./src/cleanup/cleanup.c Thu Jun 1 21:52:22 2000
***************
*** 118,121 ****
/* FILES
diff --git a/mail/postfix28/files/patch-eb b/mail/postfix28/files/patch-eb
index d576de434580..e67680963d2d 100644
--- a/mail/postfix28/files/patch-eb
+++ b/mail/postfix28/files/patch-eb
@@ -1,5 +1,5 @@
-*** ./global/mail_conf.c.orig Sun May 7 18:51:16 2000
---- ./global/mail_conf.c Thu Jun 1 22:16:29 2000
+*** ./src/global/mail_conf.c.orig Sun May 7 18:51:16 2000
+--- ./src/global/mail_conf.c Thu Jun 1 22:16:29 2000
***************
*** 53,55 ****
/* FILES
diff --git a/mail/postfix28/files/patch-ec b/mail/postfix28/files/patch-ec
index 74edda76007b..6d12d1ce4c17 100644
--- a/mail/postfix28/files/patch-ec
+++ b/mail/postfix28/files/patch-ec
@@ -1,5 +1,5 @@
-*** ./global/mail_params.h.orig Wed May 31 19:18:31 2000
---- ./global/mail_params.h Thu Jun 1 22:17:10 2000
+*** ./src/global/mail_params.h.orig Wed May 31 19:18:31 2000
+--- ./src/global/mail_params.h Thu Jun 1 22:17:10 2000
***************
*** 155,157 ****
#ifndef DEF_PROGRAM_DIR
diff --git a/mail/postfix28/files/patch-ed b/mail/postfix28/files/patch-ed
index b573748b45e1..f971b62720d8 100644
--- a/mail/postfix28/files/patch-ed
+++ b/mail/postfix28/files/patch-ed
@@ -1,5 +1,5 @@
-*** ./local/mailbox.c.orig Fri Apr 28 16:55:53 2000
---- ./local/mailbox.c Thu Jun 1 22:37:48 2000
+*** ./src/local/mailbox.c.orig Fri Apr 28 16:55:53 2000
+--- ./src/local/mailbox.c Thu Jun 1 22:37:48 2000
***************
*** 15,17 ****
/* suppression. The default is direct mailbox delivery to
diff --git a/mail/postfix28/files/patch-ee b/mail/postfix28/files/patch-ee
index d79219b1ba62..ef44eac24b73 100644
--- a/mail/postfix28/files/patch-ee
+++ b/mail/postfix28/files/patch-ee
@@ -1,5 +1,5 @@
-*** ./master/master.c.orig Tue Mar 7 10:25:07 2000
---- ./master/master.c Thu Jun 1 22:43:50 2000
+*** ./src/master/master.c.orig Tue Mar 7 10:25:07 2000
+--- ./src/master/master.c Thu Jun 1 22:43:50 2000
***************
*** 104,107 ****
/* FILES
diff --git a/mail/postfix28/files/patch-ef b/mail/postfix28/files/patch-ef
index 44816a063b95..586b304a103d 100644
--- a/mail/postfix28/files/patch-ef
+++ b/mail/postfix28/files/patch-ef
@@ -1,5 +1,5 @@
-*** ./postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
---- ./postdrop/postdrop.c Thu Jun 1 22:44:22 2000
+*** ./src/postdrop/postdrop.c.orig Sun Apr 25 18:05:43 1999
+--- ./src/postdrop/postdrop.c Thu Jun 1 22:44:22 2000
***************
*** 39,41 ****
/* /var/spool/postfix, mail queue
diff --git a/mail/postfix28/files/patch-eg b/mail/postfix28/files/patch-eg
index 28950509870c..2983bbfd86ea 100644
--- a/mail/postfix28/files/patch-eg
+++ b/mail/postfix28/files/patch-eg
@@ -1,34 +1,20 @@
---- sendmail/sendmail.c.orig Sun Mar 26 22:51:33 2000
-+++ sendmail/sendmail.c Wed Dec 20 18:17:31 2000
-@@ -55,10 +55,12 @@
- /* \fBjust-send-eight\fR.
- /* .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
--/* files are kept in \fB/etc/postfix\fR.
-+/* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- /* .IP "\fB-F \fIfull_name\fR
- /* Set the sender full name. This is used only with messages that
- /* have no \fBFrom:\fR message header.
-+/* .IP "\fB-G \fR (ignored)"
-+/* Gateway (relay) submission, as opposed to initial user submission.
- /* .IP \fB-I\fR
- /* Initialize alias database. See the \fBnewaliases\fR
- /* command above.
-@@ -157,7 +159,7 @@
- /* \fBdebugger_command\fR configuration parameter.
- /* FILES
- /* /var/spool/postfix, mail queue
--/* /etc/postfix, configuration files
-+/* !!PREFIX!!/etc/postfix, configuration files
- /* CONFIGURATION PARAMETERS
- /* .ad
- /* .fi
-@@ -710,6 +712,8 @@
- break;
- case 'F': /* full name */
- full_name = optarg;
-+ break;
-+ case 'G': /* gateway submission */
- break;
- case 'I': /* newaliases */
- mode = SM_MODE_NEWALIAS;
+*** ./src/sendmail/sendmail.c.orig Tue Mar 14 10:42:06 2000
+--- ./src/sendmail/sendmail.c Thu Jun 1 22:47:24 2000
+***************
+*** 57,59 ****
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+--- 57,59 ----
+ /* The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /* files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ /* .IP "\fB-F \fIfull_name\fR
+***************
+*** 159,161 ****
+ /* /var/spool/postfix, mail queue
+! /* /etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
+--- 159,161 ----
+ /* /var/spool/postfix, mail queue
+! /* !!PREFIX!!/etc/postfix, configuration files
+ /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix28/files/patch-eh b/mail/postfix28/files/patch-eh
index f95b51423128..c104c3680d21 100644
--- a/mail/postfix28/files/patch-eh
+++ b/mail/postfix28/files/patch-eh
@@ -1,5 +1,5 @@
-*** ./trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
---- ./trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
+*** ./src/trivial-rewrite/transport.c.orig Tue Nov 16 19:15:41 1999
+--- ./src/trivial-rewrite/transport.c Thu Jun 1 22:47:49 2000
***************
*** 32,34 ****
/* FILES
diff --git a/mail/postfix28/files/patch-ei b/mail/postfix28/files/patch-ei
new file mode 100644
index 000000000000..3029372b746e
--- /dev/null
+++ b/mail/postfix28/files/patch-ei
@@ -0,0 +1,21 @@
+*** ./src/smtpd/smtpd.h.orig Thu Sep 14 10:17:23 2000
+--- ./src/smtpd/smtpd.h Thu Sep 14 10:17:38 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix28/files/patch-ej b/mail/postfix28/files/patch-ej
new file mode 100644
index 000000000000..6c5cf2e23758
--- /dev/null
+++ b/mail/postfix28/files/patch-ej
@@ -0,0 +1,21 @@
+*** ./src/smtp/smtp.h.orig Thu Sep 14 13:04:43 2000
+--- ./src/smtp/smtp.h Thu Sep 14 13:04:53 2000
+***************
+*** 12,19 ****
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+ #endif
+
+ /*
+--- 12,19 ----
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix28/files/patch-fa b/mail/postfix28/files/patch-fa
deleted file mode 100644
index bc1c2dc388c2..000000000000
--- a/mail/postfix28/files/patch-fa
+++ /dev/null
@@ -1,12 +0,0 @@
---- makedefs.orig Sun Jan 23 03:04:27 2000
-+++ makedefs Mon Apr 3 08:59:17 2000
-@@ -89,6 +89,8 @@
- ;;
- FreeBSD.4*) SYSTYPE=FREEBSD4
- ;;
-+ FreeBSD.5*) SYSTYPE=FREEBSD5
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- NetBSD.1*) SYSTYPE=NETBSD1
-
diff --git a/mail/postfix28/files/patch-fb b/mail/postfix28/files/patch-fb
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix28/files/patch-fb
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
- * makedefs script, and adding a section below for the new system.
- */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+ || defined(FREEBSD5) \
- || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
- || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix28/files/patch-ga b/mail/postfix28/files/patch-ga
index 3ad7120b8322..60a6dd578564 100644
--- a/mail/postfix28/files/patch-ga
+++ b/mail/postfix28/files/patch-ga
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_MYSQL" option at compile time ("make -DWITH_MYSQL").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
[Code contributed by Scott Cotton and Joshua Marcus, IC Group, Inc.]
diff --git a/mail/postfix28/files/patch-gb b/mail/postfix28/files/patch-gb
index 312c8c60f9e5..98816d155122 100644
--- a/mail/postfix28/files/patch-gb
+++ b/mail/postfix28/files/patch-gb
@@ -3,8 +3,8 @@
***************
*** 1,3 ****
--- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_LDAP" option at compile time ("make -DWITH_LDAP").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
+
BUILDING WITH LDAP SUPPORT
==========================
diff --git a/mail/postfix28/files/patch-lmtp.h b/mail/postfix28/files/patch-lmtp.h
new file mode 100644
index 000000000000..3d941c034198
--- /dev/null
+++ b/mail/postfix28/files/patch-lmtp.h
@@ -0,0 +1,13 @@
+--- ./src/lmtp/lmtp.h.orig Fri Jan 19 15:43:06 2001
++++ ./src/lmtp/lmtp.h Sat Feb 3 14:01:09 2001
+@@ -12,8 +12,8 @@
+ * SASL library.
+ */
+ #ifdef USE_SASL_AUTH
+-#include <sasl.h>
+-#include <saslutil.h>
++#include <sasl/sasl.h>
++#include <sasl/saslutil.h>
+ #endif
+
+ /*
diff --git a/mail/postfix28/pkg-install b/mail/postfix28/pkg-install
index 933c669e6b98..0d18b67ddee3 100644
--- a/mail/postfix28/pkg-install
+++ b/mail/postfix28/pkg-install
@@ -1,4 +1,9 @@
#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
user=postfix
group=postfix
@@ -87,6 +92,5 @@ if [ x"$2" = xPOST-INSTALL ]; then
fi
/usr/sbin/chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
/bin/chmod 2555 ${PKG_PREFIX}/sbin/postdrop
- /bin/mkdir -p /var/spool/postfix
${PKG_PREFIX}/sbin/postfix check
fi
diff --git a/mail/postfix28/pkg-plist b/mail/postfix28/pkg-plist
index 5f8572883b4c..97167cb8ed15 100644
--- a/mail/postfix28/pkg-plist
+++ b/mail/postfix28/pkg-plist
@@ -5,24 +5,29 @@ etc/postfix/postfix-script
etc/postfix/sample-access
etc/postfix/sample-aliases
etc/postfix/sample-aliases.cf
+%%SUB_SASL%%etc/postfix/sample-auth.cf
etc/postfix/sample-canonical
etc/postfix/sample-canonical.cf
etc/postfix/sample-debug.cf
etc/postfix/sample-filter.cf
-%%WITH_LDAP%%etc/postfix/sample-ldap.cf
+etc/postfix/sample-flush.cf
+%%SUB_LDAP%%etc/postfix/sample-ldap.cf
etc/postfix/sample-local.cf
etc/postfix/sample-main.cf
etc/postfix/sample-master.cf
etc/postfix/sample-misc.cf
-%%WITH_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_PCRE%%etc/postfix/sample-pcre_table
etc/postfix/sample-rate.cf
etc/postfix/sample-regexp.cf
+etc/postfix/sample-regexp_table
etc/postfix/sample-relocated
etc/postfix/sample-relocated.cf
etc/postfix/sample-resource.cf
etc/postfix/sample-rewrite.cf
etc/postfix/sample-smtp.cf
etc/postfix/sample-smtpd.cf
+%%SUB_TLS%%etc/postfix/sample-tls.cf
etc/postfix/sample-transport
etc/postfix/sample-transport.cf
etc/postfix/sample-virtual
@@ -30,6 +35,8 @@ etc/postfix/sample-virtual.cf
libexec/postfix/bounce
libexec/postfix/cleanup
libexec/postfix/error
+libexec/postfix/flush
+libexec/postfix/lmtp
libexec/postfix/local
libexec/postfix/master
libexec/postfix/pickup
@@ -38,6 +45,8 @@ libexec/postfix/qmgr
libexec/postfix/showq
libexec/postfix/smtp
libexec/postfix/smtpd
+libexec/postfix/spawn
+%%SUB_TLS%%libexec/postfix/tlsmgr
libexec/postfix/trivial-rewrite
sbin/postalias
sbin/postcat
@@ -50,62 +59,66 @@ sbin/postlog
sbin/postmap
sbin/postsuper
sbin/sendmail
-share/doc/postfix/LDAP_README
-share/doc/postfix/MYSQL_README
-share/doc/postfix/html/access.5.html
-share/doc/postfix/html/aliases.5.html
-share/doc/postfix/html/architecture.html
-share/doc/postfix/html/backstage.html
-share/doc/postfix/html/basic.html
-share/doc/postfix/html/big-picture.gif
-share/doc/postfix/html/big-picture.html
-share/doc/postfix/html/bounce.8.html
-share/doc/postfix/html/canonical.5.html
-share/doc/postfix/html/cleanup.8.html
-share/doc/postfix/html/commands.html
-share/doc/postfix/html/defer.8.html
-share/doc/postfix/html/delivering.html
-share/doc/postfix/html/error.8.html
-share/doc/postfix/html/faq.html
-share/doc/postfix/html/goals.html
-share/doc/postfix/html/inbound.gif
-share/doc/postfix/html/index.html
-share/doc/postfix/html/local.8.html
-share/doc/postfix/html/mailq.1.html
-share/doc/postfix/html/master.8.html
-share/doc/postfix/html/motivation.html
-share/doc/postfix/html/newaliases.1.html
-share/doc/postfix/html/outbound.gif
-share/doc/postfix/html/pickup.8.html
-share/doc/postfix/html/pipe.8.html
-share/doc/postfix/html/postalias.1.html
-share/doc/postfix/html/postcat.1.html
-share/doc/postfix/html/postconf.1.html
-share/doc/postfix/html/postdrop.1.html
-share/doc/postfix/html/postfix.1.html
-share/doc/postfix/html/postkick.1.html
-share/doc/postfix/html/postlock.1.html
-share/doc/postfix/html/postlog.1.html
-share/doc/postfix/html/postmap.1.html
-share/doc/postfix/html/postsuper.1.html
-share/doc/postfix/html/qmgr.8.html
-share/doc/postfix/html/queuing.html
-share/doc/postfix/html/rate.html
-share/doc/postfix/html/receiving.html
-share/doc/postfix/html/relocated.5.html
-share/doc/postfix/html/resource.html
-share/doc/postfix/html/rewrite.html
-share/doc/postfix/html/security.html
-share/doc/postfix/html/sendmail.1.html
-share/doc/postfix/html/showq.8.html
-share/doc/postfix/html/small-picture.gif
-share/doc/postfix/html/smtp.8.html
-share/doc/postfix/html/smtpd.8.html
-share/doc/postfix/html/transport.5.html
-share/doc/postfix/html/trivial-rewrite.8.html
-share/doc/postfix/html/uce.html
-share/doc/postfix/html/virtual.5.html
-@dirrm etc/postfix
+%%SUB_TEST%%sbin/smtp-sink
+%%SUB_TEST%%sbin/smtp-source
+%%SUB_DOCS%%share/doc/postfix/access.5.html
+%%SUB_DOCS%%share/doc/postfix/aliases.5.html
+%%SUB_DOCS%%share/doc/postfix/architecture.html
+%%SUB_DOCS%%share/doc/postfix/backstage.html
+%%SUB_DOCS%%share/doc/postfix/basic.html
+%%SUB_DOCS%%share/doc/postfix/big-picture.gif
+%%SUB_DOCS%%share/doc/postfix/big-picture.html
+%%SUB_DOCS%%share/doc/postfix/bounce.8.html
+%%SUB_DOCS%%share/doc/postfix/canonical.5.html
+%%SUB_DOCS%%share/doc/postfix/cleanup.8.html
+%%SUB_DOCS%%share/doc/postfix/commands.html
+%%SUB_DOCS%%share/doc/postfix/defer.8.html
+%%SUB_DOCS%%share/doc/postfix/delivering.html
+%%SUB_DOCS%%share/doc/postfix/error.8.html
+%%SUB_DOCS%%share/doc/postfix/faq.html
+%%SUB_DOCS%%share/doc/postfix/flush.8.html
+%%SUB_DOCS%%share/doc/postfix/goals.html
+%%SUB_DOCS%%share/doc/postfix/inbound.gif
+%%SUB_DOCS%%share/doc/postfix/index.html
+%%SUB_DOCS%%share/doc/postfix/lmtp.8.html
+%%SUB_DOCS%%share/doc/postfix/local.8.html
+%%SUB_DOCS%%share/doc/postfix/mailq.1.html
+%%SUB_DOCS%%share/doc/postfix/master.8.html
+%%SUB_DOCS%%share/doc/postfix/motivation.html
+%%SUB_DOCS%%share/doc/postfix/newaliases.1.html
+%%SUB_DOCS%%share/doc/postfix/outbound.gif
+%%SUB_DOCS%%share/doc/postfix/pcre_table.5.html
+%%SUB_DOCS%%share/doc/postfix/pickup.8.html
+%%SUB_DOCS%%share/doc/postfix/pipe.8.html
+%%SUB_DOCS%%share/doc/postfix/postalias.1.html
+%%SUB_DOCS%%share/doc/postfix/postcat.1.html
+%%SUB_DOCS%%share/doc/postfix/postconf.1.html
+%%SUB_DOCS%%share/doc/postfix/postdrop.1.html
+%%SUB_DOCS%%share/doc/postfix/postfix.1.html
+%%SUB_DOCS%%share/doc/postfix/postkick.1.html
+%%SUB_DOCS%%share/doc/postfix/postlock.1.html
+%%SUB_DOCS%%share/doc/postfix/postlog.1.html
+%%SUB_DOCS%%share/doc/postfix/postmap.1.html
+%%SUB_DOCS%%share/doc/postfix/postsuper.1.html
+%%SUB_DOCS%%share/doc/postfix/qmgr.8.html
+%%SUB_DOCS%%share/doc/postfix/queuing.html
+%%SUB_DOCS%%share/doc/postfix/rate.html
+%%SUB_DOCS%%share/doc/postfix/receiving.html
+%%SUB_DOCS%%share/doc/postfix/regexp_table.5.html
+%%SUB_DOCS%%share/doc/postfix/relocated.5.html
+%%SUB_DOCS%%share/doc/postfix/resource.html
+%%SUB_DOCS%%share/doc/postfix/rewrite.html
+%%SUB_DOCS%%share/doc/postfix/security.html
+%%SUB_DOCS%%share/doc/postfix/sendmail.1.html
+%%SUB_DOCS%%share/doc/postfix/showq.8.html
+%%SUB_DOCS%%share/doc/postfix/small-picture.gif
+%%SUB_DOCS%%share/doc/postfix/smtp.8.html
+%%SUB_DOCS%%share/doc/postfix/smtpd.8.html
+%%SUB_DOCS%%share/doc/postfix/spawn.8.html
+%%SUB_DOCS%%share/doc/postfix/transport.5.html
+%%SUB_DOCS%%share/doc/postfix/trivial-rewrite.8.html
+%%SUB_DOCS%%share/doc/postfix/uce.html
+%%SUB_DOCS%%share/doc/postfix/virtual.5.html
+%%SUB_DOCS%%@dirrm share/doc/postfix
@dirrm libexec/postfix
-@dirrm share/doc/postfix/html
-@dirrm share/doc/postfix
+@dirrm etc/postfix
diff --git a/mail/postfix28/scripts/configure.postfix b/mail/postfix28/scripts/configure.postfix
new file mode 100644
index 000000000000..9ba8f21e8612
--- /dev/null
+++ b/mail/postfix28/scripts/configure.postfix
@@ -0,0 +1,129 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.1 2001-03-04 19:35:00 sf Exp $
+
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
+ exit
+fi
+
+tempfile=`mktemp -t checklist`
+
+if [ "${BATCH}" = "yes" ]; then
+ set \"PCRE\"
+else
+ /usr/bin/dialog --title "Postfix configuration options" --clear \
+ --checklist "\n\
+Please select desired options:" -1 -1 16 \
+PCRE "Perl Compatible Regular Expressions" OFF \
+SASL "Cyrus SASL (Simple Authentication and Security Layer)" OFF \
+DB3 "Berkeley DB3 (required if SASL also built with DB3)" OFF \
+MySQL "MySQL map lookups" OFF \
+OpenLDAP "OpenLDAP map lookups" OFF \
+Test "SMTP/LMTP test server and generator" OFF \
+TLS "Secure Sockets Layer and Transport Layer Security" OFF \
+IPv6 "IPv6 support" OFF \
+2> $tempfile
+
+ retval=$?
+
+ if [ -s $tempfile ]; then
+ set `cat $tempfile`
+ fi
+ rm -f $tempfile
+
+ case $retval in
+ 0) if [ -z "$*" ]; then
+ echo "Nothing selected"
+ fi
+ ;;
+ 1) echo "Cancel pressed."
+ exit 1
+ ;;
+ esac
+fi
+
+${MKDIR} ${WRKDIRPREFIX}${CURDIR}
+exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+
+echo "PREFIX= ${PREFIX}"
+
+SUB_PCRE="@comment "
+SUB_SASL="@comment "
+SUB_TLS="@comment "
+SUB_LDAP="@comment "
+SUB_TEST="@comment "
+
+while [ "$1" ]; do
+ case $1 in
+ \"PCRE\")
+ echo "CONF1+= pcre_table"
+ echo "CONF2+= sample-pcre.cf"
+ echo "MAN5+= pcre_table.5"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre"
+ echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a"
+ SUB_PCRE=""
+ ;;
+ \"SASL\")
+ echo "CONF2+= sample-auth.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl"
+ echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -lpam -lcrypt"
+ echo ".if exists(/usr/lib/libkrb.a)"
+ echo "POSTFIX_AUXLIBS+= -lkrb -ldes -lcom_err"
+ echo ".endif"
+ SUB_SASL=""
+ ;;
+ \"TLS\")
+ echo "CONF2+= sample-tls.cf"
+ echo "BIN1+= tlsmgr"
+ echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl"
+ echo "POSTFIX_AUXLIBS+= -lssl -lcrypto"
+ echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.7.0-20010228-0.9.6.tar.gz"
+ echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.7.0-20010228-0.9.6/pfixtls.diff"
+ echo "PATCH_STRIP= -p1"
+ SUB_TLS=""
+ ;;
+ \"DB3\")
+ echo "LIB_DEPENDS+= db3.1:\${PORTSDIR}/databases/db3"
+ echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3"
+ echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3"
+ ;;
+ \"MySQL\")
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
+ echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
+ ;;
+ \"OpenLDAP\")
+ echo "CONF2+= sample-ldap.cf"
+ echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
+ echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include"
+ echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
+ SUB_LDAP=""
+ ;;
+ \"Test\")
+ echo "BIN3= smtp-sink smtp-source"
+ SUB_TEST=""
+ ;;
+ \"IPv6\")
+ echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/"
+ echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}"
+ echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz"
+ echo ""
+ echo "pre-patch:"
+ echo " cd \${WRKSRC} && ln -s . postfix"
+ echo ""
+ ;;
+ *)
+ echo "Invalid option(s): $*" > /dev/stderr
+ rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+echo "PLIST_SUB+= SUB_PCRE=\"${SUB_PCRE}\""
+echo "PLIST_SUB+= SUB_SASL=\"${SUB_SASL}\""
+echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\""
+echo "PLIST_SUB+= SUB_LDAP=\"${SUB_LDAP}\""
+echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""