[pkgsrc/pkgsrc-2005Q1]: pkgsrc/archivers/arj Pullup ticket 388 - requested by...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2005Q1]: pkgsrc/archivers/arj Pullup ticket 388 - requested by...
From: snj <snj%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:31:00 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/80a518be5761
branches:  pkgsrc-2005Q1
changeset: 490860:80a518be5761
user:      snj <snj%pkgsrc.org@localhost>
date:      Fri Mar 25 08:27:53 2005 +0000

description:
Pullup ticket 388 - requested by Min Sik Kim
portability fix for arj

Revisions pulled up:
- pkgsrc/archivers/arj/distinfo         1.9
- pkgsrc/archivers/arj/patches/patch-aa 1.6
- pkgsrc/archivers/arj/patches/patch-ab 1.6
- pkgsrc/archivers/arj/patches/patch-ac 1.3
- pkgsrc/archivers/arj/patches/patch-ad 1.1
- pkgsrc/archivers/arj/patches/patch-ae 1.1


    Module Name:  pkgsrc
    Committed By: minskim
    Date:         Tue Mar 22 16:24:13 UTC 2005

    Modified Files:
          pkgsrc/archivers/arj: distinfo
          pkgsrc/archivers/arj/patches: patch-aa patch-ab patch-ac
    Added Files:
          pkgsrc/archivers/arj/patches: patch-ad patch-ae

    Log Message:
    Make this package build on Darwin.
      - Include mount.h to use statfs.
      - Use chown(2) if lchown(2) is unavailable.  (Can be problematic,
        but no easy solution.)
      - Pass -bundle to gcc to build a Mach-o bundle format file.

diffstat:

 archivers/arj/distinfo         |  10 +++++---
 archivers/arj/patches/patch-aa |  12 ++++++---
 archivers/arj/patches/patch-ab |  49 ++++++++++++++++++++++++++++++++---------
 archivers/arj/patches/patch-ac |  13 +++++++++-
 archivers/arj/patches/patch-ad |  12 ++++++++++
 archivers/arj/patches/patch-ae |  16 +++++++++++++
 6 files changed, 91 insertions(+), 21 deletions(-)

diffs (183 lines):

diff -r 947b67ba0013 -r 80a518be5761 archivers/arj/distinfo
--- a/archivers/arj/distinfo    Fri Mar 25 08:07:47 2005 +0000
+++ b/archivers/arj/distinfo    Fri Mar 25 08:27:53 2005 +0000
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.8 2005/02/23 14:45:22 agc Exp $
+$NetBSD: distinfo,v 1.8.2.1 2005/03/25 08:27:53 snj Exp $
 
 SHA1 (arj-3.10.21.tar.gz) = 3599001a762655688dcd1663e100f2d6ebec8227
 RMD160 (arj-3.10.21.tar.gz) = e126821cf15abba91bbeeeb771ffd279ffc7d114
 Size (arj-3.10.21.tar.gz) = 430807 bytes
-SHA1 (patch-aa) = d9d1d7970a00286451a8fcf56e27cd86182e8a99
-SHA1 (patch-ab) = a704418a3c1fe22e4d8c2f72a52483c68b114da6
-SHA1 (patch-ac) = 4e557fa98bc92e033d11e2e9a8e34127275f7f72
+SHA1 (patch-aa) = 015dbd20e8fbd51c9ef185d8a6070feaba473964
+SHA1 (patch-ab) = d97fb922d7d0c4656dfd648d72e132bfd6198355
+SHA1 (patch-ac) = bb74d73a4f07ab9d1d915d3383ba2904caa69573
+SHA1 (patch-ad) = 186b05ec694daa25504123690f9b7bba9f22a7f4
+SHA1 (patch-ae) = 46181177d4a42b510a02ce8e138275dca453f1de
diff -r 947b67ba0013 -r 80a518be5761 archivers/arj/patches/patch-aa
--- a/archivers/arj/patches/patch-aa    Fri Mar 25 08:07:47 2005 +0000
+++ b/archivers/arj/patches/patch-aa    Fri Mar 25 08:27:53 2005 +0000
@@ -1,9 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2004/07/27 13:03:39 wiz Exp $
+$NetBSD: patch-aa,v 1.5.6.1 2005/03/25 08:27:53 snj Exp $
 
---- environ.c.orig     2004-06-18 18:19:36.000000000 +0200
+--- environ.c.orig     Fri Jun 18 11:19:36 2004
 +++ environ.c
