Date: Wed, 9 Nov 2016 15:28:55 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425798 - in head/mail/anubis: . files Message-ID: <201611091528.uA9FStdA032436@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Wed Nov 9 15:28:55 2016 New Revision: 425798 URL: https://svnweb.freebsd.org/changeset/ports/425798 Log: Add TEST option to toggle regression tests. They were previously running by default and causing aarch64 builds to fail, presumably due to an emulation issue. [1] Add EMACS option to install emacs lisp files. Previously, if emacs was already installed on the system, it would install these files in STAGEDIR and would cause check-plist to error. Convert USE_MYSQL to USES=mysql Convert CPPFLAGS/LDFLAGS to USES=localbase Add some missing dependencies reported by stage-qa Remake patches Bump PORTREVISION Reported by: linimon (via private mail) [1] Added: head/mail/anubis/files/patch-src_env.c - copied, changed from r425797, head/mail/anubis/files/patch-src__env.c head/mail/anubis/files/patch-src_headers.h - copied, changed from r425797, head/mail/anubis/files/patch-src__headers.h Deleted: head/mail/anubis/files/patch-src__env.c head/mail/anubis/files/patch-src__headers.h Modified: head/mail/anubis/Makefile head/mail/anubis/files/patch-configure.ac head/mail/anubis/pkg-plist Modified: head/mail/anubis/Makefile ============================================================================== --- head/mail/anubis/Makefile Wed Nov 9 15:27:58 2016 (r425797) +++ head/mail/anubis/Makefile Wed Nov 9 15:28:55 2016 (r425798) @@ -3,7 +3,7 @@ PORTNAME= anubis PORTVERSION= 4.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= GNU @@ -13,7 +13,8 @@ COMMENT= Outgoing SMTP mail processor LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= autoreconf charsetfix cpe makeinfo pkgconfig shebangfix +USES= autoreconf charsetfix cpe localbase makeinfo \ + pkgconfig shebangfix CHARSETFIX_MAKEFILEIN= gnulib.mk CPE_VENDOR= gnu SHEBANG_FILES= contrib/msg2smtp.pl @@ -23,15 +24,14 @@ GNU_CONFIGURE= yes INFO= anubis PORTEXAMPLES= 1anubisrc 2anubisrc -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= NLS EXAMPLES GUILE GNUPG GNUTLS GSASL \ - LIBWRAP PCRE PAM SOCKS +OPTIONS_DEFINE= NLS EXAMPLES EMACS GUILE GNUPG GNUTLS \ + GSASL LIBWRAP PCRE PAM SOCKS TEST OPTIONS_GROUP= DB OPTIONS_GROUP_DB= GDBM MYSQL PGSQL OPTIONS_DEFAULT= GUILE GNUPG GNUTLS GSASL +OPTIONS_EXCLUDE_aarch64=TEST OPTIONS_SUB= yes NO_OPTIONS_SORT= yes @@ -42,29 +42,38 @@ OPTIONS_EXCLUDE+= LIBWRAP OPTIONS_EXCLUDE+= PAM .endif +EMACS_DESC= Install EMACS lisp files (requires emacs) +EMACS_USE= EMACS=yes +EMACS_CONFIGURE_ON= --with-lispdir=${PREFIX}/${EMACS_SITE_LISPDIR}/anubis +EMACS_CONFIGURE_OFF= --with-lispdir=no + GDBM_DESC= GDBM backend GDBM_IMPLIES= GSASL GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_WITH= gdbm -GNUPG_LIB_DEPENDS= libgpgme.so:security/gpgme +GNUPG_LIB_DEPENDS= libgpgme.so:security/gpgme \ + libgpg-error.so:security/libgpg-error GNUPG_CONFIGURE_WITH= gpgme -GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \ + libgcrypt.so:security/libgcrypt GNUTLS_CONFIGURE_WITH= gnutls GSASL_DESC= GSASL support (required for databases) GSASL_LIB_DEPENDS= libgsasl.so:security/gsasl GSASL_CONFIGURE_WITH= gsasl -GUILE_LIB_DEPENDS= libguile.so:lang/guile +GUILE_LIB_DEPENDS= libltdl.so:devel/libltdl \ + libguile.so:lang/guile \ + libgmp.so:math/gmp GUILE_CONFIGURE_WITH= guile GUILE_PORTEXAMPLES= anubis.scm anubisrc.guile LIBWRAP_CONFIGURE_WITH= tcp-wrappers MYSQL_IMPLIES= GSASL -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql MYSQL_VARS= REQUIRE+=mysql @@ -94,6 +103,9 @@ SUB_LIST+= REQUIRE="${REQUIRE}" post-patch: @${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/src/headers.h +post-patch-TEST-off: + @${REINPLACE_CMD} -e 's| testsuite||' ${WRKSRC}/Makefile.am + post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/*rc ${STAGEDIR}${EXAMPLESDIR} Modified: head/mail/anubis/files/patch-configure.ac ============================================================================== --- head/mail/anubis/files/patch-configure.ac Wed Nov 9 15:27:58 2016 (r425797) +++ head/mail/anubis/files/patch-configure.ac Wed Nov 9 15:28:55 2016 (r425798) @@ -1,6 +1,6 @@ ---- ./configure.ac.orig 2008-12-16 11:21:54.000000000 -0500 -+++ ./configure.ac 2011-02-09 20:52:34.000000000 -0500 -@@ -78,7 +78,6 @@ +--- configure.ac.orig 2014-05-23 20:25:28 UTC ++++ configure.ac +@@ -78,7 +78,6 @@ AH_BOTTOM([ ]) AC_CHECK_LIB(socket, socket) @@ -8,7 +8,7 @@ AC_SUBST(ADD_INCLUDES) case $build in -@@ -179,11 +178,21 @@ +@@ -179,11 +178,21 @@ MU_CHECK_GSASL(0.2.3, [ ANUBIS_BIN_ADM='$(adm_bin_programs)' M4_DEFS="$M4_DEFS -DWITH_GSASL" @@ -31,7 +31,7 @@ AC_ARG_WITH(mysql, AC_HELP_STRING([--with-mysql], -@@ -285,8 +294,8 @@ +@@ -285,8 +294,8 @@ AC_ARG_WITH(pam, [with_pam=no]) if test "$with_pam" = "yes"; then AC_CHECK_LIB(pam, main,, with_pam=no) @@ -42,7 +42,7 @@ fi if test "$with_pam" = "yes"; then AC_MSG_RESULT([Enabling PAM support...]) -@@ -300,7 +309,6 @@ +@@ -300,7 +309,6 @@ AC_ARG_WITH(tcp-wrappers, [with_tcp_wrappers=no]) if test "$with_tcp_wrappers" = "yes"; then AC_CHECK_LIB(wrap, main,, with_tcp_wrappers=no) Copied and modified: head/mail/anubis/files/patch-src_env.c (from r425797, head/mail/anubis/files/patch-src__env.c) ============================================================================== --- head/mail/anubis/files/patch-src__env.c Wed Nov 9 15:27:58 2016 (r425797, copy source) +++ head/mail/anubis/files/patch-src_env.c Wed Nov 9 15:28:55 2016 (r425798) @@ -1,6 +1,6 @@ ---- ./src/env.c.orig 2008-12-16 16:44:38.000000000 -0500 -+++ ./src/env.c 2011-02-09 20:52:34.000000000 -0500 -@@ -32,7 +32,7 @@ +--- src/env.c.orig 2014-05-17 20:26:43 UTC ++++ src/env.c +@@ -30,7 +30,7 @@ #ifdef HAVE_PAM pam_handle_t *pamh; static struct pam_conv conv = { Copied and modified: head/mail/anubis/files/patch-src_headers.h (from r425797, head/mail/anubis/files/patch-src__headers.h) ============================================================================== --- head/mail/anubis/files/patch-src__headers.h Wed Nov 9 15:27:58 2016 (r425797, copy source) +++ head/mail/anubis/files/patch-src_headers.h Wed Nov 9 15:28:55 2016 (r425798) @@ -1,5 +1,5 @@ ---- ./src/headers.h.orig 2008-12-16 11:21:54.000000000 -0500 -+++ ./src/headers.h 2011-02-09 20:52:34.000000000 -0500 +--- src/headers.h.orig 2014-05-22 05:42:44 UTC ++++ src/headers.h @@ -43,11 +43,11 @@ # define HAVE_PCRE # endif /* HAVE_PCRE_H or HAVE_PCRE_PCRE_H */ Modified: head/mail/anubis/pkg-plist ============================================================================== --- head/mail/anubis/pkg-plist Wed Nov 9 15:27:58 2016 (r425797) +++ head/mail/anubis/pkg-plist Wed Nov 9 15:28:55 2016 (r425798) @@ -6,6 +6,8 @@ man/man1/anubis.1.gz %%GUILE%%share/anubis/entire-msg.scm %%GUILE%%share/anubis/remailer.scm %%GUILE%%share/anubis/rot-13.scm +%%EMACS%%%%EMACS_SITE_LISPDIR%%/anubis/anubis-mode.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/anubis/anubis-mode.elc %%NLS%%share/locale/da/LC_MESSAGES/anubis.mo %%NLS%%share/locale/de/LC_MESSAGES/anubis.mo %%NLS%%share/locale/es/LC_MESSAGES/anubis.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611091528.uA9FStdA032436>