summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2003-02-19 13:22:54 +0000
committerjmmv <jmmv@pkgsrc.org>2003-02-19 13:22:54 +0000
commitea05f2f200ad12123f4242397ce52d487d040185 (patch)
treeebe20a3dae28cb38daf734d76019280c1b8380c6 /textproc
parent3d043f8983a7958c7b30db75efccaa6ef6a4520d (diff)
downloadpkgsrc-ea05f2f200ad12123f4242397ce52d487d040185.tar.gz
Do not install the xml-i18n-toolize program, so this package can coexist
with xml-i18n-tools. Bump PKGREVISION. This fixes the build of the gnome meta-package; pointed out by tron.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/intltool/Makefile5
-rw-r--r--textproc/intltool/PLIST7
-rw-r--r--textproc/intltool/distinfo3
-rw-r--r--textproc/intltool/patches/patch-aa31
4 files changed, 37 insertions, 9 deletions
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index 65842a2e318..ba99f80ee09 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/02/01 16:08:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/02/19 13:22:54 jmmv Exp $
#
DISTNAME= intltool-0.25
+PKGREVISION= 1
CATEGORIES= textproc devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/intltool/0.25/}
EXTRACT_SUFX= .tar.bz2
@@ -10,7 +11,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Toolbox for internationalisation
-CONFLICTS+= xml-i18n-tools-[0-9]*
+CONFLICTS= xml-i18n-tools<=0.9
USE_GMAKE= YES
USE_BUILDLINK2= YES
diff --git a/textproc/intltool/PLIST b/textproc/intltool/PLIST
index 1e9e2a96cdd..9e64ee435e3 100644
--- a/textproc/intltool/PLIST
+++ b/textproc/intltool/PLIST
@@ -1,18 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/01 16:08:15 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/02/19 13:22:54 jmmv Exp $
bin/intltool-extract
bin/intltool-merge
bin/intltool-prepare
bin/intltool-unicodify
bin/intltool-update
bin/intltoolize
-bin/xml-i18n-toolize
man/man8/intltool-extract.8
man/man8/intltool-merge.8
man/man8/intltool-prepare.8
man/man8/intltool-update.8
man/man8/intltoolize.8
share/aclocal/intltool.m4
-share/aclocal/xml-i18n-tools.m4
share/intltool/intltool-extract.in
share/intltool/intltool-merge.in
share/intltool/intltool-po-Makefile.in.in-patch-1
@@ -22,7 +20,4 @@ share/intltool/intltool-po-Makefile.in.in-patch-4
share/intltool/intltool-po-Makefile.in.in-patch-5
share/intltool/intltool-po-Makefile.in.in-patch-6
share/intltool/intltool-update.in
-share/intltool/xml-i18n-po-Makefile.in.in-patch-1
-share/intltool/xml-i18n-po-Makefile.in.in-patch-2
-share/intltool/xml-i18n-po-Makefile.in.in-patch-5
@dirrm share/intltool
diff --git a/textproc/intltool/distinfo b/textproc/intltool/distinfo
index be1bdebefb5..1481f4c3bcd 100644
--- a/textproc/intltool/distinfo
+++ b/textproc/intltool/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/02/01 16:08:15 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2003/02/19 13:22:54 jmmv Exp $
SHA1 (intltool-0.25.tar.bz2) = 4fe99b511783e039b2519cbbbe407563a8588296
Size (intltool-0.25.tar.bz2) = 97484 bytes
+SHA1 (patch-aa) = cc697f607dd6a709d8e32c10ba626677946b32c9
diff --git a/textproc/intltool/patches/patch-aa b/textproc/intltool/patches/patch-aa
new file mode 100644
index 00000000000..244176431aa
--- /dev/null
+++ b/textproc/intltool/patches/patch-aa
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.1 2003/02/19 13:22:55 jmmv Exp $
+
+--- Makefile.in.orig 2003-01-06 20:50:41.000000000 +0100
++++ Makefile.in
+@@ -69,7 +69,7 @@ SUBDIRS = . tests doc doc-i18n-tool
+
+ NULL =
+
+-aclocal_macros = intltool.m4 xml-i18n-tools.m4
++aclocal_macros = intltool.m4
+
+ CLEANFILES = \
+ intltoolize \
+@@ -97,9 +97,6 @@ pkgdata_DATA = \
+ intltool-po-Makefile.in.in-patch-4 \
+ intltool-po-Makefile.in.in-patch-5 \
+ intltool-po-Makefile.in.in-patch-6 \
+- xml-i18n-po-Makefile.in.in-patch-1 \
+- xml-i18n-po-Makefile.in.in-patch-2 \
+- xml-i18n-po-Makefile.in.in-patch-5 \
+ $(NULL)
+
+
+@@ -110,7 +107,6 @@ aclocal_DATA = $(aclocal_macros)
+
+ bin_SCRIPTS = \
+ intltoolize \
+- xml-i18n-toolize \
+ intltool-update \
+ intltool-merge \
+ intltool-extract \