Update to zarafa-7.0.0 (rc2).

avsm · Jun 10, 2011 · 072cf2d · 072cf2d
1 parent 42aec6f
commit 072cf2d
Show file tree

Hide file tree

Showing 14 changed files with 156 additions and 136 deletions.
diff --git a/mail/zarafa/Makefile.inc b/mail/zarafa/Makefile.inc
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile.inc,v 1.9 2011/06/02 12:45:17 ajacoutot Exp $
+# $OpenBSD: Makefile.inc,v 1.10 2011/06/10 15:55:00 ajacoutot Exp $
 
 # there is no point in building/running this on NO_SHARED_LIBS archs
 SHARED_ONLY=	Yes
 
 V?=		7.0.0
-BUILD?=		26667
+BUILD?=		27588
 DISTNAME?=	zcp-${V}
 
-DIST_SUBDIR?=	zarafa
-
 CATEGORIES+=	mail/zarafa
 
 HOMEPAGE?=	http://www.zarafa.nl/
@@ -23,5 +21,7 @@ PERMIT_PACKAGE_FTP?=	Yes
 PERMIT_DISTFILES_CDROM?=Yes
 PERMIT_DISTFILES_FTP?=	Yes
 
-#MASTER_SITES?=	http://download.zarafa.com/community/final/${V:C/^([0-9]+\.[0-9]+).*/\1/}/${V}-${BUILD}/
-MASTER_SITES?=	http://download.zarafa.com/community/beta/${V:C/^([0-9]+\.[0-9]+).*/\1/}/${V}rc1-${BUILD}/sourcecode/
+DIST_SUBDIR?=		zarafa-rc2
+MASTER_SITES_ZARAFA=	http://download.zarafa.com/community/beta/${V:C/^([0-9]+\.[0-9]+).*/\1/}/${V}rc2-${BUILD}/sourcecode/
+#MASTER_SITES_ZARAFA=	http://download.zarafa.com/community/final/${V:C/^([0-9]+\.[0-9]+).*/\1/}/${V}-${BUILD}/
+MASTER_SITES?=		${MASTER_SITES_ZARAFA}
diff --git a/mail/zarafa/libvmime/Makefile b/mail/zarafa/libvmime/Makefile
@@ -1,12 +1,14 @@
-# $OpenBSD: Makefile,v 1.14 2011/06/02 12:45:43 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2011/06/10 15:55:00 ajacoutot Exp $
 
 COMMENT=	modified libvmime library for Zarafa
 
-VMIME_V=	0.9.2
-DISTNAME=	libvmime-${VMIME_V}+svn581
+VMIME_V=	0.9.1
+DISTNAME=	libvmime-${VMIME_V}
 PKGNAME=	zarafa-libvmime-${VMIME_V}
 EXTRACT_SUFX=	.tar.bz2
 
+EPOCH=		0
+
 WRKDIST=	${WRKDIR}/libvmime-${VMIME_V}
 
 PATCH_DIST_STRIP= -p1
@@ -22,7 +24,8 @@ PATCHFILES= \
 	vmime-fullname-without-email-address.diff:0 \
 	vmime-highchar-filename.diff:0
 
-MASTER_SITES0=	${MASTER_SITES:=/vmime-patches/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vmime/}
+MASTER_SITES0=	${MASTER_SITES_ZARAFA:=/vmime-patches/}
 
 CATEGORIES=	mail devel
 

