diff options
Diffstat (limited to 'devel/apr0')
| -rw-r--r-- | devel/apr0/Makefile | 191 | ||||
| -rw-r--r-- | devel/apr0/pkg-plist | 10 |
2 files changed, 115 insertions, 86 deletions
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile index a6de0636ae07..5fdf04581f80 100644 --- a/devel/apr0/Makefile +++ b/devel/apr0/Makefile @@ -3,19 +3,10 @@ # Whom: Garrett Rooney <rooneg@electricjellyfish.net> # # $FreeBSD$ -# -# Tunables: -# APR_UTIL_WITHOUT_THREADS: disable threads support -# APR_UTIL_WITH_GDBM: force dependency on the GNU dbm -# APR_UTIL_WITHOUT_GDBM: unconditionally disable the use of GNU dbm -# APR_UTIL_WITH_BERKELEY_DB: force dependency on Sleepycat's Berkeley DB 4.2 -# APR_UTIL_WITHOUT_BERKELEY_DB: unconditionally disable the use of db4.2 -# (the database bindings are detected and recorded automatically if these -# switches are not set) -# APR_UTIL_WITH_LDAP: force dependency on OpenLDAP PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= apr @@ -26,45 +17,74 @@ COMMENT= Apache Portability Library LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2 +OPTIONS= THREADS "Enable Threads in apr" on \ + IPV6 "Enable IPV6 Support in apr" off \ + GDBM "Enable GNU dbm support in apr-util" on \ + BDB "Enable Berkley BDB support in apr-util" 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 + APR_VERSION= 1.3.3 APU_VERSION= 1.3.4 USE_ICONV= yes USE_AUTOTOOLS= automake:19 autoconf:262 libtool:15:env USE_PERL5_BUILD= yes -USE_GMAKE= yes USE_PYTHON_BUILD= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes NO_WRKSUBDIR= yes +APR_WRKDIR= ${WRKDIR}/apr-${APR_VERSION} +APU_WRKDIR= ${WRKDIR}/apr-util-${APU_VERSION} PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}" SHLIB_MAJOR= 3 -APR_UTIL_CONF_ARGS= --with-apr=../apr-${APR_VERSION} \ +APR_CONF_ARGS= +APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \ --with-expat=${LOCALBASE} \ --with-iconv=${LOCALBASE} .include <bsd.port.pre.mk> -.if defined(APR_UTIL_WITHOUT_THREADS) -CONFIGURE_ARGS+= --disable-threads -APR_UTIL_CONF_ARGS+= --disable-threads +.if defined(WITH_MYSQL) || defined(WITH_PGSQL) || defined (WITH_LDAP) +PLIST_SUB+= APU_EXTRAS="" +.else +PLIST_SUB+= APU_EXTRAS="@comment " +.endif + +########## APR Options +.if defined(WITHOUT_THREADS) +APR_CONF_ARGS+= --disable-threads .if defined(PKGNAMESUFFIX) PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nothr .else PKGNAMESUFFIX= -nothr .endif .else -CONFIGURE_ARGS+= --enable-threads +APR_CONF_ARGS+= --enable-threads .endif -.if defined(APR_UTIL_WITHOUT_GDBM) -APR_UTIL_CONF_ARGS+= --without-gdbm -.elif defined(APR_UTIL_WITH_GDBM) || exists(${LOCALBASE}/lib/libgdbm.so.3) +.if defined(WITHOUT_IPV6) +APR_CONF_ARGS+= --disable-ipv6 +.else +APR_CONF_ARGS+= --enable-ipv6 +.if defined(PKGNAMESUFFIX) +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ipv6 +.else +PKGNAMESUFFIX= -ipv6 +.endif +.endif + +######### APR-Util Options +.if defined(WITHOUT_GDBM) +APU_CONF_ARGS+= --without-gdbm +.elif defined(WITH_GDBM) || exists(${LOCALBASE}/lib/libgdbm.so.3) LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm -APR_UTIL_CONF_ARGS+= --with-gdbm=${LOCALBASE} +APU_CONF_ARGS+= --with-gdbm=${LOCALBASE} .if defined(PKGNAMESUFFIX) PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gdbm .else @@ -74,15 +94,11 @@ PKGNAMESUFFIX= -gdbm APR_UTIL_CONF_ARGS+= --without-gdbm .endif -.if defined(WITH_BDB) -APR_UTIL_WITH_BERKELEY_DB= yes -.endif - -.if defined(APR_UTIL_WITHOUT_BERKELEY_DB) -APR_UTIL_CONF_ARGS+= --without-berkeley-db -.elif defined(APR_UTIL_WITH_BERKELEY_DB) || exists(${LOCALBASE}/lib/libdb-4.2.so.2) +.if defined(WITHOUT_BDB) +APU_CONF_ARGS+= --without-berkeley-db +.elif defined(WITH_BDB) || exists(${LOCALBASE}/lib/libdb-4.2.so.2) USE_BDB= 42+ -APR_UTIL_CONF_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} +APU_CONF_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} .if defined(PKGNAMESUFFIX) PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,} .else @@ -90,14 +106,21 @@ PKGNAMESUFFIX= -${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,} .endif .endif -.if defined(WITH_LDAP) -APR_UTIL_WITH_LDAP= yes +.if defined(WITHOUT_NDBM) +APU_CONF_ARGS+= --without-ndbm +.elif defined(WITH_NDBM) +APU_CONF_ARGS+= --with-ndbm=/usr +.if defined(PKGNAMESUFFIX) +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ndbm +.else +PKGNAMESUFFIX= -ndbm +.endif .endif -.if defined(APR_UTIL_WITH_LDAP) +.if defined(WITH_LDAP) PLIST_SUB+= LDAP="" USE_OPENLDAP= yes -APR_UTIL_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \ +APU_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \ --with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap .if defined(PKGNAMESUFFIX) PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ldap @@ -108,82 +131,80 @@ PKGNAMESUFFIX= -ldap PLIST_SUB+= LDAP="@comment " .endif -pre-extract: - @${ECHO_MSG} "" -.if defined(APR_UTIL_WITHOUT_THREADS) - @${ECHO_MSG} "apr library will be built without threads support." +.if defined(WITH_MYSQL) +PLIST_SUB+= MYSQL="" +USE_MYSQL= YES +APU_CONF_ARGS+= --with-mysql=${LOCALBASE} +CONFIGURE_ENV+= LIBS="${LIBS}" +CFLAGS+= -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H +LDFLAGS+= -L${LOCALBASE}/lib/mysql +.if defined(PKGNAMESUFFIX) +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-mysql .else - @${ECHO_MSG} "apr library will be built with threads support." - @${ECHO_MSG} "All programs which use apr must be linked with threads too." - @${ECHO_MSG} "You can disable threads by defining APR_UTIL_WITHOUT_THREADS." -.endif - @${ECHO_MSG} "" -.if defined(APR_UTIL_WITHOUT_GDBM) - @${ECHO_MSG} "GDBM support is disabled." -.elif defined(APR_UTIL_WITH_GDBM) - @${ECHO_MSG} "GDBM support is forced." -.elif exists(${LOCALBASE}/lib/libgdbm.so.3) - @${ECHO_MSG} "GDBM support is enabled." - @${ECHO_MSG} "You can disable GDBM support by defining APR_UTIL_WITHOUT_GDBM." +PKGNAMESUFFIX= -mysql +.endif .else - @${ECHO_MSG} "GDBM was not found." - @${ECHO_MSG} "You can force GDBM support by defining APR_UTIL_WITH_GDBM." -.endif - @${ECHO_MSG} "" -.if defined(APR_UTIL_WITHOUT_BERKELEY_DB) - @${ECHO_MSG} "Berkeley DB support is disabled." -.elif defined(APR_UTIL_WITH_BERKELEY_DB) - @${ECHO_MSG} "Berkeley DB support forced." -.elif exists(${LOCALBASE}/lib/libdb-4.2.so.2) - @${ECHO_MSG} "Berkeley db4.2 support is enabled." - @${ECHO_MSG} "You can disable Berkeley db4.2 support by defining APR_UTIL_WITHOUT_BERKELEY_DB." +PLIST_SUB+= MYSQL="@comment " +.endif + +.if defined(WITH_PGSQL) +PLIST_SUB+= PGSQL="" +USE_PGSQL= YES +APU_CONF_ARGS+= --with-pgsql=${LOCALBASE} +CONFIGURE_ENV+= ac_cv_path_PGSQL_CONFIG="" +.if defined(PKGNAMESUFFIX) +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-pgsql .else - @${ECHO_MSG} "Berkeley DB was not found." - @${ECHO_MSG} "You can force Berkeley DB support by defining APR_UTIL_WITH_BERKELEY_DB." +PKGNAMESUFFIX= -pgsql +.endif +.else +PLIST_SUB+= PGSQL="@comment " .endif - @${ECHO_MSG} "" post-patch: ${REINPLACE_CMD} -e 's/OSVERSION/'${OSVERSION}'/g' \ - ${WRKDIR}/apr-${APR_VERSION}/build/apr_hints.m4 + ${APR_WRKDIR}/build/apr_hints.m4 ${FIND} ${WRKDIR} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' run-autotools:: - cd ${WRKDIR}/apr-${APR_VERSION} ; \ + cd ${APR_WRKDIR} ; \ ${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf - cd ${WRKDIR}/apr-util-${APU_VERSION} ; \ + cd ${APU_WRKDIR} ; \ ${RM} -fr xml/expat - cd ${WRKDIR}/apr-util-${APU_VERSION} ; \ + cd ${APU_WRKDIR} ; \ ${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf \ - --with-apr=../apr-${APR_VERSION} - cd ${WRKDIR}/apr-${APR_VERSION}; \ - ${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} - cd ${WRKDIR}/apr-util-${APU_VERSION}; \ + --with-apr=${APR_WRKDIR} + cd ${APR_WRKDIR}; \ + ${SETENV} ${CONFIGURE_ENV} ${SH} \ + ./configure ${CONFIGURE_ARGS} ${APR_CONF_ARGS} + cd ${APU_WRKDIR}; \ ${SETENV} ${CONFIGURE_ENV} ${SH} \ - ./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS} + ./configure ${CONFIGURE_ARGS} ${APU_CONF_ARGS} do-configure: ${DO_NADA} do-build: - cd ${WRKDIR}/apr-${APR_VERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE} - cd ${WRKDIR}/apr-util-${APU_VERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE} + cd ${APR_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} + cd ${APU_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} do-install: - cd ${WRKDIR}/apr-${APR_VERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET} - cd ${WRKDIR}/apr-util-${APU_VERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET} + cd ${APR_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} + cd ${APU_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} debug_autoconf: - @echo "LIBTOOL: ${LIBTOOL_VERSION}" - @echo "AUTOCONF: dev ${dev_acver} cur ${cur_acver} use ${use_acver}" - @echo "AUTOMAKE: dev ${dev_amver} cur ${cur_amver} use ${use_amver}" - @echo "AUTOCONF_DIR: ${AUTOCONF_DIR}" - @echo "BUILD_DEPENDS: ${BUILD_DEPENDS}" - @echo "ACLOCAL_DIR: ${ACLOCAL_DIR}" - @echo "LIBTOOLFILES: ${LIBTOOLFILES}" - @echo "LIBTOOL_SHAREDIR: ${LIBTOOL_SHAREDIR}" - @echo "LIBTOOL_LIBEXECDIR: ${LIBTOOL_LIBEXECDIR}" - @echo "LIBTOOL_M4: ${LIBTOOL_M4}" + @${ECHO} "LIBTOOL: ${LIBTOOL_VERSION}" + @${ECHO} "AUTOCONF: dev ${dev_acver} cur ${cur_acver} use ${use_acver}" + @${ECHO} "AUTOMAKE: dev ${dev_amver} cur ${cur_amver} use ${use_amver}" + @${ECHO} "AUTOCONF_DIR: ${AUTOCONF_DIR}" + @${ECHO} "BUILD_DEPENDS: ${BUILD_DEPENDS}" + @${ECHO} "ACLOCAL_DIR: ${ACLOCAL_DIR}" + @${ECHO} "LIBTOOLFILES: ${LIBTOOLFILES}" + @${ECHO} "LIBTOOL_SHAREDIR: ${LIBTOOL_SHAREDIR}" + @${ECHO} "LIBTOOL_LIBEXECDIR: ${LIBTOOL_LIBEXECDIR}" + @${ECHO} "LIBTOOL_M4: ${LIBTOOL_M4}" + @${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${APR_CONF_ARGS}" + @${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}" .include <bsd.port.post.mk> diff --git a/devel/apr0/pkg-plist b/devel/apr0/pkg-plist index 7402d8e77672..18e965e5d109 100644 --- a/devel/apr0/pkg-plist +++ b/devel/apr0/pkg-plist @@ -88,6 +88,14 @@ lib/libaprutil-1.so.%%SHLIB_MAJOR%% %%LDAP%%lib/apr-util-1/apr_ldap.so %%LDAP%%lib/apr-util-1/apr_ldap.la %%LDAP%%lib/apr-util-1/apr_ldap.a -%%LDAP%%@dirrm lib/apr-util-1 +%%MYSQL%%lib/apr-util-1/apr_dbd_mysql-1.so +%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.so +%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.la +%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.a +%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql-1.so +%%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 +%%APU_EXTRAS%%@dirrm lib/apr-util-1 @dirrm build-1 @dirrm include/apr-1 |