[Midnightbsd-cvs] mports [21803] trunk/devel/subversion: screw it, just use system sqlite

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Aug 21 13:40:01 EDT 2016


Revision: 21803
          http://svnweb.midnightbsd.org/mports/?rev=21803
Author:   laffer1
Date:     2016-08-21 13:39:59 -0400 (Sun, 21 Aug 2016)
Log Message:
-----------
screw it, just use system sqlite

Modified Paths:
--------------
    trunk/devel/subversion/Makefile
    trunk/devel/subversion/Makefile.common

Modified: trunk/devel/subversion/Makefile
===================================================================
--- trunk/devel/subversion/Makefile	2016-08-21 17:36:03 UTC (rev 21802)
+++ trunk/devel/subversion/Makefile	2016-08-21 17:39:59 UTC (rev 21803)
@@ -203,7 +203,7 @@
 	fi
 .endif
 .if ${PORT_OPTIONS:MSTATIC}
-	@if grep -q icui18n ${LOCALBASE}/lib/libsqlite3.la ; then \
+	@if grep -q icui18n /usr/lib/libsqlite3.la ; then \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "You can not build static subversion if your SQLite3 is built with ICU enabled."; \
 		${ECHO_MSG} "Please, reinstall 'devel/sqlite3' port with disabled ICU support."; \

Modified: trunk/devel/subversion/Makefile.common
===================================================================
--- trunk/devel/subversion/Makefile.common	2016-08-21 17:36:03 UTC (rev 21802)
+++ trunk/devel/subversion/Makefile.common	2016-08-21 17:39:59 UTC (rev 21803)
@@ -16,12 +16,10 @@
 CPE_VENDOR=	apache
 
 LIB_DEPENDS+=		libapr-1.so:${PORTSDIR}/devel/apr1 \
-			libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
 			libexpat.so:${PORTSDIR}/textproc/expat2
-BUILD_DEPENDS+=		${LOCALBASE}/bin/sqlite3:${PORTSDIR}/databases/sqlite3
 
 CONFIGURE_ARGS+=	--without-swig \
-			--with-sqlite=${LOCALBASE} \
+			--with-sqlite=/usr \
 			--with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat
 
 .if defined(SVN_BUILD_BINDINGS)



More information about the Midnightbsd-cvs mailing list