Simplify Makefile

1 files changed, 8 insertions, 22 deletions

diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index ca52a4bb3fe3..926c8da8a341 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -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