ports/153498: [MAINTAINER] databases/sqlite3: Change options list

[Pavel I Volkov]

>Number:         153498
>Category:       ports
>Synopsis:       [MAINTAINER] databases/sqlite3: Change options list
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 28 17:00:19 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Pavel I Volkov
>Release:        FreeBSD 8.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD pol.iib.ru 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Tue Jul 27 11:56:19 MSD 2010
>Description:
 - Add ICU 4.x support
 - Changed the way the call options for debugging and profiling.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- sqlite3-3.7.4_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/databases/sqlite3.orig/Makefile /usr/ports/databases/sqlite3/Makefile
--- /usr/ports/databases/sqlite3.orig/Makefile	2010-12-24 11:15:05.000000000 +0300
+++ /usr/ports/databases/sqlite3/Makefile	2010-12-28 17:40:07.000000000 +0300
@@ -7,6 +7,7 @@
 
 PORTNAME=	sqlite3
 PORTVERSION=	3.7.4
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sqlite.org/ http://www2.sqlite.org/
 DISTNAME=	sqlite-src-3070400
@@ -39,7 +40,8 @@
 # Compilation Options For SQLite http://www.sqlite.org/compile.html
 OPTIONS=	\
 		FTS3		"Enable FTS3/4 (Full Text Search) module" on \
-		ICU		"Enable built with \"ICU\""		off \
+		ICU3		"Enable built with ICU 3.x"		off \
+		ICU4		"Enable built with ICU 4.x"		off \
 		RTREE		"Enable R*Tree module"			off \
 		RAMTABLE	"Store temporary tables in RAM = ${RAMTABLE}" off \
 		UPD_DEL_LIMIT	"ORDER BY and LIMIT on UPDATE and DELETE" off \
@@ -52,8 +54,6 @@
 		THREADSAFE	"Build thread-safe library"		on \
 		EXTENSION	"Allow loadable extensions"		on \
 		TCLWRAPPER	"Enable TCL wrapper"			off \
-		DEBUG		"Enable debugging & verbose explain"	off \
-		GCOV		"Enable coverage testing using gcov (broken)"	off \
 
 .include <bsd.port.options.mk>
 
@@ -70,13 +70,23 @@
 EXTRA_PATCHES+=		${FILESDIR}/pthread_equal_stub
 .endif
 
+#		DEBUG	"Enable debugging & verbose explain"	off \
+# This options used only for debug and is not required during normal work
+# applications or its libraries.
+# This options can be specified on the command line.
+# Execute: make -D WITH_DEBUG ...
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 CFLAGS+=		-Wall
 .endif
 
+#		GCOV	"Enable coverage testing using gcov/gprof"	off \
+# These options are only used for debugging, profiling the application.
+# And can cause errors when using the application or its libraries in other
+# products (for example build security/nss is BROKEN).
+# This options can be specified on the command line.
+# Execute: make -D WITH_GCOV ...
 .if defined(WITH_GCOV)
-BROKEN=	WITH_GCOV breaks security/nss
 CONFIGURE_ARGS+=	--enable-gcov
 LDFLAGS+=		-fstack-protector
 .endif
@@ -111,12 +121,19 @@
 CFLAGS+=		-DSQLITE_ENABLE_RTREE=1
 .endif
 
-.if defined(WITH_ICU)
+.ifdef WITH_ICU3 && WITH_ICU4
+IGNORE=	do not use ICU 3.x and 4.x versions
+.endif
+.ifdef WITH_ICU3 || WITH_ICU4
 BUILD_DEPENDS+=		${LOCALBASE}/bin/icu-config:${PORTSDIR}/devel/icu
-LIB_DEPENDS+=		icudata.38:${PORTSDIR}/devel/icu
 CFLAGS+=		-DSQLITE_ENABLE_ICU=1
 CPPFLAGS+=		`${LOCALBASE}/bin/icu-config --cppflags`
 LDFLAGS+=		`${LOCALBASE}/bin/icu-config --ldflags`
+.ifdef WITH_ICU3
+LIB_DEPENDS+=		icudata.38:${PORTSDIR}/devel/icu
+.elifdef WITH_ICU4
+LIB_DEPENDS+=		icudata.44:${PORTSDIR}/devel/icu4
+.endif
 .endif
 
 .if defined(WITH_RAMTABLE)
@@ -184,7 +201,7 @@
 .endif
 
 test: build
-	@(cd ${WRKSRC} && ${CHOWN} ${TESTUSER} ${WRKSRC} && su ${TESTUSER} -c "${MAKE} test"; ${CHOWN} ${USER} ${WRKSRC})
+	@(cd ${WRKSRC} && ${CHOWN} -R ${TESTUSER} ${WRKSRC} ${WRKSRC}/*.gcno && su ${TESTUSER} -c "${MAKE} test"; ${CHOWN} ${USER} ${WRKSRC})
 
 post-build:
 	@${ECHO_CMD}
@@ -208,7 +225,7 @@
 .ifdef WITH_RTREE
 	@${INSTALL_DATA} ${WRKSRC}/ext/rtree/README ${DOCSDIR}
 .endif
-.ifdef WITH_ICU
+.ifdef WITH_ICU3 || WITH_ICU4
 	@${INSTALL_DATA} ${WRKSRC}/ext/icu/README.txt ${DOCSDIR}
 .endif
 .endif
--- sqlite3-3.7.4_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: