Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/gnu/usr.bin/gettext Merge conflicts and delete junk.
details: https://anonhg.NetBSD.org/src/rev/5f5f825bff64
branches: trunk
changeset: 580561:5f5f825bff64
user: christos <christos%NetBSD.org@localhost>
date: Fri Apr 29 15:05:01 2005 +0000
description:
Merge conflicts and delete junk.
diffstat:
gnu/usr.bin/gettext/Makefile | 7 ++++---
gnu/usr.bin/gettext/Makefile.inc | 6 ++----
gnu/usr.bin/gettext/Makefile.inc.prog | 24 +++++++++++++++++-------
gnu/usr.bin/gettext/gettext/Makefile | 2 +-
gnu/usr.bin/gettext/info/Makefile | 8 +++++---
gnu/usr.bin/gettext/lib/Makefile | 16 ----------------
gnu/usr.bin/gettext/libgrep/Makefile | 2 +-
gnu/usr.bin/gettext/libnlspr/Makefile | 2 +-
gnu/usr.bin/gettext/libnlsut/Makefile | 2 +-
gnu/usr.bin/gettext/locale/Makefile | 2 +-
gnu/usr.bin/gettext/msgattrib/Makefile | 2 +-
gnu/usr.bin/gettext/msgcat/Makefile | 2 +-
gnu/usr.bin/gettext/msgcmp/Makefile | 2 +-
gnu/usr.bin/gettext/msgcomm/Makefile | 2 +-
gnu/usr.bin/gettext/msgconv/Makefile | 2 +-
gnu/usr.bin/gettext/msgen/Makefile | 2 +-
gnu/usr.bin/gettext/msgexec/Makefile | 2 +-
gnu/usr.bin/gettext/msgfilter/Makefile | 2 +-
gnu/usr.bin/gettext/msgfmt/Makefile | 6 ++----
gnu/usr.bin/gettext/msggrep/Makefile | 2 +-
gnu/usr.bin/gettext/msginit/Makefile | 2 +-
gnu/usr.bin/gettext/msgmerge/Makefile | 4 +---
gnu/usr.bin/gettext/msgunfmt/Makefile | 5 ++---
gnu/usr.bin/gettext/msguniq/Makefile | 2 +-
gnu/usr.bin/gettext/xgettext/Makefile | 29 +++++++++++++++++++++++++----
25 files changed, 74 insertions(+), 63 deletions(-)
diffs (truncated from 337 to 300 lines):
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/Makefile
--- a/gnu/usr.bin/gettext/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2001/01/09 08:52:58 enami Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/29 15:05:01 christos Exp $
.include <bsd.own.mk>
-SUBDIR= lib info .WAIT \
- gettext msgcmp msgcomm msgfmt msgmerge msgunfmt xgettext
+SUBDIR= libgrep libnlsut libnlspr info .WAIT \
+ gettext msgattrib msgcat msgcmp msgcomm msgconv msgen msgfilter \
+ msgfmt msginit msgmerge msgunfmt msguniq xgettext
.if ${MKNLS} != "no"
SUBDIR+=locale
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/Makefile.inc
--- a/gnu/usr.bin/gettext/Makefile.inc Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/Makefile.inc Fri Apr 29 15:05:01 2005 +0000
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.5 2002/09/19 03:09:37 lukem Exp $
-
-NOMAN= # defined
+# $NetBSD: Makefile.inc,v 1.6 2005/04/29 15:05:01 christos Exp $
.include <bsd.own.mk>
DIST= ${NETBSDSRCDIR}/gnu/dist
CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR} -I${.CURDIR}/../include \
- -I${DIST}/gettext/lib -DLOCALEDIR=\"/usr/share/locale\"
+ -I${DIST}/gettext/gettext-tools/lib -DLOCALEDIR=\"/usr/share/locale\"
BINDIR?= /usr/bin
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/Makefile.inc.prog
--- a/gnu/usr.bin/gettext/Makefile.inc.prog Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/Makefile.inc.prog Fri Apr 29 15:05:01 2005 +0000
@@ -1,15 +1,25 @@
-# $NetBSD: Makefile.inc.prog,v 1.3 2001/01/09 08:52:58 enami Exp $
+# $NetBSD: Makefile.inc.prog,v 1.4 2005/04/29 15:05:01 christos Exp $
.include <bsd.own.mk>
-LIBDIR!= cd ${.CURDIR}/../lib && ${PRINTOBJDIR}
+LIBNLSPRDIR!= cd ${.CURDIR}/../libnlspr && ${PRINTOBJDIR}
+LDADD+= -L${LIBNLSPRDIR} -lnlspr
+DPADD+= ${LIBNLSPRDIR}/libnlspr.a
+
+LIBNLSUTDIR!= cd ${.CURDIR}/../libnlsut && ${PRINTOBJDIR}
+DPADD+= ${LIBNLSUTDIR}/libnlsut.a
+LDADD+= -L${LIBNLSUTDIR} -lnlsut
LDADD+= -lintl
DPADD+= ${LIBINTL}
-LDADD+= -L${LIBDIR} -lnlsut
-DPADD+= ${LIBDIR}/libnlsut.a
+.if defined(PROG) && ${PROG} == "gettext"
+TOOLTOP=${DIST}/gettext/gettext-runtime/src
+.else
+TOOLTOP=${DIST}/gettext/gettext-tools/src
+.PATH.1: ${DIST}/gettext/gettext-tools/man
+.endif
+MAN=${PROG}.1
-.PATH: ${DIST}/gettext/src
-
-CPPFLAGS+= -I${DIST}/gettext/src
+.PATH: ${TOOLTOP}
+CPPFLAGS+= -I${TOOLTOP}
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/gettext/Makefile
--- a/gnu/usr.bin/gettext/gettext/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/gettext/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/29 14:59:30 christos Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/29 15:05:01 christos Exp $
PROG= gettext
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/info/Makefile
--- a/gnu/usr.bin/gettext/info/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/info/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2002/09/19 03:09:37 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/29 15:05:01 christos Exp $
.include <bsd.own.mk>
+GETTEXTTOP=${NETBSDSRCDIR}/gnu/dist/gettext
TEXINFO= gettext.texi
-INFOFLAGS= -I${NETBSDSRCDIR}/gnu/dist/gettext/doc
+INFOFLAGS= -I${GETTEXTTOP}/gettext-tools/doc \
+ -I${GETTEXTTOP}/gettext-runtime/doc
.include <bsd.info.mk>
-.PATH: ${DIST}/gettext/doc
+.PATH: ${GETTEXTTOP}/gettext-tools/doc
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/lib/Makefile
--- a/gnu/usr.bin/gettext/lib/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2004/05/23 02:24:51 lukem Exp $
-
-MKPRIVATELIB= yes
-
-.include <bsd.own.mk>
-
-LIB= nlsut
-SRCS= basename.c error.c fstrcmp.c getline.c getopt.c getopt1.c hash.c \
- obstack.c printf-prs.c stpcpy.c stpncpy.c xgetcwd.c xmalloc.c \
- xstrdup.c
-
-.include "${.CURDIR}/../Makefile.inc"
-
-.PATH: ${DIST}/gettext/lib
-
-.include <bsd.lib.mk>
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/libgrep/Makefile
--- a/gnu/usr.bin/gettext/libgrep/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/libgrep/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/29 14:59:32 christos Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/29 15:05:01 christos Exp $
MKPRIVATELIB= yes
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/libnlspr/Makefile
--- a/gnu/usr.bin/gettext/libnlspr/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/libnlspr/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/29 14:59:32 christos Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/29 15:05:01 christos Exp $
MKPRIVATELIB= yes
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/libnlsut/Makefile
--- a/gnu/usr.bin/gettext/libnlsut/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/libnlsut/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/29 14:59:32 christos Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/29 15:05:01 christos Exp $
MKPRIVATELIB= yes
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/locale/Makefile
--- a/gnu/usr.bin/gettext/locale/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/locale/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/29 14:59:32 christos Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/29 15:05:01 christos Exp $
.include <bsd.own.mk>
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/msgattrib/Makefile
--- a/gnu/usr.bin/gettext/msgattrib/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/msgattrib/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/29 14:59:32 christos Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/29 15:05:01 christos Exp $
PROG= msgattrib
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/msgcat/Makefile
--- a/gnu/usr.bin/gettext/msgcat/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/msgcat/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/29 14:59:32 christos Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/29 15:05:01 christos Exp $
PROG= msgcat
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/msgcmp/Makefile
--- a/gnu/usr.bin/gettext/msgcmp/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/msgcmp/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/29 14:59:32 christos Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/29 15:05:01 christos Exp $
PROG= msgcmp
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/msgcomm/Makefile
--- a/gnu/usr.bin/gettext/msgcomm/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/msgcomm/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/29 14:59:32 christos Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/29 15:05:01 christos Exp $
PROG= msgcomm
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/msgconv/Makefile
--- a/gnu/usr.bin/gettext/msgconv/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/msgconv/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/29 14:59:32 christos Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/29 15:05:01 christos Exp $
PROG= msgconv
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/msgen/Makefile
--- a/gnu/usr.bin/gettext/msgen/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/msgen/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/29 14:59:32 christos Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/29 15:05:01 christos Exp $
PROG= msgen
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/msgexec/Makefile
--- a/gnu/usr.bin/gettext/msgexec/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/msgexec/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/29 14:59:32 christos Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/29 15:05:01 christos Exp $
PROG= msgexec
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/msgfilter/Makefile
--- a/gnu/usr.bin/gettext/msgfilter/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/msgfilter/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/29 14:59:32 christos Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/29 15:05:01 christos Exp $
PROG= msgexec
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/msgfmt/Makefile
--- a/gnu/usr.bin/gettext/msgfmt/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/msgfmt/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/12/13 00:30:28 thorpej Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/29 15:05:01 christos Exp $
PROG= msgfmt
-SRCS= msgfmt.c open-po.c po-gram.gen.c po-hash.gen.c po-lex.c po.c \
- str-list.c message.c dir-list.c
.include <bsd.prog.mk>
.include "${.CURDIR}/../Makefile.inc.prog"
-CPPFLAGS+= -I${DIST}/gettext/intl
+CPPFLAGS+=-I${DIST}/gettext/gettext-runtime/intl
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/msggrep/Makefile
--- a/gnu/usr.bin/gettext/msggrep/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/msggrep/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/29 14:59:32 christos Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/29 15:05:01 christos Exp $
PROG= msggrep
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/msginit/Makefile
--- a/gnu/usr.bin/gettext/msginit/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/msginit/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/29 14:59:32 christos Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/29 15:05:01 christos Exp $
PROG= msginit
SRCS+= msginit.c \
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/msgmerge/Makefile
--- a/gnu/usr.bin/gettext/msgmerge/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/msgmerge/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2001/12/13 00:31:39 thorpej Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/29 15:05:01 christos Exp $
PROG= msgmerge
-SRCS= message.c msgmerge.c open-po.c po-gram.gen.c po-hash.gen.c \
- po-lex.c po.c str-list.c dir-list.c
.include <bsd.prog.mk>
.include "${.CURDIR}/../Makefile.inc.prog"
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/msgunfmt/Makefile
--- a/gnu/usr.bin/gettext/msgunfmt/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/msgunfmt/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/12/13 00:31:39 thorpej Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/29 15:05:02 christos Exp $
PROG= msgunfmt
-SRCS= message.c msgunfmt.c str-list.c
.include <bsd.prog.mk>
.include "${.CURDIR}/../Makefile.inc.prog"
-CPPFLAGS+= -I${DIST}/gettext/intl
+CPPFLAGS+= -I${DIST}/gettext/gettext-tools/intl
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/msguniq/Makefile
--- a/gnu/usr.bin/gettext/msguniq/Makefile Fri Apr 29 15:04:32 2005 +0000
+++ b/gnu/usr.bin/gettext/msguniq/Makefile Fri Apr 29 15:05:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/29 14:59:32 christos Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/29 15:05:02 christos Exp $
PROG= msguniq
diff -r d340d21d4b45 -r 5f5f825bff64 gnu/usr.bin/gettext/xgettext/Makefile
--- a/gnu/usr.bin/gettext/xgettext/Makefile Fri Apr 29 15:04:32 2005 +0000
Home |
Main Index |
Thread Index |
Old Index