Commit 7a7e5e04 authored by Natanael Copa's avatar Natanael Copa

main/ctags: fix install location

also fix format string error

ref #2446
parent ae31d1d0
......@@ -2,7 +2,7 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=ctags
pkgver=5.8
pkgrel=3
pkgrel=4
pkgdesc="Generator of tags for all types of C/C++ languages"
url="http://ctags.sourceforge.net/"
arch="all"
......@@ -11,11 +11,17 @@ depends=""
makedepends=""
install=""
subpackages="$pkgname-doc"
source="http://prdownloads.sourceforge.net/ctags/$pkgname-$pkgver.tar.gz"
source="http://prdownloads.sourceforge.net/ctags/$pkgname-$pkgver.tar.gz
error-format.patch"
_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
cd "$_builddir"
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
update_config_sub || return 1
}
......@@ -34,14 +40,17 @@ build() {
package() {
cd "$_builddir"
mkdir -p "$pkgdir"
mkdir -p "$pkgdir"/usr/bin
make -j1 \
DEST_CTAGS="$pkgdir" \
DEST_CTAGS="$pkgdir"/usr/bin \
mandir="$pkgdir"/usr/share/man \
install || return 1
rm -f "$pkgdir"/usr/lib/*.la
}
md5sums="c00f82ecdcc357434731913e5b48630d ctags-5.8.tar.gz"
sha256sums="0e44b45dcabe969e0bbbb11e30c246f81abe5d32012db37395eb57d66e9e99c7 ctags-5.8.tar.gz"
sha512sums="981912cd335978cde22864e977947fc75326572fb29518e559cc4a8ac1edc84b3604165218a666e36353f17da4f89f8e967acdb88696f816748eb946d79eaa15 ctags-5.8.tar.gz"
md5sums="c00f82ecdcc357434731913e5b48630d ctags-5.8.tar.gz
f0b35e99098aba05128c12859fa44e9e error-format.patch"
sha256sums="0e44b45dcabe969e0bbbb11e30c246f81abe5d32012db37395eb57d66e9e99c7 ctags-5.8.tar.gz
30339f93cdf0da56fe746703330332d0f345a677c38025c4be6d56d56b82414c error-format.patch"
sha512sums="981912cd335978cde22864e977947fc75326572fb29518e559cc4a8ac1edc84b3604165218a666e36353f17da4f89f8e967acdb88696f816748eb946d79eaa15 ctags-5.8.tar.gz
bc861fa7fe401e5f5845c39d8ec714268898fafcd76afa54bebfc7965d4ef66e227e7bab80733c8f95a79a131b05fbdd4024d05139f2f9bd67914ff4c9e0e9b9 error-format.patch"
diff --git a/lregex.c b/lregex.c
index 59f5df6..f76aac0 100644
--- a/lregex.c
+++ b/lregex.c
@@ -408,7 +408,7 @@ static void processLanguageRegex (const langType language,
const char* regexfile = parameter + 1;
FILE* const fp = fopen (regexfile, "r");
if (fp == NULL)
- error (WARNING | PERROR, regexfile);
+ error (WARNING | PERROR, "%s", regexfile);
else
{
vString* const regex = vStringNew ();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment