From owner-svn-ports-head@freebsd.org  Fri Jun  3 07:22:53 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 17103B68CB7;
 Fri,  3 Jun 2016 07:22:53 +0000 (UTC)
 (envelope-from ehaupt@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 DDB461629;
 Fri,  3 Jun 2016 07:22:52 +0000 (UTC)
 (envelope-from ehaupt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u537Mq1o091029;
 Fri, 3 Jun 2016 07:22:52 GMT (envelope-from ehaupt@FreeBSD.org)
Received: (from ehaupt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u537MqSK091028;
 Fri, 3 Jun 2016 07:22:52 GMT (envelope-from ehaupt@FreeBSD.org)
Message-Id: <201606030722.u537MqSK091028@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to
 ehaupt@FreeBSD.org using -f
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Fri, 3 Jun 2016 07:22:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r416303 - head/net/rsync
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jun 2016 07:22:53 -0000

Author: ehaupt
Date: Fri Jun  3 07:22:51 2016
New Revision: 416303
URL: https://svnweb.freebsd.org/changeset/ports/416303

Log:
  Really fix popt option logic (real fix of r416270).
  
  Notified by:	adamw

Modified:
  head/net/rsync/Makefile

Modified: head/net/rsync/Makefile
==============================================================================
--- head/net/rsync/Makefile	Fri Jun  3 07:05:32 2016	(r416302)
+++ head/net/rsync/Makefile	Fri Jun  3 07:22:51 2016	(r416303)
@@ -4,7 +4,7 @@
 PORTNAME=	rsync
 PORTVERSION=	3.1.2
 CATEGORIES=	net ipv6
-PORTREVISION=	4
+PORTREVISION=	5
 MASTER_SITES=	http://rsync.samba.org/ftp/rsync/ \
 		ftp://ftp.samba.org/pub/rsync/ \
 		ftp://ftp.sunet.se/pub/unix/admin/rsync/  \
@@ -70,11 +70,11 @@ ICONV_CPPFLAGS=	-I${LOCALBASE}/include
 ICONV_LDFLAGS=	-L${LOCALBASE}/lib
 ICONV_CONFIGURE_ENABLE=	iconv iconv-open
 
-POPT_PORT_LIB_DEPENDS_OFF=	libpopt.so:devel/popt
-POPT_PORT_CPPFLAGS_OFF=	-I${LOCALBASE}/include
-POPT_PORT_LDFLAGS_OFF=	-L${LOCALBASE}/lib
+POPT_PORT_LIB_DEPENDS=	libpopt.so:devel/popt
+POPT_PORT_CPPFLAGS=	-I${LOCALBASE}/include
+POPT_PORT_LDFLAGS=	-L${LOCALBASE}/lib
 
-POPT_PORT_CONFIGURE_WITH=	included-popt
+POPT_PORT_CONFIGURE_WITH_OFF=	included-popt
 
 SSH_CONFIGURE_ON=	--with-rsh=ssh
 SSH_CONFIGURE_OFF=	--with-rsh=rsh