Ticket #12180: arj-3.10.22-update.diff

File arj-3.10.22-update.diff, 6.5 KB (added by boeyms@…, 17 years ago)

  • files/patch-makefile.in

     
    1 --- gnu/makefile.in-orig        Sat Apr 17 15:28:06 2004
    2 +++ gnu/makefile.in     Tue Aug  3 03:02:13 2004
    3 @@ -84,7 +84,7 @@
     1--- gnu/makefile.in     2004-04-17 11:28:06.000000000 +0000
     2+++ gnu/makefile.in.new 2007-06-26 00:37:06.000000000 +0000
     3@@ -80,7 +80,9 @@
     4 # Definitions for compiling submodules
     5 
     6 LDFLAGS = @LDFLAGS@ $(ADD_LDFLAGS)
     7-DLL_FLAGS = @DLL_FLAGS@ $(ADD_LDFLAGS)
     8+# Can't strip symbols from dynamic libraries, at least on Darwin
     9+#DLL_FLAGS = @DLL_FLAGS@ $(ADD_LDFLAGS)
     10+DLL_FLAGS = @DLL_FLAGS@
    411 DLL_CFLAGS = @DLL_CFLAGS@
    512 REQUIRES_DEF = @REQUIRES_DEF@
    613 
    7 -COPT = -c -I@OUT_DIR@ -I$(BASEDIR) -I$(SRC_DIR) @CFLAGS@ $(ALL_CFLAGS)
    8 +COPT = -c -I$(BASEDIR) -I$(SRC_DIR) @CFLAGS@ $(ALL_CFLAGS)
    9  STD_COPT = -DARJUTIL $(COPT)
    10  ARJ_COPT = -DSFL=4 $(COPT)
    11  ARJSFXV_COPT = -DSFL=3 $(COPT)
     14@@ -253,7 +255,11 @@
     15 
     16 $(ARJCRYPT_DIR)/arjcrypt$d: $(ARJCRYPT_OBJS) $(TOOLS_DIR)/postproc$x
     17        $(CC) $(ALL_CFLAGS) $(DLL_FLAGS) -o $@ $(ARJCRYPT_OBJS) $(ARJCRYPT_DEF) $(LIBS)
     18-       $(TOOLS_DIR)/postproc $@
     19+# Skip postproc step since it doesn't currently work.  We aren't producing an
     20+# EXE here, and postproc.c says that postproc is for storing the CRC of ARJ.EXE
     21+# in a file so that "ARJ i" can locate it, so I'm not sure that it's necessary
     22+# to postproc this anyway.
     23+#      $(TOOLS_DIR)/postproc $@
     24 
     25 $(BASEDIR)/nmsg_crp.c: $(TOOLS_DIR)/msgbind$x $(RESFILE)
     26        $(TOOLS_DIR)/msgbind $(RESFILE) msg_crp $(OS_ID) $(PACKAGE) $(LOCALE) $(BASEDIR)

  • files/patch-conifgure.in

     
    1 --- gnu/configure.in-orig       Sat Apr 17 15:28:06 2004
    2 +++ gnu/configure.in    Tue Aug  3 03:11:54 2004
    3 @@ -15,7 +15,7 @@
    4  AC_CONFIG_HEADER([../c_defs.h:config.h.in])
    5  
    6  dnl Checks for the canonical system name
    7 -AC_CANONICAL_HOST
    8 +dnl AC_CANONICAL_HOST
    9  
    10  dnl Checks for programs.
    11  AC_PROG_CC
    12 @@ -39,12 +39,12 @@
    13  
    14  dnl Platform-specific tuning
    15  PROG_EXT=
    16 -DLL_EXT=".so"
    17 -DLL_FLAGS="-shared"
    18 +DLL_EXT=".dylib"
    19 +dnl DLL_FLAGS="-shared"
    20  REQUIRES_DEF=
    21  OS_ID="UNIX"
    22  OS_DEF="-D_UNIX"
    23 -DLL_CFLAGS="-fPIC"
    24 +dnl DLL_CFLAGS="-fPIC"
    25  
    26  case $host_os in
    27  linux*)
     1--- gnu/configure.in    2005-06-21 18:27:20.000000000 +0000
     2+++ gnu/configure.in.new        2007-06-25 23:15:00.000000000 +0000
     3@@ -62,6 +62,10 @@
     4         DLL_FLAGS="-shared -export-dynamic"
     5         LD_STRIP="gnu/stripgcc.lnk"
     6        ;;
     7+darwin*)
     8+       DLL_EXT=".dylib"
     9+       DLL_FLAGS="-dynamiclib"
     10+       ;;
     11 interix3*)
     12        # not ELF
     13        DLL_FLAGS="-shared"

  • files/patch-postproc.c

     
     1--- postproc.c  2003-06-22 11:12:28.000000000 +0000
     2+++ postproc.c.new      2007-06-25 21:00:52.000000000 +0000
     3@@ -29,7 +29,7 @@
     4                                0x04, 0xB0, 0x05, 0};
     5 static unsigned char encryption_pattern[]={0xB0, 0x02, 0xB0, 0x02, 0xB0, 0x03, 0xB0,
     6                                  0x04, 0xB0, 0x05, 0};
     7-static unsigned char integrity_pattern[]={0xB0, 0x03, 0xB0, 0x02, 0xB0, 0x03, 0xB0,
     8+static unsigned char integrity_pattern[]={0xB1, 0x03, 0xB0, 0x02, 0xB0, 0x03, 0xB0,
     9                                  0x04, 0xB0, 0x05, 0};
     10 static unsigned short self_check[]={0x9090, 0x9090, 0x138, 0x9090, 0x9090};
     11 

  • files/patch-arjcrypt.c 

    Property changes on: files/patch-postproc.c
___________________________________________________________________
Name: svn:eol-style
   + native
     
    1 --- arjcrypt.c-orig     Sun Jun 22 15:12:28 2003
    2 +++ arjcrypt.c  Tue Aug  3 12:51:15 2004
    3 @@ -321,13 +321,10 @@
    4  
    5  /* Main routine - just a stub. Don't even need it in an OS/2 DLL. */
    6  
    7 -#if TARGET==DOS
    8  int main()
    9  {
    10 - out_str(M_ARJCRYPT_BANNER);
    11   return(0);
    12  }
    13 -#endif
    14  
    15  /* External entry */
    16  

  • Portfile

     
    22
    33PortSystem 1.0
    44name            arj
    5 version         3.10.21
     5version         3.10.22
    66categories      archivers sysutils
    77description     create and extract files from dos .arj archives
    88maintainers     jc@crazic.ru
    99long_description ${description}
    1010homepage        http://arj.sourceforge.net/
    1111master_sites    sourceforge:arj
    12 checksums       md5 887d400ca6048516d4d447e1649af396
    13 depends_build   bin:gmake:gmake bin:autoconf:autoconf
     12checksums       md5 f263bf3cf6d42a8b7e85b4fb514336d3
     13depends_build   port:autoconf
     14use_autoconf    yes
     15autoconf.dir    gnu
     16configure.dir   ${autoconf.dir}
    1417
    15 patchfiles      patch-arjcrypt.c patch-conifgure.in patch-environ.c patch-makefile.in patch-uxspec.c
    16 
    17 pre-configure {
    18         system "cd ${build.dir}/gnu; autoconf"
     18# Hack: copy XCode-provided config.guess and config.sub into source tree so that
     19# it can properly guess the system type
     20post-extract {
     21    copy -force /usr/share/libtool/config.guess ${worksrcpath}/${autoconf.dir}
     22    copy -force /usr/share/libtool/config.sub ${worksrcpath}/${autoconf.dir}
    1923}
    2024
    21 configure {
    22         system "cd ${build.dir}/gnu; ./configure --prefix=${prefix}"
    23 }
     25patchfiles      patch-conifgure.in patch-environ.c patch-makefile.in patch-postproc.c patch-uxspec.c
    2426
    25 pre-build {
    26         system "gmake prepare"
    27 }
    28 
    29 destroot        {
    30         xinstall -m 755 -d ${destroot}/${prefix}/bin
    31         xinstall -m 755 -d ${destroot}/${prefix}/share/man/man1
    32         xinstall -m 755 -d ${destroot}/${prefix}/share/doc/arj
    33 
    34         file copy ${build.dir}/en/rs/arj/arj ${build.dir}/en/rs/arjdisp/arjdisp ${build.dir}/en/rs/arjsfx/arjsfx ${build.dir}/en/rs/arjsfxjr/arjsfxjr ${build.dir}/en/rs/arjsfxv/arjsfxv ${build.dir}/en/rs/rearj/rearj ${build.dir}/en/rs/register/arj-register ${build.dir}/en/rs/sfxstub/sfxstub ${destroot}/${prefix}/bin
    35 
    36         file copy ${build.dir}/resource/en/arj-register.1 ${build.dir}/resource/en/arj.1 ${build.dir}/resource/en/arjdisp.1 ${build.dir}/resource/en/rearj.1 ${destroot}/${prefix}/share/man/man1
    37         file copy ${build.dir}/resource/en/arjl.txt ${build.dir}/resource/en/arjs.txt ${build.dir}/resource/en/file_id.diz ${build.dir}/resource/en/history.txt ${build.dir}/resource/en/readme.txt ${build.dir}/resource/en/unix.txt ${destroot}/${prefix}/share/doc/arj
    38 
    39 }
     27build.target    prepare all