Bug 168780 - [PATCH] textproc/redland: allow BDB to be optional
Summary: [PATCH] textproc/redland: allow BDB to be optional
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-kde (group)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-06-07 00:30 UTC by Sean Farley
Modified: 2012-08-17 09:20 UTC (History)
1 user (show)

See Also:


Attachments
redland-1.0.15.patch (1005 bytes, patch)
2012-06-07 00:30 UTC, Sean Farley
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Sean Farley freebsd_committer freebsd_triage 2012-06-07 00:30:09 UTC
This turn BDB into an option with a default of 'on'.  Apache OpenOffice
seems to run fine without BDB enabled in redland.

Port maintainer (kde@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: suffix)
Comment 1 Beech Rintoul freebsd_committer freebsd_triage 2012-06-07 09:13:14 UTC
Responsible Changed
From-To: freebsd-ports-bugs->beech

I'll take it
Comment 2 Beech Rintoul freebsd_committer freebsd_triage 2012-06-07 17:20:56 UTC
Responsible Changed
From-To: beech->kde

Pass to kde@
Comment 3 dfilter service freebsd_committer freebsd_triage 2012-08-17 09:12:24 UTC
Author: avilla
Date: Fri Aug 17 08:12:13 2012
New Revision: 302670
URL: http://svn.freebsd.org/changeset/ports/302670

Log:
  - Make BDB optional (on by default). [1]
  - OPTIONSngify.
  - Use USE_PKGCONFIG.
  - Bump PORTREVISION.
  
  PR:		168780 [1]
  Submitted by:	scf [1]

Modified:
  head/textproc/redland/Makefile   (contents, props changed)
  head/textproc/redland/pkg-descr   (contents, props changed)

Modified: head/textproc/redland/Makefile
==============================================================================
--- head/textproc/redland/Makefile	Fri Aug 17 07:27:04 2012	(r302669)
+++ head/textproc/redland/Makefile	Fri Aug 17 08:12:13 2012	(r302670)
@@ -8,35 +8,33 @@
 
 PORTNAME=	redland
 PORTVERSION=	1.0.15
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.librdf.org/source/
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	A high-level interface for RDF
+COMMENT=	High-level interface for RDF
 
 LIB_DEPENDS=	raptor2.0:${PORTSDIR}/textproc/raptor2 \
 		rasqal.3:${PORTSDIR}/textproc/rasqal
 
-USE_BDB=	yes
-WITH_BDB_HIGHEST=	yes
-INVALID_BDB_VER=2
-USE_GNOME=	gnomehack lthack pkgconfig libxml2
 USE_AUTOTOOLS=	libltdl
+USE_GNOME=	gnomehack libxml2 lthack
 USE_OPENSSL=	yes
-USE_GMAKE=	yes
+USE_PERL5_BUILD=	yes
+USE_PKGCONFIG=	both
 GNU_CONFIGURE=	yes
-
 CONFIGURE_ARGS=	--with-raptor=system \
 		--with-threestore=no
-
+USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_PERL5_BUILD=	yes
 
 MAN1=		rdfproc.1 redland-config.1 \
 		redland-db-upgrade.1
 MAN3=		redland.3
 
-OPTIONS+=	THREADS "Enable Threads" off
+OPTIONS_DEFINE=	BDB THREADS
+OPTIONS_DEFAULT=	BDB
 #		MYSQL "Use MySQL instead of BDB" off \
 #		PGSQL "Use PgSQL instead of BDB" off \
 #		SQLITE "Use SQLite instead of BDB" off \
@@ -44,10 +42,18 @@ OPTIONS+=	THREADS "Enable Threads" off
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_THREADS)
-CONFIGURE_ARGS+=	--disable-threads
+.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)
@@ -90,8 +96,10 @@ 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"

Modified: head/textproc/redland/pkg-descr
==============================================================================
--- head/textproc/redland/pkg-descr	Fri Aug 17 07:27:04 2012	(r302669)
+++ head/textproc/redland/pkg-descr	Fri Aug 17 08:12:13 2012	(r302670)
@@ -1,7 +1,8 @@
-Redland is a library that provides a high-level interface for RDF allowing
-the model to be stored, queried and manipulated. Redland implements each
-of the RDF model concepts in its own class so provides an object based API
-for them. Some of the classes providing the parsers, storage mechanisms and
-other elements are built as modules that can be added or removed as required.
+Redland is a set of libraries that provide a high-level interface for
+RDF allowing the model to be stored, queried and manipulated. Redland
+implements each of the RDF model concepts in its own class and
+provides an object based API for them. Some of the classes providing
+the parsers, storage mechanisms and other elements are built as
+modules that can be added or removed as required.
 
-WWW: http://librdf.org/
+WWW: http://librdf.org
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Alberto Villa freebsd_committer freebsd_triage 2012-08-17 09:13:41 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!