diff --git a/mail/zarafa/libvmime/distinfo b/mail/zarafa/libvmime/distinfo
@@ -1,50 +1,50 @@
-MD5 (zarafa/libvmime-0.9.2+svn581.tar.bz2) = 45G2SXtmPk56i6B/SNeBAQ==
-MD5 (zarafa/vmime-0.8.1-attachfnamelen.diff) = KFDyJ4lAXv7+Lyiidtmiwg==
-MD5 (zarafa/vmime-0.8.1-charset-catch.diff) = TVQrWMV+vFfDFdudT++WSA==
-MD5 (zarafa/vmime-0.8.1-header-value-on-next-line.diff) = e2iB5+jS1O9/5O6VOX/Zpw==
-MD5 (zarafa/vmime-0.8.1-unicode-1-1-utf-7-charset.diff) = TjaHzB1TQ+C3SosM7t+Xaw==
-MD5 (zarafa/vmime-0.9.0-undisclosed-recipients.diff) = 5Z4MaRIjw4VPDQW8BYQK+A==
-MD5 (zarafa/vmime-0.9.2-infinite-loop.diff) = uY2QpqNCYBG/kGzAXdd2Sg==
-MD5 (zarafa/vmime-flush-iconv.diff) = 0AnFe1uuLaFjfk/MEtVALg==
-MD5 (zarafa/vmime-fullname-without-email-address.diff) = eTo2fE1NO3Yze3euBGDz/Q==
-MD5 (zarafa/vmime-highchar-filename.diff) = Wvcg9Z4POjMrJhWVcIL6SA==
-RMD160 (zarafa/libvmime-0.9.2+svn581.tar.bz2) = ZKXaCquHzI2MOvFoRCRBkUSQb2M=
-RMD160 (zarafa/vmime-0.8.1-attachfnamelen.diff) = heSGuItGXqNkUy2LvaRu2BDc1Sw=
-RMD160 (zarafa/vmime-0.8.1-charset-catch.diff) = hcOcS6UxLKkHIN4qPvePJg3m8zA=
-RMD160 (zarafa/vmime-0.8.1-header-value-on-next-line.diff) = nGaRZ9+F1L5A1I8IzcYTsdr3tFA=
-RMD160 (zarafa/vmime-0.8.1-unicode-1-1-utf-7-charset.diff) = wHg14DH2UFG/nX7sKLdci7P6+T8=
-RMD160 (zarafa/vmime-0.9.0-undisclosed-recipients.diff) = d+L0ATUXUQZiRXJggbEXeiFgduw=
-RMD160 (zarafa/vmime-0.9.2-infinite-loop.diff) = kTiI0zRhF3mz1X/aTCpX8paiRfw=
-RMD160 (zarafa/vmime-flush-iconv.diff) = IptklBJHm8NCUY0SXggUllkmsTQ=
-RMD160 (zarafa/vmime-fullname-without-email-address.diff) = 8eyn2oAaoQ/cPraJx4zoFpndS8w=
-RMD160 (zarafa/vmime-highchar-filename.diff) = k+9W1m1lwp4l43St7a5UWNtcKM8=
-SHA1 (zarafa/libvmime-0.9.2+svn581.tar.bz2) = +19z9HGzkEu1+MC5oxQDsn367Gg=
-SHA1 (zarafa/vmime-0.8.1-attachfnamelen.diff) = ny6vidi40jncGVriKOqYj0WbpjU=
-SHA1 (zarafa/vmime-0.8.1-charset-catch.diff) = llnkqSxgBGySQqZkkczIo2KIdTI=
-SHA1 (zarafa/vmime-0.8.1-header-value-on-next-line.diff) = UMVgrHaSpxGyZNQoqscXAYQHV/E=
-SHA1 (zarafa/vmime-0.8.1-unicode-1-1-utf-7-charset.diff) = EOFk+a4jIcREb0YCEeG6NmqmFQc=
-SHA1 (zarafa/vmime-0.9.0-undisclosed-recipients.diff) = 163af2HPrq5wd3UNbKv4Akik2nM=
-SHA1 (zarafa/vmime-0.9.2-infinite-loop.diff) = aHlQziE0CFZKD20N04C5P/MzRx4=
-SHA1 (zarafa/vmime-flush-iconv.diff) = TlNcurDIdSKG1JptJYMWy3miUK0=
-SHA1 (zarafa/vmime-fullname-without-email-address.diff) = uhWFgKLxsPSftus0E+45UFXxK7I=
-SHA1 (zarafa/vmime-highchar-filename.diff) = ZFbe3b2WG1Ry8585oLUfO6LI1Lg=
-SHA256 (zarafa/libvmime-0.9.2+svn581.tar.bz2) = 8aqhJNQPELcZEMrLBZqnfxRglKXs3ccORkCRlrJrJsc=
-SHA256 (zarafa/vmime-0.8.1-attachfnamelen.diff) = nLwJjBT6Jzc8yIskZYcZG0QuigaRBpQPQjm14NGwS14=
-SHA256 (zarafa/vmime-0.8.1-charset-catch.diff) = I4y+a1z9wXCBalRJ187SGU4xx0p9JFbRrH3zfxWvDss=
-SHA256 (zarafa/vmime-0.8.1-header-value-on-next-line.diff) = /snTVkNCED58Jbmr1Ou+1YgTPelo/3xUAhrUkNA0fco=
-SHA256 (zarafa/vmime-0.8.1-unicode-1-1-utf-7-charset.diff) = /LEQKO+O9/JwK7Nqk+hvrvg2ADPkKDTyMk9SyvKtRx0=
-SHA256 (zarafa/vmime-0.9.0-undisclosed-recipients.diff) = A5ycGmwBjaY+2yHAfi0dtgiWhGzrQvqghsaS3JYcxN4=
-SHA256 (zarafa/vmime-0.9.2-infinite-loop.diff) = MJEAhL0IXitpl2C0URt6/fprXMXKUVSGbrJ2NpMTkLw=
-SHA256 (zarafa/vmime-flush-iconv.diff) = FMjm2cNpPgzhwKKGc6OxxZpj7rhLeA8v1D0w8sgb0sM=
-SHA256 (zarafa/vmime-fullname-without-email-address.diff) = uea6QKlGjS+8resHUTj88/kisdxSO2jnkofE4SCapHI=
-SHA256 (zarafa/vmime-highchar-filename.diff) = iSMo6opI0w3I28vASzh4d9XHGWhkJWn+ra6FravghwA=
-SIZE (zarafa/libvmime-0.9.2+svn581.tar.bz2) = 520479
-SIZE (zarafa/vmime-0.8.1-attachfnamelen.diff) = 692
-SIZE (zarafa/vmime-0.8.1-charset-catch.diff) = 435
-SIZE (zarafa/vmime-0.8.1-header-value-on-next-line.diff) = 645
-SIZE (zarafa/vmime-0.8.1-unicode-1-1-utf-7-charset.diff) = 889
-SIZE (zarafa/vmime-0.9.0-undisclosed-recipients.diff) = 759
-SIZE (zarafa/vmime-0.9.2-infinite-loop.diff) = 416
-SIZE (zarafa/vmime-flush-iconv.diff) = 1992
-SIZE (zarafa/vmime-fullname-without-email-address.diff) = 745
-SIZE (zarafa/vmime-highchar-filename.diff) = 3285
+MD5 (zarafa-rc2/libvmime-0.9.1.tar.bz2) = 1bbeRPf5yg5M7+WX0ZBWBQ==
+MD5 (zarafa-rc2/vmime-0.8.1-attachfnamelen.diff) = KFDyJ4lAXv7+Lyiidtmiwg==
+MD5 (zarafa-rc2/vmime-0.8.1-charset-catch.diff) = TVQrWMV+vFfDFdudT++WSA==
+MD5 (zarafa-rc2/vmime-0.8.1-header-value-on-next-line.diff) = e2iB5+jS1O9/5O6VOX/Zpw==
+MD5 (zarafa-rc2/vmime-0.8.1-unicode-1-1-utf-7-charset.diff) = TjaHzB1TQ+C3SosM7t+Xaw==
+MD5 (zarafa-rc2/vmime-0.9.0-undisclosed-recipients.diff) = 5Z4MaRIjw4VPDQW8BYQK+A==
+MD5 (zarafa-rc2/vmime-0.9.2-infinite-loop.diff) = uY2QpqNCYBG/kGzAXdd2Sg==
+MD5 (zarafa-rc2/vmime-flush-iconv.diff) = 0AnFe1uuLaFjfk/MEtVALg==
+MD5 (zarafa-rc2/vmime-fullname-without-email-address.diff) = eTo2fE1NO3Yze3euBGDz/Q==
+MD5 (zarafa-rc2/vmime-highchar-filename.diff) = Wvcg9Z4POjMrJhWVcIL6SA==
+RMD160 (zarafa-rc2/libvmime-0.9.1.tar.bz2) = 69yokN7pRm5jz0Pc7UDVUnuz/E4=
+RMD160 (zarafa-rc2/vmime-0.8.1-attachfnamelen.diff) = heSGuItGXqNkUy2LvaRu2BDc1Sw=
+RMD160 (zarafa-rc2/vmime-0.8.1-charset-catch.diff) = hcOcS6UxLKkHIN4qPvePJg3m8zA=
+RMD160 (zarafa-rc2/vmime-0.8.1-header-value-on-next-line.diff) = nGaRZ9+F1L5A1I8IzcYTsdr3tFA=
+RMD160 (zarafa-rc2/vmime-0.8.1-unicode-1-1-utf-7-charset.diff) = wHg14DH2UFG/nX7sKLdci7P6+T8=
+RMD160 (zarafa-rc2/vmime-0.9.0-undisclosed-recipients.diff) = d+L0ATUXUQZiRXJggbEXeiFgduw=
+RMD160 (zarafa-rc2/vmime-0.9.2-infinite-loop.diff) = kTiI0zRhF3mz1X/aTCpX8paiRfw=
+RMD160 (zarafa-rc2/vmime-flush-iconv.diff) = IptklBJHm8NCUY0SXggUllkmsTQ=
+RMD160 (zarafa-rc2/vmime-fullname-without-email-address.diff) = 8eyn2oAaoQ/cPraJx4zoFpndS8w=
+RMD160 (zarafa-rc2/vmime-highchar-filename.diff) = k+9W1m1lwp4l43St7a5UWNtcKM8=
+SHA1 (zarafa-rc2/libvmime-0.9.1.tar.bz2) = Po3YhV5CPbQ41GV3fv61I8SrtfM=
+SHA1 (zarafa-rc2/vmime-0.8.1-attachfnamelen.diff) = ny6vidi40jncGVriKOqYj0WbpjU=
+SHA1 (zarafa-rc2/vmime-0.8.1-charset-catch.diff) = llnkqSxgBGySQqZkkczIo2KIdTI=
+SHA1 (zarafa-rc2/vmime-0.8.1-header-value-on-next-line.diff) = UMVgrHaSpxGyZNQoqscXAYQHV/E=
+SHA1 (zarafa-rc2/vmime-0.8.1-unicode-1-1-utf-7-charset.diff) = EOFk+a4jIcREb0YCEeG6NmqmFQc=
+SHA1 (zarafa-rc2/vmime-0.9.0-undisclosed-recipients.diff) = 163af2HPrq5wd3UNbKv4Akik2nM=
+SHA1 (zarafa-rc2/vmime-0.9.2-infinite-loop.diff) = aHlQziE0CFZKD20N04C5P/MzRx4=
+SHA1 (zarafa-rc2/vmime-flush-iconv.diff) = TlNcurDIdSKG1JptJYMWy3miUK0=
+SHA1 (zarafa-rc2/vmime-fullname-without-email-address.diff) = uhWFgKLxsPSftus0E+45UFXxK7I=
+SHA1 (zarafa-rc2/vmime-highchar-filename.diff) = ZFbe3b2WG1Ry8585oLUfO6LI1Lg=
+SHA256 (zarafa-rc2/libvmime-0.9.1.tar.bz2) = O2bLdtm8fagO8fJxzCnToYO1/4tWDvYOhf8Aa/+00a4=
+SHA256 (zarafa-rc2/vmime-0.8.1-attachfnamelen.diff) = nLwJjBT6Jzc8yIskZYcZG0QuigaRBpQPQjm14NGwS14=
+SHA256 (zarafa-rc2/vmime-0.8.1-charset-catch.diff) = I4y+a1z9wXCBalRJ187SGU4xx0p9JFbRrH3zfxWvDss=
+SHA256 (zarafa-rc2/vmime-0.8.1-header-value-on-next-line.diff) = /snTVkNCED58Jbmr1Ou+1YgTPelo/3xUAhrUkNA0fco=
+SHA256 (zarafa-rc2/vmime-0.8.1-unicode-1-1-utf-7-charset.diff) = /LEQKO+O9/JwK7Nqk+hvrvg2ADPkKDTyMk9SyvKtRx0=
+SHA256 (zarafa-rc2/vmime-0.9.0-undisclosed-recipients.diff) = A5ycGmwBjaY+2yHAfi0dtgiWhGzrQvqghsaS3JYcxN4=
+SHA256 (zarafa-rc2/vmime-0.9.2-infinite-loop.diff) = MJEAhL0IXitpl2C0URt6/fprXMXKUVSGbrJ2NpMTkLw=
+SHA256 (zarafa-rc2/vmime-flush-iconv.diff) = FMjm2cNpPgzhwKKGc6OxxZpj7rhLeA8v1D0w8sgb0sM=
+SHA256 (zarafa-rc2/vmime-fullname-without-email-address.diff) = uea6QKlGjS+8resHUTj88/kisdxSO2jnkofE4SCapHI=
+SHA256 (zarafa-rc2/vmime-highchar-filename.diff) = iSMo6opI0w3I28vASzh4d9XHGWhkJWn+ra6FravghwA=
+SIZE (zarafa-rc2/libvmime-0.9.1.tar.bz2) = 522546
+SIZE (zarafa-rc2/vmime-0.8.1-attachfnamelen.diff) = 692
+SIZE (zarafa-rc2/vmime-0.8.1-charset-catch.diff) = 435
+SIZE (zarafa-rc2/vmime-0.8.1-header-value-on-next-line.diff) = 645
+SIZE (zarafa-rc2/vmime-0.8.1-unicode-1-1-utf-7-charset.diff) = 889
+SIZE (zarafa-rc2/vmime-0.9.0-undisclosed-recipients.diff) = 759
+SIZE (zarafa-rc2/vmime-0.9.2-infinite-loop.diff) = 416
+SIZE (zarafa-rc2/vmime-flush-iconv.diff) = 1992
+SIZE (zarafa-rc2/vmime-fullname-without-email-address.diff) = 745
+SIZE (zarafa-rc2/vmime-highchar-filename.diff) = 3285
diff --git a/mail/zarafa/zarafa/Makefile b/mail/zarafa/zarafa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.88 2011/06/08 17:50:10 jasper Exp $
+# $OpenBSD: Makefile,v 1.89 2011/06/10 15:55:00 ajacoutot Exp $
 
 COMMENT-main=	MS Exchange groupware suite replacement
 COMMENT-web=	zarafa webaccess frontend and MAPI extensions for PHP
