From owner-svn-ports-all@freebsd.org Mon Nov 30 10:05:02 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D7CBA3C4FC; Mon, 30 Nov 2015 10:05:02 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3805F134A; Mon, 30 Nov 2015 10:05:02 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAUA51Jn061837; Mon, 30 Nov 2015 10:05:01 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAUA514X061835; Mon, 30 Nov 2015 10:05:01 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201511301005.tAUA514X061835@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 30 Nov 2015 10:05:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r402658 - in head/mail/mpop: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Nov 2015 10:05:02 -0000 Author: jbeich Date: Mon Nov 30 10:05:01 2015 New Revision: 402658 URL: https://svnweb.freebsd.org/changeset/ports/402658 Log: mail/mpop: update to 1.2.3 - Add CPE information - Let pkg-config handle flags for WITH_OPENSSL_PORT in order to - Make sure ld(1) finds correct library - Avoid -I/usr/include -L/usr/lib poisoning ports compiler - Convert the patch to sed(1) line in order to - Respect LOCALBASE for ca_root_nss paths - Apply the fix against INFO page as well - Avoid having to pet portlint with |make makepatch| - Simplify GNUTLS=off + OPENSSL=off logic - Simplify GSASL option a bit more - Take maintainership Changes: http://sourceforge.net/p/mpop/code/ci/e3eff0/log/ Deleted: head/mail/mpop/files/ Modified: head/mail/mpop/Makefile (contents, props changed) head/mail/mpop/distinfo (contents, props changed) Modified: head/mail/mpop/Makefile ============================================================================== --- head/mail/mpop/Makefile Mon Nov 30 09:57:08 2015 (r402657) +++ head/mail/mpop/Makefile Mon Nov 30 10:05:01 2015 (r402658) @@ -2,18 +2,19 @@ # $FreeBSD$ PORTNAME= mpop -DISTVERSION= 1.2.2 +DISTVERSION= 1.2.3 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jbeich@FreeBSD.org COMMENT= Small and fast POP3 client LICENSE= GPLv3 # (or later) -USES= gmake pkgconfig tar:xz +USES= cpe gmake pkgconfig tar:xz +CPE_VENDOR= martin_lambers GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-silent-rules +CONFIGURE_ARGS= --disable-silent-rules --with-tls=no INFO= mpop @@ -25,9 +26,9 @@ OPTIONS_SUB= yes GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_ON= --with-tls=gnutls -GSASL_DESC= SASL authentication support via GNU SASL +GSASL_DESC= ${SASL_DESC} via GNU SASL GSASL_LIB_DEPENDS= libgsasl.so:${PORTSDIR}/security/gsasl -GSASL_CONFIGURE_OFF= --without-libgsasl +GSASL_CONFIGURE_WITH= libgsasl IDN_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn IDN_CONFIGURE_WITH= libidn LIBSECRET_DESC= GNOME password management @@ -36,14 +37,15 @@ LIBSECRET_CONFIGURE_WITH= libsecret NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls OPENSSL_USE= openssl=yes -OPENSSL_CONFIGURE_ON= --with-tls=openssl \ - libssl_CFLAGS=-I${OPENSSLINC} \ - libssl_LIBS="-lssl -lcrypto" - -.include - -.if empty(PORT_OPTIONS:MGNUTLS) && empty(PORT_OPTIONS:MOPENSSL) -CONFIGURE_ARGS+= --with-tls=no -.endif +OPENSSL_CONFIGURE_ENV= ${OPENSSLINC:M/usr/include:C,.+,libssl_CFLAGS=" ",} \ + ${OPENSSLLIB:M/usr/lib:C,.+,libssl_LIBS="-lssl -lcrypto",} +OPENSSL_CONFIGURE_ON= --with-tls=openssl + +post-patch: + @${REINPLACE_CMD} -Ee 's/Debian/${OPSYS}/' \ + -e 's,/etc/ssl/certs,${LOCALBASE}/share/certs,' \ + -e '/crt/s/ca(\\?)-certificates/ca\1-root\1-nss/' \ + -e 's/ca\\?-certificates/ca_root_nss/' \ + ${WRKSRC}/doc/mpop* .include Modified: head/mail/mpop/distinfo ============================================================================== --- head/mail/mpop/distinfo Mon Nov 30 09:57:08 2015 (r402657) +++ head/mail/mpop/distinfo Mon Nov 30 10:05:01 2015 (r402658) @@ -1,2 +1,2 @@ -SHA256 (mpop-1.2.2.tar.xz) = d1e7d7d18147996cfc6195cdfb936ca51620cb841a7460043d8cc838ca48bfc3 -SIZE (mpop-1.2.2.tar.xz) = 266272 +SHA256 (mpop-1.2.3.tar.xz) = ed770af29b291291f643e1d132bb1bdae6b2f897cd9c09372d7aadf85290ed70 +SIZE (mpop-1.2.3.tar.xz) = 268584