From f672c0b8ff69ff6252310065d01f4a2dff894edb Mon Sep 17 00:00:00 2001 From: "Philip M. Gollucci" Date: Thu, 24 Dec 2009 19:49:51 +0000 Subject: [PATCH] OPTIONS += SQLITE Submitted by: Adam Pordzik (via e-mail) --- devel/apr/Makefile | 19 ++++++++++++++++++- devel/apr/pkg-plist | 4 ++++ devel/apr0/Makefile | 19 ++++++++++++++++++- devel/apr0/pkg-plist | 4 ++++ devel/apr1/Makefile | 19 ++++++++++++++++++- devel/apr1/pkg-plist | 4 ++++ devel/apr2/Makefile | 19 ++++++++++++++++++- devel/apr2/pkg-plist | 4 ++++ 8 files changed, 88 insertions(+), 4 deletions(-) diff --git a/devel/apr/Makefile b/devel/apr/Makefile index afd3cad68621..7eee15382965 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -6,6 +6,7 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= apr @@ -25,7 +26,8 @@ OPTIONS= THREADS "Enable Threads in apr" on \ NDBM "Enable NDBM support in apr-util" off \ LDAP "Enable LDAP support in apr-util" off \ MYSQL "Enable MySQL suport in apr-util" off \ - PGSQL "Enable Postgresql suport in apr-util" off + PGSQL "Enable Postgresql suport in apr-util" off \ + SQLITE "Enable SQLite3 support in apr-util" off APR_VERSION= 1.3.9 APU_VERSION= 1.3.9 @@ -171,6 +173,21 @@ PKGNAMESUFFIX= -pgsql PLIST_SUB+= PGSQL="@comment " .endif +.if defined(WITH_SQLITE) +APU_EXTRAS= yes +PLIST_SUB+= SQLITE3="" +USE_SQLITE= YES +CONFIGURE_ARGS+= --with-sqlite3=${LOCALBASE} +.if defined(PKGNAMESUFFIX) +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-sqlite3 +.else +PKGNAMESUFFIX= -sqlite3 +.endif +.else +CONFIGURE_ARGS+= --without-sqlite3 +PLIST_SUB+= SQLITE3="@comment " +.endif + .if defined(APU_EXTRAS) PLIST_SUB+= APU_EXTRAS="" .else diff --git a/devel/apr/pkg-plist b/devel/apr/pkg-plist index f53299ea4bcb..d974fce9edac 100644 --- a/devel/apr/pkg-plist +++ b/devel/apr/pkg-plist @@ -108,6 +108,10 @@ lib/libaprutil-1.so.%%SHLIB_MAJOR%% %%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.so %%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.la %%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.a +%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3-1.so +%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.so +%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.la +%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.a %%APU_EXTRAS%%@dirrm lib/apr-util-1 @dirrm %%DATADIR%%/build-1 @dirrm %%DATADIR%% diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile index afd3cad68621..7eee15382965 100644 --- a/devel/apr0/Makefile +++ b/devel/apr0/Makefile @@ -6,6 +6,7 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= apr @@ -25,7 +26,8 @@ OPTIONS= THREADS "Enable Threads in apr" on \ NDBM "Enable NDBM support in apr-util" off \ LDAP "Enable LDAP support in apr-util" off \ MYSQL "Enable MySQL suport in apr-util" off \ - PGSQL "Enable Postgresql suport in apr-util" off + PGSQL "Enable Postgresql suport in apr-util" off \ + SQLITE "Enable SQLite3 support in apr-util" off APR_VERSION= 1.3.9 APU_VERSION= 1.3.9 @@ -171,6 +173,21 @@ PKGNAMESUFFIX= -pgsql PLIST_SUB+= PGSQL="@comment " .endif +.if defined(WITH_SQLITE) +APU_EXTRAS= yes +PLIST_SUB+= SQLITE3="" +USE_SQLITE= YES +CONFIGURE_ARGS+= --with-sqlite3=${LOCALBASE} +.if defined(PKGNAMESUFFIX) +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-sqlite3 +.else +PKGNAMESUFFIX= -sqlite3 +.endif +.else +CONFIGURE_ARGS+= --without-sqlite3 +PLIST_SUB+= SQLITE3="@comment " +.endif + .if defined(APU_EXTRAS) PLIST_SUB+= APU_EXTRAS="" .else diff --git a/devel/apr0/pkg-plist b/devel/apr0/pkg-plist index f53299ea4bcb..d974fce9edac 100644 --- a/devel/apr0/pkg-plist +++ b/devel/apr0/pkg-plist @@ -108,6 +108,10 @@ lib/libaprutil-1.so.%%SHLIB_MAJOR%% %%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.so %%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.la %%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.a +%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3-1.so +%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.so +%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.la +%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.a %%APU_EXTRAS%%@dirrm lib/apr-util-1 @dirrm %%DATADIR%%/build-1 @dirrm %%DATADIR%% diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index afd3cad68621..7eee15382965 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -6,6 +6,7 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= apr @@ -25,7 +26,8 @@ OPTIONS= THREADS "Enable Threads in apr" on \ NDBM "Enable NDBM support in apr-util" off \ LDAP "Enable LDAP support in apr-util" off \ MYSQL "Enable MySQL suport in apr-util" off \ - PGSQL "Enable Postgresql suport in apr-util" off + PGSQL "Enable Postgresql suport in apr-util" off \ + SQLITE "Enable SQLite3 support in apr-util" off APR_VERSION= 1.3.9 APU_VERSION= 1.3.9 @@ -171,6 +173,21 @@ PKGNAMESUFFIX= -pgsql PLIST_SUB+= PGSQL="@comment " .endif +.if defined(WITH_SQLITE) +APU_EXTRAS= yes +PLIST_SUB+= SQLITE3="" +USE_SQLITE= YES +CONFIGURE_ARGS+= --with-sqlite3=${LOCALBASE} +.if defined(PKGNAMESUFFIX) +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-sqlite3 +.else +PKGNAMESUFFIX= -sqlite3 +.endif +.else +CONFIGURE_ARGS+= --without-sqlite3 +PLIST_SUB+= SQLITE3="@comment " +.endif + .if defined(APU_EXTRAS) PLIST_SUB+= APU_EXTRAS="" .else diff --git a/devel/apr1/pkg-plist b/devel/apr1/pkg-plist index f53299ea4bcb..d974fce9edac 100644 --- a/devel/apr1/pkg-plist +++ b/devel/apr1/pkg-plist @@ -108,6 +108,10 @@ lib/libaprutil-1.so.%%SHLIB_MAJOR%% %%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.so %%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.la %%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.a +%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3-1.so +%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.so +%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.la +%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.a %%APU_EXTRAS%%@dirrm lib/apr-util-1 @dirrm %%DATADIR%%/build-1 @dirrm %%DATADIR%% diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile index afd3cad68621..7eee15382965 100644 --- a/devel/apr2/Makefile +++ b/devel/apr2/Makefile @@ -6,6 +6,7 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= apr @@ -25,7 +26,8 @@ OPTIONS= THREADS "Enable Threads in apr" on \ NDBM "Enable NDBM support in apr-util" off \ LDAP "Enable LDAP support in apr-util" off \ MYSQL "Enable MySQL suport in apr-util" off \ - PGSQL "Enable Postgresql suport in apr-util" off + PGSQL "Enable Postgresql suport in apr-util" off \ + SQLITE "Enable SQLite3 support in apr-util" off APR_VERSION= 1.3.9 APU_VERSION= 1.3.9 @@ -171,6 +173,21 @@ PKGNAMESUFFIX= -pgsql PLIST_SUB+= PGSQL="@comment " .endif +.if defined(WITH_SQLITE) +APU_EXTRAS= yes +PLIST_SUB+= SQLITE3="" +USE_SQLITE= YES +CONFIGURE_ARGS+= --with-sqlite3=${LOCALBASE} +.if defined(PKGNAMESUFFIX) +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-sqlite3 +.else +PKGNAMESUFFIX= -sqlite3 +.endif +.else +CONFIGURE_ARGS+= --without-sqlite3 +PLIST_SUB+= SQLITE3="@comment " +.endif + .if defined(APU_EXTRAS) PLIST_SUB+= APU_EXTRAS="" .else diff --git a/devel/apr2/pkg-plist b/devel/apr2/pkg-plist index f53299ea4bcb..d974fce9edac 100644 --- a/devel/apr2/pkg-plist +++ b/devel/apr2/pkg-plist @@ -108,6 +108,10 @@ lib/libaprutil-1.so.%%SHLIB_MAJOR%% %%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.so %%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.la %%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.a +%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3-1.so +%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.so +%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.la +%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.a %%APU_EXTRAS%%@dirrm lib/apr-util-1 @dirrm %%DATADIR%%/build-1 @dirrm %%DATADIR%%