diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe index f8123ae20..a97f50c9c 100644 --- a/dev-vcs/mercurial/mercurial-2.2.2.recipe +++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe @@ -1,17 +1,16 @@ SUMMARY="Free, distributed source control management tool" -DESCRIPTION=" -Mercurial is a free, distributed source control management tool. -" +DESCRIPTION="Mercurial (hg) is a free, distributed source control management \ +tool." HOMEPAGE="http://mercurial.selenic.com/" COPYRIGHT="2005-2012 Matt Mackall et al." LICENSE="GNU GPL v2" +REVISION="5" SOURCE_URI="http://mercurial.selenic.com/release/mercurial-2.2.2.tar.gz" CHECKSUM_SHA256="3489110ec11fefbd2cbdefb8d715d0a869cef3dd729aaf4d5141108f8be1600a" -REVISION="5" -ARCHITECTURES="x86_gcc2 x86 x86_64" - PATCHES="mercurial-2.2.2.patch" +ARCHITECTURES="x86_gcc2 x86 x86_64" + PROVIDES=" mercurial = $portVersion compat >= 2 cmd:hg = $portVersion compat >= 2 @@ -22,10 +21,11 @@ REQUIRES=" cmd:nano lib:libintl " + BUILD_REQUIRES=" + haiku_devel " BUILD_PREREQUIRES=" - haiku_devel cmd:python cmd:aclocal cmd:autoconf @@ -36,7 +36,6 @@ BUILD_PREREQUIRES=" cmd:make " - BUILD() { $portPackageLinksDir/cmd~python/bin/python setup.py build --force diff --git a/dev-vcs/mercurial/mercurial-2.8.1.recipe b/dev-vcs/mercurial/mercurial-2.8.1.recipe index f408a4001..c6bd5eb12 100644 --- a/dev-vcs/mercurial/mercurial-2.8.1.recipe +++ b/dev-vcs/mercurial/mercurial-2.8.1.recipe @@ -1,22 +1,20 @@ SUMMARY="Free, distributed source control management tool" -DESCRIPTION=" -Mercurial is a free, distributed source control management tool. -" +DESCRIPTION="Mercurial (hg) is a free, distributed source control management \ +tool." HOMEPAGE="http://mercurial.selenic.com/" COPYRIGHT="2005-2012 Matt Mackall et al." LICENSE="GNU GPL v2" +REVISION="1" SOURCE_URI="http://mercurial.selenic.com/release/mercurial-2.8.1.tar.gz" CHECKSUM_SHA256="d239a204cc76b6456b4121eaf35e584f33c510855865da0376dd1f708dd33366" -REVISION="1" -ARCHITECTURES="x86_gcc2 x86 x86_64" - PATCHES="mercurial-2.8.1.patch" +ARCHITECTURES="x86_gcc2 x86 x86_64" + PROVIDES=" mercurial = $portVersion compat >= 2 cmd:hg = $portVersion compat >= 2 " - REQUIRES=" haiku_devel cmd:python @@ -26,7 +24,6 @@ REQUIRES=" BUILD_REQUIRES=" haiku_devel " - BUILD_PREREQUIRES=" cmd:python cmd:gcc diff --git a/dev-vcs/mercurial/mercurial-2.9.1.recipe b/dev-vcs/mercurial/mercurial-2.9.1.recipe index c68a97d70..6d77d39de 100644 --- a/dev-vcs/mercurial/mercurial-2.9.1.recipe +++ b/dev-vcs/mercurial/mercurial-2.9.1.recipe @@ -1,22 +1,20 @@ SUMMARY="Free, distributed source control management tool" -DESCRIPTION=" -Mercurial is a free, distributed source control management tool. -" +DESCRIPTION="Mercurial (hg) is a free, distributed source control management \ +tool." HOMEPAGE="http://mercurial.selenic.com/" COPYRIGHT="2005-2012 Matt Mackall et al." LICENSE="GNU GPL v2" +REVISION="1" SOURCE_URI="http://mercurial.selenic.com/release/mercurial-2.9.1.tar.gz" CHECKSUM_SHA256="a20fb1434ecbdb070ef955c7c292db9eb2676bfc1ac165e95ba73866623bc01a" -REVISION="1" -ARCHITECTURES="x86_gcc2 x86 x86_64" - PATCHES="mercurial-2.9.1.patch" +ARCHITECTURES="x86_gcc2 x86 x86_64" + PROVIDES=" mercurial = $portVersion compat >= 2 cmd:hg = $portVersion compat >= 2 " - REQUIRES=" haiku_devel cmd:python @@ -26,7 +24,6 @@ REQUIRES=" BUILD_REQUIRES=" haiku_devel " - BUILD_PREREQUIRES=" cmd:python cmd:gcc diff --git a/dev-vcs/mercurial/mercurial-2.9.2.recipe b/dev-vcs/mercurial/mercurial-2.9.2.recipe index b1ac5c2b7..a4bb3f9b1 100644 --- a/dev-vcs/mercurial/mercurial-2.9.2.recipe +++ b/dev-vcs/mercurial/mercurial-2.9.2.recipe @@ -1,22 +1,20 @@ SUMMARY="Free, distributed source control management tool" -DESCRIPTION=" -Mercurial is a free, distributed source control management tool. -" +DESCRIPTION="Mercurial (hg) is a free, distributed source control management \ +tool." HOMEPAGE="http://mercurial.selenic.com/" COPYRIGHT="2005-2014 Matt Mackall et al." LICENSE="GNU GPL v2" +REVISION="1" SOURCE_URI="http://mercurial.selenic.com/release/mercurial-$portVersion.tar.gz" CHECKSUM_SHA256="86462b3a1518e137cfe813dc273b8acb120ad71230a1813c0dc9335223b38f53" -REVISION="1" -ARCHITECTURES="x86_gcc2 x86 x86_64" - PATCHES="mercurial-2.9.2.patch" +ARCHITECTURES="x86_gcc2 x86 x86_64" + PROVIDES=" mercurial = $portVersion compat >= 2 cmd:hg = $portVersion compat >= 2 " - REQUIRES=" haiku_devel cmd:python @@ -26,7 +24,6 @@ REQUIRES=" BUILD_REQUIRES=" haiku_devel " - BUILD_PREREQUIRES=" cmd:python cmd:gcc diff --git a/dev-vcs/mercurial/mercurial-3.2.1.recipe b/dev-vcs/mercurial/mercurial-3.2.1.recipe index 8607a5079..65c5c9a4d 100644 --- a/dev-vcs/mercurial/mercurial-3.2.1.recipe +++ b/dev-vcs/mercurial/mercurial-3.2.1.recipe @@ -1,22 +1,20 @@ SUMMARY="Free, distributed source control management tool" -DESCRIPTION=" -Mercurial is a free, distributed source control management tool. -" +DESCRIPTION="Mercurial (hg) is a free, distributed source control management \ +tool." HOMEPAGE="http://mercurial.selenic.com/" COPYRIGHT="2005-2014 Matt Mackall et al." LICENSE="GNU GPL v2" +REVISION="2" SOURCE_URI="http://mercurial.selenic.com/release/mercurial-$portVersion.tar.gz" CHECKSUM_SHA256="26418276fbc36850782f1f4feb30da4a83800b48493082985c4d3ac29ad0ca0f" -REVISION="2" -ARCHITECTURES="x86_gcc2 x86 x86_64" - PATCHES="mercurial-3.2.1.patch" +ARCHITECTURES="x86_gcc2 x86 x86_64" + PROVIDES=" mercurial = $portVersion compat >= 3 cmd:hg = $portVersion compat >= 3 " - REQUIRES=" haiku_devel cmd:python < 3 @@ -26,7 +24,6 @@ REQUIRES=" BUILD_REQUIRES=" haiku_devel " - BUILD_PREREQUIRES=" cmd:python < 3 cmd:gcc diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe index 6caffaec8..35d9082a8 100644 --- a/dev-vcs/subversion/subversion-1.6.18.recipe +++ b/dev-vcs/subversion/subversion-1.6.18.recipe @@ -1,21 +1,19 @@ SUMMARY="Open source version control system" -DESCRIPTION=" -Subversion 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. -" +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" -LICENSE="Apache-Subversion" COPYRIGHT="2010 The Apache Software Foundation" +LICENSE="Apache-Subversion" +REVISION="6" SOURCE_URI="http://subversion.tigris.org/downloads/subversion-1.6.18.tar.bz2" CHECKSUM_SHA256="b50f073336249565c12dca1a4f4fef830f1d7492b3d39747f1635da2a8c6f188" -REVISION="6" -ARCHITECTURES="x86_gcc2 x86 x86_64" - PATCHES="subversion-1.6.18.patch" +ARCHITECTURES="x86_gcc2 x86 x86_64" + PROVIDES=" subversion = $portVersion compat >= 1.6 cmd:svn = $portVersion compat >= 1.6 @@ -52,7 +50,29 @@ REQUIRES=" 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 @@ -65,7 +85,6 @@ BUILD_REQUIRES=" devel:libz " BUILD_PREREQUIRES=" - haiku_devel cmd:python cmd:aclocal cmd:autoconf @@ -79,7 +98,6 @@ USER_SETTINGS_FILES=" settings/subversion directory " - PATCH() { sed -i "s,@HAIKU_GLOBAL_SETTINGS_DIR@,$sysconfDir," \ @@ -141,25 +159,3 @@ TEST() { make check } - -# ----- devel package ------------------------------------------------------- - -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 - " diff --git a/dev-vcs/subversion/subversion-1.8.11.recipe b/dev-vcs/subversion/subversion-1.8.11.recipe index 6dc828bcf..5747dab40 100644 --- a/dev-vcs/subversion/subversion-1.8.11.recipe +++ b/dev-vcs/subversion/subversion-1.8.11.recipe @@ -1,17 +1,16 @@ SUMMARY="Open source version control system" -DESCRIPTION=" -Subversion 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. -" +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" -LICENSE="Apache-Subversion" COPYRIGHT="2010-2014 The Apache Software Foundation" +LICENSE="Apache-Subversion" +REVISION="6" SOURCE_URI="http://wwwftp.ciril.fr/pub/apache/subversion/subversion-$portVersion.tar.bz2" CHECKSUM_SHA256="10b056420e1f194c12840368f6bf58842e6200f9cb8cc5ebbf9be2e89e56e4d9" -REVISION="1" + ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" @@ -52,7 +51,29 @@ REQUIRES=" lib:libxml2 lib:libz " + +PROVIDES_devel=" + subversion_devel = $portVersion compat >= 1.8 + 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_svn_1 = 0.0.0 compat >= 0 + devel:libsvn_ra_serf_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.1 libiconv_devel >= 1.13 sqlite_devel >= 3.4 @@ -65,7 +86,6 @@ BUILD_REQUIRES=" devel:libserf_1 " BUILD_PREREQUIRES=" - haiku_devel cmd:pkg_config cmd:python cmd:aclocal @@ -80,7 +100,6 @@ USER_SETTINGS_FILES=" settings/subversion directory " - PATCHES="subversion-$portVersion.patchset" BUILD() @@ -135,25 +154,3 @@ TEST() { make check } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - subversion_devel = $portVersion compat >= 1.8 - 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_svn_1 = 0.0.0 compat >= 0 - devel:libsvn_ra_serf_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 - " diff --git a/haiku-apps/vision/vision-0.9.7.r949.recipe b/haiku-apps/vision/vision-0.9.7.r949.recipe index b08bcd41c..f2093271b 100644 --- a/haiku-apps/vision/vision-0.9.7.r949.recipe +++ b/haiku-apps/vision/vision-0.9.7.r949.recipe @@ -1,22 +1,21 @@ -SUMMARY="IRC client for Haiku" -DESCRIPTION=" -Vision is an IRC client for Haiku. -" +SUMMARY="An IRC client" +DESCRIPTION="Vision is an IRC (Internet Relay Chat) client, originally for \ +BeOS, now for Haiku. The goal of this project is to provide the BeOS/Haiku \ +community with an elegant, fast, and--most importantly--stable client to \ +communicate with other users and make new friends around the world." +COPYRIGHT="1999-2010 The Vision Team" +LICENSE="MPL v1.1" +REVISION="3" HOMEPAGE="http://vision.sourceforge.net/" SOURCE_URI="http://haiku-files.org/distfiles/vision-0.9.7.r949.tar.gz" CHECKSUM_SHA256="9718be3a3b374ae280728e6fc2257d5e5430574c4c81b8b1dabeee14eadee638" -LICENSE="MPL v1.1" -COPYRIGHT="1999-2010 The Vision Team" -REVISION="3" -ARCHITECTURES="x86_gcc2 x86 x86_64" - - if [ $targetArchitecture != x86_gcc2 ]; then PATCHES="vision-0.9.7-gcc4.patch" fi - ADDITIONAL_FILES="InitialSettings" +ARCHITECTURES="x86_gcc2 x86 x86_64" + PROVIDES=" vision = $portVersion app:Vision = $portVersion @@ -24,10 +23,11 @@ PROVIDES=" REQUIRES=" haiku " + BUILD_REQUIRES=" + haiku_devel " BUILD_PREREQUIRES=" - haiku_devel cmd:find cmd:gcc cmd:ld @@ -38,7 +38,6 @@ USER_SETTINGS_FILES=" settings/Vision directory " - BUILD() { make