Skip to content

Commit 5b0f9c5

Browse files
triallaxleahneukirchen
authored andcommitted
firebird3: rename isql to avoid conflict with unixodbc.
1 parent 4d612c1 commit 5b0f9c5

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

srcpkgs/firebird3/template

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'firebird3'
22
pkgname=firebird3
33
version=3.0.6.33328
4-
revision=1
4+
revision=2
55
_build=0
66
_uver=${version//./_}
77
build_style=gnu-configure
@@ -30,7 +30,7 @@ makedepends="boost-devel libedit-devel icu-devel ncurses-devel libatomic_ops-dev
3030
libtommath-devel zlib-devel"
3131
short_desc="Relational database offering many ANSI SQL standard features (V3)"
3232
maintainer="Orphaned <[email protected]>"
33-
license="custom"
33+
license="custom:IDPL-1.0, Interbase-1.0"
3434
homepage="https://www.firebirdsql.org/en/start/"
3535
distfiles="https://github.com/FirebirdSQL/firebird/releases/download/R${_uver%_*}/Firebird-${version}-${_build}.tar.bz2"
3636
checksum=34c1d2a29bbaf288e682cd1b5f8083f2baf73f351062245ace0bee35a3f7d35f
@@ -87,7 +87,7 @@ pre_configure() {
8787
# do not change ownership to root:root and
8888
# do not change permissions to read-only
8989
find -iname "*.sh.in" -exec sed -i "{}" \
90-
-e 's;"`whoami`";"root";' \
90+
-e 's;"\x60whoami\x60";"root";' \
9191
-e 's;chown root:root;#&;' \
9292
-e 's;chown -R;#&;' \
9393
-e 's;chmod 0444;chmod 0644;' \
@@ -113,6 +113,9 @@ do_install() {
113113

114114
cp -pR gen/buildroot/* ${DESTDIR}/
115115

116+
# Conflicts with isql from unixodbc.
117+
mv ${DESTDIR}/usr/bin/isql{,-fb}
118+
116119
# TODO: create superserver?
117120
# system account?
118121
# runit service?

0 commit comments

Comments
 (0)