Changeset 98748

Timestamp:

Oct 14, 2012, 5:33:01 PM (12 years ago)

Author:

pixilla@…

Message:

mail/amavisd-new:

• Replace adduser and addgroup with add_users.
• Put perl version into variable.

File:

• trunk/dports/mail/amavisd-new/Portfile (modified) (3 diffs)

trunk/dports/mail/amavisd-new/Portfile

@@ -6 +6 @@
 name                amavisd-new
 version             2.8.0
+revision            1
 categories          mail
 license             GPL-2
@@ -25 +26 @@
                     sha256  342b805f58db667b099a85863328b3fdfe9c575a22ace119d541e5f12bee63ac
 
-depends_run         port:perl5 \
-                    port:p5.12-archive-zip \
-                    port:p5.12-berkeleydb \
-                    port:p5.12-convert-tnef \
-                    port:p5.12-convert-uulib \
-                    port:p5.12-digest-md5 \
-                    port:p5.12-io-compress \
-                    port:p5.12-io-stringy \
-                    port:p5.12-mail-dkim \
-                    port:p5.12-mailtools \
-                    port:p5.12-mime-tools \
-                    port:p5.12-mime-base64 \
-                    port:p5.12-net-server \
-                    port:p5.12-time-hires \
-                    port:p5.12-unix-syslog \
-                    port:p5.12-mail-spamassassin \
-                    port:p5.12-dbd-mysql \
-                    port:p5.12-mail-clamav \
+set perl_version    5.12
+set daemon_user     _amavisd
+set daemon_group    _amavisd
+set amavisd_home    ${prefix}/var/amavis
+add_users ${daemon_user} group=${daemon_group} realname=AMaViS\ Daemon home=${amavisd_home}
+
+depends_run         port:p${perl_version}-archive-zip \
+                    port:p${perl_version}-berkeleydb \
+                    port:p${perl_version}-convert-tnef \
+                    port:p${perl_version}-convert-uulib \
+                    port:p${perl_version}-digest-md5 \
+                    port:p${perl_version}-io-compress \
+                    port:p${perl_version}-io-stringy \
+                    port:p${perl_version}-mail-dkim \
+                    port:p${perl_version}-mailtools \
+                    port:p${perl_version}-mime-tools \
+                    port:p${perl_version}-mime-base64 \
+                    port:p${perl_version}-net-server \
+                    port:p${perl_version}-time-hires \
+                    port:p${perl_version}-unix-syslog \
+                    port:p${perl_version}-mail-spamassassin \
+                    port:p${perl_version}-dbd-mysql \
+                    port:p${perl_version}-mail-clamav \
                     port:clamav \
                     port:clamav-server
 
-set daemon_user     _amavisd
-set daemon_group    _amavisd
-set amavisd_home    ${prefix}/var/amavis
-
 post-patch {
-    reinplace "s|#!/usr/bin/perl|#!${prefix}/bin/perl5.12|" \
+    reinplace "s|#!/usr/bin/perl|#!${prefix}/bin/perl${perl_version}|" \
               ${worksrcpath}/amavisd
     file copy ${worksrcpath}/amavisd.conf ${worksrcpath}/amavisd.conf.example
@@ -69 +71 @@
 
 destroot {
-    if { ![existsgroup ${daemon_group}]} {
-        addgroup ${daemon_group}
-    }
-    if { ![existsuser ${daemon_user}]} {
-        set gid ${daemon_group}
-        adduser ${daemon_user} gid=${gid} realname="AMaViS Daemon" home=${amavisd_home}
-    }
     xinstall -m 750 -o ${daemon_user} -g ${daemon_group} \
         ${worksrcpath}/amavisd \