From owner-svn-ports-all@FreeBSD.ORG  Thu Oct  3 21:23:02 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 2F2D6939;
 Thu,  3 Oct 2013 21:23:02 +0000 (UTC)
 (envelope-from ehaupt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1C04D20AF;
 Thu,  3 Oct 2013 21:23:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r93LN1EF035305;
 Thu, 3 Oct 2013 21:23:01 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r93LN17j035304;
 Thu, 3 Oct 2013 21:23:01 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201310032123.r93LN17j035304@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Thu, 3 Oct 2013 21:23:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r329237 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Oct 2013 21:23:02 -0000

Author: ehaupt
Date: Thu Oct  3 21:23:01 2013
New Revision: 329237
URL: http://svnweb.freebsd.org/changeset/ports/329237

Log:
  The previously introduced "fix" for the supposedly ignored --with-rsyncd-conf
  configure option was bogus. The reason for it being ignored was a clobbered
  CONFIGURE_ARGS definition (lack of +=).
  
  Revert previous change and properly append later CONFIGURE_ARGS.
  
  Notified by:    naddy

Modified:
  head/net/rsync/Makefile

Modified: head/net/rsync/Makefile
==============================================================================
--- head/net/rsync/Makefile	Thu Oct  3 21:19:08 2013	(r329236)
+++ head/net/rsync/Makefile	Thu Oct  3 21:23:01 2013	(r329237)
@@ -56,7 +56,7 @@ NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MZLIB_BASE}
-CONFIGURE_ARGS=	--with-included-zlib=no
+CONFIGURE_ARGS+=	--with-included-zlib=no
 .endif
 
 .if ${PORT_OPTIONS:MTIMELIMIT}
@@ -120,9 +120,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|CFLAGS|CONFIGUREDCFLAGS|' \
 		-e 's|perl.*|${DO_NADA}|' \
 			${WRKSRC}/Makefile.in
-# workaround for bug in configure which ignores --with-rsyncd-conf 
-	@${REINPLACE_CMD} -e 's|RSYNCD_SYSCONF|"${PREFIX}/etc/rsyncd.conf"|' \
-			${WRKSRC}/clientserver.c
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's:/etc/:${PREFIX}/etc/:g'  \