explicitly search ${LOCALBASE}/bin and sbin when looking for gpg etc.,
fixing a problem seen by wesley at e-solutions.re where /usr/local is not in the path for cronjobs running sa-update
This commit is contained in:
parent
09de3d8123
commit
cb2b6fcd3a
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.95 2015/05/23 14:18:55 bluhm Exp $
|
||||
# $OpenBSD: Makefile,v 1.96 2015/08/26 13:28:54 sthen Exp $
|
||||
|
||||
COMMENT= mailfilter to identify and mark spam
|
||||
|
||||
VER= 3.4.1
|
||||
DISTNAME= Mail-SpamAssassin-${VER}
|
||||
PKGNAME= p5-${DISTNAME}
|
||||
REVISION= 1
|
||||
REVISION= 2
|
||||
RULESNAME= Mail-SpamAssassin-rules-${VER}.r1675274.tgz
|
||||
CATEGORIES= mail perl5
|
||||
|
||||
@ -69,6 +69,9 @@ _R= ${WRKSRC}/_dist_rules
|
||||
post-extract:
|
||||
mkdir ${_R} && cd ${_R} && tar xzf ${FULLDISTDIR}/${RULESNAME}
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/lib/Mail/SpamAssassin/Util.pm
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/SpamAssassin
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/SpamAssassin/sql
|
||||
|
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-lib_Mail_SpamAssassin_Util_pm,v 1.1 2015/08/26 13:28:54 sthen Exp $
|
||||
--- lib/Mail/SpamAssassin/Util.pm.orig Wed Aug 26 14:14:36 2015
|
||||
+++ lib/Mail/SpamAssassin/Util.pm Wed Aug 26 14:21:17 2015
|
||||
@@ -108,7 +108,7 @@ BEGIN {
|
||||
if ( !$displayed_path++ ) {
|
||||
dbg("util: current PATH is: ".join($Config{'path_sep'},File::Spec->path()));
|
||||
}
|
||||
- foreach my $path (File::Spec->path()) {
|
||||
+ foreach my $path (File::Spec->path(), qw(${LOCALBASE}/bin ${LOCALBASE}/sbin)) {
|
||||
my $fname = File::Spec->catfile ($path, $filename);
|
||||
if ( -f $fname ) {
|
||||
if (-x $fname) {
|
Loading…
x
Reference in New Issue
Block a user