@@ -7,8 +7,8 @@ PKGNAME=	zarafa-${V}
 PKGNAME-main=	zarafa-${V}
 PKGNAME-web=	zarafa-webaccess-${V}
 
-REVISION-main=	6
-REVISION-web=	1
+REVISION-main=	7
+REVISION-web=	2
 
 CATEGORIES=	mail www productivity
 
@@ -193,7 +193,10 @@ post-install:
 		man/man5/zarafa-licensed.cfg.5 \
 		man/man1/zarafa-restore.1 \
 		man/man1/zarafa-backup.1 \
-		man/man1/zarafa-report.1
+		man/man1/zarafa-report.1 \
+		man/man1/za-aclsync.1 \
+		man/man1/zarafa-msr.1 \
+		man/man5/zarafa-msr.cfg.5
 	rmdir ${PREFIX}/share/examples/zarafa/{report,report-ca}
 
 	chown -R ${SHAREOWN}:${SHAREGRP} ${WRKINST}${INSTDIR}

diff --git a/mail/zarafa/zarafa/distinfo b/mail/zarafa/zarafa/distinfo
@@ -1,5 +1,5 @@
-MD5 (zarafa/zcp-7.0.0.tar.gz) = +aoJiasks7noilNXjZdCgw==
-RMD160 (zarafa/zcp-7.0.0.tar.gz) = auImbb4kNlUhD22V2673z6vfmB0=
-SHA1 (zarafa/zcp-7.0.0.tar.gz) = qEIq+WxnyryEMXol/uk8Xz+jyBQ=
-SHA256 (zarafa/zcp-7.0.0.tar.gz) = gTayy/vTFHkeI1GSOhIVNEEbNOghbFglG9KAz1HVfN8=
-SIZE (zarafa/zcp-7.0.0.tar.gz) = 6002363
+MD5 (zarafa-rc2/zcp-7.0.0.tar.gz) = cfUVX4gwredU+CvexHUflA==
+RMD160 (zarafa-rc2/zcp-7.0.0.tar.gz) = unX7hCCiMcs4j8JF+hvZvJREmZg=
+SHA1 (zarafa-rc2/zcp-7.0.0.tar.gz) = l0uHFyMCFV2Y1ngHxMBSdycVm3Y=
+SHA256 (zarafa-rc2/zcp-7.0.0.tar.gz) = LMJY2kzh0TZgWu1cwi92wS35cdY7BPRpkH3dn5QKlQM=
+SIZE (zarafa-rc2/zcp-7.0.0.tar.gz) = 6018720
diff --git a/mail/zarafa/zarafa/patches/patch-configure b/mail/zarafa/zarafa/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.14 2011/06/02 12:46:37 ajacoutot Exp $
---- configure.orig	Wed Apr 20 16:39:39 2011
-+++ configure	Sun May 29 09:27:20 2011
-@@ -21919,13 +21919,13 @@ fi
+$OpenBSD: patch-configure,v 1.15 2011/06/10 15:55:00 ajacoutot Exp $
+--- configure.orig	Thu Jun  9 22:21:21 2011
++++ configure	Fri Jun 10 13:34:10 2011
+@@ -21920,13 +21920,13 @@ fi
 
  # Everything uses pthread
  # check lib, but do not set in link list, but use -pthread instead (gnu c/c++ only?)