-@@ -61,7 +61,7 @@
-  #elif defined(__FreeBSD__)||defined(__NetBSD__)
+@@ -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__)
    #include <sys/param.h>
    #include <sys/mount.h>
 - #elif defined(__QNXNTO__)
diff -r 947b67ba0013 -r 80a518be5761 archivers/arj/patches/patch-ab
--- a/archivers/arj/patches/patch-ab    Fri Mar 25 08:07:47 2005 +0000
+++ b/archivers/arj/patches/patch-ab    Fri Mar 25 08:27:53 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2005/01/16 16:57:12 tv Exp $
+$NetBSD: patch-ab,v 1.5.2.1 2005/03/25 08:27:53 snj Exp $
 
---- gnu/configure.in.orig      2004-04-17 07:28:06.000000000 -0400
+--- gnu/configure.in.orig      2004-04-17 06:28:06.000000000 -0500
 +++ gnu/configure.in
 @@ -12,13 +12,23 @@ dnl Installation script (let it be, temp
  AC_PROG_INSTALL([e:/os2apps/autoconf/install-sh])
@@ -27,37 +27,64 @@
  
  dnl Checks for header files.
  AC_HEADER_STDC
-@@ -36,6 +46,7 @@ AC_FUNC_SETVBUF_REVERSED
+@@ -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 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=
-@@ -57,6 +68,11 @@ linux*)
+@@ -45,30 +56,42 @@ 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"
+       ;;
+ *bsd*)
+       AC_DEFINE(ELF_EXECUTABLES)
          DLL_FLAGS="-shared -export-dynamic"
-         LD_STRIP="gnu/stripgcc.lnk"
-       ;;
+-        LD_STRIP="gnu/stripgcc.lnk"
++        LD_STRIP="-s gnu/stripgcc.lnk"
++      ;;
++darwin*)
++      DLL_FLAGS="-bundle"
++      LD_STRIP=""
++      ;;
 +interix3*)
 +      # not ELF
 +      DLL_FLAGS="-shared"
 +      DLL_CFLAGS=""
-+      ;;
+       ;;
  *qnx*)
        AC_DEFINE(ELF_EXECUTABLES)
          DLL_FLAGS="-shared -fPIC"
-@@ -68,7 +84,9 @@ linux*)
+         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="gnu/stripgcc.lnk"
++        LD_STRIP="-s gnu/stripgcc.lnk"
 +      fi
        ;;
  os2*)
        PROG_EXT=".exe"
-@@ -115,7 +133,7 @@ dnl Initial setup
+@@ -115,7 +138,7 @@ dnl Initial setup
  
  test -z "$CONFIG_SHELL" && CONFIG_SHELL=/bin/sh
  AC_SUBST(CONFIG_SHELL)
diff -r 947b67ba0013 -r 80a518be5761 archivers/arj/patches/patch-ac
--- a/archivers/arj/patches/patch-ac    Fri Mar 25 08:07:47 2005 +0000
+++ b/archivers/arj/patches/patch-ac    Fri Mar 25 08:27:53 2005 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-ac,v 1.2 2004/04/22 20:16:58 dillo Exp $
+$NetBSD: patch-ac,v 1.2.8.1 2005/03/25 08:27:53 snj Exp $
 
---- gnu/makefile.in.orig       Sat Apr 17 13:28:06 2004
+--- gnu/makefile.in.orig       Sat Apr 17 06:28:06 2004
 +++ 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
  
diff -r 947b67ba0013 -r 80a518be5761 archivers/arj/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/arj/patches/patch-ad    Fri Mar 25 08:27:53 2005 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1.2.2 2005/03/25 08:27:53 snj Exp $
+
+--- gnu/config.h.in.orig       Sat Apr 17 05:33:38 2004
++++ 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 947b67ba0013 -r 80a518be5761 archivers/arj/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/arj/patches/patch-ae    Fri Mar 25 08:27:53 2005 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1.2.2 2005/03/25 08:27:53 snj Exp $
+
+--- uxspec.c.orig      Sat Apr 17 06:39:42 2004
++++ 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 */
Prev by Date: [pkgsrc/pkgsrc-2005Q1]: pkgsrc/doc 388
Next by Date: [pkgsrc/pkgsrc-2005Q1]: pkgsrc/doc #385
Previous by Thread: [pkgsrc/pkgsrc-2005Q1]: pkgsrc/doc 388
Next by Thread: [pkgsrc/pkgsrc-2005Q1]: pkgsrc/doc #385
Indexes:
Home | Main Index | Thread Index | Old Index