Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Nov 2019 01:21:18 +0000 (UTC)
From:      Dima Panov <fluffy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r516937 - in head/mail/dbmail: . files
Message-ID:  <201911070121.xA71LIJv056584@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: fluffy
Date: Thu Nov  7 01:21:18 2019
New Revision: 516937
URL: https://svnweb.freebsd.org/changeset/ports/516937

Log:
  - Unbreak fetch, official site provide pure .tar.gz only
  - Teach configure to find openssl libs from base without pkg-config
  - Use libc to find gethostbyname(), connect(), res_search()

Modified:
  head/mail/dbmail/Makefile
  head/mail/dbmail/distinfo
  head/mail/dbmail/files/patch-acinclude.m4

Modified: head/mail/dbmail/Makefile
==============================================================================
--- head/mail/dbmail/Makefile	Thu Nov  7 00:59:32 2019	(r516936)
+++ head/mail/dbmail/Makefile	Thu Nov  7 01:21:18 2019	(r516937)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dbmail
 PORTVERSION=	3.2.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	http://git.dbmail.eu/paul/dbmail/snapshot/ \
 		http://www.dbmail.org/download/3.2/
@@ -11,8 +11,6 @@ MASTER_SITES=	http://git.dbmail.eu/paul/dbmail/snapsho
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	SQL database-based mail system (POP3 and IMAP)
 
-BROKEN=		unfetchable
-
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgmime-2.6.so:mail/gmime26 \
@@ -32,7 +30,7 @@ SIEVE_DESC=	Sieve mail sorting language support
 OPTIONS_SUB=	yes
 
 INSTALL_TARGET=	install-strip
-USES=		autoreconf gmake libtool pkgconfig shebangfix ssl tar:bzip2
+USES=		autoreconf gmake libtool pkgconfig shebangfix ssl
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
 USE_RC_SUBR=	dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved
 GNU_CONFIGURE=	yes

Modified: head/mail/dbmail/distinfo
==============================================================================
--- head/mail/dbmail/distinfo	Thu Nov  7 00:59:32 2019	(r516936)
+++ head/mail/dbmail/distinfo	Thu Nov  7 01:21:18 2019	(r516937)
@@ -1,2 +1,3 @@
-SHA256 (dbmail-3.2.3.tar.bz2) = a72ec3b2df572bc47018f33f81a9b52b59ec693bf42fe86730d729da2b607a74
-SIZE (dbmail-3.2.3.tar.bz2) = 2278823
+TIMESTAMP = 1573088818
+SHA256 (dbmail-3.2.3.tar.gz) = fd4d90e3e5ddb0c3fbdaa766d19d2464b5027a8c8d0b0df614418a3aac811832
+SIZE (dbmail-3.2.3.tar.gz) = 2444227

Modified: head/mail/dbmail/files/patch-acinclude.m4
==============================================================================
--- head/mail/dbmail/files/patch-acinclude.m4	Thu Nov  7 00:59:32 2019	(r516936)
+++ head/mail/dbmail/files/patch-acinclude.m4	Thu Nov  7 01:21:18 2019	(r516937)
@@ -27,3 +27,34 @@
          AC_SUBST(LDAPLIB)
          AC_SUBST(LDAPINC)
          AUTHALIB="modules/.libs/libauth_ldap.a"
+@@ -339,7 +339,7 @@ AC_DEFUN([DM_CHECK_EVENT], [
+ 
+ AC_DEFUN([DM_CHECK_SSL], [
+ 	AC_CHECK_HEADERS([openssl/ssl.h],
+-	 [SSLLIB=`pkg-config --libs openssl 2>/dev/null`],[SSLLIB="failed"])
++	 [SSLLIB="-lcrypto -lssl"],[SSLLIB="failed"])
+ 	if test [ "x$SSLLIB" = "xfailed" ]; then
+ 		AC_MSG_ERROR([Could not find OPENSSL library.])
+ 	else
+@@ -539,15 +539,15 @@ AC_DEFUN([CMU_SOCKETS], [
+ 	save_LIBS="$LIBS"
+ 	SOCKETLIB=""
+ 	AC_CHECK_FUNC(connect, :,
+-		AC_CHECK_LIB(nsl, gethostbyname,
+-			     SOCKETLIB="-lnsl $SOCKETLIB")
+-		AC_CHECK_LIB(socket, connect,
+-			     SOCKETLIB="-lsocket $SOCKETLIB")
++		AC_CHECK_LIB(c, gethostbyname,
++			     SOCKETLIB="-lc $SOCKETLIB")
++		AC_CHECK_LIB(c, connect,
++			     SOCKETLIB="-lc $SOCKETLIB")
+ 	)
+ 	LIBS="$SOCKETLIB $save_LIBS"
+ 	AC_CHECK_FUNC(res_search, :,
+-                AC_CHECK_LIB(resolv, res_search,
+-                              SOCKETLIB="-lresolv $SOCKETLIB") 
++                AC_CHECK_LIB(c, res_search,
++                              SOCKETLIB="-lc $SOCKETLIB") 
+         )
+ 	LIBS="$SOCKETLIB $save_LIBS"
+ 	AC_CHECK_FUNCS(dn_expand dns_lookup)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911070121.xA71LIJv056584>