@@ -18,16 +18,16 @@ $OpenBSD: patch-configure,v 1.14 2011/06/02 12:46:37 ajacoutot Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22044,7 +22044,7 @@ else
+@@ -22045,7 +22045,7 @@ else
    with_distro=rhel
  fi
 
--if test "$with_distro" != "rhel" -a "$with_distro" != "suse" -a "$with_distro" != "sles"; then
-+if test "$with_distro" != "rhel" -a "$with_distro" != "suse" -a "$with_distro" != "sles" -a "$with_distro" != "openbsd"; then
-    { echo "$as_me:$LINENO: result: invalid distro, using rhel instead" >&5
- echo "${ECHO_T}invalid distro, using rhel instead" >&6; }
+-if test "$with_distro" != "rhel" -a "$with_distro" != "suse" -a "$with_distro" != "sles" -a "$with_distro" != "cbs4"; then
++if test "$with_distro" != "rhel" -a "$with_distro" != "suse" -a "$with_distro" != "sles" -a "$with_distro" != "cbs4" -a "$with_distro" != "openbsd"; then
+    { echo "$as_me:$LINENO: result: unknown distro, using rhel instead" >&5
+ echo "${ECHO_T}unknown distro, using rhel instead" >&6; }
     with_distro=rhel
-@@ -24444,7 +24444,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then
+@@ -24445,7 +24445,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.14 2011/06/02 12:46:37 ajacoutot Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24504,7 +24504,7 @@ if test $ac_cv_lib_intl_strftime = yes; then
+@@ -24505,7 +24505,7 @@ if test $ac_cv_lib_intl_strftime = yes; then
  #define HAVE_STRFTIME 1
  _ACEOF
 
