diff options
author | obache <obache@pkgsrc.org> | 2007-12-13 07:43:20 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2007-12-13 07:43:20 +0000 |
commit | e05214ad4554143c210131a7d3d95897a1be5afe (patch) | |
tree | a42b0c301fe6e3988eb168b86c7ac05477c535e8 | |
parent | f8d184fcf279530464a41fb702ae96e4d243297a (diff) | |
download | pkgsrc-e05214ad4554143c210131a7d3d95897a1be5afe.tar.gz |
Update DBMail to 2.2.8.
While here, pkglint clean and add DESTDIR support.
This is strictly a maintenance release. No new functionality was added.
Changes since 2.2.8-rc1
none
Bugs fixed since 2.2.7
0000655: [Database layer] MIME headers are incorrectly parsed into cached tables (paul)
0000656: [Command-Line programs (dbmail-users, dbmail-util)] dbmail-export: bogus date in "From_" lines (paul)
-rw-r--r-- | mail/dbmail/Makefile | 21 | ||||
-rw-r--r-- | mail/dbmail/PLIST | 6 | ||||
-rw-r--r-- | mail/dbmail/distinfo | 8 | ||||
-rw-r--r-- | mail/dbmail/options.mk | 29 |
4 files changed, 36 insertions, 28 deletions
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile index 18f8478a7b9..7895c59f078 100644 --- a/mail/dbmail/Makefile +++ b/mail/dbmail/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2007/11/03 11:39:49 obache Exp $ +# $NetBSD: Makefile,v 1.16 2007/12/13 07:43:20 obache Exp $ # -DISTNAME= dbmail-2.2.7 -PKGREVISION= 1 +DISTNAME= dbmail-2.2.8 CATEGORIES= mail MASTER_SITES= http://www.dbmail.org/download/2.2/ @@ -11,14 +10,18 @@ HOMEPAGE= http://www.dbmail.org/ COMMENT= Store and retrieve mail messages in a database GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-logdir=${VARBASE:Q}/log -CONFIGURE_ARGS+= --with-pkglibdir=${PREFIX:Q}/lib/dbmail -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}/run +CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log +CONFIGURE_ARGS+= --with-pkglibdir=${PREFIX}/lib/dbmail +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --localstatedir=${VARBASE}/run USE_TOOLS+= gmake pkg-config USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes +BUILD_DEFS+= VARBASE + +PKG_DESTDIR_SUPPORT= user-destdir + EGDIR= ${PREFIX}/share/examples/dbmail CONF_FILES= ${EGDIR}/dbmail.conf ${PKG_SYSCONFDIR}/dbmail.conf RCD_SCRIPTS= dbmail dbmailimapd dbmaillmtpd dbmailpop3d @@ -45,9 +48,9 @@ SUBST_MESSAGE.sysconf= Fixing sysconf paths. INSTALLATION_DIRS= lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin ${DOCSDIR} ${EGDIR} ${DATADIR}/sql post-install: - ${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${DESTDIR}${EGDIR} .for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCSDIR} .endfor .include "options.mk" diff --git a/mail/dbmail/PLIST b/mail/dbmail/PLIST index ad69172f102..0ba83bae9f7 100644 --- a/mail/dbmail/PLIST +++ b/mail/dbmail/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2007/11/03 11:39:49 obache Exp $ +@comment $NetBSD: PLIST,v 1.7 2007/12/13 07:43:20 obache Exp $ ${MYSQL}lib/dbmail/libmysql.la ${PGSQL}lib/dbmail/libpgsql.la ${SQLITE}lib/dbmail/libsqlite.la @@ -6,8 +6,8 @@ ${LDAP}lib/dbmail/libauth_ldap.la lib/dbmail/libauth_sql.la lib/dbmail/libdbmail.la ${SIEVE}lib/dbmail/libsort_sieve.la -man/man1/dbmail.1 man/man1/dbmail-smtp.1 +man/man1/dbmail.1 man/man5/dbmail.conf.5 man/man8/dbmail-export.8 man/man8/dbmail-imapd.8 @@ -62,7 +62,7 @@ share/examples/rc.d/dbmailpop3d ${SIEVE}share/examples/rc.d/dbmailtimsieved @dirrm share/examples/dbmail ${SQLITE}@dirrm share/dbmail/sql/sqlite -${PGSQL}@dirrm share/dbmail/sql/pgsql +${PGSQL}@dirrm share/dbmail/sql/postgresql ${MYSQL}@dirrm share/dbmail/sql/mysql @dirrm share/dbmail/sql @dirrm share/doc/dbmail diff --git a/mail/dbmail/distinfo b/mail/dbmail/distinfo index fdff03482b2..5905fb445b1 100644 --- a/mail/dbmail/distinfo +++ b/mail/dbmail/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.6 2007/11/03 11:39:49 obache Exp $ +$NetBSD: distinfo,v 1.7 2007/12/13 07:43:20 obache Exp $ -SHA1 (dbmail-2.2.7.tar.gz) = 15d3bbd945ee09fdc36da6f988f2b4723bd1cc28 -RMD160 (dbmail-2.2.7.tar.gz) = aac1d5a7d049b7384455b37e8380d4e57eae5164 -Size (dbmail-2.2.7.tar.gz) = 895586 bytes +SHA1 (dbmail-2.2.8.tar.gz) = 83927a431d8c7da47ab004ea4839dfe432095fab +RMD160 (dbmail-2.2.8.tar.gz) = ad740224581ee753354a629514ef09c42b06adaa +Size (dbmail-2.2.8.tar.gz) = 898224 bytes diff --git a/mail/dbmail/options.mk b/mail/dbmail/options.mk index 2b0f34495b8..a71813ec64c 100644 --- a/mail/dbmail/options.mk +++ b/mail/dbmail/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2007/11/03 11:39:50 obache Exp $ +# $NetBSD: options.mk,v 1.7 2007/12/13 07:43:20 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.dbmail PKG_SUPPORTED_OPTIONS= ldap sieve @@ -15,7 +15,7 @@ PKG_SUGGESTED_OPTIONS= mysql sieve .include "../../mk/mysql.buildlink3.mk" CONFIGURE_ARGS+= --with-mysql PLIST_SUBST+= MYSQL="" -INSTALLATION_DIRS+= ${DATADIR:Q}/sql/mysql +INSTALLATION_DIRS+= ${DATADIR}/sql/mysql .else PLIST_SUBST+= MYSQL="@comment " .endif @@ -27,7 +27,7 @@ PLIST_SUBST+= MYSQL="@comment " .include "../../mk/pgsql.buildlink3.mk" CONFIGURE_ARGS+= --with-pgsql PLIST_SUBST+= PGSQL="" -INSTALLATION_DIRS+= ${DATADIR:Q}/sql/pgsql +INSTALLATION_DIRS+= ${DATADIR}/sql/pgsql .else PLIST_SUBST+= PGSQL="@comment " .endif @@ -39,9 +39,9 @@ PLIST_SUBST+= PGSQL="@comment " .include "../../databases/sqlite3/buildlink3.mk" CONFIGURE_ARGS+= --with-sqlite PLIST_SUBST+= SQLITE="" -INSTALLATION_DIRS+= ${DATADIR:Q}/sql/sqlite +INSTALLATION_DIRS+= ${DATADIR}/sql/sqlite .else -PLIST_SUBST+= SQLITE="@comment " +PLIST_SUBST+= SQLITE="@comment " .endif ### @@ -49,7 +49,7 @@ PLIST_SUBST+= SQLITE="@comment " ### .if !empty(PKG_OPTIONS:Msieve) .include "../../mail/libsieve/buildlink3.mk" -CONFIGURE_ARGS+= --with-sieve=${BUILDLINK_PREFIX.libsieve:Q} +CONFIGURE_ARGS+= --with-sieve=${BUILDLINK_PREFIX.libsieve} PLIST_SUBST+= SIEVE="" FILES_SUBST+= TIMSIEVED="dbmailtimsieved" RCD_SCRIPTS+= dbmailtimsieved @@ -63,7 +63,7 @@ FILES_SUBST+= TIMSIEVED="" ### .if !empty(PKG_OPTIONS:Mldap) .include "../../databases/openldap-client/buildlink3.mk" -CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client:Q} +CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client} PLIST_SUBST+= LDAP="" .else PLIST_SUBST+= LDAP="@comment " @@ -74,9 +74,14 @@ PLIST_SUBST+= LDAP="@comment " ### post-install: dbmail-install-scripts +.PHONY: dbmail-install-scripts dbmail-install-scripts: -.for d in ${PKG_OPTIONS_GROUP.sql} -. if !empty(PKG_OPTIONS:M${d}) - ${INSTALL_DATA} ${WRKSRC:Q}/sql/$d/* ${DATADIR:Q}/sql/$d -. endif -.endfor +.if !empty(PKG_OPTIONS:Mmysql) + ${INSTALL_DATA} ${WRKSRC}/sql/mysql/* ${DESTDIR}${DATADIR}/sql/mysql +.endif +.if !empty(PKG_OPTIONS:Mpgsql) + ${INSTALL_DATA} ${WRKSRC}/sql/postgresql/* ${DESTDIR}${DATADIR}/sql/pgsql +.endif +.if !empty(PKG_OPTIONS:Msqlite) + ${INSTALL_DATA} ${WRKSRC}/sql/sqlite/* ${DESTDIR}${DATADIR}/sql/sqlite +.endif |