From f057e4a2dc1d6d2db4ec7750a43054fe15a1c71e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 4 Oct 2013 18:42:48 +0200 Subject: use gettext-tiny instead of gettext --- package/SDL_ttf/Makefile | 4 +- package/avahi/Makefile | 3 +- package/gettext-tiny/Makefile | 7 +- package/gettext-tiny/patches/patch-Makefile | 37 + package/gettext-tiny/src/LICENSE | 21 - package/gettext-tiny/src/Makefile | 73 - package/gettext-tiny/src/create-dist.sh | 21 - package/gettext-tiny/src/docs/gettext.html | 18036 -------------------------- package/gettext-tiny/src/docs/msgfmt.txt | 74 - package/gettext-tiny/src/docs/msgmerge.txt | 81 - package/gettext-tiny/src/docs/xgettext.txt | 101 - package/gettext-tiny/src/include/libintl.h | 61 - package/gettext-tiny/src/libintl/libintl.c | 82 - package/gettext-tiny/src/src/StringEscape.c | 111 - package/gettext-tiny/src/src/StringEscape.h | 7 - package/gettext-tiny/src/src/msgfmt.c | 278 - package/gettext-tiny/src/src/msgmerge.c | 222 - package/gettext-tiny/src/src/poparser.c | 144 - package/gettext-tiny/src/src/poparser.h | 36 - package/gettext-tiny/src/src/xgettext.sh | 112 - package/glib/Makefile | 4 +- package/krb5/Makefile | 3 +- package/libdaemon/Makefile | 3 +- package/libvpx/Makefile | 7 +- package/mplayer/Makefile | 9 +- package/pcre/Makefile | 3 +- 26 files changed, 60 insertions(+), 19480 deletions(-) create mode 100644 package/gettext-tiny/patches/patch-Makefile delete mode 100644 package/gettext-tiny/src/LICENSE delete mode 100644 package/gettext-tiny/src/Makefile delete mode 100755 package/gettext-tiny/src/create-dist.sh delete mode 100644 package/gettext-tiny/src/docs/gettext.html delete mode 100644 package/gettext-tiny/src/docs/msgfmt.txt delete mode 100644 package/gettext-tiny/src/docs/msgmerge.txt delete mode 100644 package/gettext-tiny/src/docs/xgettext.txt delete mode 100644 package/gettext-tiny/src/include/libintl.h delete mode 100644 package/gettext-tiny/src/libintl/libintl.c delete mode 100644 package/gettext-tiny/src/src/StringEscape.c delete mode 100644 package/gettext-tiny/src/src/StringEscape.h delete mode 100644 package/gettext-tiny/src/src/msgfmt.c delete mode 100644 package/gettext-tiny/src/src/msgmerge.c delete mode 100644 package/gettext-tiny/src/src/poparser.c delete mode 100644 package/gettext-tiny/src/src/poparser.h delete mode 100755 package/gettext-tiny/src/src/xgettext.sh (limited to 'package') diff --git a/package/SDL_ttf/Makefile b/package/SDL_ttf/Makefile index 9d7cdf971..68e60aaf9 100644 --- a/package/SDL_ttf/Makefile +++ b/package/SDL_ttf/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 814e6e17e8879254208d23b3b7e0354b PKG_DESCR:= TrueType fonts in your SDL applications PKG_SECTION:= libs PKG_DEPENDS:= libsdl libfreetype -PKG_BUILDDEP:= sdl freetype +PKG_BUILDDEP:= sdl freetype gettext-tiny PKG_URL:= http://www.libsdl.org/projects/SDL_ttf/ PKG_SITES:= http://www.libsdl.org/projects/SDL_ttf/release/ @@ -23,8 +23,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSDL_TTF,libsdl-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBSDL_TTF_DEV,libsdl-ttf-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSDL_TTF_DEV},${PKGSC_LIBSDL_TTF_DEV})) -TARGET_LDFLAGS+= -lintl - libsdl-ttf-install: $(INSTALL_DIR) $(IDIR_LIBSDL_TTF)/usr/lib $(CP) $(WRKINST)/usr/lib/libSDL_ttf*so* $(IDIR_LIBSDL_TTF)/usr/lib diff --git a/package/avahi/Makefile b/package/avahi/Makefile index 6dae612ba..6e5330aac 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= e4db89a2a403ff4c47d66ac66fad1f43 PKG_DESCR:= mDNS daemon PKG_SECTION:= dhcp -PKG_BUILDDEP:= libdaemon expat gdbm glib gettext gtk+ dbus +PKG_BUILDDEP:= libdaemon expat gdbm glib gettext-tiny gtk+ dbus PKG_URL:= http://avahi.org/ PKG_SITES:= http://avahi.org/download/ PKG_NEED_CXX:= 1 @@ -27,7 +27,6 @@ $(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEAS $(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DNSCONFD},${PKGSD_AVAHI_DNSCONFD},${PKG_SECTION})) $(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAVAHI},${PKGSC_LIBAVAHI})) -TARGET_LDFLAGS+= -lintl CONFIGURE_ARGS+= --enable-glib \ --enable-gtk2 \ --enable-libdaemon \ diff --git a/package/gettext-tiny/Makefile b/package/gettext-tiny/Makefile index a61061cd6..181e5f974 100644 --- a/package/gettext-tiny/Makefile +++ b/package/gettext-tiny/Makefile @@ -4,14 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= gettext-tiny -PKG_VERSION:= 0.1 +PKG_VERSION:= 0.0.3 PKG_RELEASE:= 1 +PKG_MD5SUM:= 3af6fd8a9042603b61f634b1c6f49e7e PKG_DESCR:= Gettext stub and replacement PKG_SECTION:= libs PKG_URL:= https://github.com/rofl0r/gettext-tiny +PKG_SITES:= http://ftp.barfooze.de/pub/sabotage/tarballs/ -WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} -NO_DISTFILES:= 1 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/gettext-tiny/patches/patch-Makefile b/package/gettext-tiny/patches/patch-Makefile new file mode 100644 index 000000000..45cbae4dc --- /dev/null +++ b/package/gettext-tiny/patches/patch-Makefile @@ -0,0 +1,37 @@ +--- gettext-tiny-0.0.3.orig/Makefile 2013-06-30 06:48:42.000000000 +0200 ++++ gettext-tiny-0.0.3/Makefile 2013-10-04 11:58:03.000000000 +0200 +@@ -1,4 +1,4 @@ +-prefix=/usr/local ++prefix=/usr + bindir=$(prefix)/bin + includedir=$(prefix)/include + libdir=$(prefix)/lib +@@ -19,7 +19,7 @@ ALL_INCLUDES = $(HEADERS) + ALL_LIBS=libintl.a + ALL_TOOLS=msgfmt msgmerge xgettext + +-CFLAGS=-O0 -fPIC ++CFLAGS?=-O0 -fPIC + + AR ?= $(CROSS_COMPILE)ar + RANLIB ?= $(CROSS_COMPILE)ranlib +@@ -56,13 +56,16 @@ xgettext: + cp src/xgettext.sh ./xgettext + + $(DESTDIR)$(libdir)/%.a: %.a +- install -D -m 755 $< $@ ++ mkdir -p $(DESTDIR)$(libdir) ++ install -m 755 $< $@ + + $(DESTDIR)$(includedir)/%.h: include/%.h +- install -D -m 644 $< $@ ++ mkdir -p $(DESTDIR)$(includedir) ++ install -m 644 $< $@ + + $(DESTDIR)$(bindir)/%: % +- install -D -m 755 $< $@ ++ mkdir -p $(DESTDIR)$(bindir) ++ install -m 755 $< $@ + + .PHONY: all clean install + diff --git a/package/gettext-tiny/src/LICENSE b/package/gettext-tiny/src/LICENSE deleted file mode 100644 index 465ec8a88..000000000 --- a/package/gettext-tiny/src/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -Copyright (C) 2012 rofl0r - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff --git a/package/gettext-tiny/src/Makefile b/package/gettext-tiny/src/Makefile deleted file mode 100644 index 6709ad1e8..000000000 --- a/package/gettext-tiny/src/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -prefix=/usr -bindir=$(prefix)/bin -includedir=$(prefix)/include -libdir=$(prefix)/lib -sysconfdir=$(prefix)/etc - -LIBSRC = $(sort $(wildcard libintl/*.c)) -PROGSRC = $(sort $(wildcard src/*.c)) - -PARSEROBJS = src/poparser.o src/StringEscape.o -PROGOBJS = $(PROGSRC:.c=.o) -LIBOBJS = $(LIBSRC:.c=.o) -OBJS = $(PROGOBJS) $(LIBOBJS) - - -HEADERS = libintl.h -ALL_INCLUDES = $(HEADERS) - -ALL_LIBS=libintl.a -ALL_TOOLS=msgfmt msgmerge xgettext - -CFLAGS?=-O0 -fPIC - -AR ?= $(CROSS_COMPILE)ar -RANLIB ?= $(CROSS_COMPILE)ranlib -CC ?= $(CROSS_COMPILE)cc - --include config.mak - -BUILDCFLAGS=$(CFLAGS) - -all: $(ALL_LIBS) $(ALL_TOOLS) - -install: $(ALL_LIBS:lib%=$(DESTDIR)$(libdir)/lib%) $(ALL_INCLUDES:%=$(DESTDIR)$(includedir)/%) $(ALL_TOOLS:%=$(DESTDIR)$(bindir)/%) - -clean: - rm -f $(ALL_LIBS) - rm -f $(OBJS) - rm -f $(ALL_TOOLS) - -%.o: %.c - $(CC) $(BUILDCFLAGS) -c -o $@ $< - -libintl.a: $(LIBOBJS) - rm -f $@ - $(AR) rc $@ $(LIBOBJS) - $(RANLIB) $@ - -msgmerge: $(OBJS) - $(CC) $(LDFLAGS) -static -o $@ src/msgmerge.o $(PARSEROBJS) - -msgfmt: $(OBJS) - $(CC) $(LDFLAGS) -static -o $@ src/msgfmt.o $(PARSEROBJS) - -xgettext: - cp src/xgettext.sh ./xgettext - -$(DESTDIR)$(libdir)/%.a: %.a - mkdir -p $(DESTDIR)$(libdir) - install -m 755 $< $@ - -$(DESTDIR)$(includedir)/%.h: include/%.h - mkdir -p $(DESTDIR)$(includedir) - install -m 644 $< $@ - -$(DESTDIR)$(bindir)/%: % - mkdir -p $(DESTDIR)$(bindir) - install -m 755 $< $@ - -.PHONY: all clean install - - - diff --git a/package/gettext-tiny/src/create-dist.sh b/package/gettext-tiny/src/create-dist.sh deleted file mode 100755 index b1d1b7a89..000000000 --- a/package/gettext-tiny/src/create-dist.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -if [[ -z "$VER" ]] ; then - echo set VER! - exit -fi -me=`pwd` - -proj=gettext-tiny -projver=${proj}-${VER} - -tempdir=/tmp/${proj}-0000 -rm -rf $tempdir -mkdir -p $tempdir - -cd $tempdir -git clone http://github.com/rofl0r/$proj $projver -rm -rf $projver/.git -rm -rf $projver/docs - -tar cjf $proj.tar.bz2 $projver/ -mv $proj.tar.bz2 $me/$projver.tar.bz2 diff --git a/package/gettext-tiny/src/docs/gettext.html b/package/gettext-tiny/src/docs/gettext.html deleted file mode 100644 index 05d4c9c43..000000000 --- a/package/gettext-tiny/src/docs/gettext.html +++ /dev/null @@ -1,18036 +0,0 @@ - - -GNU `gettext' utilities - - - - - - - - - -

