From owner-svn-ports-head@FreeBSD.ORG Wed Jul 17 18:58:40 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 5D948E4C; Wed, 17 Jul 2013 18:58:40 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4FF6036B; Wed, 17 Jul 2013 18:58:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6HIwepB094570; Wed, 17 Jul 2013 18:58:40 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6HIwdYT094568; Wed, 17 Jul 2013 18:58:39 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201307171858.r6HIwdYT094568@svn.freebsd.org> From: Matthias Andree Date: Wed, 17 Jul 2013 18:58:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323182 - head/mail/mailutils X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jul 2013 18:58:40 -0000 Author: mandree Date: Wed Jul 17 18:58:39 2013 New Revision: 323182 URL: http://svnweb.freebsd.org/changeset/ports/323182 Log: - Return port to ports@, at the maintainers request (private mail in response to a bug report); Attila Nagy is not using the port any more. - Add/fix GUILE option (to make it build in Tinderbox) and fix the pkg-plist accordingly, so that the port now installs successfully and uninstalls without left-over files with default options (i. e. no options) and with GUILE enabled. - Remove versions from LIB_DEPENDS. WARNING: THIS PORT NEEDS MORE ATTENTION, known issues: - movemail is reported to stall on messages containing NUL bytes in the middle of (body) lines - enabling the PYTHON option causes pkg-plist breakage, missing bin/popauth, and other issues - Note the upstream has released a 2.99.96 alpha/beta version earlier this year, but I did not have the time to review bug fixes and other changes. It seems a massive overhaul, partial rewrite, though. Modified: head/mail/mailutils/Makefile head/mail/mailutils/pkg-plist (contents, props changed) Modified: head/mail/mailutils/Makefile ============================================================================== --- head/mail/mailutils/Makefile Wed Jul 17 18:19:08 2013 (r323181) +++ head/mail/mailutils/Makefile Wed Jul 17 18:58:39 2013 (r323182) @@ -3,11 +3,11 @@ PORTNAME= mailutils PORTVERSION= 2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= GNU -MAINTAINER= bra@fsn.hu +MAINTAINER= ports@FreeBSD.org COMMENT= Mailutils offers utilities and daemons for processing e-mail GNU_CONFIGURE= yes @@ -15,14 +15,16 @@ CONFIGURE_ENV= MAKEINFO="makeinfo --no-s CONFIGURE_ARGS+=--disable-build-comsat MAKE_JOBS_UNSAFE= yes -LDFLAGS= -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/${PORTNAME} INFO= ${PORTNAME} MAN1= imap4d.1 mail.1 pop3d.1 popauth.1 OPTIONS_DEFINE= GDBM BDB TOKYOCABINET GNUTLS MYSQL PGSQL LDAP PYTHON -OPTIONS_DEFAULT= +OPTIONS_DEFINE+= GUILE +OPTIONS_DEFAULT= +OPTIONS_SUB= yes GDBM_DESC= Use GNU DBM BDB_DESC= Use Berkeley DB @@ -37,7 +39,7 @@ PYTHON_DESC= Enable Python support .if ${PORT_OPTIONS:MGDBM} CONFIGURE_ARGS+= --with-gdbm -LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm +LIB_DEPENDS+= gdbm:${PORTSDIR}/databases/gdbm .else CONFIGURE_ARGS+= --without-gdbm .endif @@ -51,7 +53,7 @@ CONFIGURE_ARGS+= --without-berkeley-db .if ${PORT_OPTIONS:MTOKYOCABINET} CONFIGURE_ARGS+= --with-tokyocabinet -LIB_DEPENDS+= tokyocabinet.9:${PORTSDIR}/databases/tokyocabinet +LIB_DEPENDS+= tokyocabinet:${PORTSDIR}/databases/tokyocabinet PLIST_SUB+= TOKYOCABINET="" .else CONFIGURE_ARGS+= --without-tokyocabinet @@ -103,6 +105,10 @@ CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif +GUILE_CONFIGURE_ON= --with-guile +GUILE_CONFIGURE_ON= --without-guile +GUILE_LIB_DEPENDS= guile:${PORTSDIR}/lang/guile + post-patch: @${REINPLACE_CMD} -e '/need_charset_alias=/s|true|false|g' ${WRKSRC}/lib/Makefile.in Modified: head/mail/mailutils/pkg-plist ============================================================================== --- head/mail/mailutils/pkg-plist Wed Jul 17 18:19:08 2013 (r323181) +++ head/mail/mailutils/pkg-plist Wed Jul 17 18:58:39 2013 (r323182) @@ -276,6 +276,24 @@ sbin/imap4d sbin/maidag sbin/pop3d share/aclocal/mailutils.m4 +%%GUILE%%bin/sieve.scm +%%GUILE%%bin/guimb +%%GUILE%%lib/libmu_scm.so.3 +%%GUILE%%lib/libmu_scm.so +%%GUILE%%lib/libmu_scm.la +%%GUILE%%lib/libmu_scm.a +%%GUILE%%lib/libguile-mailutils-v-2.2.so +%%GUILE%%share/guile/site/mailutils/mailutils.scm +%%GUILE%%share/guile/site/mailutils/guile-procedures.txt +%%GUILE%%share/guile/site/mailutils/sieve-modules/mimeheader.scm +%%GUILE%%share/guile/site/mailutils/sieve-modules/numaddr.scm +%%GUILE%%share/guile/site/mailutils/sieve-modules/redirect.scm +%%GUILE%%share/guile/site/mailutils/sieve-modules/reject.scm +%%GUILE%%share/guile/site/mailutils/sieve-modules/vacation.scm +%%GUILE%%share/guile/site/mailutils/sieve-core.scm +%%GUILE%%@dirrmtry share/guile/site/mailutils/sieve-modules +%%GUILE%%@dirrmtry share/guile/site/mailutils +%%GUILE%%@dirrmtry share/guile/site%%NLS%%share/locale/ca/LC_MESSAGES/mailutils.mo %%NLS%%share/locale/ca/LC_MESSAGES/mailutils.mo %%NLS%%share/locale/es/LC_MESSAGES/mailutils.mo %%NLS%%share/locale/fr/LC_MESSAGES/mailutils.mo