[pkgsrc/trunk]: pkgsrc/archivers/arj Make the build more robust by using a te...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1fe78d8eeaf8
branches:  trunk
changeset: 543667:1fe78d8eeaf8
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Jun 21 20:24:08 2008 +0000

description:
Make the build more robust by using a temporary arj binary.
This fixes random build errors that disappeared after running
make again.

diffstat:

 archivers/arj/distinfo         |   4 ++--
 archivers/arj/patches/patch-ac |  17 +++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r bdb933d455ff -r 1fe78d8eeaf8 archivers/arj/distinfo
--- a/archivers/arj/distinfo    Sat Jun 21 20:01:59 2008 +0000
+++ b/archivers/arj/distinfo    Sat Jun 21 20:24:08 2008 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2006/03/05 21:40:57 adam Exp $
+$NetBSD: distinfo,v 1.13 2008/06/21 20:24:08 joerg Exp $
 
 SHA1 (arj-3.10.22.tar.gz) = e8470f480e9eee14906e5485a8898e5c24738c8b
 RMD160 (arj-3.10.22.tar.gz) = 80f8a1a8cd203f73def8e957d96563a4dba80153
 Size (arj-3.10.22.tar.gz) = 431467 bytes
 SHA1 (patch-aa) = 7dc0000f3d0c0974a40bbea7d9103449cb89b4b9
 SHA1 (patch-ab) = da21aae85f1bf4b9c8cac78d45ad33c44fcd5d3d
-SHA1 (patch-ac) = bb74d73a4f07ab9d1d915d3383ba2904caa69573
+SHA1 (patch-ac) = db8a0afa61f49242e9fd601d5fc3167cf75f748b
 SHA1 (patch-ad) = 186b05ec694daa25504123690f9b7bba9f22a7f4
 SHA1 (patch-ae) = 46181177d4a42b510a02ce8e138275dca453f1de
 SHA1 (patch-af) = 66793484466fa8c7f0ad5cd0010ef8672b2305f4
diff -r bdb933d455ff -r 1fe78d8eeaf8 archivers/arj/patches/patch-ac
--- a/archivers/arj/patches/patch-ac    Sat Jun 21 20:01:59 2008 +0000
+++ b/archivers/arj/patches/patch-ac    Sat Jun 21 20:24:08 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2005/03/22 16:24:13 minskim Exp $
+$NetBSD: patch-ac,v 1.4 2008/06/21 20:24:08 joerg Exp $
 
---- gnu/makefile.in.orig       Sat Apr 17 06:28:06 2004
+--- gnu/makefile.in.orig       2004-04-17 11:28:06.000000000 +0000
 +++ gnu/makefile.in
 @@ -53,7 +53,7 @@ DEBUG_SM = d
  ALL_CFLAGS += -g -DDEBUG
@@ -20,3 +20,16 @@
  
  do-all:       \
        $(ARJ_DIR)/arj$x \
+@@ -351,8 +351,10 @@ $(ARJ_DIR)/arj$x: $(ARJ_OBJS) \
+       $(TOOLS_DIR)/join $(ARJ_DIR)/arj$x $(SFXSTUB_DIR)/sfxstub$x
+       rm -f $(BASEDIR)/help.arj
+       $(ARJ_DIR)/arj$x a $(BASEDIR)/help.arj -+ -t1f -2e -e -jm -jh65535 -jt $(RES_DIR)/$(LOCALE)/arj?.txt
+-      $(TOOLS_DIR)/join $(ARJ_DIR)/arj$x $(BASEDIR)/help.arj
+-      $(TOOLS_DIR)/postproc $@
++      cp $(ARJ_DIR)/arj$x $(ARJ_DIR)/arj$x-tmp
++      $(TOOLS_DIR)/join $(ARJ_DIR)/arj$x-tmp $(BASEDIR)/help.arj
++      $(TOOLS_DIR)/postproc $(ARJ_DIR)/arj$x-tmp
++      mv -f $(ARJ_DIR)/arj$x-tmp $(ARJ_DIR)/arj$x
+ 
+ $(BASEDIR)/fmsg_arj.c $(BASEDIR)/imsg_arj.c $(BASEDIR)/nmsg_arj.c: $(TOOLS_DIR)/msgbind$x $(RESFILE)
+       $(TOOLS_DIR)/msgbind $(RESFILE) msg_arj $(OS_ID) $(PACKAGE) $(LOCALE) $(BASEDIR)