svn commit: r329237 - head/net/rsync

[Emanuel Haupt]

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'  \