1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
$NetBSD: patch-ab,v 1.6 2003/12/27 19:16:04 heinz Exp $
--- Makefile.PL.orig Sun Nov 2 01:42:04 2003
+++ Makefile.PL
@@ -95,7 +95,7 @@ sub yesno {
my %opt = (
'enable_ssl' => undef,
- 'contact_address' => undef,
+ 'contact_address' => '@SA_CONTACT_ADDRESS@',
'run_razor_tests' => undef,
'destdir' => undef,
'__cruft' => undef,
@@ -333,18 +333,20 @@ if (!defined $opt{'contact_address'}) {
}
$makefile{'macro'}{'CONTACT_ADDRESS'} = $opt{'contact_address'};
-if (!defined $opt{'run_razor_tests'}) {
my $got_razor2 = eval { require Razor2::Client::Agent };
if ($got_razor2) {
- $opt{'run_razor_tests'} = prompt(
- "Run Razor v2 tests (these may fail due to network problems)? (y/n)",
- 'n'
- );
- print "\n";
+ if (!defined $opt{'run_razor_tests'}) {
+ $opt{'run_razor_tests'} = prompt(
+ "Run Razor v2 tests (these may fail due to network problems)? (y/n)",
+ 'n'
+ );
+ print "\n";
+ }
+ $opt{'run_razor_tests'} = bool($opt{'run_razor_tests'});
+ $makefile{'macro'}{'TEST_RUN_RAZOR'} = yesno($opt{'run_razor_tests'});
}
-}
-$opt{'run_razor_tests'} = bool($opt{'run_razor_tests'});
+
if ($opt{'run_razor_tests'}) {
open(FLAG, "> t/do_razor2");
close(FLAG);
@@ -352,7 +354,6 @@ if ($opt{'run_razor_tests'}) {
else {
unlink("t/do_razor2");
}
-$makefile{'macro'}{'TEST_RUN_RAZOR'} = yesno($opt{'run_razor_tests'});
# Now dump the Makefile
@@ -745,7 +746,7 @@ sub MY::libscan {
return q{} if $path =~ m{
(^|/)CVS(/|$)|
- [/.](orig|old|rej|diff|patch|bak|backup|my)$
+ [/.](orig|old|rej|diff|patch|bak|backup|my|subst.sav)$
}ix;
clean_MY_globals($self);
@@ -965,15 +966,16 @@ spamd/binaries.mk: spamd/configure
cd spamd; ./configure --prefix="$(I_PREFIX)" --sysconfdir="$(I_SYSCONFDIR)" --datadir="$(I_DATADIR)" --enable-ssl="$(ENABLE_SSL)"
conf__install:
- -$(MKPATH) $(B_CONFDIR)
- $(PERL) -MFile::Spec -MFile::Copy \
+ -$(BSD_INSTALL_DATA_DIR) $(B_CONFDIR)
+ @ # manage local.cf through pkgsrc .mk files
+ @ # $(PERL) -MFile::Spec -MFile::Copy \
-e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf};"
data__install:
- -$(MKPATH) $(B_DATADIR)
+ -$(BSD_INSTALL_DATA_DIR) $(B_DATADIR)
$(PERL) -e "map unlink, <$(B_DATADIR)/*>"
$(PREPROCESS) $(FIXVARS) -m$(PERM_RW) -Irules -O$(B_DATADIR) $(RULES)
- $(CHMOD) $(PERM_RWX) $(B_DATADIR)
+ @ # $(CHMOD) $(PERM_RWX) $(B_DATADIR)
text_html_doc: made-doc-stamp
$(NOOP)
|
