pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/archivers/arj rename and annotate patches
details: https://anonhg.NetBSD.org/pkgsrc/rev/8326a832361f
branches: trunk
changeset: 649911:8326a832361f
user: tnn <tnn%pkgsrc.org@localhost>
date: Sun Apr 12 15:45:00 2015 +0000
description:
rename and annotate patches
diffstat:
archivers/arj/distinfo | 18 ++--
archivers/arj/patches/patch-aa | 56 ----------------
archivers/arj/patches/patch-ab | 98 ----------------------------
archivers/arj/patches/patch-ac | 35 ----------
archivers/arj/patches/patch-ad | 12 ---
archivers/arj/patches/patch-ae | 16 ----
archivers/arj/patches/patch-af | 31 --------
archivers/arj/patches/patch-ag | 22 ------
archivers/arj/patches/patch-arjdata.c | 24 ++++++
archivers/arj/patches/patch-environ.c | 56 ++++++++++++++++
archivers/arj/patches/patch-fardata.c | 33 +++++++++
archivers/arj/patches/patch-gnu_config.h.in | 12 +++
archivers/arj/patches/patch-gnu_configure.in | 98 ++++++++++++++++++++++++++++
archivers/arj/patches/patch-gnu_makefile.in | 35 ++++++++++
archivers/arj/patches/patch-integr.c | 5 +-
archivers/arj/patches/patch-uxspec.c | 18 +++++
16 files changed, 289 insertions(+), 280 deletions(-)
diffs (truncated from 641 to 300 lines):
diff -r 76ed60eced2e -r 8326a832361f archivers/arj/distinfo
--- a/archivers/arj/distinfo Sun Apr 12 15:09:32 2015 +0000
+++ b/archivers/arj/distinfo Sun Apr 12 15:45:00 2015 +0000
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.16 2014/05/11 20:56:16 rodent Exp $
+$NetBSD: distinfo,v 1.17 2015/04/12 15:45:00 tnn 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) = 02a45f1365121b63020f3714cea142f9571d8f72
-SHA1 (patch-ab) = 062f3dc1eee6f009dfdfa432bb3c138a9c28a829
-SHA1 (patch-ac) = db8a0afa61f49242e9fd601d5fc3167cf75f748b
-SHA1 (patch-ad) = 2cf609a6c7cb4e32441a433db3dc9cc04c23ae2a
-SHA1 (patch-ae) = 5bc829e43a4d45354905f061905e2810408847f1
-SHA1 (patch-af) = cbde8eccfa95e934714591974786fe94d7b4f19f
-SHA1 (patch-ag) = 898539d86abd3747b60d9f95a5a797f709f6360d
+SHA1 (patch-arjdata.c) = 4e4c142b97feee0673b14ea6f454f3d9de45f584
+SHA1 (patch-environ.c) = 02a45f1365121b63020f3714cea142f9571d8f72
SHA1 (patch-exe__sear.c) = 6d8db5a2cdb8f2452b96cf4d09687ae9d45d3e17
-SHA1 (patch-integr.c) = 67ae3fc4149a7b71a185bf45d2a457a109bcef9b
+SHA1 (patch-fardata.c) = 341a8d10ec1927b9cb980c90400e323cd53f979d
+SHA1 (patch-gnu_config.h.in) = 2cf609a6c7cb4e32441a433db3dc9cc04c23ae2a
+SHA1 (patch-gnu_configure.in) = 062f3dc1eee6f009dfdfa432bb3c138a9c28a829
+SHA1 (patch-gnu_makefile.in) = db8a0afa61f49242e9fd601d5fc3167cf75f748b
+SHA1 (patch-integr.c) = fade32219b21ac3382028bf23ee4171d8d095b5f
+SHA1 (patch-uxspec.c) = c54bd6223c39a73fed95286ce0a5f834770c86d3
diff -r 76ed60eced2e -r 8326a832361f archivers/arj/patches/patch-aa
--- a/archivers/arj/patches/patch-aa Sun Apr 12 15:09:32 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2014/05/11 20:56:16 rodent Exp $
-
-Add support for various OSes.
-
---- environ.c.orig 2004-06-18 16:19:36.000000000 +0000
-+++ environ.c
-@@ -58,10 +58,10 @@
- #include <sys/ioctl.h>
- #include <sys/statfs.h>
- #include <sys/statvfs.h>
-- #elif defined(__FreeBSD__)||defined(__NetBSD__)
-+ #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__OpenBSD__)
- #include <sys/param.h>
- #include <sys/mount.h>
-- #elif defined(__QNXNTO__)
-+ #elif defined(__QNXNTO__)||defined(__INTERIX)
- #include <sys/statvfs.h>
- #else
- #include <sys/statfs.h>
-@@ -2286,7 +2286,7 @@ unsigned long file_getfree(char *name)
- else
- return((LONG_MAX/(spclu*bps)<fclu)?LONG_MAX:spclu*bps*fclu);
- #elif TARGET==UNIX
-- #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)
-+ #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)||defined(__INTERIX)||(defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900))
- struct statvfs vfs;
-
- if(statvfs(name, &vfs)==-1)
-@@ -3005,7 +3005,7 @@ void get_exe_name(char *dest, char *arg)
- they are missing altogether, the corresponding code will gracefully
- terminate. */
- #if SFX_LEVEL==ARJ
-- strcpy(dest, "/usr/local/bin/arj");
-+ strcpy(dest, "@PREFIX@/bin/arj");
- #elif SFX_LEVEL==ARJSFXV
- strcpy(dest, "./arjsfxv");
- #elif SFX_LEVEL==ARJSFX
-@@ -3013,7 +3013,7 @@ void get_exe_name(char *dest, char *arg)
- #elif SFX_LEVEL==ARJSFXJR
- strcpy(dest, "./arjsfxjr");
- #elif defined(REARJ)
-- strcpy(dest, "/usr/local/bin/rearj");
-+ strcpy(dest, "@PREFIX@/bin/rearj");
- #else
- dest[0]='\0';
- #endif
-@@ -3802,7 +3802,9 @@ int reset_drive(char *name)
- #elif TARGET==WIN32
- return(0);
- #elif TARGET==UNIX
-+ #ifndef __INTERIX
- sync();
-+ #endif
- return(0);
- #endif
- }
diff -r 76ed60eced2e -r 8326a832361f archivers/arj/patches/patch-ab
--- a/archivers/arj/patches/patch-ab Sun Apr 12 15:09:32 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2014/05/11 20:56:16 rodent Exp $
-
---- gnu/configure.in.orig 2005-06-21 18:27:20.000000000 +0000
-+++ gnu/configure.in
-@@ -12,13 +12,23 @@ dnl Installation script (let it be, temp
- AC_PROG_INSTALL([e:/os2apps/autoconf/install-sh])
-
- dnl Configuration parameters
--AC_CONFIG_HEADER([../c_defs.h:config.h.in])
-+AC_CONFIG_HEADER([c_defs.h:config.h.in])
-
- dnl Checks for the canonical system name
- AC_CANONICAL_HOST
-
- dnl Checks for programs.
- AC_PROG_CC
-+AC_DEFUN(AC_PROG_LD_GNU,
-+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+ ac_cv_prog_gnu_ld=yes
-+else
-+ ac_cv_prog_gnu_ld=no
-+fi])
-+])
-+AC_PROG_LD_GNU
-
- dnl Checks for header files.
- AC_HEADER_STDC
-@@ -35,7 +45,8 @@ AC_FUNC_MEMCMP
- AC_FUNC_SETVBUF_REVERSED
- AC_TYPE_SIGNAL
- AC_FUNC_VPRINTF
--AC_CHECK_FUNCS([getcwd min max mkdir mkdtemp rmdir fcloseall strcasecmp setpriority strdup strerror strstr strupr strlwr strtol strtoul])
-+AC_CHECK_FUNCS([getcwd lchown min max mkdir mkdtemp rmdir fcloseall strcasecmp setpriority strdup strerror strstr strupr strlwr strtol strtoul])
-+AC_SEARCH_LIBS([dlsym], [dl])
-
- dnl Platform-specific tuning
- PROG_EXT=
-@@ -45,22 +56,27 @@ REQUIRES_DEF=
- OS_ID="UNIX"
- OS_DEF="-D_UNIX"
- DLL_CFLAGS="-fPIC"
-+LD_STRIP="-s "
-
- case $host_os in
- linux*)
- AC_DEFINE(ELF_EXECUTABLES, 1, [Define if executables use ELF format])
- DYN_LIBS="-ldl"
-- LD_STRIP="gnu/stripgcc.lnk"
-+ LD_STRIP="-s gnu/stripgcc.lnk"
- ;;
- k*bsd*)
- AC_DEFINE(ELF_EXECUTABLES)
- DYN_LIBS="-ldl"
-- LD_STRIP="gnu/stripgcc.lnk"
-+ LD_STRIP="-s gnu/stripgcc.lnk"
- ;;
- *bsd*)
- AC_DEFINE(ELF_EXECUTABLES)
- DLL_FLAGS="-shared -export-dynamic"
-- LD_STRIP="gnu/stripgcc.lnk"
-+ LD_STRIP="-s gnu/stripgcc.lnk"
-+ ;;
-+darwin*)
-+ DLL_FLAGS="-bundle"
-+ LD_STRIP=""
- ;;
- interix3*)
- # not ELF
-@@ -71,14 +87,16 @@ interix3*)
- AC_DEFINE(ELF_EXECUTABLES)
- DLL_FLAGS="-shared -fPIC"
- DLL_CFLAGS="-shared -fPIC"
-- LD_STRIP="gnu/stripgcc.lnk"
-+ LD_STRIP="-s gnu/stripgcc.lnk"
- ;;
- *solaris*)
- AC_DEFINE(ELF_EXECUTABLES)
- CFLAGS="-DSUNOS -D_UNIX"
- DLL_FLAGS="-shared -fPIC"
- DLL_CFLAGS="-shared -fPIC"
-- LD_STRIP="gnu/stripgcc.lnk"
-+ if test X"$ac_cv_prog_gnu_ld" = X"yes"; then
-+ LD_STRIP="-s gnu/stripgcc.lnk"
-+ fi
- ;;
- os2*)
- PROG_EXT=".exe"
-@@ -125,7 +143,7 @@ dnl Initial setup
-
- test -z "$CONFIG_SHELL" && CONFIG_SHELL=/bin/sh
- AC_SUBST(CONFIG_SHELL)
--
-+AC_OUTPUT(makefile.gnu:makefile.in)
- AC_MSG_CHECKING([if dynamic C library may be used])
- AC_ARG_ENABLE(libc,
- [ --disable-libc Disable linking with dynamic C library],
diff -r 76ed60eced2e -r 8326a832361f archivers/arj/patches/patch-ac
--- a/archivers/arj/patches/patch-ac Sun Apr 12 15:09:32 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2008/06/21 20:24:08 joerg Exp $
-
---- 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
- else
- DEBUG_SM = r
--ADD_LDFLAGS = -s @LD_STRIP@
-+ADD_LDFLAGS = @LD_STRIP@
- endif
-
- ALL_CFLAGS += $(CFLAGS)
-@@ -166,7 +166,7 @@ MAKE_KEY=$(TOOLS_DIR)/make_key$x
- endif
-
- all: prepare timestamp
-- $(MAKE) do-all
-+ $(MAKE) -f makefile.gnu do-all
-
- 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)
diff -r 76ed60eced2e -r 8326a832361f archivers/arj/patches/patch-ad
--- a/archivers/arj/patches/patch-ad Sun Apr 12 15:09:32 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2014/05/11 20:56:16 rodent Exp $
-
---- gnu/config.h.in.orig 2004-04-17 10:33:38.000000000 +0000
-+++ gnu/config.h.in
-@@ -4,6 +4,7 @@
- #undef LIBC
- #undef NP_SFX
- #undef ELF_EXECUTABLES
-+#undef HAVE_LCHOWN
- #undef HAVE_MKDTEMP
- #undef HAVE_FCLOSEALL
- #undef HAVE_SETPRIORITY
diff -r 76ed60eced2e -r 8326a832361f archivers/arj/patches/patch-ae
--- a/archivers/arj/patches/patch-ae Sun Apr 12 15:09:32 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2014/05/11 20:56:16 rodent Exp $
-
---- uxspec.c.orig 2004-04-17 11:39:42.000000000 +0000
-+++ uxspec.c
-@@ -13,6 +13,11 @@
- #include <unistd.h>
- #endif
-
-+#include "c_defs.h"
-+#ifndef HAVE_LCHOWN
-+#define lchown chown
-+#endif
-+
- DEBUGHDR(__FILE__) /* Debug information block */
-
- /* UXSPECIAL block types */
diff -r 76ed60eced2e -r 8326a832361f archivers/arj/patches/patch-af
--- a/archivers/arj/patches/patch-af Sun Apr 12 15:09:32 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.3 2014/05/11 20:56:16 rodent Exp $
-
---- fardata.c.orig 2004-04-17 11:39:42.000000000 +0000
-+++ fardata.c
-@@ -190,7 +190,7 @@ int msg_sprintf(char *str, FMSG *fmt, ..
-
- /* Length-limited strlen() */
-
--static int strnlen(const char FAR *s, int count)
-+static int _strnlen(const char FAR *s, int count)
- {
- const char FAR *sc;
-
-@@ -569,7 +569,7 @@ int vcprintf(int ccode, FMSG *fmt, va_li
- if(!s)
- s="(null)";
- #endif
-- len=strnlen(s, precision);
-+ len=_strnlen(s, precision);
- if(!(flags&LEFT))
- {
- while(len<field_width--)
-@@ -655,7 +655,7 @@ int vcprintf(int ccode, FMSG *fmt, va_li
- num=va_arg(args, unsigned long);
- else if(qualifier=='h')
- {
--#ifdef __linux__
-+#if TARGET==UNIX
- if (flags&SIGN)
- num=va_arg(args, int); /* num=va_arg(args, short); */
- else
diff -r 76ed60eced2e -r 8326a832361f archivers/arj/patches/patch-ag
Home |
Main Index |
Thread Index |
Old Index