diff options
Diffstat (limited to 'mail/vpopmail')
| -rw-r--r-- | mail/vpopmail/Makefile | 2 | ||||
| -rw-r--r-- | mail/vpopmail/files/patch-Makefile.in | 6 | ||||
| -rw-r--r-- | mail/vpopmail/files/patch-vusagec.conf | 17 | ||||
| -rw-r--r-- | mail/vpopmail/pkg-plist | 3 |
4 files changed, 25 insertions, 3 deletions
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile index 5747137adb22..c10951dea7d5 100644 --- a/mail/vpopmail/Makefile +++ b/mail/vpopmail/Makefile @@ -7,7 +7,7 @@ PORTNAME= vpopmail PORTVERSION= 5.4.30 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION} \ SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION} diff --git a/mail/vpopmail/files/patch-Makefile.in b/mail/vpopmail/files/patch-Makefile.in index eb31e777ea4d..3bd393015d2b 100644 --- a/mail/vpopmail/files/patch-Makefile.in +++ b/mail/vpopmail/files/patch-Makefile.in @@ -1,13 +1,14 @@ Description: Install config files with -dist, do not add -fPIC. Install the config files with a -dist extension. Do not unconditionally add -fPIC, this is done only for shared libs. + Actually look for and install the vusagec.conf sample file! Forwarded: not-needed Author: Peter Pentchev <roam@FreeBSD.org> -Last-Update: 2010-01-05 +Last-Update: 2010-02-09 --- a/Makefile.in +++ b/Makefile.in -@@ -320,12 +320,11 @@ +@@ -320,12 +320,12 @@ noinst_HEADERS = md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h COMMONSOURCES = vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c backfill.c client.c conf.c ippp.c CONFIG_CLEAN_FILES = vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load @@ -15,6 +16,7 @@ Last-Update: 2010-01-05 -VLIMITS = $(DESTDIR)@vpopmaildir@/etc/vlimits.default +MYSQLCONF = $(DESTDIR)@vpopmaildir@/etc/vpopmail.mysql-dist +VLIMITS = $(DESTDIR)@vpopmaildir@/etc/vlimits.default-dist ++VUSAGECCONF = $(DESTDIR)@vpopmaildir@/etc/vusagec.conf-dist noinst_LIBRARIES = libvpopmail.a libvpopmail_a_SOURCES = $(COMMONSOURCES) libvpopmail_a_LIBADD = cdb/*.o diff --git a/mail/vpopmail/files/patch-vusagec.conf b/mail/vpopmail/files/patch-vusagec.conf new file mode 100644 index 000000000000..e1ce2aa6ec75 --- /dev/null +++ b/mail/vpopmail/files/patch-vusagec.conf @@ -0,0 +1,17 @@ +Description: Disable vusage.conf since we don't install vusaged at all. + Tracked down by: Renato Botelho <garga@FreeBSD.org> +Forwarded: not-needed +Author: Peter Pentchev <roam@FreeBSD.org> +Last-Update: 2010-02-09 + +--- a/vusagec.conf ++++ b/vusagec.conf +@@ -23,7 +23,7 @@ + True or False + */ + +- Disable = False; ++ Disable = True; + + /* + Daemon is listening on local socket diff --git a/mail/vpopmail/pkg-plist b/mail/vpopmail/pkg-plist index 2a8b2fa61087..2370f9f73fbc 100644 --- a/mail/vpopmail/pkg-plist +++ b/mail/vpopmail/pkg-plist @@ -77,6 +77,9 @@ vpopmail/etc/vlimits.default-dist %%MYSQL%%@unexec if cmp -s %D/vpopmail/etc/vpopmail.mysql %D/vpopmail/etc/vpopmail.mysql-dist; then rm -f %D/vpopmail/etc/vpopmail.mysql; fi %%MYSQL%%vpopmail/etc/vpopmail.mysql-dist %%MYSQL%%@exec if [ ! -f %D/vpopmail/etc/vpopmail.mysql ] ; then cp -p %D/%F %B/vpopmail.mysql; fi +@unexec if cmp -s %D/vpopmail/etc/vusagec.conf %D/vpopmail/etc/vusagec.conf-dist; then rm -f %D/vpopmail/etc/vusagec.conf; fi +vpopmail/etc/vusagec.conf-dist +@exec if [ ! -f %D/vpopmail/etc/vusagec.conf ] ; then cp -p %D/%F %B/vusagec.conf; fi vpopmail/include/client.h vpopmail/include/conf.h vpopmail/include/config.h |