diff --git a/libiconv/build.sh b/libiconv/build.sh index 144c08b..f096ca3 100755 --- a/libiconv/build.sh +++ b/libiconv/build.sh @@ -6,8 +6,8 @@ ########################################################### # Check the following 4 variables before running the script topdir=libiconv -version=1.12 -pkgver=1 +version=1.14 +pkgver=2 source[0]=$topdir-$version.tar.gz # If there are no patches, simply comment this #patch[0]= @@ -18,6 +18,7 @@ source[0]=$topdir-$version.tar.gz # Global settings export LDFLAGS="-L$prefix/lib -R$prefix/lib" configure_args+=(--enable-extra-encodings) +gnu_link iconv reg prep prep() @@ -37,6 +38,14 @@ install() generic_install DESTDIR doc NOTES ChangeLog DESIGN NEWS COPYING AUTHORS README COPYING.LIB ${__rm} -f ${stagedir}${prefix}/${_libdir}/charset.alias + + # Sadly configure ignores --program-prefix, so we have to fix this manually + ${__mv} ${stagedir}${prefix}/${_bindir}/iconv ${stagedir}${prefix}/${_bindir}/${gnu_prefix}iconv + ${__mv} ${stagedir}${prefix}/${_mandir}/man1/iconv.1 ${stagedir}/${prefix}/${_mandir}/man1/giconv.1 + + # Compatible with previous package + compat libiconv 1.12 1 1 + compat libiconv 1.14 1 1 } reg pack diff --git a/libiconv/meta/ChangeLog b/libiconv/meta/ChangeLog new file mode 100644 index 0000000..48f4e78 --- /dev/null +++ b/libiconv/meta/ChangeLog @@ -0,0 +1,7 @@ +CHANGELOG +--------- +* Thu Nov 07 2013 Tom G. Christensen - 1.14-2 +- Rebuild + +* Mon Mar 25 2013 Tom G. Christensen - 1.14-1 +- Update to 1.14 and create gnu link diff --git a/libiconv/meta/pkgdef b/libiconv/meta/pkgdef index 7ab34a6..2b4c03e 100644 --- a/libiconv/meta/pkgdef +++ b/libiconv/meta/pkgdef @@ -8,6 +8,7 @@ pkgver="$pkgver" files(-,root,bin) default_docs $_bindir +$_gnudir $_libdir/libiconv.so.2* $_libdir/libcharset.so.* $_libdir/preloadable_libiconv.so