- Statically hardcode the hostname at build-time isn't correct because

packages will hold the hostname of the building cluster in this way.
  Just set $localhost_name to $myhostname instead. The latter is
  tunable in the configuration file.
- Bump PORTREVISION

Pointed out by:	delphij
This commit is contained in:
Gabor Kovesdan 2009-12-21 23:08:19 +00:00
parent 342bcd5b6f
commit ce2040e29e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=246403

View File

@ -8,7 +8,7 @@
PORTNAME= amavisd-new
PORTVERSION= 2.6.4
PORTREVISION= 3
PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= security
MASTER_SITES= http://www.ijs.si/software/amavisd/ \
@ -46,7 +46,6 @@ AMAVISGROUP?= vscan
AMAVISDIR?= /var/amavis
AMAVISQUARANTINE?= /var/virusmails
DAEMON?= /usr/sbin/daemon -p
HOSTNAME!= /bin/hostname
OPTIONS= BDB "Use BerkeleyDB for nanny/cache/snmp" on \
SNMP "Install amavisd snmp subagent" off \
@ -245,7 +244,7 @@ post-patch:
-e "s|/var/lib/amavis|${AMAVISDIR}|" \
-e 's|$$log_level = 2;|$$log_level = 0;|' \
-e "s|/var/virusmails|${AMAVISQUARANTINE}|" \
-e "s|\$localhost_name = \'localhost\';|\$localhost_name = \'${HOSTNAME}\';|g" \
-e 's|$$localhost_name = .localhost.;|$$localhost_name = $$myhostname;|' \
-e 's|/var/run/clamav/clamd|/var/run/clamav/clamd.sock|g' \
${WRKSRC}/${i}
.endfor
@ -260,7 +259,7 @@ post-patch:
@${REINPLACE_CMD} -e "s|/etc/amavisd.conf|${PREFIX}/etc/amavisd.conf|" \
-e "s|/usr/bin/perl|${PERL}|" \
-e "s|/var/amavis|${AMAVISDIR}|g" \
-e "s|\$localhost_name = \'localhost\';|\$localhost_name = \'${HOSTNAME}\';|g" \
-e 's|$$localhost_name = .localhost.;|$$localhost_name = $$myhostname;|' \
${WRKSRC}/amavisd
.if defined(AMAVIS_NOAMAVIS)