@@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.14 2011/06/02 12:46:37 ajacoutot Exp $
  fi
 
  fi
-@@ -26018,7 +26018,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -26019,7 +26019,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
  _ACEOF
 
  		VMIME_CFLAGS=-I$VMIME_PREFIX
@@ -54,7 +54,7 @@ $OpenBSD: patch-configure,v 1.14 2011/06/02 12:46:37 ajacoutot Exp $
 
  else
 
-@@ -27535,13 +27535,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -27536,13 +27536,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
  	 { echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6; }
 
@@ -71,7 +71,7 @@ $OpenBSD: patch-configure,v 1.14 2011/06/02 12:46:37 ajacoutot Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27601,7 +27601,7 @@ if test $ac_cv_lib_crypt_crypt = yes; then
+@@ -27602,7 +27602,7 @@ if test $ac_cv_lib_crypt_crypt = yes; then
  #define HAVE_LIBCRYPT 1
  _ACEOF
 
@@ -80,7 +80,7 @@ $OpenBSD: patch-configure,v 1.14 2011/06/02 12:46:37 ajacoutot Exp $
 
  else
    { { echo "$as_me:$LINENO: error: required library libcrypt missing or unusable" >&5
-@@ -27695,7 +27695,7 @@ if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then
+@@ -27696,7 +27696,7 @@ if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -89,7 +89,7 @@ $OpenBSD: patch-configure,v 1.14 2011/06/02 12:46:37 ajacoutot Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28802,7 +28802,7 @@ if test "${ac_cv_lib_intl_gettext+set}" = set; then
+@@ -28803,7 +28803,7 @@ if test "${ac_cv_lib_intl_gettext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -98,7 +98,7 @@ $OpenBSD: patch-configure,v 1.14 2011/06/02 12:46:37 ajacoutot Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28858,7 +28858,7 @@ fi
+@@ -28859,7 +28859,7 @@ fi
  { echo "$as_me:$LINENO: result: $ac_cv_lib_intl_gettext" >&5
  echo "${ECHO_T}$ac_cv_lib_intl_gettext" >&6; }
  if test $ac_cv_lib_intl_gettext = yes; then