From 6b7c19cc17a0ce993175b8b653818a08db67ad4a Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Thu, 30 Apr 2020 12:39:16 +0200 Subject: [PATCH] subversion, remove outdated files (#4920) --- .../patches/subversion-1.6.15.patch | 74 -------- .../patches/subversion-1.6.17.patch | 86 ---------- .../patches/subversion-1.6.18.patch | 67 -------- dev-vcs/subversion/subversion-1.6.18.recipe | 161 ------------------ 4 files changed, 388 deletions(-) delete mode 100644 dev-vcs/subversion/patches/subversion-1.6.15.patch delete mode 100644 dev-vcs/subversion/patches/subversion-1.6.17.patch delete mode 100644 dev-vcs/subversion/patches/subversion-1.6.18.patch delete mode 100644 dev-vcs/subversion/subversion-1.6.18.recipe diff --git a/dev-vcs/subversion/patches/subversion-1.6.15.patch b/dev-vcs/subversion/patches/subversion-1.6.15.patch deleted file mode 100644 index 24e4f81db..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.15.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -urN subversion-1.6.15/subversion/libsvn_subr/config_file.c subversion-1.6.15-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.15/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 -+++ subversion-1.6.15-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 -@@ -32,6 +32,11 @@ - - #include "svn_private_config.h" - -+#ifdef __HAIKU__ -+# include -+# include -+#endif -+ - /* Used to terminate lines in large multi-line string literals. */ - #define NL APR_EOL_STR - -@@ -326,7 +331,19 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many(pool, folder, -+ SVN_CONFIG__SYS_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -@@ -1115,8 +1132,21 @@ - *path = svn_path_join_many(pool, folder, - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } -+ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path = svn_path_join_many(pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - --#else /* ! WIN32 */ - { - const char *homedir = svn_user_get_homedir(pool); - if (! homedir) -diff -urN subversion-1.6.15/subversion/libsvn_subr/config_impl.h subversion-1.6.15-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.15/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 -+++ subversion-1.6.15-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 -@@ -109,7 +109,10 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" --#else /* ! WIN32 */ -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "subversion" -+# define SVN_CONFIG__USR_DIRECTORY "subversion" -+#else /* ! WIN32 && ! __HAIKU__ */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" - #endif /* WIN32 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.17.patch b/dev-vcs/subversion/patches/subversion-1.6.17.patch deleted file mode 100644 index 8db6b23c0..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.17.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -urN subversion-1.6.17/configure.ac subversion-1.6.17-haiku/configure.ac ---- subversion-1.6.17/configure.ac 2009-10-13 09:09:30.026214400 -0700 -+++ subversion-1.6.17-haiku/configure.ac 2011-08-02 14:32:39.227278848 -0700 -@@ -249,7 +249,7 @@ - dnl Check for libraries -------------------- - - # Berkeley DB on SCO OpenServer needs -lsocket --AC_CHECK_LIB(socket, socket) -+AC_SEARCH_LIBS(socket, socket network) - - # Build the BDB filesystem library only if we have an appropriate - # version of Berkeley DB. -diff -urN subversion-1.6.17/subversion/libsvn_subr/config_file.c subversion-1.6.17-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.17/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 -+++ subversion-1.6.17-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 -@@ -32,6 +32,11 @@ - - #include "svn_private_config.h" - -+#ifdef __HAIKU__ -+# include -+# include -+#endif -+ - /* Used to terminate lines in large multi-line string literals. */ - #define NL APR_EOL_STR - -@@ -326,7 +331,19 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many(pool, folder, -+ SVN_CONFIG__SYS_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -@@ -1115,8 +1132,21 @@ - *path = svn_path_join_many(pool, folder, - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } -+ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path = svn_path_join_many(pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - --#else /* ! WIN32 */ - { - const char *homedir = svn_user_get_homedir(pool); - if (! homedir) -diff -urN subversion-1.6.17/subversion/libsvn_subr/config_impl.h subversion-1.6.17-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.17/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 -+++ subversion-1.6.17-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 -@@ -109,7 +109,10 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" --#else /* ! WIN32 */ -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "subversion" -+# define SVN_CONFIG__USR_DIRECTORY "subversion" -+#else /* ! WIN32 && ! __HAIKU__ */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" - #endif /* WIN32 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.18.patch b/dev-vcs/subversion/patches/subversion-1.6.18.patch deleted file mode 100644 index 097f8eebc..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.18.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -ur orig/subversion-1.6.18/configure.ac subversion-1.6.18/configure.ac ---- orig/subversion-1.6.18/configure.ac 2009-10-13 18:09:30.043778048 +0200 -+++ subversion-1.6.18/configure.ac 2013-04-30 22:10:52.741605376 +0200 -@@ -249,7 +249,7 @@ - dnl Check for libraries -------------------- - - # Berkeley DB on SCO OpenServer needs -lsocket --AC_CHECK_LIB(socket, socket) -+AC_SEARCH_LIBS(socket, socket network) - - # Build the BDB filesystem library only if we have an appropriate - # version of Berkeley DB. -diff -ur orig/subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6.18/subversion/libsvn_subr/config_file.c ---- orig/subversion-1.6.18/subversion/libsvn_subr/config_file.c 2009-11-25 18:27:35.015728640 +0100 -+++ subversion-1.6.18/subversion/libsvn_subr/config_file.c 2013-04-30 22:20:33.557842432 +0200 -@@ -32,6 +32,11 @@ - - #include "svn_private_config.h" - -+#ifdef __HAIKU__ -+# include -+# include -+#endif -+ - /* Used to terminate lines in large multi-line string literals. */ - #define NL APR_EOL_STR - -@@ -1115,8 +1120,21 @@ - *path = svn_path_join_many(pool, folder, - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } -+ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path = svn_path_join_many(pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - --#else /* ! WIN32 */ - { - const char *homedir = svn_user_get_homedir(pool); - if (! homedir) -diff -ur orig/subversion-1.6.18/subversion/libsvn_subr/config_impl.h subversion-1.6.18/subversion/libsvn_subr/config_impl.h ---- orig/subversion-1.6.18/subversion/libsvn_subr/config_impl.h 2009-01-27 14:23:50.020971520 +0100 -+++ subversion-1.6.18/subversion/libsvn_subr/config_impl.h 2013-04-30 22:19:32.338427904 +0200 -@@ -109,8 +109,11 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" --#else /* ! WIN32 */ --# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "subversion" -+# define SVN_CONFIG__USR_DIRECTORY "subversion" -+#else /* ! WIN32 && ! __HAIKU__ */ -+# define SVN_CONFIG__SYS_DIRECTORY "@HAIKU_GLOBAL_SETTINGS_DIR@" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" - #endif /* WIN32 */ - diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe deleted file mode 100644 index 50d483aae..000000000 --- a/dev-vcs/subversion/subversion-1.6.18.recipe +++ /dev/null @@ -1,161 +0,0 @@ -SUMMARY="Open source version control system" -DESCRIPTION="Subversion (svn) exists to be universally recognized and adopted \ -as an open-source, centralized version control system characterized by its \ -reliability as a safe haven for valuable data; the simplicity of its model \ -and usage; and its ability to support the needs of a wide variety of users \ -and projects, from individuals to large-scale enterprise operations." -HOMEPAGE="http://subversion.apache.org" -COPYRIGHT="2010 The Apache Software Foundation" -LICENSE="Apache-Subversion" -REVISION="7" -SOURCE_URI="http://subversion.tigris.org/downloads/subversion-1.6.18.tar.bz2" -CHECKSUM_SHA256="b50f073336249565c12dca1a4f4fef830f1d7492b3d39747f1635da2a8c6f188" -PATCHES="subversion-1.6.18.patch" - -ARCHITECTURES="x86_gcc2 x86 x86_64" - -USER_SETTINGS_FILES=" - settings/subversion directory - " - -PROVIDES=" - subversion = $portVersion compat >= 1.6 - cmd:svn = $portVersion compat >= 1.6 - cmd:svnadmin = $portVersion compat >= 1.6 - cmd:svndumpfilter = $portVersion compat >= 1.6 - cmd:svnlook = $portVersion compat >= 1.6 - cmd:svnserve = $portVersion compat >= 1.6 - cmd:svnsync = $portVersion compat >= 1.6 - cmd:svnversion = $portVersion compat >= 1.6 - lib:libsvn_client_1 = 0.0.0 compat >= 0 - lib:libsvn_delta_1 = 0.0.0 compat >= 0 - lib:libsvn_diff_1 = 0.0.0 compat >= 0 - lib:libsvn_fs_1 = 0.0.0 compat >= 0 - lib:libsvn_fs_fs_1 = 0.0.0 compat >= 0 - lib:libsvn_fs_util_1 = 0.0.0 compat >= 0 - lib:libsvn_ra_1 = 0.0.0 compat >= 0 - lib:libsvn_ra_local_1 = 0.0.0 compat >= 0 - lib:libsvn_ra_neon_1 = 0.0.0 compat >= 0 - lib:libsvn_ra_svn_1 = 0.0.0 compat >= 0 - lib:libsvn_repos_1 = 0.0.0 compat >= 0 - lib:libsvn_subr_1 = 0.0.0 compat >= 0 - lib:libsvn_wc_1 = 0.0.0 compat >= 0 - " -REQUIRES=" - haiku - lib:libapr_1 - lib:libaprutil_1 - lib:libcrypto - lib:libexpat - lib:libiconv - lib:libneon - lib:libsqlite3 - lib:libssl - lib:libxml2 - lib:libz - " - -PROVIDES_devel=" - subversion_devel = $portVersion compat >= 1.6 - devel:libsvn_client_1 = 0.0.0 compat >= 0 - devel:libsvn_delta_1 = 0.0.0 compat >= 0 - devel:libsvn_diff_1 = 0.0.0 compat >= 0 - devel:libsvn_fs_1 = 0.0.0 compat >= 0 - devel:libsvn_fs_fs_1 = 0.0.0 compat >= 0 - devel:libsvn_fs_util_1 = 0.0.0 compat >= 0 - devel:libsvn_ra_1 = 0.0.0 compat >= 0 - devel:libsvn_ra_local_1 = 0.0.0 compat >= 0 - devel:libsvn_ra_neon_1 = 0.0.0 compat >= 0 - devel:libsvn_ra_svn_1 = 0.0.0 compat >= 0 - devel:libsvn_repos_1 = 0.0.0 compat >= 0 - devel:libsvn_subr_1 = 0.0.0 compat >= 0 - devel:libsvn_wc_1 = 0.0.0 compat >= 0 - " -REQUIRES_devel=" - subversion == $portVersion base - " - -BUILD_REQUIRES=" - haiku_devel - expat_devel >= 2.0 - libiconv_devel >= 1.13 - neon_devel >= 0.29 - sqlite_devel >= 3.4 - devel:libapr_1 >= 0.3 - devel:libaprutil_1 >= 0.3 - devel:libcrypto - devel:libssl - devel:libxml2 >= 2.7 - devel:libz - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:gcc - cmd:ld - cmd:libtoolize - cmd:make - cmd:python - " - -PATCH() -{ - sed -i "s,@HAIKU_GLOBAL_SETTINGS_DIR@,$sysconfDir," \ - subversion/libsvn_subr/config_impl.h -} - -BUILD() -{ - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autoconf - runConfigure ./configure \ - --with-apr=$portPackageLinksDir/devel~libapr_1 \ - --with-apr-util=$portPackageLinksDir/devel~libaprutil_1 \ - --with-neon=$portPackageLinksDir/neon_devel \ - --with-zlib=$portPackageLinksDir/devel~libz \ - --with-editor=nano \ - --disable-nls - make $jobArgs -} - -INSTALL() -{ - make install - if type -p swig > /dev/null;then - if type -p python > /dev/null;then - PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") - make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn - fi - #if type -p perl > /dev/null;then - # make install-swig-pl - #fi - #if type -p ruby > /dev/null;then - # make install-swig-rb - #fi - fi - - prepareInstalledDevelLibs \ - libsvn_client-1 \ - libsvn_delta-1 \ - libsvn_diff-1 \ - libsvn_fs-1 \ - libsvn_fs_fs-1 \ - libsvn_fs_util-1 \ - libsvn_ra-1 \ - libsvn_ra_local-1 \ - libsvn_ra_neon-1 \ - libsvn_ra_svn-1 \ - libsvn_repos-1 \ - libsvn_subr-1 \ - libsvn_wc-1 - - # devel package - packageEntries devel \ - $developDir -} - -TEST() -{ - make check -}