diff options
| author | pgollucci <pgollucci@FreeBSD.org> | 2009-01-19 03:43:53 +0800 |
|---|---|---|
| committer | pgollucci <pgollucci@FreeBSD.org> | 2009-01-19 03:43:53 +0800 |
| commit | e2ccf35356971818f9f03222a19b479462bc96e4 (patch) | |
| tree | f2c8eccac5ca65008dd7720b2d6308a178b92600 | |
| parent | 9d5b23f8d3d0b3edf1a0b6231e0a2b080e0c8eaa (diff) | |
| download | freebsd-ports-gnome-e2ccf35356971818f9f03222a19b479462bc96e4.tar.gz freebsd-ports-gnome-e2ccf35356971818f9f03222a19b479462bc96e4.tar.zst freebsd-ports-gnome-e2ccf35356971818f9f03222a19b479462bc96e4.zip | |
o Remove devel/apr-svn and replace with devel/apr
o devel/apr:
defaults changed: WITH_BDB=yes [1]
convert APR_UTIL_* flags to KNOBS flag names
optionify and add IPV6, NDBM, LDAP, MYSQL, PGSQL
o Remove devel/apr-svn and replace with devel/apr
o devel/apr:
defaults changed: WITH_BDB=yes [1]
convert APR_UTIL_* flags to KNOBS flag names
optionify and add IPV6, NDBM, LDAP, MYSQL, PGSQL
(sqlite,orcale,freetds,odbc -- PATCHES welcome, MAINTAINER does not use)
GMAKE is not needed, so remove it
split ./configure args into apr and apr-util args, they do not accept all the same options
standardize on naming apr and apu to match other oses and the C code.
create APR_WRKDIR And APU_WRKDIR for simplicity
delete pre-extract target
bump PORTREVISION
NOTE: port still breaks hier(7), need to fix
o devel/kdesvn, devel/rapidsvn, devel/subcommander*, devel/subversion*
devel/apr-svn -> devel/apr
(subversion will pull in devel/apr)
Notes: dev@apr.apache.org, trunk in svn is as of TODAY(2008/01/03) 2.0.x, ports infra needs to prep for
[devel/apr-0,] devel/apr-1, devel/apr-2
Helpful for PRs: ports/117596, ports/83644, ports/96749, ports/110651, ports/118003, ports/128078
Fixes PRs: ports/126053 [1]
Requeted by: many on ports@, many on #bsdports [1]
Exp Run by : pav
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | UPDATING | 8 | ||||
| -rw-r--r-- | devel/Makefile | 1 | ||||
| -rw-r--r-- | devel/apr-svn/Makefile | 12 | ||||
| -rw-r--r-- | devel/apr/Makefile | 191 | ||||
| -rw-r--r-- | devel/apr/pkg-plist | 10 | ||||
| -rw-r--r-- | devel/apr0/Makefile | 191 | ||||
| -rw-r--r-- | devel/apr0/pkg-plist | 10 | ||||
| -rw-r--r-- | devel/apr1/Makefile | 191 | ||||
| -rw-r--r-- | devel/apr1/pkg-plist | 10 | ||||
| -rw-r--r-- | devel/apr2/Makefile | 191 | ||||
| -rw-r--r-- | devel/apr2/pkg-plist | 10 | ||||
| -rw-r--r-- | devel/kdesvn/Makefile | 4 | ||||
| -rw-r--r-- | devel/rapidsvn/Makefile | 3 | ||||
| -rw-r--r-- | devel/subcommander/Makefile | 2 | ||||
| -rw-r--r-- | devel/subcommander2/Makefile | 2 | ||||
| -rw-r--r-- | devel/subversion/Makefile.common | 6 | ||||
| -rw-r--r-- | devel/subversion16/Makefile.common | 6 |
18 files changed, 474 insertions, 375 deletions
@@ -3753,3 +3753,4 @@ net/fpc-netdb||2008-01-13|This is now part of fpc-fcl-net textproc/p5-Text-CSV_PP||2009-01-14|Has expired: textproc/Text-CSV_PP was merged into textproc/p5-Text-CSV games/fgfs-base|games/flightgear-data|2009-01-15|Renamed lang/gcc41|lang/gcc42|2009-01-17|Abandoned upstream, superseded by gcc42 and, preferrably, gcc43 +devel/apr-svn|devel/apr|2009-01-18|Only needed for FreeBSD 5.2 and below for threading @@ -6,6 +6,14 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20090118: + AFFECTS: users of devel/apr-svn devel/apr + AUTHOR: pgollucci@FreeBSD.org + + devel/apr-svn has been removed and devel/apr now handles its role. + devel/apr now defaults to building with berkley database support (bdb) + APR_UTIL_* tunablables have been renamed to compy with ports/KNOBS names. + 20090114: AFFECTS: users of x11/kdebase4-workspace, x11/kdebase4-runtime AUTHOR: kde@FreeBSD.org diff --git a/devel/Makefile b/devel/Makefile index 37e590ab6249..d674e400801e 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -40,7 +40,6 @@ SUBDIR += antlrworks SUBDIR += apache-ant SUBDIR += apr - SUBDIR += apr-svn SUBDIR += argouml SUBDIR += argp-standalone SUBDIR += argtable diff --git a/devel/apr-svn/Makefile b/devel/apr-svn/Makefile deleted file mode 100644 index fb10b4d194ac..000000000000 --- a/devel/apr-svn/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# New ports collection makefile for: apr-svn -# Date created: 1 February 2003 -# Whom: Lev Serebryakov <lev@serebryakov.spb.ru> -# -# $FreeBSD$ - -APR_UTIL_WITH_BERKELEY_DB= yes -APR_SVN_WITHOUT_THREADS_4= yes -MASTERDIR= ${.CURDIR}/../apr -CONFLICTS= apr-* - -.include "${MASTERDIR}/Makefile" diff --git a/devel/apr/Makefile b/devel/apr/Makefile index a6de0636ae07..5fdf04581f80 100644 --- a/devel/apr/Makefile +++ b/devel/apr/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/apr/pkg-plist b/devel/apr/pkg-plist index 7402d8e77672..18e965e5d109 100644 --- a/devel/apr/pkg-plist +++ b/devel/apr/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 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 diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index a6de0636ae07..5fdf04581f80 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/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/apr1/pkg-plist b/devel/apr1/pkg-plist index 7402d8e77672..18e965e5d109 100644 --- a/devel/apr1/pkg-plist +++ b/devel/apr1/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 diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile index a6de0636ae07..5fdf04581f80 100644 --- a/devel/apr2/Makefile +++ b/devel/apr2/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/apr2/pkg-plist b/devel/apr2/pkg-plist index 7402d8e77672..18e965e5d109 100644 --- a/devel/apr2/pkg-plist +++ b/devel/apr2/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 diff --git a/devel/kdesvn/Makefile b/devel/kdesvn/Makefile index d672ef1fcfe9..27e5996bcade 100644 --- a/devel/kdesvn/Makefile +++ b/devel/kdesvn/Makefile @@ -6,14 +6,14 @@ PORTNAME= kdesvn PORTVERSION= 0.14.4 +PORTREVISION= 1 CATEGORIES= devel kde MASTER_SITES= http://kdesvn.alwins-world.de/trac.fcgi/downloads/ MAINTAINER= yuanjue@FreeBSD.org COMMENT= KDE frontend for Subversion -LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr-svn \ - svn_client-1:${PORTSDIR}/devel/subversion \ +LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion \ neon:${PORTSDIR}/www/neon28 USE_CMAKE= yes diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile index 3e52bbcb79c2..4be1433f9537 100644 --- a/devel/rapidsvn/Makefile +++ b/devel/rapidsvn/Makefile @@ -13,8 +13,7 @@ MASTER_SITES= http://www.rapidsvn.org/download/release/${PORTVERSION}/ MAINTAINER= kuriyama@FreeBSD.org COMMENT= Cross-platform GUI front-end for the Subversion revision system -BUILD_DEPENDS= apr-1-config:${PORTSDIR}/devel/apr-svn \ - neon-config:${PORTSDIR}/www/neon28 \ +BUILD_DEPENDS= neon-config:${PORTSDIR}/www/neon28 \ svn:${PORTSDIR}/devel/subversion \ xsltproc:${PORTSDIR}/textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/VERSION:${PORTSDIR}/textproc/docbook-xsl diff --git a/devel/subcommander/Makefile b/devel/subcommander/Makefile index 2161dbfeb9b9..873da8887fc4 100644 --- a/devel/subcommander/Makefile +++ b/devel/subcommander/Makefile @@ -7,6 +7,7 @@ PORTNAME= subcommander PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://subcommander.tigris.org/files/documents/1759/42385/ DISTNAME= Subcommander-${PORTVERSION} @@ -15,7 +16,6 @@ MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Qt based multiplatform subversion client, diff & merge tool LIB_DEPENDS= neon.28:${PORTSDIR}/www/neon28 \ - apr-1.3:${PORTSDIR}/devel/apr-svn \ boost_thread.4:${PORTSDIR}/devel/boost \ svn_client-1.0:${PORTSDIR}/devel/subversion diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile index 1ac87d088385..ea0313d345d7 100644 --- a/devel/subcommander2/Makefile +++ b/devel/subcommander2/Makefile @@ -7,6 +7,7 @@ PORTNAME= subcommander DISTVERSION= 2.0.0.b4 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://subcommander.tigris.org/files/documents/1759/43367/ DISTNAME= Subcommander-${PORTVERSION:S/.b/b/g} @@ -15,7 +16,6 @@ MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Qt4 based multiplatform subversion client, diff & merge tool LIB_DEPENDS= neon.28:${PORTSDIR}/www/neon28 \ - apr-1.3:${PORTSDIR}/devel/apr-svn \ boost_thread.4:${PORTSDIR}/devel/boost \ svn_client-1.0:${PORTSDIR}/devel/subversion diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index e0547b767c83..a3ffc221eed5 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -91,15 +91,9 @@ OPT_NAME= WITH_BERKELEYDB=(db4|db41|db42) APR_APU_DIR= ${LOCALBASE}/bin APR_CONFIG= apr-1-config APU_CONFIG= apu-1-config -.if !defined(WITHOUT_BDB) -LIB_DEPENDS+= apr-1.3:${PORTSDIR}/devel/apr-svn -APR_PORT= devel/apr-svn -OPT_NAME= APR_UTIL_WITH_BERKELEY_DB=yes -.else LIB_DEPENDS+= apr-1.3:${PORTSDIR}/devel/apr APR_PORT= devel/apr .endif -.endif CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \ --with-apr-util=${APR_APU_DIR}/${APU_CONFIG} diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common index e0547b767c83..a3ffc221eed5 100644 --- a/devel/subversion16/Makefile.common +++ b/devel/subversion16/Makefile.common @@ -91,15 +91,9 @@ OPT_NAME= WITH_BERKELEYDB=(db4|db41|db42) APR_APU_DIR= ${LOCALBASE}/bin APR_CONFIG= apr-1-config APU_CONFIG= apu-1-config -.if !defined(WITHOUT_BDB) -LIB_DEPENDS+= apr-1.3:${PORTSDIR}/devel/apr-svn -APR_PORT= devel/apr-svn -OPT_NAME= APR_UTIL_WITH_BERKELEY_DB=yes -.else LIB_DEPENDS+= apr-1.3:${PORTSDIR}/devel/apr APR_PORT= devel/apr .endif -.endif CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \ --with-apr-util=${APR_APU_DIR}/${APU_CONFIG} |