update to 2.4

This commit is contained in:
naddy 2001-10-24 12:08:58 +00:00
parent 7359c8b9ac
commit 60cb14aa0d
9 changed files with 17 additions and 145 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2001/08/01 20:41:07 naddy Exp $
# $OpenBSD: Makefile,v 1.2 2001/10/24 12:08:58 naddy Exp $
COMMENT= "interactive typing tutor"
DISTNAME= gtypist-2.3.2
DISTNAME= gtypist-2.4
CATEGORIES= education
NEED_VERSION= 1.433
NEED_VERSION= 1.474
HOMEPAGE= http://www.gnu.org/software/gtypist/
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
@ -18,9 +18,9 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gtypist
LIB_DEPENDS= intl.1::devel/gettext
MODULE= gettext
CONFIGURE_STYLE= autoconf
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

View File

@ -1,3 +1,3 @@
MD5 (gtypist-2.3.2.tar.gz) = 26cc537a215d8ba8b1cfb4e7d7471df3
RMD160 (gtypist-2.3.2.tar.gz) = 7251b107b120f0c7d58bb482c91ea8b1a7ff0ea2
SHA1 (gtypist-2.3.2.tar.gz) = 4ab7ff05996c339abba1513450847aeda4777b3e
MD5 (gtypist-2.4.tar.gz) = c889c01bba588225d2769a9c4ce4b691
RMD160 (gtypist-2.4.tar.gz) = 10099c9e1a6b4bbced68139d5ecb98b1bdbb7f4c
SHA1 (gtypist-2.4.tar.gz) = 55bada5000142ba04e93df78ec2e48ddf4894fba

View File

@ -1,20 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2001/08/01 20:41:07 naddy Exp $
--- Makefile.in.orig Thu May 17 15:58:41 2001
+++ Makefile.in Thu May 17 15:59:28 2001
@@ -95,8 +95,6 @@ gtypist_LDADD = @INTLLIBS@
man_MANS = gtypist.1
INCLUDES = -I./intl -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\"
-CPPFLAGS = -Wall
-
# GEN_MAN is a shell command that generates the man page
GEN_MAN = @GEN_MAN@
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -107,6 +105,7 @@ PROGRAMS = $(bin_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I.
+CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
gtypist_OBJECTS = gtypist.o getopt.o getopt1.o

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-aclocal_m4,v 1.1.1.1 2001/08/01 20:41:07 naddy Exp $
--- aclocal.m4.orig Fri Dec 8 12:32:15 2000
+++ aclocal.m4 Thu May 17 15:54:17 2001
@@ -173,10 +173,9 @@ AC_DEFUN(AM_WITH_NLS,
if test "$gt_cv_func_gettext_libc" != "yes"; then
AC_CHECK_LIB(intl, bindtextdomain,
- [AC_CACHE_CHECK([for gettext in libintl],
- gt_cv_func_gettext_libintl,
+ [AC_CACHE_VAL(gt_cv_func_gettext_libintl,
[AC_CHECK_LIB(intl, gettext,
- gt_cv_func_gettext_libintl=yes,
+ [gt_cv_func_gettext_libintl=yes; LIBS="$LIBS -lintl"],
gt_cv_func_gettext_libintl=no)],
gt_cv_func_gettext_libintl=no)])
fi

View File

@ -1,58 +0,0 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.1.1.1 2001/08/01 20:41:07 naddy Exp $
--- po/Makefile.in.in.orig Wed Nov 29 14:25:27 2000
+++ po/Makefile.in.in Thu May 17 17:33:32 2001
@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(datadir); \
+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
@@ -123,7 +123,7 @@ install-data-yes: all
*) destdir=$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$$destdir/$$lang/LC_MESSAGES; \
+ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
@@ -153,12 +153,12 @@ install-data-yes: all
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(gettextsrcdir); \
+ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(gettextsrcdir)/Makefile.in.in; \
+ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
@@ -171,12 +171,12 @@ uninstall:
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
done
- rm -f $(gettextsrcdir)/po-Makefile.in.in
+ rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
check: all

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-po_de_po,v 1.1.1.1 2001/08/01 20:41:07 naddy Exp $
--- po/de.po.orig Thu May 17 17:38:32 2001
+++ po/de.po Thu May 17 17:38:54 2001
@@ -9,8 +9,8 @@ msgstr ""
"Last-Translator: Kester Habermann <kester@linuxtag.de>\n"
"Language-Team:\n"
"MIME-Version: 1.0\n"
-"Content-Type:\n"
-"Content-Transfer-Encoding:\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
#. print out the error message and stop
#: gtypist.c:268

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-po_es_po,v 1.1.1.1 2001/08/01 20:41:07 naddy Exp $
--- po/es.po.orig Thu May 17 17:38:34 2001
+++ po/es.po Thu May 17 17:39:12 2001
@@ -9,8 +9,8 @@ msgstr ""
"Last-Translator: Vladimir Támara Patiño <vtamara@gnu.org>\n"
"Language-Team:\n"
"MIME-Version: 1.0\n"
-"Content-Type:\n"
-"Content-Transfer-Encoding:\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
#. print out the error message and stop
#: gtypist.c:268

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-po_gtypist_pot,v 1.1.1.1 2001/08/01 20:41:07 naddy Exp $
--- po/gtypist.pot.orig Thu May 17 17:39:20 2001
+++ po/gtypist.pot Thu May 17 17:39:38 2001
@@ -11,8 +11,8 @@ msgstr ""
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=US-ASCII\n"
+"Content-Transfer-Encoding: 7bit\n"
#. print out the error message and stop
#: gtypist.c:268

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/08/01 20:41:07 naddy Exp $
@comment $OpenBSD: PLIST,v 1.2 2001/10/24 12:08:58 naddy Exp $
@unexec install-info --delete --info-dir=%D/info %D/info/gtypist.info
bin/gtypist
info/gtypist.info
@ -7,15 +7,23 @@ share/gtypist/d.typ
share/gtypist/demo.typ
share/gtypist/esp.typ
share/gtypist/gtypist.typ
share/gtypist/ktde.typ
share/gtypist/kten.typ
share/gtypist/ktfr.typ
share/gtypist/ktlecten.typ
share/gtypist/ktno.typ
share/gtypist/ktnumber.typ
share/gtypist/m.typ
share/gtypist/n.typ
share/gtypist/q.typ
share/gtypist/r.typ
share/gtypist/s.typ
share/gtypist/t.typ
share/gtypist/ttde.typ
share/gtypist/u.typ
share/gtypist/v.typ
share/locale/de/LC_MESSAGES/gtypist.mo
share/locale/es/LC_MESSAGES/gtypist.mo
share/locale/fi/LC_MESSAGES/gtypist.mo
@dirrm share/gtypist
@exec install-info --info-dir=%D/info %D/info/gtypist.info