summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <igor.pashev@nexenta.com>2012-12-21 21:47:54 +0400
committerIgor Pashev <igor.pashev@nexenta.com>2012-12-21 21:47:54 +0400
commitbe0f5e534d21a78b36055553c982adf3325c9d7b (patch)
treeed0fa8aaff2575b63b473e45ff20cb95255d516f
parent95f6392d5409ecb10adeb1e7595e0445a2028228 (diff)
downloadcibs-pkgs-be0f5e534d21a78b36055553c982adf3325c9d7b.tar.gz
gettext build depends on libexpat
-rw-r--r--gettext/Makefile3
-rw-r--r--gettext/gettext.p5m26
-rw-r--r--gettext/libasprintf.p5m4
3 files changed, 17 insertions, 16 deletions
diff --git a/gettext/Makefile b/gettext/Makefile
index cc2713e..e7272a8 100644
--- a/gettext/Makefile
+++ b/gettext/Makefile
@@ -10,11 +10,14 @@ license-file := COPYING
build-depends += \
pkg:/library/libunistring \
pkg:/developer/versioning/git \
+ pkg:/library/libexpat \
pkg:/library/ncurses \
pkg:/library/libxml2
prefix = /usr/gnu
+configure-options += --includedir=/usr/include
+
name := gettext
home := http://www.gnu.org/software/$(name)/
version := 0.18.1.1
diff --git a/gettext/gettext.p5m b/gettext/gettext.p5m
index fd043a0..544410d 100644
--- a/gettext/gettext.p5m
+++ b/gettext/gettext.p5m
@@ -41,14 +41,14 @@ file path=usr/gnu/bin/gettextize
file path=usr/gnu/bin/msginit
file path=usr/gnu/bin/msgcomm
file path=usr/gnu/bin/msguniq
-file path=usr/gnu/lib/$(MACH64)/libgettextpo.a
-file path=usr/gnu/lib/$(MACH64)/libgettextlib-0.18.1.so
-file path=usr/gnu/lib/$(MACH64)/gettext/user-email
-file path=usr/gnu/lib/$(MACH64)/gettext/project-id
-file path=usr/gnu/lib/$(MACH64)/gettext/urlget
-file path=usr/gnu/lib/$(MACH64)/gettext/hostname
-file path=usr/gnu/lib/$(MACH64)/libgettextsrc-0.18.1.so
-file path=usr/gnu/lib/$(MACH64)/libasprintf.a
+file path=usr/gnu/lib/$(mach64)/libgettextpo.a
+file path=usr/gnu/lib/$(mach64)/libgettextlib-0.18.1.so
+file path=usr/gnu/lib/$(mach64)/gettext/user-email
+file path=usr/gnu/lib/$(mach64)/gettext/project-id
+file path=usr/gnu/lib/$(mach64)/gettext/urlget
+file path=usr/gnu/lib/$(mach64)/gettext/hostname
+file path=usr/gnu/lib/$(mach64)/libgettextsrc-0.18.1.so
+file path=usr/gnu/lib/$(mach64)/libasprintf.a
file path=usr/gnu/share/gettext/config.rpath
file path=usr/gnu/share/gettext/styles/po-emacs-xterm16.css
file path=usr/gnu/share/gettext/styles/po-emacs-xterm.css
@@ -242,9 +242,7 @@ file path=usr/include/gettext-po.h
file path=usr/include/autosprintf.h
file path=usr/share/info/gettext.info
file path=usr/share/info/autosprintf.info
-link path=usr/gnu/lib/$(MACH64)/libgettextsrc.so target=libgettextsrc-0.18.1.so
-link path=usr/gnu/lib/$(MACH64)/libasprintf.so.0 target=libasprintf.so.0.0.0
-link path=usr/gnu/lib/$(MACH64)/libgettextlib.so target=libgettextlib-0.18.1.so
-link path=usr/gnu/lib/$(MACH64)/libgettextpo.so.0 target=libgettextpo.so.0.5.1
-link path=usr/gnu/lib/$(MACH64)/libasprintf.so target=libasprintf.so.0.0.0
-link path=usr/gnu/lib/$(MACH64)/libgettextpo.so target=libgettextpo.so.0.5.1
+link path=usr/gnu/lib/$(mach64)/libgettextsrc.so target=libgettextsrc-0.18.1.so
+link path=usr/gnu/lib/$(mach64)/libgettextlib.so target=libgettextlib-0.18.1.so
+link path=usr/gnu/lib/$(mach64)/libasprintf.so target=libasprintf.so.0
+link path=usr/gnu/lib/$(mach64)/libgettextpo.so target=libgettextpo.so.0
diff --git a/gettext/libasprintf.p5m b/gettext/libasprintf.p5m
index c1c7fa8..019dba8 100644
--- a/gettext/libasprintf.p5m
+++ b/gettext/libasprintf.p5m
@@ -4,6 +4,6 @@ set name=pkg.description value="This package contains the libgettextpo shared li
set name=info.upstream-url value="$(home)"
set name=info.source-url value="$(download)"
-file path=usr/gnu/lib/$(MACH64)/libasprintf.so.0.0.0
-link path=usr/gnu/lib/$(MACH64)/libasprintf.so.0 target=libasprintf.so.0.0.0
+file path=usr/gnu/lib/$(mach64)/libasprintf.so.0.0.0
+link path=usr/gnu/lib/$(mach64)/libasprintf.so.0 target=libasprintf.so.0.0.0