From owner-svn-ports-all@FreeBSD.ORG Sun Feb 2 20:16:52 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E549397; Sun, 2 Feb 2014 20:16:52 +0000 (UTC) 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 1A6941A2E; Sun, 2 Feb 2014 20:16:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s12KGp9d048105; Sun, 2 Feb 2014 20:16:51 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s12KGpBU048104; Sun, 2 Feb 2014 20:16:51 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201402022016.s12KGpBU048104@svn.freebsd.org> From: Max Brazhnikov Date: Sun, 2 Feb 2014 20:16:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342363 - head/textproc/redland 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.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Feb 2014 20:16:52 -0000 Author: makc Date: Sun Feb 2 20:16:51 2014 New Revision: 342363 URL: http://svnweb.freebsd.org/changeset/ports/342363 QAT: https://qat.redports.org/buildarchive/r342363/ Log: - Remove needless dependencies - Convert to options helpers Modified: head/textproc/redland/Makefile Modified: head/textproc/redland/Makefile ============================================================================== --- head/textproc/redland/Makefile Sun Feb 2 19:40:24 2014 (r342362) +++ head/textproc/redland/Makefile Sun Feb 2 20:16:51 2014 (r342363) @@ -3,6 +3,7 @@ PORTNAME= redland PORTVERSION= 1.0.17 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://download.librdf.org/source/ @@ -18,39 +19,26 @@ LIB_DEPENDS= libraptor2.so:${PORTSDIR}/t librasqal.so:${PORTSDIR}/textproc/rasqal USE_AUTOTOOLS= libltdl -USE_GNOME= libxml2 lthack -USE_OPENSSL= yes USE_PERL5= build USES= gmake pathfix perl5 pkgconfig shebangfix SHEBANG_FILES= scripts/touch-mtime.pl GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-raptor=system \ - --with-threestore=no +CONFIGURE_ARGS= --with-threestore=no USE_LDCONFIG= yes OPTIONS_DEFINE= BDB THREADS OPTIONS_DEFAULT= BDB + +BDB_USE= BDB= yes +BDB_CONFIGURE_OFF= --with-bdb=no + +THREADS_CONFIGURE_ENABLE= threads + # MYSQL "Use MySQL instead of BDB" off \ # PGSQL "Use PgSQL instead of BDB" off \ # SQLITE "Use SQLite instead of BDB" off \ # VIRTUOSO "Use Virtoso instead of BDB" off -.include - -.if ${PORT_OPTIONS:MBDB} -USE_BDB= yes -WITH_BDB_HIGHEST= yes -INVALID_BDB_VER= 2 -.else -CONFIGURE_ARGS+= --with-bdb=no -.endif - -.if ${PORT_OPTIONS:MTHREADS} -CONFIGURE_ARGS+= --enable-threads -.else -CONFIGURE_ARGS+= --disable-threads -.endif - #.if defined(WITH_MYSQL) #USE_MYSQL= yes #CONFIGURE_ARGS+=--with-mysql=yes @@ -90,15 +78,4 @@ CONFIGURE_ARGS+=--with-virtuoso=no PLIST_SUB+= VIRTUOSO="@comment " #.endif -pre-everything:: -. if ${PORT_OPTIONS:MBDB} - @${ECHO_CMD} "You can choose BDB version by setting WITH_BDB_VER to one off:" - @${ECHO_CMD} "3 40 41 42 43 44 3+ 40+ 41+ 42+ 43+ 44+ (current: ${BDB_VER})" -. endif -. if defined(WITH_MYSQL) - @${ECHO_CMD} "MySQL version to be used: ${MYSQL_VER}" - @${ECHO_CMD} "If you don't have MySQL installed you can stop the build now" - @${ECHO_CMD} "and set WITH_MYSQL_VER to the desired version" -. endif - .include