Index: head/mail/anubis/Makefile =================================================================== --- head/mail/anubis/Makefile (revision 425797) +++ head/mail/anubis/Makefile (revision 425798) @@ -1,109 +1,121 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= anubis PORTVERSION= 4.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= GNU MAINTAINER= jhale@FreeBSD.org 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 USE_RC_SUBR= anubis 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 .if !exists(/usr/include/tcpd.h) OPTIONS_EXCLUDE+= LIBWRAP .endif .if !exists(/usr/lib/libpam.so) 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 NLS_USES= gettext iconv NLS_CONFIGURE_ENABLE= nls PAM_CONFIGURE_WITH= pam PAM_PORTEXAMPLES= pam PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PCRE_CONFIGURE_WITH= pcre PGSQL_IMPLIES= GSASL PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= postgres PGSQL_VARS= REQUIRE+=postgresql SOCKS_DESC= SOCKS proxy support SOCKS_CONFIGURE_WITH= socks-proxy .include # Default requirement for anubis rc script REQUIRE+= mail 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} .if ${PORT_OPTIONS:MGUILE} cd ${WRKSRC}/examples && \ ${INSTALL_DATA} ${GUILE_PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .endif .if ${PORT_OPTIONS:MPAM} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/pam ${INSTALL_DATA} ${WRKSRC}/examples/pam/anubis* ${STAGEDIR}${EXAMPLESDIR}/pam .endif .include Index: head/mail/anubis/files/patch-src__env.c =================================================================== --- head/mail/anubis/files/patch-src__env.c (revision 425797) +++ head/mail/anubis/files/patch-src__env.c (nonexistent) @@ -1,11 +0,0 @@ ---- ./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 @@ - #ifdef HAVE_PAM - pam_handle_t *pamh; - static struct pam_conv conv = { -- misc_conv, -+ openpam_ttyconv, - NULL - }; - #endif /* HAVE_PAM */ Property changes on: head/mail/anubis/files/patch-src__env.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/anubis/files/patch-src__headers.h =================================================================== --- head/mail/anubis/files/patch-src__headers.h (revision 425797) +++ head/mail/anubis/files/patch-src__headers.h (nonexistent) @@ -1,27 +0,0 @@ ---- ./src/headers.h.orig 2008-12-16 11:21:54.000000000 -0500 -+++ ./src/headers.h 2011-02-09 20:52:34.000000000 -0500 -@@ -43,11 +43,11 @@ - # define HAVE_PCRE - # endif /* HAVE_PCRE_H or HAVE_PCRE_PCRE_H */ - # endif /* HAVE_LIBPCRE */ --# if defined(HAVE_LIBPAM) && defined(HAVE_LIBPAM_MISC) --# if defined(HAVE_SECURITY_PAM_APPL_H) && defined(HAVE_SECURITY_PAM_MISC_H) -+# if defined(HAVE_LIBPAM) -+# if defined(HAVE_SECURITY_PAM_APPL_H) && defined(HAVE_SECURITY_OPENPAM_H) - # define HAVE_PAM --# endif /* HAVE_SECURITY_PAM_APPL_H and HAVE_SECURITY_PAM_MISC_H */ --# endif /* HAVE_LIBPAM and HAVE_LIBPAM_MISC */ -+# endif /* HAVE_SECURITY_PAM_APPL_H and HAVE_SECURITY_OPENPAM_H */ -+# endif /* HAVE_LIBPAM */ - # if defined(HAVE_LIBWRAP) && defined(HAVE_TCPD_H) - # define USE_LIBWRAP - # endif /* HAVE_LIBWRAP and HAVE_TCPD_H */ -@@ -111,7 +111,7 @@ - - #ifdef HAVE_PAM - # include --# include -+# include - #endif /* HAVE_PAM */ - - #if defined(WITH_GSASL) Property changes on: head/mail/anubis/files/patch-src__headers.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/anubis/files/patch-configure.ac =================================================================== --- head/mail/anubis/files/patch-configure.ac (revision 425797) +++ head/mail/anubis/files/patch-configure.ac (revision 425798) @@ -1,52 +1,52 @@ ---- ./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) -AC_CHECK_LIB(nsl, gethostbyaddr) 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" + AC_ARG_WITH(gdbm, + AC_HELP_STRING([--with-gdbm], + [Configure to work with GDBM]), + [with_gdbm=${withval}], + [with_gdbm=no]) + if test "$with_gdbm" = "yes"; then AC_CHECK_LIB(gdbm, gdbm_open, [WITH_GDBM=yes LIBS="$LIBS -lgdbm" AC_DEFINE(HAVE_LIBGDBM,1,[Define if you have libgdbm])], - [AC_MSG_RESULT([Disabling GDBM support...])]) + with_gdbm=no) + fi + if test "$with_gdbm" = "yes"; then + AC_MSG_RESULT([Enabling GDBM support...]) + fi 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) - AC_CHECK_LIB(pam_misc, main,, with_pam=no) - AC_CHECK_HEADERS(security/pam_appl.h security/pam_misc.h,, with_pam=no) + AC_CHECK_HEADER(security/pam_appl.h,, with_pam=no) + AC_CHECK_HEADER(security/openpam.h,, with_pam=no, [ #include ]) 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) - AC_CHECK_LIB(nsl, main,, with_tcp_wrappers=no) AC_CHECK_HEADERS(tcpd.h,, with_tcp_wrappers=no) fi if test "$with_tcp_wrappers" = "yes"; then Index: head/mail/anubis/files/patch-src_env.c =================================================================== --- head/mail/anubis/files/patch-src_env.c (nonexistent) +++ head/mail/anubis/files/patch-src_env.c (revision 425798) @@ -0,0 +1,11 @@ +--- 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 = { +- misc_conv, ++ openpam_ttyconv, + NULL + }; + #endif /* HAVE_PAM */ Property changes on: head/mail/anubis/files/patch-src_env.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/anubis/files/patch-src_headers.h =================================================================== --- head/mail/anubis/files/patch-src_headers.h (nonexistent) +++ head/mail/anubis/files/patch-src_headers.h (revision 425798) @@ -0,0 +1,27 @@ +--- 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 */ + # endif /* HAVE_LIBPCRE */ +-# if defined(HAVE_LIBPAM) && defined(HAVE_LIBPAM_MISC) +-# if defined(HAVE_SECURITY_PAM_APPL_H) && defined(HAVE_SECURITY_PAM_MISC_H) ++# if defined(HAVE_LIBPAM) ++# if defined(HAVE_SECURITY_PAM_APPL_H) && defined(HAVE_SECURITY_OPENPAM_H) + # define HAVE_PAM +-# endif /* HAVE_SECURITY_PAM_APPL_H and HAVE_SECURITY_PAM_MISC_H */ +-# endif /* HAVE_LIBPAM and HAVE_LIBPAM_MISC */ ++# endif /* HAVE_SECURITY_PAM_APPL_H and HAVE_SECURITY_OPENPAM_H */ ++# endif /* HAVE_LIBPAM */ + # if defined(HAVE_LIBWRAP) && defined(HAVE_TCPD_H) + # define USE_LIBWRAP + # endif /* HAVE_LIBWRAP and HAVE_TCPD_H */ +@@ -111,7 +111,7 @@ + + #ifdef HAVE_PAM + # include +-# include ++# include + #endif /* HAVE_PAM */ + + #if defined(WITH_GSASL) Property changes on: head/mail/anubis/files/patch-src_headers.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/anubis/pkg-plist =================================================================== --- head/mail/anubis/pkg-plist (revision 425797) +++ head/mail/anubis/pkg-plist (revision 425798) @@ -1,28 +1,30 @@ %%GSASL%%bin/anubisusr bin/msg2smtp.pl sbin/anubis man/man1/anubis.1.gz %%GSASL%%sbin/anubisadm %%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 %%NLS%%share/locale/fi/LC_MESSAGES/anubis.mo %%NLS%%share/locale/fr/LC_MESSAGES/anubis.mo %%NLS%%share/locale/hr/LC_MESSAGES/anubis.mo %%NLS%%share/locale/id/LC_MESSAGES/anubis.mo %%NLS%%share/locale/it/LC_MESSAGES/anubis.mo %%NLS%%share/locale/ms/LC_MESSAGES/anubis.mo %%NLS%%share/locale/nb/LC_MESSAGES/anubis.mo %%NLS%%share/locale/nl/LC_MESSAGES/anubis.mo %%NLS%%share/locale/pl/LC_MESSAGES/anubis.mo %%NLS%%share/locale/ro/LC_MESSAGES/anubis.mo %%NLS%%share/locale/ru/LC_MESSAGES/anubis.mo %%NLS%%share/locale/sr/LC_MESSAGES/anubis.mo %%NLS%%share/locale/sv/LC_MESSAGES/anubis.mo %%NLS%%share/locale/tr/LC_MESSAGES/anubis.mo %%NLS%%share/locale/uk/LC_MESSAGES/anubis.mo %%NLS%%share/locale/vi/LC_MESSAGES/anubis.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/anubis.mo