From fd0463545b559701c4e6f3b045c1a52a2845ff07 Mon Sep 17 00:00:00 2001 From: "Lev A. Serebryakov" Date: Sat, 26 Jul 2008 13:56:14 +0000 Subject: (1) Update to 1.5.1 (2) Toss options processing to build apr as subversion dependency, not as sirf one, if sirf is selected on very clean system. It allows to build apr with BDB option turned on, if needed. --- devel/subversion/Makefile.common | 20 ++++++++++---------- devel/subversion/distinfo | 6 +++--- devel/subversion/files/build-outputs.mk | 4 ++-- devel/subversion16/Makefile.common | 20 ++++++++++---------- devel/subversion16/distinfo | 6 +++--- devel/subversion16/files/build-outputs.mk | 4 ++-- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index 8903a1f92cbf..2cdf8d0c0b4d 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -5,8 +5,8 @@ # $FreeBSD$ PORTNAME= subversion -PORTVERSION= 1.5.0 -PORTREVISION?= 4 +PORTVERSION= 1.5.1 +PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= http://subversion.tigris.org/downloads/:main \ http://svnbook.red-bean.com/en/1.4/:book @@ -41,14 +41,6 @@ CONFIGURE_ARGS+= --without-neon PLIST_SUB+= NEON="@comment " .endif -.if defined(WITH_SERF) -LIB_DEPENDS+= serf-0.0:${PORTSDIR}/www/serf -CONFIGURE_ARGS+= --with-serf=${LOCALBASE} -PLIST_SUB+= SERF="" -.else -PLIST_SUB+= SERF="@comment " -.endif - .if defined(WITH_SASL) LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= --with-sasl=${LOCALBASE} @@ -110,6 +102,14 @@ APR_PORT= devel/apr CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \ --with-apr-util=${APR_APU_DIR}/${APU_CONFIG} +.if defined(WITH_SERF) +LIB_DEPENDS+= serf-0.0:${PORTSDIR}/www/serf +CONFIGURE_ARGS+= --with-serf=${LOCALBASE} +PLIST_SUB+= SERF="" +.else +PLIST_SUB+= SERF="@comment " +.endif + .if defined(SVN_BUILD_BINDINGS) .if defined(WITH_FREEBSD_SUBVERSION) LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion-freebsd diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo index 4df41db3fec7..d70ffbded535 100644 --- a/devel/subversion/distinfo +++ b/devel/subversion/distinfo @@ -1,6 +1,6 @@ -MD5 (subversion/subversion-1.5.0.tar.bz2) = 004b57643406dd10957ec87955702189 -SHA256 (subversion/subversion-1.5.0.tar.bz2) = 755e9b2bac5ce69ff0177a02f3946c2840db06411e92e767e3c44a8c46d496b3 -SIZE (subversion/subversion-1.5.0.tar.bz2) = 4852793 +MD5 (subversion/subversion-1.5.1.tar.bz2) = 8dbdaa625d6b18887702885df07fc87e +SHA256 (subversion/subversion-1.5.1.tar.bz2) = daa8fabc24a10e96c79adcd892a16ed4c9dda685049a41e10032e39d49cfb3cb +SIZE (subversion/subversion-1.5.1.tar.bz2) = 4871789 MD5 (subversion/svn-book-html.tar.bz2) = eda5fa7d7e3aff9473adf063385d3527 SHA256 (subversion/svn-book-html.tar.bz2) = a73110c724ee7fca4ab0e6090f0a47fdd3a03cfdfbecab799aca90c80824d9e0 SIZE (subversion/svn-book-html.tar.bz2) = 366277 diff --git a/devel/subversion/files/build-outputs.mk b/devel/subversion/files/build-outputs.mk index 5671f37963d8..5fa4eae6bc0d 100644 --- a/devel/subversion/files/build-outputs.mk +++ b/devel/subversion/files/build-outputs.mk @@ -233,7 +233,7 @@ install-lib: $(SVN_RA_LIB_INSTALL_DEPS) libsvn_ra_DEPS = $(SVN_RA_LIB_DEPS) subversion/libsvn_ra/compat.lo subversion/libsvn_ra/ra_loader.lo subversion/libsvn_ra/util.lo libsvn_ra_OBJECTS = compat.lo ra_loader.lo util.lo subversion/libsvn_ra/libsvn_ra-1.la: $(libsvn_ra_DEPS) - cd subversion/libsvn_ra && $(LINK) -o libsvn_ra-1.la $(LT_NO_UNDEFINED) $(libsvn_ra_OBJECTS) -lsvn_subr-1 $(SVN_RA_LIB_LINK) $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) + cd subversion/libsvn_ra && $(LINK) -o libsvn_ra-1.la $(LT_NO_UNDEFINED) $(libsvn_ra_OBJECTS) -lsvn_delta-1 -lsvn_subr-1 $(SVN_RA_LIB_LINK) $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) libsvn_ra_local_PATH = subversion/libsvn_ra_local libsvn_ra_local_DEPS = subversion/libsvn_ra_local/ra_plugin.lo subversion/libsvn_ra_local/split_url.lo @@ -2085,7 +2085,7 @@ subversion/svn/unlock-cmd.o: subversion/svn/unlock-cmd.c subversion/include/svn_ subversion/svn/update-cmd.o: subversion/svn/update-cmd.c subversion/include/svn_auth.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/util.o: subversion/svn/util.c subversion/include/svn_auth.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/util.o: subversion/svn/util.c subversion/include/svn_auth.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h subversion/svnadmin/main.o: subversion/svnadmin/main.c subversion/include/svn_auth.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common index 8903a1f92cbf..2cdf8d0c0b4d 100644 --- a/devel/subversion16/Makefile.common +++ b/devel/subversion16/Makefile.common @@ -5,8 +5,8 @@ # $FreeBSD$ PORTNAME= subversion -PORTVERSION= 1.5.0 -PORTREVISION?= 4 +PORTVERSION= 1.5.1 +PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= http://subversion.tigris.org/downloads/:main \ http://svnbook.red-bean.com/en/1.4/:book @@ -41,14 +41,6 @@ CONFIGURE_ARGS+= --without-neon PLIST_SUB+= NEON="@comment " .endif -.if defined(WITH_SERF) -LIB_DEPENDS+= serf-0.0:${PORTSDIR}/www/serf -CONFIGURE_ARGS+= --with-serf=${LOCALBASE} -PLIST_SUB+= SERF="" -.else -PLIST_SUB+= SERF="@comment " -.endif - .if defined(WITH_SASL) LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= --with-sasl=${LOCALBASE} @@ -110,6 +102,14 @@ APR_PORT= devel/apr CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \ --with-apr-util=${APR_APU_DIR}/${APU_CONFIG} +.if defined(WITH_SERF) +LIB_DEPENDS+= serf-0.0:${PORTSDIR}/www/serf +CONFIGURE_ARGS+= --with-serf=${LOCALBASE} +PLIST_SUB+= SERF="" +.else +PLIST_SUB+= SERF="@comment " +.endif + .if defined(SVN_BUILD_BINDINGS) .if defined(WITH_FREEBSD_SUBVERSION) LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion-freebsd diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo index 4df41db3fec7..d70ffbded535 100644 --- a/devel/subversion16/distinfo +++ b/devel/subversion16/distinfo @@ -1,6 +1,6 @@ -MD5 (subversion/subversion-1.5.0.tar.bz2) = 004b57643406dd10957ec87955702189 -SHA256 (subversion/subversion-1.5.0.tar.bz2) = 755e9b2bac5ce69ff0177a02f3946c2840db06411e92e767e3c44a8c46d496b3 -SIZE (subversion/subversion-1.5.0.tar.bz2) = 4852793 +MD5 (subversion/subversion-1.5.1.tar.bz2) = 8dbdaa625d6b18887702885df07fc87e +SHA256 (subversion/subversion-1.5.1.tar.bz2) = daa8fabc24a10e96c79adcd892a16ed4c9dda685049a41e10032e39d49cfb3cb +SIZE (subversion/subversion-1.5.1.tar.bz2) = 4871789 MD5 (subversion/svn-book-html.tar.bz2) = eda5fa7d7e3aff9473adf063385d3527 SHA256 (subversion/svn-book-html.tar.bz2) = a73110c724ee7fca4ab0e6090f0a47fdd3a03cfdfbecab799aca90c80824d9e0 SIZE (subversion/svn-book-html.tar.bz2) = 366277 diff --git a/devel/subversion16/files/build-outputs.mk b/devel/subversion16/files/build-outputs.mk index 5671f37963d8..5fa4eae6bc0d 100644 --- a/devel/subversion16/files/build-outputs.mk +++ b/devel/subversion16/files/build-outputs.mk @@ -233,7 +233,7 @@ install-lib: $(SVN_RA_LIB_INSTALL_DEPS) libsvn_ra_DEPS = $(SVN_RA_LIB_DEPS) subversion/libsvn_ra/compat.lo subversion/libsvn_ra/ra_loader.lo subversion/libsvn_ra/util.lo libsvn_ra_OBJECTS = compat.lo ra_loader.lo util.lo subversion/libsvn_ra/libsvn_ra-1.la: $(libsvn_ra_DEPS) - cd subversion/libsvn_ra && $(LINK) -o libsvn_ra-1.la $(LT_NO_UNDEFINED) $(libsvn_ra_OBJECTS) -lsvn_subr-1 $(SVN_RA_LIB_LINK) $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) + cd subversion/libsvn_ra && $(LINK) -o libsvn_ra-1.la $(LT_NO_UNDEFINED) $(libsvn_ra_OBJECTS) -lsvn_delta-1 -lsvn_subr-1 $(SVN_RA_LIB_LINK) $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) libsvn_ra_local_PATH = subversion/libsvn_ra_local libsvn_ra_local_DEPS = subversion/libsvn_ra_local/ra_plugin.lo subversion/libsvn_ra_local/split_url.lo @@ -2085,7 +2085,7 @@ subversion/svn/unlock-cmd.o: subversion/svn/unlock-cmd.c subversion/include/svn_ subversion/svn/update-cmd.o: subversion/svn/update-cmd.c subversion/include/svn_auth.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/util.o: subversion/svn/util.c subversion/include/svn_auth.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/util.o: subversion/svn/util.c subversion/include/svn_auth.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h subversion/svnadmin/main.o: subversion/svnadmin/main.c subversion/include/svn_auth.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h -- cgit v1.2.3