summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/gawk/Makefile4
-rw-r--r--lang/ja-gawk/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 39ef6e2a164..46734b7eec8 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/04 20:57:21 seb Exp $
+# $NetBSD: Makefile,v 1.14 2003/07/05 15:14:38 seb Exp $
# FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:14 fenner Exp $
DISTNAME= gawk-3.1.1
@@ -9,6 +9,8 @@ MAINTAINER= bouyer@netbsd.org
HOMEPAGE= http://www.gnu.org/software/gawk/gawk.html
COMMENT= GNU awk
+CONFLICTS= ja-gawk-[0-9]*
+
# We need ${GETTEXT_PREFIX}/share/gettext/po/Makefile.in.in.
BUILD_DEPENDS+= gettext>=0.10.35nb1:../../devel/gettext
diff --git a/lang/ja-gawk/Makefile b/lang/ja-gawk/Makefile
index 7cd5466d208..f71b8938aac 100644
--- a/lang/ja-gawk/Makefile
+++ b/lang/ja-gawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/07/05 15:06:09 seb Exp $
+# $NetBSD: Makefile,v 1.3 2003/07/05 15:14:39 seb Exp $
# FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:14 fenner Exp $
DISTNAME= gawk-3.0.4
@@ -14,6 +14,8 @@ MAINTAINER= tech-pkg-ja@jp.netbsd.org
HOMEPAGE= http://www.gnu.org/software/gawk/gawk.html
COMMENT= GNU awk + multi-byte extension
+CONFLICTS= gawk-[0-9]*
+
USE_NEW_TEXINFO= YES
INFO_FILES= gawk.info