From owner-svn-ports-all@FreeBSD.ORG  Thu Oct 31 23:40:51 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 D370272F;
 Thu, 31 Oct 2013 23:40:51 +0000 (UTC)
 (envelope-from garga@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 C10A42C42;
 Thu, 31 Oct 2013 23:40:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9VNepX3014475;
 Thu, 31 Oct 2013 23:40:51 GMT (envelope-from garga@svn.freebsd.org)
Received: (from garga@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9VNeprC014474;
 Thu, 31 Oct 2013 23:40:51 GMT (envelope-from garga@svn.freebsd.org)
Message-Id: <201310312340.r9VNeprC014474@svn.freebsd.org>
From: Renato Botelho <garga@FreeBSD.org>
Date: Thu, 31 Oct 2013 23:40:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332309 - head/net/xmlrpc-c-devel
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, 31 Oct 2013 23:40:51 -0000

Author: garga
Date: Thu Oct 31 23:40:51 2013
New Revision: 332309
URL: http://svnweb.freebsd.org/changeset/ports/332309

Log:
  Simplify Makefile

Modified:
  head/net/xmlrpc-c-devel/Makefile

Modified: head/net/xmlrpc-c-devel/Makefile
==============================================================================
--- head/net/xmlrpc-c-devel/Makefile	Thu Oct 31 23:40:29 2013	(r332308)
+++ head/net/xmlrpc-c-devel/Makefile	Thu Oct 31 23:40:51 2013	(r332309)
@@ -14,6 +14,7 @@ LICENSE=	BSD
 
 OPTIONS_DEFINE=	DEBUG CURL LIBWWW CPLUSPLUS
 OPTIONS_DEFAULT=CURL LIBWWW CPLUSPLUS
+OPTIONS_SUB=	CPLUSPLUS
 
 LIBWWW_DESC=	 Compile with libwww support
 CPLUSPLUS_DESC=	 Build xmlrpc-c c++ libs and tools
@@ -27,34 +28,19 @@ MAKEFILE=	GNUmakefile
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 
+CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_CONFIGURE_ENABLE=	curl-client
+LIBWWW_LIB_DEPENDS=	libwwwcore.so:${PORTSDIR}/www/libwww
+LIBWWW_CONFIGURE_ENABLE=libwww-client
+LIBWWW_CONFIGURE_WITH=	libwww-ssl
+CPLUSPLUS_CONFIGURE_ENABLE=	cplusplus
+
 .include <bsd.port.pre.mk>
 
 .if empty(PORT_OPTIONS:MDEBUG)
 CFLAGS+=	-DNDEBUG
 .endif
 
-.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
-CONFIGURE_ARGS+=	--enable-curl-client
-.else
-CONFIGURE_ARGS+=	--disable-curl-client
-.endif
-
-.if ${PORT_OPTIONS:MLIBWWW}
-LIB_DEPENDS+=	wwwcore:${PORTSDIR}/www/libwww
-CONFIGURE_ARGS+=	--enable-libwww-client --with-libwww-ssl
-.else
-CONFIGURE_ARGS+=	--disable-libwww-client
-.endif
-
-.if ${PORT_OPTIONS:MCPLUSPLUS}
-CONFIGURE_ARGS+=	--enable-cplusplus
-PLIST_SUB+=	CPLUSPLUS=""
-.else
-CONFIGURE_ARGS+=	--disable-cplusplus
-PLIST_SUB+=	CPLUSPLUS="@comment "
-.endif
-
 .if empty(PORT_OPTIONS:MLIBWWW) && empty(PORT_OPTIONS:MCURL)
 PLIST_SUB+=	CLIENT="@comment "
 .else