diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe b/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe deleted file mode 100644 index e9e61c1b6..000000000 --- a/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe +++ /dev/null @@ -1,78 +0,0 @@ -SUMMARY="A code-searching tool similar to ack, but faster" -DESCRIPTION="A code-searching tool similar to ack, but faster. -* It searches code about 3–5× faster than ack. -* It ignores file patterns from your .gitignore and .hgignore. -* If there are files in your source repo you don't want to search, just add \ -their patterns to a .agignore file. -* Ag uses Pthreads to take advantage of multiple CPU cores and search files in \ -parallel." -HOMEPAGE="https://github.com/ggreer/the_silver_searcher/" -COPYRIGHT="2013 Geoff Greer" -LICENSE="Apache v2" -REVISION="1" -SOURCE_URI="git+https://github.com/ggreer/the_silver_searcher.git#ae5f4417d1" - -ARCHITECTURES="!x86_gcc2 x86" -SECONDARY_ARCHITECTURES="x86" - -# On x86_gcc2 we don't want to install the commands in bin//, but in bin/. -commandSuffix=$secondaryArchSuffix -commandBinDir=$binDir -if [ "$targetArchitecture" = x86_gcc2 ]; then - commandSuffix= - commandBinDir=$prefix/bin -fi - -PROVIDES=" - the_silver_searcher$secondaryArchSuffix = $portVersion - cmd:ag$commandSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:liblzma${secondaryArchSuffix} - lib:libpcre${secondaryArchSuffix} - lib:libz${secondaryArchSuffix} - " - -BUILD_REQUIRES=" - devel:liblzma${secondaryArchSuffix} - devel:libpcre${secondaryArchSuffix} - devel:libz${secondaryArchSuffix} - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:aclocal - cmd:autoconf - cmd:autoheader - cmd:automake - cmd:make - cmd:gcc${secondaryArchSuffix} - cmd:pkg_config$secondaryArchSuffix - " - -PATCH() -{ - sed -i 's,-lpthread,,' Makefile.am -} - -BUILD() -{ - aclocal - autoconf - autoheader - automake --add-missing - - #Need to override the pkgconfig variables - LZMA_CFLAGS="-I$includeDir" \ - LZMA_LIBS="-L$libDir -llzma" \ - PCRE_CFLAGS="-I$includeDir" \ - PCRE_LIBS="-L$libDir -lpcre" \ - runConfigure --omit-dirs binDir ./configure \ - --bindir=$commandBinDir - make -} - -INSTALL() -{ - make install -} diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe b/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe deleted file mode 100644 index 18ef6992e..000000000 --- a/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe +++ /dev/null @@ -1,78 +0,0 @@ -SUMMARY="A code-searching tool similar to ack, but faster" -DESCRIPTION="A code-searching tool similar to ack, but faster. -* It searches code about 3–5× faster than ack. -* It ignores file patterns from your .gitignore and .hgignore. -* If there are files in your source repo you don't want to search, just add \ -their patterns to a .agignore file. -* Ag uses Pthreads to take advantage of multiple CPU cores and search files in \ -parallel." -HOMEPAGE="https://github.com/ggreer/the_silver_searcher/" -COPYRIGHT="2013 Geoff Greer" -LICENSE="Apache v2" -REVISION="1" -SOURCE_URI="git+https://github.com/ggreer/the_silver_searcher.git#0.26.0" - -ARCHITECTURES="!x86_gcc2 x86" -SECONDARY_ARCHITECTURES="x86" - -# On x86_gcc2 we don't want to install the commands in bin//, but in bin/. -commandSuffix=$secondaryArchSuffix -commandBinDir=$binDir -if [ "$targetArchitecture" = x86_gcc2 ]; then - commandSuffix= - commandBinDir=$prefix/bin -fi - -PROVIDES=" - the_silver_searcher$secondaryArchSuffix = $portVersion - cmd:ag$commandSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:liblzma${secondaryArchSuffix} - lib:libpcre${secondaryArchSuffix} - lib:libz${secondaryArchSuffix} - " - -BUILD_REQUIRES=" - devel:liblzma${secondaryArchSuffix} - devel:libpcre${secondaryArchSuffix} - devel:libz${secondaryArchSuffix} - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:aclocal - cmd:autoconf - cmd:autoheader - cmd:automake - cmd:make - cmd:gcc${secondaryArchSuffix} - cmd:pkg_config$secondaryArchSuffix - " - -PATCH() -{ - sed -i 's,-lpthread,,' Makefile.am -} - -BUILD() -{ - aclocal - autoconf - autoheader - automake --add-missing - - #Need to override the pkgconfig variables - LZMA_CFLAGS="-I$includeDir" \ - LZMA_LIBS="-L$libDir -llzma" \ - PCRE_CFLAGS="-I$includeDir" \ - PCRE_LIBS="-L$libDir -lpcre" \ - runConfigure --omit-dirs binDir ./configure \ - --bindir=$commandBinDir - make -} - -INSTALL() -{ - make install -} diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.32.0.recipe b/sys-apps/the_silver_searcher/the_silver_searcher-0.33.0.recipe similarity index 92% rename from sys-apps/the_silver_searcher/the_silver_searcher-0.32.0.recipe rename to sys-apps/the_silver_searcher/the_silver_searcher-0.33.0.recipe index 6a331296d..7cfa9dbb8 100644 --- a/sys-apps/the_silver_searcher/the_silver_searcher-0.32.0.recipe +++ b/sys-apps/the_silver_searcher/the_silver_searcher-0.33.0.recipe @@ -12,9 +12,9 @@ COPYRIGHT="2013-2016 Geoff Greer" LICENSE="Apache v2" REVISION="1" SOURCE_URI="https://github.com/ggreer/the_silver_searcher/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="c5b208572e5cfc8a3cf366e8eb337b0c673c2ffa90c1ad90dfdcbe78251ba4cc" +CHECKSUM_SHA256="351ab79ada811fd08f81296de10a7498ea3c46b681d73696d5a2911edbdc19db" -ARCHITECTURES="!x86_gcc2 x86" +ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" # On x86_gcc2 we don't want to install the commands in bin//, but in bin/. @@ -73,3 +73,8 @@ INSTALL() { make install } + +TEST() +{ + make check +}