cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Maintenance update to gettext 0.19.7. No major outward changes.

Browse Source 
Internally, -tools no longer uses expat.
This commit is contained in:
naddy 2016-01-02 22:00:49 +00:00
parent a470edaac8
commit 88145488ec
9 changed files with 56 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devel/gettext-tools/Makefile
View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.2 2015/09/14 19:48:45 naddy Exp $
# $OpenBSD: Makefile,v 1.3 2016/01/02 22:00:49 naddy Exp $
COMMENT= GNU gettext development and translation tools
VERSION= 0.19.6
VERSION= 0.19.7
DISTNAME= gettext-${VERSION}
PKGNAME= gettext-tools-${VERSION}
SHARED_LIBS += gettextlib 6.0 # unknown
SHARED_LIBS += gettextsrc 5.1 # unknown
SHARED_LIBS += gettextpo 7.1 # 5.3
SHARED_LIBS += gettextlib 7.0 # unknown
SHARED_LIBS += gettextsrc 6.0 # unknown
SHARED_LIBS += gettextpo 8.0 # 5.3
CATEGORIES= devel
# DPB: parallel-safe, not worth it. Too much time in configure
@ -25,7 +25,7 @@ PERMIT_PACKAGE_CDROM= Yes
MODULES= devel/gettext
MODGETTEXT_TOOLS=No
WANTLIB= c expat m ncurses
WANTLIB= c m ncurses
# required by the autopoint tool
RUN_DEPENDS= archivers/xz

4
devel/gettext-tools/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gettext-0.19.6.tar.xz) = m5WBZiD9EWjLTuyg6dwP/YboZPxmj3b143zAVNaYLlE=
SIZE (gettext-0.19.6.tar.xz) = 6878652
SHA256 (gettext-0.19.7.tar.xz) = N4+oagkc7DrN7OPJYbuNjAaJkGKHgJqNqnncDGOY2TQ=
SIZE (gettext-0.19.7.tar.xz) = 7187304

