Subject: pkg/31355: textproc/scrollkeeper package broken
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: None <carton@Ivy.NET>
List: pkgsrc-bugs
Date: 09/20/2005 03:05:00
>Number: 31355
>Category: pkg
>Synopsis: textproc/scrollkeeper package broken
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Tue Sep 20 03:05:00 +0000 2005
>Originator: Miles Nordin
>Release: pkgsrc 2005-08-24
>Organization:
Ivy Ministries
>Environment:
System: NetBSD castrovalva 3.0_BETA NetBSD 3.0_BETA (CASTROVALVA-$Revision: 1.10 $) #0: Sun Sep 11 15:08:04 EDT 2005 carton@castrovalva:/export/src/sys/arch/alpha/compile/CASTROVALVA alpha
Architecture: alpha
Machine: alpha
>Description:
scrollkeeper package is broken with an error from intltool
>How-To-Repeat:
# cd textproc/scrollkeeper
# make
[...]
Making all in templates
gmake[3]: Entering directory `/usr/pkgobj/textproc/scrollkeeper/work/scrollkeeper-0.3.14/cl/templates'
LC_ALL=C ../../intltool-merge ../../po scrollkeeper_cl.xml.in scrollkeeper_cl.xml -x -u -c ../../po/.intltool-merge-cache
Usage: intltool-merge [OPTION]... PO_DIRECTORY FILENAME OUTPUT_FILE
Generates an output file that includes some localized attributes from an
untranslated source file.
Mandatory options: (exactly one must be specified)
-b, --ba-style includes translations in the bonobo-activation style
-d, --desktop-style includes translations in the desktop style
-k, --keys-style includes translations in the keys style
-s, --schemas-style includes translations in the schemas style
-r, --rfc822deb-style includes translations in the RFC822 style
[...more intltool usage information...]
>Fix:
patch scrollkeeper to invoke intltool according to the usage output, with
options first, _followed_ by positional filenames.
Index: Makefile
===================================================================
RCS file: /scratch/cvsroot/netbsd/pkgsrc/textproc/scrollkeeper/Makefile,v
retrieving revision 1.1.1.8
retrieving revision 1.2
diff -u -r1.1.1.8 -r1.2
--- Makefile 18 Jul 2005 13:15:15 -0000 1.1.1.8
+++ Makefile 20 Sep 2005 03:00:43 -0000 1.2
@@ -17,11 +17,14 @@
DEPENDS= docbook-xml>=4.2nb7:../../textproc/docbook-xml
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake automake autoconf
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
+AUTOMAKE_REQD= 1.7
+AUTOCONF_REQD= 2.57
+
CONFIGURE_ARGS= --localstatedir=${SCROLLKEEPER_DATADIR}
CONFIGURE_ARGS+= --sharedstatedir=${SCROLLKEEPER_DATADIR}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
@@ -54,6 +57,9 @@
XML_ENTRIES+= public "-//Open Source Metadata Framework (OMF) //DTD OMF.dtd V1.1//EN" \
${PREFIX}/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
+pre-configure:
+ cd ${WRKSRC} && autoreconf --force
+
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
Index: distinfo
===================================================================
RCS file: /scratch/cvsroot/netbsd/pkgsrc/textproc/scrollkeeper/distinfo,v
retrieving revision 1.1.1.6
retrieving revision 1.2
diff -u -r1.1.1.6 -r1.2
--- distinfo 2 Apr 2005 21:59:35 -0000 1.1.1.6
+++ distinfo 20 Sep 2005 03:00:43 -0000 1.2
@@ -4,6 +4,7 @@
RMD160 (scrollkeeper-0.3.14.tar.gz) = 30a4ae4b1d70cf2eef25c352308e50f921ad5270
Size (scrollkeeper-0.3.14.tar.gz) = 679513 bytes
SHA1 (patch-aa) = e4658d7589cea0da3c57045e33d9d4812d11ccc9
-SHA1 (patch-ab) = 745fad045b7a9d2286ab3060714a2cf967e875a1
-SHA1 (patch-ac) = bd464789672250d8dc6d968ffd0f14735dec0848
-SHA1 (patch-ad) = 5577b0b5a1211911a5fa334bec6e6edef28aa10b
+SHA1 (patch-ab) = e4914728724d39aa1c1db3572677115925bab676
+SHA1 (patch-ac) = edbead8728449c1c5518e6cf31b158c42fb36030
+SHA1 (patch-ad) = 918588969a6b332a833974ffea8c07c6af6a7ece
+SHA1 (patch-ae) = c35b3d35f686172a3f51e9584eb612d4f4f43dba
Index: patches/patch-ab
===================================================================
RCS file: /scratch/cvsroot/netbsd/pkgsrc/textproc/scrollkeeper/patches/patch-ab,v
retrieving revision 1.1.1.4
retrieving revision 1.2
diff -u -r1.1.1.4 -r1.2
--- patches/patch-ab 28 May 2004 06:37:55 -0000 1.1.1.4
+++ patches/patch-ab 20 Sep 2005 03:00:43 -0000 1.2
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2004/05/06 16:20:17 minskim Exp $
+$NetBSD$
---- cl/templates/Makefile.in.orig 2003-12-06 02:17:56.000000000 -0600
-+++ cl/templates/Makefile.in
-@@ -184,7 +184,7 @@ target_vendor = @target_vendor@
- EXTRA_DIST = scrollkeeper_cl.xml.in
- LIB_PATH = $(top_builddir)/libs/.libs
+--- cl/templates/Makefile.am.orig 2003-12-05 11:51:38.000000000 +0800
++++ cl/templates/Makefile.am
+@@ -5,7 +5,7 @@
+ EXTRA_DIST=scrollkeeper_cl.xml.in
+ LIB_PATH=$(top_builddir)/libs/.libs
-TRANSLATED_LOCALES = C am az be ca cs da de el es fr hu it ja kn ko nl no pl pt_BR ro ru sk sl sr sr@Latn sv tr uk vi zh_CN zh_TW
+TRANSLATED_LOCALES = C am be ca cs da de el es fr hu it ja ko nl no pl pt_BR ro ru sk sl sr sr@Latn sv tr vi zh_CN zh_TW
- subdir = cl/templates
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+
+ all: scrollkeeper_cl.xml
+ $(top_builddir)/buildtools/scrollkeeper-tree-separate scrollkeeper_cl.xml $(top_builddir)/cl/templates
Index: patches/patch-ac
===================================================================
RCS file: /scratch/cvsroot/netbsd/pkgsrc/textproc/scrollkeeper/patches/patch-ac,v
retrieving revision 1.1.1.4
retrieving revision 1.2
diff -u -r1.1.1.4 -r1.2
--- patches/patch-ac 28 May 2004 06:37:55 -0000 1.1.1.4
+++ patches/patch-ac 20 Sep 2005 03:00:43 -0000 1.2
@@ -1,13 +1,12 @@
-$NetBSD: patch-ac,v 1.5 2004/01/23 16:55:37 jmmv Exp $
+$NetBSD$
---- config/Makefile.in.orig 2003-12-06 09:17:57.000000000 +0100
-+++ config/Makefile.in
-@@ -181,7 +181,7 @@ target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
+--- config/Makefile.am.orig
++++ config/Makefile.am
+@@ -1,6 +1,6 @@
+ # copyright (C) 2001 Sun Microsystems, Inc. and Dan Mueth
--pkgconfigdir = $(sysconfdir)
-+pkgconfigdir = $(datadir)/examples/scrollkeeper
+-pkgconfigdir=$(sysconfdir)
++pkgconfigdir=$(datadir)/examples/scrollkeeper
- pkgconfig_DATA = scrollkeeper.conf
+ pkgconfig_DATA=scrollkeeper.conf
Index: patches/patch-ad
===================================================================
RCS file: /scratch/cvsroot/netbsd/pkgsrc/textproc/scrollkeeper/patches/patch-ad,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- patches/patch-ad 20 Dec 2003 07:55:48 -0000 1.1.1.2
+++ patches/patch-ad 20 Sep 2005 03:00:43 -0000 1.2
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2003/02/18 14:39:04 jmmv Exp $
+$NetBSD$
---- Makefile.in.orig 2003-01-23 07:11:56.000000000 +0100
-+++ Makefile.in
-@@ -536,13 +536,6 @@ dist-hook: scrollkeeper.spec
+--- Makefile.am.orig
++++ Makefile.am
+@@ -29,13 +29,6 @@
# Build/rebuild the catalog
install-data-hook:
Index: patches/patch-ae
===================================================================
RCS file: patches/patch-ae
diff -N patches/patch-ae
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ae 20 Sep 2005 03:00:43 -0000 1.3
@@ -0,0 +1,43 @@
+$NetBSD$
+
+--- aclocal.m4.orig
++++ aclocal.m4
+@@ -4531,22 +4531,22 @@
+ fi
+ fi
+
+- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache'
+-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache'
+- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -k -u -c $(top_builddir)/po/.intltool-merge-cache'
+- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache'
+- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -p'
+- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
+- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -u -c $(top_builddir)/po/.intltool-merge-cache'
+- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
+-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache'
+- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
+- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
+- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
+- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -m -c $(top_builddir)/po/.intltool-merge-cache'
+- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache'
+- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -s -u -c $(top_builddir)/po/.intltool-merge-cache'
+- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache'
++ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
++ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+
+ AC_SUBST(INTLTOOL_DESKTOP_RULE)
+ AC_SUBST(INTLTOOL_DIRECTORY_RULE)