Fix: - Add new OPTION for SQLite 3 support & set default
	- Make DATADIR and ETCDIR safe

	Submitted by: Chris Rees (utisoft_at_gmail.com) (maintainer)
	Requested by: Panagiotis Christias



-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.--pVHqMSoxPLN1ugLgILYurWP48ZFnVEe1UrdpzghzNwtiFicx
Content-Type: text/plain; name="mnogosearch-sqlite3.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="mnogosearch-sqlite3.diff"

Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/www/mnogosearch/Makefile,v
retrieving revision 1.82
diff -u -r1.82 Makefile
--- Makefile	8 Mar 2011 19:17:51 -0000	1.82
+++ Makefile	14 Apr 2011 09:26:26 -0000
@@ -24,16 +24,17 @@
 		PGSQL   "Use PGSQL"				off \
 		MSQL    "Use MSQL"				off \
 		MYSQL   "Use MySQL"				off \
-		SQLITE  "Use SQLite 2.x"		on
+		SQLITE  "Use SQLite 2.x"		off \
+		SQLITE3 "Use SQLite 3.x"		on
 
 USE_LDCONFIG=	yes
 USE_GNOME=	lthack
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS+=--enable-shared \
-		--sysconfdir=${PREFIX}/etc/mnogosearch \
+		--sysconfdir=${ETCDIR} \
 		--localstatedir=/var/mnogosearch \
-		--datadir=${PREFIX}/share/mnogosearch
+		--datadir=${DATADIR}
 CONFIGURE_ENV+=	LOCALBASE="${LOCALBASE}"
 MAKE_ENV+=	MKDIRPROG="${MKDIR}"
 
@@ -84,13 +85,18 @@
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 .endif
 
-.ifndef WITHOUT_SQLITE
+.ifdef WITH_SQLITE
 USE_SQLITE=	2
 CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 .endif
 
+.ifndef WITHOUT_SQLITE3
+USE_SQLITE=	3
+CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
+.endif
+
 .if defined(WITHOUT_SQLITE) && !defined(WITH_MYSQL) && \
-    !defined(WITH_MSQL) && !defined(WITH_PGSQL)
+    !defined(WITH_MSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE3)
 IGNORE=	needs at least one database driver
 .endif