3 files changed, 11 insertions, 65 deletions

diff --git a/mail/anubis/files/patch-config.h.in b/mail/anubis/files/patch-config.h.in
deleted file mode 100644
index 246471ac1b43..000000000000
--- a/mail/anubis/files/patch-config.h.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./config.h.in.orig	2008-12-19 13:30:37.000000000 -0500
-+++ ./config.h.in	2011-02-09 20:52:34.000000000 -0500
-@@ -180,9 +180,6 @@
- /* Define to 1 if you have the `pam' library (-lpam). */
- #undef HAVE_LIBPAM
- 
--/* Define to 1 if you have the `pam_misc' library (-lpam_misc). */
--#undef HAVE_LIBPAM_MISC
--
- /* Define to 1 if you have the `pcre' library (-lpcre). */
- #undef HAVE_LIBPCRE
- 
-@@ -252,8 +249,8 @@
- /* Define to 1 if you have the <security/pam_appl.h> header file. */
- #undef HAVE_SECURITY_PAM_APPL_H
- 
--/* Define to 1 if you have the <security/pam_misc.h> header file. */
--#undef HAVE_SECURITY_PAM_MISC_H
-+/* Define to 1 if you have the <security/openpam.h> header file. */
-+#undef HAVE_SECURITY_OPENPAM_H
- 
- /* Define to 1 if you have the `setegid' function. */
- #undef HAVE_SETEGID
diff --git a/mail/anubis/files/patch-configure.ac b/mail/anubis/files/patch-configure.ac
index 0c40e5fe4e4d..8e3b651a964c 100644
--- a/mail/anubis/files/patch-configure.ac
+++ b/mail/anubis/files/patch-configure.ac
@@ -1,27 +1,14 @@
 --- ./configure.ac.orig	2008-12-16 11:21:54.000000000 -0500
 +++ ./configure.ac	2011-02-09 20:52:34.000000000 -0500
-@@ -77,7 +77,6 @@
+@@ -78,7 +78,6 @@
  ])
  
  AC_CHECK_LIB(socket, socket)
 -AC_CHECK_LIB(nsl, gethostbyaddr)
  
- AC_SUBST(INCLUDES)
+ AC_SUBST(ADD_INCLUDES)
  case $build in
-@@ -143,10 +142,10 @@
- else
-  AC_PATH_PROG(GPG, gpg)
-  findgpgmedir() { :
--  if test -f "$1/include/gpgme.h"; then
-+  if test -f "$1/include/gpgme/gpgme.h"; then
-    gpgmedir=1
-    INCLUDES="$INCLUDES -I$1/include"
--   AC_MSG_CHECKING(for $1/include/gpgme.h)
-+   AC_MSG_CHECKING(for $1/include/gpgme/gpgme.h)
-    AC_MSG_RESULT([yes])
-    return 0
-   fi
-@@ -158,7 +157,7 @@
+@@ -137,7 +136,7 @@
   if test $gpgmedir; then
    AC_DEFINE(HAVE_GPGME_H, 1, [Define to 1 if HAVE_GPGME_H is requested.])
   else
@@ -30,15 +17,7 @@
   fi
   ANUBIS_GPGFILES='$(GPGFILES)'
   M4_DEFS="$M4_DEFS -DWITH_GPG"
-@@ -189,6 +188,7 @@
- WITH_MYSQL=no
- WITH_POSTGRES=no
- WITH_GDBM=no
-+WITH_GSASL=no
- 
- dnl Use option --with-gsasl to compile GSASL library support.
- MU_CHECK_GSASL(0.2.3, [
-@@ -199,11 +199,21 @@
+@@ -179,11 +178,21 @@
      ANUBIS_BIN_ADM='$(adm_bin_programs)'
      M4_DEFS="$M4_DEFS -DWITH_GSASL"
  
@@ -61,17 +40,7 @@
  
      AC_ARG_WITH(mysql,
  	AC_HELP_STRING([--with-mysql],
-@@ -277,7 +287,8 @@
- if test $with_gnutls = yes; then
-   AC_CHECK_HEADERS(gnutls/gnutls.h)
-   if test $ac_cv_header_gnutls_gnutls_h != no; then
--    AM_PATH_LIBGNUTLS("1.0.0",
-+    PKG_CHECK_MODULES([LIBGNUTLS],
-+                      [gnutls >= 1.0.0],
-                       [M4_DEFS="$M4_DEFS -DWITH_SSL -DWITH_GNUTLS"
-                       AC_DEFINE(USE_GNUTLS, 1,
-                                 [Define to 1 if USE_GNUTLS is requested.])],
-@@ -327,8 +338,8 @@
+@@ -285,8 +294,8 @@
  	[with_pam=no])
  if test "$with_pam" = "yes"; then
   AC_CHECK_LIB(pam, main,, with_pam=no)
@@ -82,7 +51,7 @@
  fi
  if test "$with_pam" = "yes"; then
   AC_MSG_RESULT([Enabling PAM support...])
-@@ -342,7 +353,6 @@
+@@ -300,7 +309,6 @@
  	[with_tcp_wrappers=no])
  if test "$with_tcp_wrappers" = "yes"; then
   AC_CHECK_LIB(wrap, main,, with_tcp_wrappers=no)
diff --git a/mail/anubis/files/patch-src__headers.h b/mail/anubis/files/patch-src__headers.h
index 3e835d0ce897..107cd74d50a5 100644
--- a/mail/anubis/files/patch-src__headers.h
+++ b/mail/anubis/files/patch-src__headers.h
@@ -1,9 +1,9 @@
 --- ./src/headers.h.orig	2008-12-16 11:21:54.000000000 -0500
 +++ ./src/headers.h	2011-02-09 20:52:34.000000000 -0500
-@@ -51,11 +51,11 @@
- # else
- #  error POSIX Regular Expressions are required!
- # endif	/* HAVE_REGEX_H and HAVE_REGCOMP */
+@@ -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)
@@ -16,7 +16,7 @@
  # if defined(HAVE_LIBWRAP) && defined(HAVE_TCPD_H)
  #  define USE_LIBWRAP
  # endif	/* HAVE_LIBWRAP and HAVE_TCPD_H */
-@@ -121,7 +121,7 @@
+@@ -111,7 +111,7 @@
  
  #ifdef HAVE_PAM
  # include <security/pam_appl.h>