diff options
| author | ijliao <ijliao@FreeBSD.org> | 2002-05-24 11:58:28 +0800 |
|---|---|---|
| committer | ijliao <ijliao@FreeBSD.org> | 2002-05-24 11:58:28 +0800 |
| commit | 756e598b38a4658d308ed4461334f47f013ba874 (patch) | |
| tree | 1fd33e056eb84fbca749d8bb2394d9da2cdf9ff4 /security | |
| parent | 837ed312c17b1372d329b7fb94e56f97ed09792a (diff) | |
| download | freebsd-ports-gnome-756e598b38a4658d308ed4461334f47f013ba874.tar.gz freebsd-ports-gnome-756e598b38a4658d308ed4461334f47f013ba874.tar.zst freebsd-ports-gnome-756e598b38a4658d308ed4461334f47f013ba874.zip | |
1. modify startup script: only one of amavisd and amavis-milter will be
installed, not both.
2. change MASTER_SITES / add MASTER_SITE_SUBDIR
3. amavisd depends on Net::SMTP, not Net::Telnet
4. bump PORTREVISION
PR: 38469
Submitted by: Yen-Ming Lee <leeym@utopia.leeym.com>
Approved by: maintainer
Diffstat (limited to 'security')
| -rw-r--r-- | security/amavisd/Makefile | 7 | ||||
| -rw-r--r-- | security/amavisd/files/amavisd-milter.sh | 4 | ||||
| -rw-r--r-- | security/amavisd/files/amavisd.sh | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/security/amavisd/Makefile b/security/amavisd/Makefile index cb47f7c6af74..170ee9cffdd3 100644 --- a/security/amavisd/Makefile +++ b/security/amavisd/Makefile @@ -7,9 +7,10 @@ PORTNAME= amavisd PORTVERSION= 20020300 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security -MASTER_SITES= http://www.amavis.org/dist/perl/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= amavis DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION} MAINTAINER= gslin@ccca.nctu.edu.tw @@ -29,7 +30,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/arc:${PORTSDIR}/archivers/arc \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/AtomicFile.pm:${PORTSDIR}/devel/p5-IO-stringy \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Body.pm:${PORTSDIR}/mail/p5-MIME-Tools \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \ - ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet + ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net RUN_DEPENDS= ${BUILD_DEPENDS} GNU_CONFIGURE= yes diff --git a/security/amavisd/files/amavisd-milter.sh b/security/amavisd/files/amavisd-milter.sh index 8ab574f4baca..eaefe61b9988 100644 --- a/security/amavisd/files/amavisd-milter.sh +++ b/security/amavisd/files/amavisd-milter.sh @@ -7,7 +7,7 @@ fi case "$1" in start) - ( [ -x ${PREFIX}/sbin/amavisd ] && [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1 + ( [ -x ${PREFIX}/sbin/amavisd ] || [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1 AMAVISD=$(/bin/ps -xU %%AMAVISUSER%% | grep amavisd | awk '{ print $1 }') AMAVIS_MILTER=$(/bin/ps -xU %%AMAVISUSER%% | grep amavis-milter | awk '{ print $1 }') ( /bin/test "$AMAVISD" || /bin/test "$AMAVIS_MILTER" ) && \ @@ -17,7 +17,7 @@ start) su - %%AMAVISUSER%% -c ${PREFIX}/sbin/amavisd > /dev/null 2>&1 && echo -n ' amavisd-milter' ;; stop) - ( [ -x ${PREFIX}/sbin/amavisd ] && [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1 + ( [ -x ${PREFIX}/sbin/amavisd ] || [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1 AMAVISD=$(/bin/ps -xU %%AMAVISUSER%% | grep amavisd | awk '{ print $1 }') AMAVIS_MILTER=$(/bin/ps -xU %%AMAVISUSER%% | grep amavis-milter | awk '{ print $1 }') ( /bin/test "$AMAVISD" || /bin/test "$AMAVIS_MILTER" ) && \ diff --git a/security/amavisd/files/amavisd.sh b/security/amavisd/files/amavisd.sh index 823b03e4a905..1a9bbe947d38 100644 --- a/security/amavisd/files/amavisd.sh +++ b/security/amavisd/files/amavisd.sh @@ -7,7 +7,7 @@ fi case "$1" in start) - ( [ -x ${PREFIX}/sbin/amavisd ] && [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1 + ( [ -x ${PREFIX}/sbin/amavisd ] || [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1 AMAVISD=$(/bin/ps -xU %%AMAVISUSER%% | grep amavisd | awk '{ print $1 }') ( /bin/test "$AMAVISD" ) && \ su - %%AMAVISUSER%% -c "/bin/kill $AMAVISD" > /dev/null @@ -15,7 +15,7 @@ start) su - %%AMAVISUSER%% -c ${PREFIX}/sbin/amavisd > /dev/null 2>&1 && echo -n ' amavisd' ;; stop) - ( [ -x ${PREFIX}/sbin/amavisd ] && [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1 + ( [ -x ${PREFIX}/sbin/amavisd ] || [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1 AMAVISD=$(/bin/ps -xU %%AMAVISUSER%% | grep amavisd | awk '{ print $1 }') ( /bin/test "$AMAVISD") && \ su - %%AMAVISUSER%% -c "/bin/kill $AMAVISD" > /dev/null && echo -n ' amavisd' |