Mon Nov 4 16:41:43 2013 UTC ()
Make guard variable used by the integrity check non-static, so that it
won't get dropped as unused.


(joerg)
diff -r1.26 -r1.27 pkgsrc/archivers/arj/Makefile
diff -r1.14 -r1.15 pkgsrc/archivers/arj/distinfo
diff -r0 -r1.1 pkgsrc/archivers/arj/patches/patch-integr.c
cvs diff -r1.26 -r1.27 pkgsrc/archivers/arj/Makefile (expand / switch to unified diff)

--- pkgsrc/archivers/arj/Makefile 2012/09/11 19:46:52 1.26
+++ pkgsrc/archivers/arj/Makefile 2013/11/04 16:41:43 1.27
@@ -1,42 +1,41 @@ @@ -1,42 +1,41 @@
1# $NetBSD: Makefile,v 1.26 2012/09/11 19:46:52 asau Exp $ 1# $NetBSD: Makefile,v 1.27 2013/11/04 16:41:43 joerg Exp $
2 2
3DISTNAME= arj-3.10.22 3DISTNAME= arj-3.10.22
4CATEGORIES= archivers 4CATEGORIES= archivers
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=arj/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=arj/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://arj.sourceforge.net/ 8HOMEPAGE= http://arj.sourceforge.net/
9COMMENT= Open-source ARJ archiver 9COMMENT= Open-source ARJ archiver
10 10
11PKG_INSTALLATION_TYPES= overwrite pkgviews 11PKG_INSTALLATION_TYPES= overwrite pkgviews
12 12
13MAKE_JOBS_SAFE= no 13MAKE_JOBS_SAFE= no
14 14
15USE_TOOLS+= autoconf gmake 15USE_TOOLS+= autoconf gmake
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17CONFIGURE_ENV+= LD=${LD:Q} 17CONFIGURE_ENV+= LD=${LD:Q}
18CONFIGURE_SCRIPT= ${WRKSRC}/gnu/configure 18CONFIGURE_SCRIPT= ${WRKSRC}/gnu/configure
19MAKE_FILE= makefile.gnu 19MAKE_FILE= makefile.gnu
20MAKE_FLAGS+= INSTALL_DIR=${INSTALL_PROGRAM_DIR:Q} 20MAKE_FLAGS+= INSTALL_DIR=${INSTALL_PROGRAM_DIR:Q}
21 21
22INSTALL_UNSTRIPPED= yes # $LOCALBASE/bin/arj must have symbol table 22INSTALL_UNSTRIPPED= yes # $LOCALBASE/bin/arj must have symbol table
23ARJ_DOCSDIR= ${PREFIX}/share/doc/arj 23ARJ_DOCSDIR= ${PREFIX}/share/doc/arj
24 24
25.include "../../mk/compiler.mk" 25.include "../../mk/compiler.mk"
26 26
27.if !empty(CC_VERSION:Mgcc-4.*) 27_WRAP_EXTRA_ARGS.CC+= -g -O0
28CFLAGS+= -fno-unit-at-a-time 28BUILDLINK_TRANSFORM+= rm:-s
29.endif 
30 29
31pre-configure: 30pre-configure:
32 ${CP} -f ${WRKSRC}/environ.c ${WRKSRC}/environ.c.1 31 ${CP} -f ${WRKSRC}/environ.c ${WRKSRC}/environ.c.1
33 ${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${WRKSRC}/environ.c.1 \ 32 ${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${WRKSRC}/environ.c.1 \
34 > ${WRKSRC}/environ.c 33 > ${WRKSRC}/environ.c
35 ${RM} -f ${WRKSRC}/environ.c.1 34 ${RM} -f ${WRKSRC}/environ.c.1
36 cd ${WRKSRC}/gnu && autoconf 35 cd ${WRKSRC}/gnu && autoconf
37 36
38INSTALLATION_DIRS+= ${ARJ_DOCSDIR} 37INSTALLATION_DIRS+= ${ARJ_DOCSDIR}
39 38
40post-install: 39post-install:
41 ${INSTALL_DATA} ${WRKSRC}/doc/COPYING ${WRKSRC}/doc/debug.txt \ 40 ${INSTALL_DATA} ${WRKSRC}/doc/COPYING ${WRKSRC}/doc/debug.txt \
42 ${DESTDIR}${ARJ_DOCSDIR} 41 ${DESTDIR}${ARJ_DOCSDIR}
cvs diff -r1.14 -r1.15 pkgsrc/archivers/arj/distinfo (expand / switch to unified diff)

--- pkgsrc/archivers/arj/distinfo 2009/05/13 14:26:24 1.14
+++ pkgsrc/archivers/arj/distinfo 2013/11/04 16:41:43 1.15
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1$NetBSD: distinfo,v 1.14 2009/05/13 14:26:24 hasso Exp $ 1$NetBSD: distinfo,v 1.15 2013/11/04 16:41:43 joerg Exp $
2 2
3SHA1 (arj-3.10.22.tar.gz) = e8470f480e9eee14906e5485a8898e5c24738c8b 3SHA1 (arj-3.10.22.tar.gz) = e8470f480e9eee14906e5485a8898e5c24738c8b
4RMD160 (arj-3.10.22.tar.gz) = 80f8a1a8cd203f73def8e957d96563a4dba80153 4RMD160 (arj-3.10.22.tar.gz) = 80f8a1a8cd203f73def8e957d96563a4dba80153
5Size (arj-3.10.22.tar.gz) = 431467 bytes 5Size (arj-3.10.22.tar.gz) = 431467 bytes
6SHA1 (patch-aa) = 7dc0000f3d0c0974a40bbea7d9103449cb89b4b9 6SHA1 (patch-aa) = 7dc0000f3d0c0974a40bbea7d9103449cb89b4b9
7SHA1 (patch-ab) = da21aae85f1bf4b9c8cac78d45ad33c44fcd5d3d 7SHA1 (patch-ab) = da21aae85f1bf4b9c8cac78d45ad33c44fcd5d3d
8SHA1 (patch-ac) = db8a0afa61f49242e9fd601d5fc3167cf75f748b 8SHA1 (patch-ac) = db8a0afa61f49242e9fd601d5fc3167cf75f748b
9SHA1 (patch-ad) = 186b05ec694daa25504123690f9b7bba9f22a7f4 9SHA1 (patch-ad) = 186b05ec694daa25504123690f9b7bba9f22a7f4
10SHA1 (patch-ae) = 46181177d4a42b510a02ce8e138275dca453f1de 10SHA1 (patch-ae) = 46181177d4a42b510a02ce8e138275dca453f1de
11SHA1 (patch-af) = c4e5a0dc8a2b42af471fd065ab28f162d94bd0b7 11SHA1 (patch-af) = c4e5a0dc8a2b42af471fd065ab28f162d94bd0b7
12SHA1 (patch-ag) = ce4d0fefed6ccf7ab7fad864a7cb7faa36e4e4ac 12SHA1 (patch-ag) = ce4d0fefed6ccf7ab7fad864a7cb7faa36e4e4ac
 13SHA1 (patch-integr.c) = 8c3f9fd4db4d4b1323cceccd6cfa31dc09ab39af
File Added: pkgsrc/archivers/arj/patches/patch-integr.c
$NetBSD: patch-integr.c,v 1.1 2013/11/04 16:41:43 joerg Exp $

--- integr.c.orig	2013-11-04 16:18:17.000000000 +0000
+++ integr.c
@@ -5,7 +5,7 @@
  *
  */
 
-static const char intergrity_identifier[] = {
+const char intergrity_identifier[] = {
 	0xB0, 0x03, 0xB0, 0x02, 0xB0, 0x03,
 	0xB0, 0x04, 0xB0, 0x05,
 	0x90, 0x90, 0x90, 0x90,