GNU `gettext' utilities

-
-

Table of Contents

- -
- - - -
- -

-Next: , -Previous: (dir), -Up: (dir) - -
- -

GNU gettext utilities

- -

This manual documents the GNU gettext tools and the GNU libintl library, -version 0.18. - -

-

--- The Detailed Node Listing --- - -

Introduction - -

- -

The User's View - -

- -

Setting the POSIX Locale - -

- -

Preparing Program Sources - -

- -

Making the PO Template File - -

- -

Creating a New PO File - -

- -

Updating Existing PO Files - -

- -

Editing PO Files - -

- -

Emacs's PO File Editor - -

- -

Using Translation Compendia - -

- -

Manipulating PO Files - -

- -

Highlighting parts of PO files - -

- -

Producing Binary MO Files - -

- -

The Programmer's View - -

- -

About catgets - -

- -

About gettext - -

- -

Temporary Notes for the Programmers Chapter - -

- -

The Translator's View - -

- -

Organization - -

- -

National Teams - -

- -

The Maintainer's View - -

- -

Files You Must Create or Alter - -

- -

Autoconf macros for use in configure.ac - -

- -

Integrating with CVS - -

- -

Other Programming Languages - -

- -

The Translator's View - -

- -

Individual Programming Languages - -

- -

sh - Shell Script - -

- -

Perl - -

- -

Internationalizable Data - -

- -

Concluding Remarks - -

- -

Language Codes - -

- -

Licenses - -

- - -
- -

-Next: , -Previous: Top, -Up: Top - -
- -

1 Introduction

- -

This chapter explains the goals sought in the creation -of GNU gettext and the free Translation Project. -Then, it explains a few broad concepts around -Native Language Support, and positions message translation with regard -to other aspects of national and cultural variance, as they apply -to programs. It also surveys those files used to convey the -translations. It explains how the various tools interact in the -initial generation of these files, and later, how the maintenance -cycle should usually operate. - -

In this manual, we use he when speaking of the programmer or -maintainer, she when speaking of the translator, and they -when speaking of the installers or end users of the translated program. -This is only a convenience for clarifying the documentation. It is -absolutely not meant to imply that some roles are more appropriate -to males or females. Besides, as you might guess, GNU gettext -is meant to be useful for people using computers, whatever their sex, -race, religion or nationality! - -

Please send suggestions and corrections to: - -

     Internet address:
-         bug-gnu-gettext@gnu.org
-
-

Please include the manual's edition number and update date in your messages. - -

- -
- -

-Next: , -Previous: Introduction, -Up: Introduction - -
-