8
devel/gettext-tools/patches/patch-gettext-tools_configure
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-gettext-tools_configure,v 1.2 2015/09/14 19:48:45 naddy Exp $
$OpenBSD: patch-gettext-tools_configure,v 1.3 2016/01/02 22:00:49 naddy Exp $
Allow use of pre-installed gettext with gettexts-tools.
--- gettext-tools/configure.orig Fri Sep 11 05:05:06 2015
+++ gettext-tools/configure Mon Sep 14 16:53:57 2015
@@ -22218,8 +22218,7 @@ $as_echo "$ac_res" >&6; }
--- gettext-tools/configure.orig Mon Dec 28 00:09:36 2015
+++ gettext-tools/configure Sat Jan 2 21:42:28 2016
@@ -22715,8 +22715,7 @@ $as_echo "$ac_res" >&6; }
if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
|| { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \

22
devel/gettext-tools/patches/patch-gettext-tools_gnulib-lib_Makefile_in
View File

@ -1,22 +1,22 @@
$OpenBSD: patch-gettext-tools_gnulib-lib_Makefile_in,v 1.2 2015/09/14 19:48:45 naddy Exp $
$OpenBSD: patch-gettext-tools_gnulib-lib_Makefile_in,v 1.3 2016/01/02 22:00:49 naddy Exp $
Use standard shared library versioning.
Do not remove static library after building.
This was also a race if MAKE_JOBS > 1.
--- gettext-tools/gnulib-lib/Makefile.in.orig Fri Sep 11 05:05:09 2015
+++ gettext-tools/gnulib-lib/Makefile.in Mon Sep 14 16:53:57 2015
@@ -2181,7 +2181,7 @@ EXTRA_libgettextlib_la_SOURCES = acl_entries.c atexit.
#libgettextlib_la_LDFLAGS += $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ @LIB_ACL@
libgettextlib_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(LIB_ACL) \
$(LTLIBICONV) $(LTLIBINTL) $(LTLIBTHREAD) $(LTLIBUNISTRING) \
- $(OPENMP_CFLAGS) @INTL_MACOSX_LIBS@ -release @VERSION@ \
+ $(OPENMP_CFLAGS) @INTL_MACOSX_LIBS@ \
$(am__append_3) $(am__append_12)
--- gettext-tools/gnulib-lib/Makefile.in.orig Mon Dec 28 00:09:40 2015
+++ gettext-tools/gnulib-lib/Makefile.in Sat Jan 2 21:42:01 2016
@@ -2473,7 +2473,7 @@ libgettextlib_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined
$(ISNAND_LIBM) $(ISNANF_LIBM) $(ISNANL_LIBM) $(LIB_ACL) \
$(LOG10_LIBM) $(LTLIBICONV) $(LTLIBINTL) $(LTLIBTHREAD) \
$(LTLIBUNISTRING) $(OPENMP_CFLAGS) $(POW_LIBM) \
- @INTL_MACOSX_LIBS@ -release @VERSION@ $(am__append_3) \
+ @INTL_MACOSX_LIBS@ $(am__append_3) \
$(am__append_12)
# Use this preprocessor expression to decide whether #include_next works.
@@ -3400,7 +3400,7 @@ getopt.h: getopt.in.h $(top_builddir)/config.status $(
@@ -3708,7 +3708,7 @@ getopt.h: getopt.in.h $(top_builddir)/config.status $(
mv -f $@-t $@
# No need to install libgettextlib.a, except on AIX.

12
devel/gettext-tools/patches/patch-gettext-tools_its_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-gettext-tools_its_Makefile_in,v 1.1 2016/01/02 22:00:49 naddy Exp $
--- gettext-tools/its/Makefile.in.orig Mon Dec 28 00:09:41 2015
+++ gettext-tools/its/Makefile.in Sat Jan 2 22:14:52 2016
@@ -1759,7 +1759,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = 1.2 gnits
-itsdir = $(pkgdatadir)$(PACKAGE_SUFFIX)/its
+itsdir = $(pkgdatadir)/its
dist_its_DATA = glade.loc glade1.its glade2.its gtkbuilder.its \
gsettings.loc gsettings.its appdata.loc appdata.its

14
devel/gettext-tools/patches/patch-gettext-tools_src_Makefile_in
View File

@ -1,22 +1,22 @@
$OpenBSD: patch-gettext-tools_src_Makefile_in,v 1.2 2015/09/14 19:48:45 naddy Exp $
$OpenBSD: patch-gettext-tools_src_Makefile_in,v 1.3 2016/01/02 22:00:49 naddy Exp $
Use standard shared library versioning.
Do not remove static library after building.
This was also a race if MAKE_JOBS > 1.
--- gettext-tools/src/Makefile.in.orig Fri Sep 11 05:05:11 2015
+++ gettext-tools/src/Makefile.in Mon Sep 14 16:53:57 2015
@@ -2052,7 +2052,7 @@ cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
--- gettext-tools/src/Makefile.in.orig Mon Dec 28 00:09:42 2015
+++ gettext-tools/src/Makefile.in Sat Jan 2 21:42:28 2016
@@ -2327,7 +2327,7 @@ cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
# Need @LTLIBINTL@ because many source files use gettext().
# Need @LTLIBICONV@ because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c
# use iconv().
-libgettextsrc_la_LDFLAGS = -release @VERSION@ \
+libgettextsrc_la_LDFLAGS = \
../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) @LTLIBINTL@ \
@LTLIBICONV@ @LTLIBEXPAT@ -lc -no-undefined $(am__append_2)
libgettextsrc_la_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_3)
@@ -3456,7 +3456,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIB
@LTLIBICONV@ -lc -no-undefined $(am__append_2)
libgettextsrc_la_CPPFLAGS = $(AM_CPPFLAGS) $(INCXML) $(am__append_3)
@@ -3722,7 +3722,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIB
# No need to install libgettextsrc.a, except on AIX.

11
devel/gettext-tools/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1 2015/07/19 23:46:08 naddy Exp $
@comment $OpenBSD: PLIST,v 1.2 2016/01/02 22:00:49 naddy Exp $
bin/autopoint
bin/gettextize
@bin bin/msgattrib
@ -1852,6 +1852,15 @@ share/gettext/intl/version.c
share/gettext/intl/wprintf-parse.h
share/gettext/intl/xsize.c
share/gettext/intl/xsize.h
share/gettext/its/
share/gettext/its/appdata.its
share/gettext/its/appdata.loc
share/gettext/its/glade.loc
share/gettext/its/glade1.its
share/gettext/its/glade2.its
share/gettext/its/gsettings.its
share/gettext/its/gsettings.loc
share/gettext/its/gtkbuilder.its
share/gettext/javaversion.class
share/gettext/msgunfmt.tcl
share/gettext/po/

4
devel/gettext/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.77 2015/09/14 19:48:44 naddy Exp $
# $OpenBSD: Makefile,v 1.78 2016/01/02 22:00:49 naddy Exp $
COMMENT= GNU gettext runtime libraries and programs
DISTNAME= gettext-0.19.6
DISTNAME= gettext-0.19.7
SHARED_LIBS += intl 6.0 # 9.4
SHARED_LIBS += asprintf 1.1 # unknown

4
devel/gettext/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gettext-0.19.6.tar.xz) = m5WBZiD9EWjLTuyg6dwP/YboZPxmj3b143zAVNaYLlE=
SIZE (gettext-0.19.6.tar.xz) = 6878652
SHA256 (gettext-0.19.7.tar.xz) = N4+oagkc7DrN7OPJYbuNjAaJkGKHgJqNqnncDGOY2TQ=
SIZE (gettext-0.19.7.tar.xz) = 7187304