From scf@FreeBSD.org  Wed Jun  6 23:21:13 2012
Return-Path: <scf@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8E48E1065687;
	Wed,  6 Jun 2012 23:21:13 +0000 (UTC)
	(envelope-from scf@FreeBSD.org)
Received: from mail.farley.org (mail.farley.org [IPv6:2001:470:1f07:14d3:2::11])
	by mx1.freebsd.org (Postfix) with ESMTP id 1FDF28FC19;
	Wed,  6 Jun 2012 23:21:13 +0000 (UTC)
Received: from thor.farley.org (root@thor.farley.org [IPv6:2001:470:1f07:14d3:1::5])
	by mail.farley.org (8.14.5/8.14.5) with ESMTP id q56NLB6i087111;
	Wed, 6 Jun 2012 19:21:11 -0400 (EDT)
	(envelope-from scf@FreeBSD.org)
Received: from thor.farley.org (localhost [127.0.0.1])
	by thor.farley.org (8.14.5/8.14.5) with ESMTP id q56NLBEq099426;
	Wed, 6 Jun 2012 19:21:11 -0400 (EDT)
	(envelope-from scf@FreeBSD.org)
Received: (from root@localhost)
	by thor.farley.org (8.14.5/8.14.5/Submit) id q56NLB2Z099425;
	Wed, 6 Jun 2012 19:21:11 -0400 (EDT)
	(envelope-from scf@FreeBSD.org)
Message-Id: <201206062321.q56NLB2Z099425@thor.farley.org>
Date: Wed, 6 Jun 2012 19:21:11 -0400 (EDT)
From: "Sean C. Farley" <scf@FreeBSD.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: kde@FreeBSD.org
Subject: [PATCH] textproc/redland: allow BDB to be optional
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         168780
>Category:       ports
>Synopsis:       [PATCH] textproc/redland: allow BDB to be optional
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kde
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 06 23:30:09 UTC 2012
>Closed-Date:    Fri Aug 17 08:13:42 UTC 2012
>Last-Modified:  Fri Aug 17 08:20:11 UTC 2012
>Originator:     Sean C. Farley
>Release:        FreeBSD 8.3-STABLE amd64
>Organization:
>Environment:
System: FreeBSD thor.farley.org 8.3-STABLE FreeBSD 8.3-STABLE #0 r236325M: Wed May 30 15:26:06 EDT
>Description:
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)
>How-To-Repeat:
>Fix:

--- redland-1.0.15.patch begins here ---
diff -ruN --exclude=CVS ../redland.orig/Makefile ./Makefile
--- ../redland.orig/Makefile	2012-02-01 10:25:37.000000000 -0500
+++ ./Makefile	2012-06-06 19:13:33.000000000 -0400
@@ -17,9 +17,6 @@
 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_OPENSSL=	yes
@@ -36,7 +33,8 @@
 		redland-db-upgrade.1
 MAN3=		redland.3
 
-OPTIONS+=	THREADS "Enable Threads" off
+OPTIONS+=	THREADS "Enable Threads" off \
+		BDB "Use BDB" on \
 #		MYSQL "Use MySQL instead of BDB" off \
 #		PGSQL "Use PgSQL instead of BDB" off \
 #		SQLITE "Use SQLite instead of BDB" off \
@@ -50,6 +48,14 @@
 CONFIGURE_ARGS+=	--enable-threads
 .endif
 
+.if !defined(WITHOUT_BDB)
+USE_BDB=	yes
+WITH_BDB_HIGHEST=	yes
+INVALID_BDB_VER=2
+.else
+CONFIGURE_ARGS+=--with-bdb=no
+.endif
+
 #.if defined(WITH_MYSQL)
 #USE_MYSQL=	yes
 #CONFIGURE_ARGS+=--with-mysql=yes
--- redland-1.0.15.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: beech 
Responsible-Changed-When: Thu Jun 7 08:13:14 UTC 2012 
Responsible-Changed-Why:  
I'll take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168780 
Responsible-Changed-From-To: beech->kde 
Responsible-Changed-By: beech 
Responsible-Changed-When: Thu Jun 7 16:20:56 UTC 2012 
Responsible-Changed-Why:  
Pass to kde@ 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168780 
State-Changed-From-To: open->closed 
State-Changed-By: avilla 
State-Changed-When: Fri Aug 17 08:13:41 UTC 2012 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168780 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/168780: commit references a PR
Date: Fri, 17 Aug 2012 08:12:24 +0000 (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"
 
>Unformatted:
