summaryrefslogtreecommitdiff
path: root/mail/spamassassin/patches/patch-ab
diff options
context:
space:
mode:
Diffstat (limited to 'mail/spamassassin/patches/patch-ab')
-rw-r--r--mail/spamassassin/patches/patch-ab55
1 files changed, 15 insertions, 40 deletions
diff --git a/mail/spamassassin/patches/patch-ab b/mail/spamassassin/patches/patch-ab
index 6dcb8689dde..f665d904b42 100644
--- a/mail/spamassassin/patches/patch-ab
+++ b/mail/spamassassin/patches/patch-ab
@@ -1,51 +1,26 @@
-$NetBSD: patch-ab,v 1.2 2002/10/20 20:09:05 heinz Exp $
+$NetBSD: patch-ab,v 1.3 2003/04/15 00:02:25 heinz Exp $
---- Makefile.PL.orig Mon Oct 14 18:44:27 2002
+--- Makefile.PL.orig Sun Mar 30 03:55:30 2003
+++ Makefile.PL
-@@ -134,8 +134,8 @@
- DEF_RULES_DIR = $(INST_PREFIX)/share/spamassassin
- PKG_DEF_RULES_DIR = $(PREFIX)/share/spamassassin
-
--LOCAL_RULES_DIR = $(INST_SYSCONFDIR)/mail/spamassassin
--PKG_LOCAL_RULES_DIR = $(SYSCONFDIR)/mail/spamassassin
-+LOCAL_RULES_DIR = $(INST_SYSCONFDIR)
-+PKG_LOCAL_RULES_DIR = $(SYSCONFDIR)
-
- FIXVARS = -Mvars \
- -DVERSION="$(VERSION)" \
-@@ -144,7 +144,7 @@
- -DLOCAL_RULES_DIR="$(LOCAL_RULES_DIR)" \
- -DINSTALLSITELIB="$(INSTALLSITELIB)"
-
--pm_to_blib: spamassassin doc/.made
-+pm_to_blib: spamassassin
-
- spamassassin: spamassassin.raw
- $(PERL) build/preprocessor $(FIXVARS) -Msharpbang <$? >$@
-@@ -163,7 +163,7 @@
- binaries.mk: configure
+@@ -334,16 +334,17 @@
./configure
--inst_cfs: $(PKG_DEF_RULES_DIR) $(PKG_LOCAL_RULES_DIR) $(PKG_LOCAL_RULES_DIR)/local.cf
-+inst_cfs: $(PKG_DEF_RULES_DIR) $(PKG_LOCAL_RULES_DIR)
- $(RM_F) $(PKG_DEF_RULES_DIR)/*; \
- for file in $(RULES) ; do \
- $(PERL) build/preprocessor $(FIXVARS) <rules/$$file >$(PKG_DEF_RULES_DIR)/$$file; \
-@@ -171,13 +171,14 @@
- $(CHMOD) $(PERM_RW) $(PKG_DEF_RULES_DIR)/*
-
- $(PKG_DEF_RULES_DIR):
-- $(MKPATH) $@
-+ $(BSD_INSTALL_DATA_DIR) $@
+ inst_cfs: $(PKG_LOCAL_RULES_DIR) $(PKG_LOCAL_RULES_DIR)/local.cf
+- $(MKPATH) $(PKG_DEF_RULES_DIR)
++ $(BSD_INSTALL_DATA_DIR) $(PKG_DEF_RULES_DIR)
+ $(RM_RF) $(PKG_DEF_RULES_DIR)/*
+ $(PERL) build/preprocessor $(FIXVARS) -Irules -O$(PKG_DEF_RULES_DIR) $(RULES)
+- $(CHMOD) $(PERM_RWX) $(PKG_DEF_RULES_DIR)
++ @ \# $(CHMOD) $(PERM_RWX) $(PKG_DEF_RULES_DIR)
$(PKG_LOCAL_RULES_DIR):
- $(MKPATH) $@
+ $(BSD_INSTALL_DATA_DIR) $@
$(PKG_LOCAL_RULES_DIR)/local.cf: rules/local.cf
-- test -f $@ || \
-+ \# manage local.cf through pkgsrc .mk files
-+ \# test -f $@ || \
- $(CP) rules/local.cf $@
+- $(PERL) -e "use File::Copy; (-f '$@') or copy ('$?', '$@');"
++ @ \# manage local.cf through pkgsrc .mk files
++ @ \# $(PERL) -e "use File::Copy; (-f '$@') or copy ('$?', '$@');"
- text_html_doc: doc/.made
+ text_html_doc: made-doc-stamp
+ $(NOOP)