Changeset 114713


Ignore:
Timestamp:
Dec 14, 2013, 5:48:15 AM (7 years ago)
Author:
ryandesign@…
Message:

cryptlib: update to 3.4.2; write an install target for the makefile instead of overriding the destroot phase, so that we can work on adding a universal variant with the muniversal portgroup (#41804)

Location:
trunk/dports/devel/cryptlib
Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/dports/devel/cryptlib/Portfile

    r114712 r114713  
    66
    77name                cryptlib
    8 version             3.4.1
     8version             3.4.2
    99set branch          [join [lrange [split ${version} .] 0 1] .]
    1010categories          devel security crypto
     
    3030use_zip             yes
    3131
    32 checksums           rmd160  2272e20697e3e1d8b484ae9d571b08371b1319fb \
    33                     sha256  d3057acbf4bc7d45694d8ec2621ee4027f9303d36cebdfe2af770567ec912c94
     32checksums           rmd160  c16757dbd44a50b211b5168fbc7ecf7c307b88d6 \
     33                    sha256  0ee4a7568ddb7de6b155b79844e25bc1a20af9439b0db38bfbd47a984be923a3
    3434
    3535pre-extract {
     
    3939extract.mkdir       yes
    4040
    41 patchfiles          patch-crypt_osconfig.h \
     41patchfiles          patch-crypt-osconfig.h.diff \
    4242                    patch-makefile.diff \
    4343                    patch-tools-ccopts.sh.diff
     
    4949
    5050build.target        default shared
    51 build.env           LIBDIR="${prefix}/lib" \
     51build.env           PREFIX="${prefix}" \
    5252                    CFLAGS="${configure.cflags} ${configure.cc_archflags}" \
    5353                    LDFLAGS="${configure.ldflags} ${configure.ld_archflags}" \
    5454                    CC="${configure.cc}"
    5555
    56 destroot {
    57     xinstall -m 644 ${worksrcpath}/libcl.a ${worksrcpath}/libcl.${branch}.dylib ${destroot}${prefix}/lib
    58     ln -s libcl.${branch}.dylib ${destroot}${prefix}/lib/libcl.dylib
    59     xinstall -m 644 ${worksrcpath}/cryptlib.h ${destroot}${prefix}/include
     56destroot.env        PREFIX="${prefix}"
     57
     58post-destroot {
    6059    xinstall -d ${destroot}${prefix}/share/doc/${name}
    6160    xinstall -m 644 ${worksrcpath}/README ${destroot}${prefix}/share/doc/${name}
  • trunk/dports/devel/cryptlib/files/patch-crypt-osconfig.h.diff

    r114695 r114713  
    1 --- crypt/osconfig.h.orig       2011-06-17 22:20:36.000000000 -0500
    2 +++ crypt/osconfig.h    2011-10-16 23:51:19.000000000 -0500
    3 @@ -259,6 +259,10 @@
    4    #else
    5         #define L_ENDIAN
    6    #endif
     1--- crypt/osconfig.h.orig       2012-11-06 01:14:56.000000000 -0600
     2+++ crypt/osconfig.h    2013-12-13 23:25:21.000000000 -0600
     3@@ -310,6 +310,10 @@
     4        #define DES_UNROLL
     5        #define RC4_INDEX
     6   #endif /* Mac OS variants */
    77+  #if defined( __LP64__ )
    8 +    #undef SIXTY_FOUR_BIT
    9 +    #define SIXTY_FOUR_BIT_LONG
     8+       #undef SIXTY_FOUR_BIT
     9+       #define SIXTY_FOUR_BIT_LONG
    1010+  #endif
    11    #define BN_LLONG
    12    #define BF_PTR
    13    #define DES_RISC1
     11 #endif /* Mac OS X / iOS */
     12 
     13 /* MSDOS */
  • trunk/dports/devel/cryptlib/files/patch-makefile.diff

    r85985 r114713  
    1 --- makefile.orig       2011-07-28 01:41:06.000000000 -0500
    2 +++ makefile    2011-10-17 21:24:31.000000000 -0500
    3 @@ -70,8 +70,8 @@
     1--- makefile.orig       2012-12-14 03:31:22.000000000 -0600
     2+++ makefile    2013-12-13 23:41:55.000000000 -0600
     3@@ -73,7 +73,7 @@
    44 # Further cc flags are gathered dynamically at runtime via the ccopts.sh
    55 # script.
    66 
    7 -CFLAGS         = "-c -D__UNIX__ -DNDEBUG -I."
    8 -CFLAGS_DEBUG = "-c -D__UNIX__ -I. -g3 -ggdb"
    9 +CFLAGS         += "-c -D__UNIX__ -DNDEBUG -I."
    10 +CFLAGS_DEBUG = "$(CFLAGS) -c -D__UNIX__ -I. -g3 -ggdb"
     7-CFLAGS         = -c -D__UNIX__ -DNDEBUG -I.
     8+CFLAGS         += -c -D__UNIX__ -DNDEBUG -I.
     9 CFLAGS_DEBUG = -c -D__UNIX__ -I. -g3 -ggdb -O0
    1110 
    1211 # Paths and command names.  We have to be careful with comments attached to
    13  # path defines because some makes don't strip trailing spaces.
    14 @@ -87,7 +87,6 @@
     12@@ -90,7 +90,6 @@
    1513 SHARED_OBJ_DIR = ./shared-obj
    1614 CPP                    = $(CC) -E
     
    1816-LDFLAGS                =
    1917 AR                     = ar
     18 STRIP          = strip
    2019 SHELL          = /bin/sh
    21  OSNAME         = `uname`
    22 @@ -1453,7 +1452,8 @@
    23                                         $(EXTRAOBJS)
     20@@ -1481,7 +1480,8 @@
     21                                        $(STRIP) $(OBJS) $(EXTRAOBJS)
    2422 
    2523 $(DYLIBNAME):  $(OBJS) $(EXTRAOBJS) $(TESTOBJS)
    2624-                               @$(LD) -dynamiclib -compatibility_version $(MAJ).$(MIN) \
    27 +                               $(LD) $(LDFLAGS) -dynamiclib -install_name $(LIBDIR)/$(DYLIBNAME) \
     25+                               $(LD) $(LDFLAGS) -dynamiclib -install_name $(PREFIX)/lib/$(DYLIBNAME) \
    2826+                                       -compatibility_version $(MAJ).$(MIN) \
    2927                                        -current_version $(MAJ).$(MIN).$(PLV) \
    3028                                        -o $(DYLIBNAME) $(OBJS) $(EXTRAOBJS)
    3129 
    32 @@ -1847,7 +1847,7 @@
     30@@ -1875,7 +1875,7 @@
    3331 #                      decide to try it.
    3432 
     
    3735+       @make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer"
    3836 
    39  # NCR MP-RAS: Use the NCR cc.  The "-DNCR_UST" is needed to enable threading
    40  #                        (User-Space Threads).
     37 # MinGW: cc is gcc.  Note that we have to use the cross-compile flags
     38 # XCFLAGS rather than CFLAGS because the latter implies a native Unix
     39@@ -2657,3 +2657,12 @@
     40        fi
     41        @if [ `uname -s` = 'CYGWIN_NT-5.0' ] ; then rm -f *.exe; fi
     42        @if [ `uname -s` = 'HP-UX' ] ; then rm -f lib$(PROJ).sl; fi
     43+
     44+
     45+install:
     46+       install -d $(DESTDIR)$(PREFIX)/lib
     47+       install -m 644 $(LIBNAME) $(DESTDIR)$(PREFIX)/lib
     48+       install -m 644 $(DYLIBNAME) $(DESTDIR)$(PREFIX)/lib
     49+       ln -s $(DYLIBNAME) $(DESTDIR)$(PREFIX)/lib/lib$(PROJ).dylib
     50+       install -d $(DESTDIR)$(PREFIX)/include
     51+       install -m 644 cryptlib.h $(DESTDIR)$(PREFIX)/include
Note: See TracChangeset for help on using the changeset viewer.