diff options
Diffstat (limited to 'mail/vpopmail-stable')
| -rw-r--r-- | mail/vpopmail-stable/Makefile | 18 | ||||
| -rw-r--r-- | mail/vpopmail-stable/files/patch-configure | 50 | ||||
| -rw-r--r-- | mail/vpopmail-stable/pkg-install | 22 | ||||
| -rw-r--r-- | mail/vpopmail-stable/pkg-plist | 2 |
4 files changed, 89 insertions, 3 deletions
diff --git a/mail/vpopmail-stable/Makefile b/mail/vpopmail-stable/Makefile index b73c64f..09f3db0 100644 --- a/mail/vpopmail-stable/Makefile +++ b/mail/vpopmail-stable/Makefile @@ -7,7 +7,7 @@ PORTNAME= vpopmail PORTVERSION= 4.9.10 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.inter7.com/vpopmail/ @@ -45,6 +45,11 @@ CONFIGURE_ARGS= --enable-qmail-dir=${QMAIL_DIR} \ # APOPFILE - location of apop secrets file # QMAIL_DIR - location of qmail directory # PREFIX - installation area for vpopmail (see comment below) +# WITH_MYSQL_USER - the username for connecting to the MySQL server (root) +# WITH_MYSQL_PASSWD - the password for connecting to the MySQL server (gipgap) +# WITH_MYSQL_DB - the name of the MySQL database to use (vpopmail) +# VCHKPW_GID - the group ID of the new vchkpw group (89) +# VPOPMAIL_UID - the user ID of the new vpopmail user (89) # HARDQUOTA?= 10000000 @@ -112,5 +117,16 @@ CONFIGURE_ARGS+= --enable-default-domain=${DEFAULT_DOMAIN} pre-configure: @PKG_PREFIX=${PREFIX}/vpopmail ${PERL5} ${PKGINSTALL} +.if defined(WITH_MYSQL) +.if defined(WITH_MYSQL_USER) + ${PERL} -pi -e "s/(#define MYSQL_USER.*)root(.*)/\$$1${WITH_MYSQL_USER}\$$2/" ${WRKSRC}/vmysql.h +.endif +.if defined(WITH_MYSQL_PASSWD) + ${PERL} -pi -e "s/(#define MYSQL_PASSWD.*)gipgap(.*)/\$$1${WITH_MYSQL_PASSWD}\$$2/" ${WRKSRC}/vmysql.h +.endif +.if defined(WITH_MYSQL_DB) + ${PERL} -pi -e "s/(#define MYSQL_DATABASE.*)vpopmail(.*)/\$$1${WITH_MYSQL_DB}\$$2/" ${WRKSRC}/vmysql.h +.endif +.endif .include <bsd.port.mk> diff --git a/mail/vpopmail-stable/files/patch-configure b/mail/vpopmail-stable/files/patch-configure new file mode 100644 index 0000000..67eba68 --- /dev/null +++ b/mail/vpopmail-stable/files/patch-configure @@ -0,0 +1,50 @@ +--- configure.old Wed Jul 4 17:14:16 2001 ++++ configure Wed Jul 4 17:14:54 2001 +@@ -1613,16 +1613,6 @@ + rm -f vpopusername + + +-if test ! -d $vpopmaildir/etc +-then +- mkdir $vpopmaildir/etc +- chown $vpopmailuid "$vpopmaildir"/etc +- chgrp $vpopmailgid "$vpopmaildir"/etc +- chmod 755 "$vpopmaildir"/etc +- echo "configure: warning: making a vpopmail etc directory " 1>&2 +-fi +- +- + open_smtp_cur="$vpopmaildir/etc/open-smtp" + open_smtp_tmp="$vpopmaildir/etc/open-smtp.tmp" + open_smtp_lok="$vpopmaildir/etc/open-smtp.lock" +@@ -1658,7 +1648,6 @@ + + if test "$tcpserver_file" = "" + then +- echo "127.:allow,RELAYCLIENT=\"\"" > "$vpopmaildir"/etc/tcp.smtp + tcpserver_file="$vpopmaildir"/etc/tcp.smtp + + echo "configure: warning: Unable to find your tcpserver relay file." 1>&2 +@@ -1873,7 +1862,6 @@ + fi + auth_libs="-L$sqllibdir -lmysqlclient -lz" + +- echo "-L$vpopmaildir/lib -lvpopmail -L$sqllibdir -lmysqlclient -lz" > $vpopmaildir/etc/lib_deps + + ;; + *) +@@ -2007,14 +1995,12 @@ + authlib= + + auth_inc="-Icdb" +- echo "-L$vpopmaildir/lib -lvpopmail" > $vpopmaildir/etc/lib_deps + + ;; + *) + ;; + esac + +-echo "-I$vpopmaildir/include" > $vpopmaildir/etc/inc_deps + + # Check whether --enable-roaming-users or --disable-roaming-users was given. + if test "${enable_roaming_users+set}" = set; then diff --git a/mail/vpopmail-stable/pkg-install b/mail/vpopmail-stable/pkg-install index f3004e7..1016024 100644 --- a/mail/vpopmail-stable/pkg-install +++ b/mail/vpopmail-stable/pkg-install @@ -8,10 +8,32 @@ %gids = ("vchkpw", 89); %uids = ('vpopmail', 89); +sub checkenv () { + my ($u, $g); + + # Users + foreach $u (keys %users) { + $var = uc($u)."_UID"; + if (defined($ENV{$var})) { + $uids{$u} = $ENV{$var}; + } + } + + # Groups + foreach $g (@groups) { + $var = uc($g)."_GID"; + if (defined($ENV{$var})) { + $gids{$g} = $ENV{$var}; + } + } +} + if ($ENV{PACKAGE_BUILDING} || $ARGV[1] eq "PRE-INSTALL") { $doguid=1; # Make sure we get the assigned guids. } +checkenv(); + foreach $group (@groups) { if (! getgrnam ($group)) { do checkrpw; # May exit diff --git a/mail/vpopmail-stable/pkg-plist b/mail/vpopmail-stable/pkg-plist index e72110f..b438c9a 100644 --- a/mail/vpopmail-stable/pkg-plist +++ b/mail/vpopmail-stable/pkg-plist @@ -29,8 +29,6 @@ vpopmail/doc/man_html/vdeluser.html vpopmail/doc/man_html/vpasswd.html vpopmail/doc/man_html/vpopbull.html vpopmail/doc/man_html/vsetuserquota.html -vpopmail/etc/inc_deps -vpopmail/etc/lib_deps vpopmail/include/config.h vpopmail/include/vauth.h vpopmail/include/vpopmail.h |
