[114713] trunk/dports/devel/cryptlib
ryandesign at macports.org
ryandesign at macports.org
Fri Dec 13 21:48:15 PST 2013
Revision: 114713
https://trac.macports.org/changeset/114713
Author: ryandesign at macports.org
Date: 2013-12-13 21:48:15 -0800 (Fri, 13 Dec 2013)
Log 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)
Modified Paths:
--------------
trunk/dports/devel/cryptlib/Portfile
trunk/dports/devel/cryptlib/files/patch-makefile.diff
Added Paths:
-----------
trunk/dports/devel/cryptlib/files/patch-crypt-osconfig.h.diff
Removed Paths:
-------------
trunk/dports/devel/cryptlib/files/patch-crypt_osconfig.h
Modified: trunk/dports/devel/cryptlib/Portfile
===================================================================
--- trunk/dports/devel/cryptlib/Portfile 2013-12-14 05:18:19 UTC (rev 114712)
+++ trunk/dports/devel/cryptlib/Portfile 2013-12-14 05:48:15 UTC (rev 114713)
@@ -5,7 +5,7 @@
PortGroup conflicts_build 1.0
name cryptlib
-version 3.4.1
+version 3.4.2
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel security crypto
platforms darwin
@@ -29,8 +29,8 @@
distname cl[join [split $version .] ""]
use_zip yes
-checksums rmd160 2272e20697e3e1d8b484ae9d571b08371b1319fb \
- sha256 d3057acbf4bc7d45694d8ec2621ee4027f9303d36cebdfe2af770567ec912c94
+checksums rmd160 c16757dbd44a50b211b5168fbc7ecf7c307b88d6 \
+ sha256 0ee4a7568ddb7de6b155b79844e25bc1a20af9439b0db38bfbd47a984be923a3
pre-extract {
# DOS to UNIX line endings.
@@ -38,7 +38,7 @@
}
extract.mkdir yes
-patchfiles patch-crypt_osconfig.h \
+patchfiles patch-crypt-osconfig.h.diff \
patch-makefile.diff \
patch-tools-ccopts.sh.diff
@@ -48,15 +48,14 @@
use_configure no
build.target default shared
-build.env LIBDIR="${prefix}/lib" \
+build.env PREFIX="${prefix}" \
CFLAGS="${configure.cflags} ${configure.cc_archflags}" \
LDFLAGS="${configure.ldflags} ${configure.ld_archflags}" \
CC="${configure.cc}"
-destroot {
- xinstall -m 644 ${worksrcpath}/libcl.a ${worksrcpath}/libcl.${branch}.dylib ${destroot}${prefix}/lib
- ln -s libcl.${branch}.dylib ${destroot}${prefix}/lib/libcl.dylib
- xinstall -m 644 ${worksrcpath}/cryptlib.h ${destroot}${prefix}/include
+destroot.env PREFIX="${prefix}"
+
+post-destroot {
xinstall -d ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 ${worksrcpath}/README ${destroot}${prefix}/share/doc/${name}
}
Copied: trunk/dports/devel/cryptlib/files/patch-crypt-osconfig.h.diff (from rev 114695, trunk/dports/devel/cryptlib/files/patch-crypt_osconfig.h)
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-crypt-osconfig.h.diff (rev 0)
+++ trunk/dports/devel/cryptlib/files/patch-crypt-osconfig.h.diff 2013-12-14 05:48:15 UTC (rev 114713)
@@ -0,0 +1,13 @@
+--- crypt/osconfig.h.orig 2012-11-06 01:14:56.000000000 -0600
++++ crypt/osconfig.h 2013-12-13 23:25:21.000000000 -0600
+@@ -310,6 +310,10 @@
+ #define DES_UNROLL
+ #define RC4_INDEX
+ #endif /* Mac OS variants */
++ #if defined( __LP64__ )
++ #undef SIXTY_FOUR_BIT
++ #define SIXTY_FOUR_BIT_LONG
++ #endif
+ #endif /* Mac OS X / iOS */
+
+ /* MSDOS */
Deleted: trunk/dports/devel/cryptlib/files/patch-crypt_osconfig.h
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-crypt_osconfig.h 2013-12-14 05:18:19 UTC (rev 114712)
+++ trunk/dports/devel/cryptlib/files/patch-crypt_osconfig.h 2013-12-14 05:48:15 UTC (rev 114713)
@@ -1,13 +0,0 @@
---- crypt/osconfig.h.orig 2011-06-17 22:20:36.000000000 -0500
-+++ crypt/osconfig.h 2011-10-16 23:51:19.000000000 -0500
-@@ -259,6 +259,10 @@
- #else
- #define L_ENDIAN
- #endif
-+ #if defined( __LP64__ )
-+ #undef SIXTY_FOUR_BIT
-+ #define SIXTY_FOUR_BIT_LONG
-+ #endif
- #define BN_LLONG
- #define BF_PTR
- #define DES_RISC1
Modified: trunk/dports/devel/cryptlib/files/patch-makefile.diff
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-makefile.diff 2013-12-14 05:18:19 UTC (rev 114712)
+++ trunk/dports/devel/cryptlib/files/patch-makefile.diff 2013-12-14 05:48:15 UTC (rev 114713)
@@ -1,40 +1,51 @@
---- makefile.orig 2011-07-28 01:41:06.000000000 -0500
-+++ makefile 2011-10-17 21:24:31.000000000 -0500
-@@ -70,8 +70,8 @@
+--- makefile.orig 2012-12-14 03:31:22.000000000 -0600
++++ makefile 2013-12-13 23:41:55.000000000 -0600
+@@ -73,7 +73,7 @@
# Further cc flags are gathered dynamically at runtime via the ccopts.sh
# script.
--CFLAGS = "-c -D__UNIX__ -DNDEBUG -I."
--CFLAGS_DEBUG = "-c -D__UNIX__ -I. -g3 -ggdb"
-+CFLAGS += "-c -D__UNIX__ -DNDEBUG -I."
-+CFLAGS_DEBUG = "$(CFLAGS) -c -D__UNIX__ -I. -g3 -ggdb"
+-CFLAGS = -c -D__UNIX__ -DNDEBUG -I.
++CFLAGS += -c -D__UNIX__ -DNDEBUG -I.
+ CFLAGS_DEBUG = -c -D__UNIX__ -I. -g3 -ggdb -O0
# Paths and command names. We have to be careful with comments attached to
- # path defines because some makes don't strip trailing spaces.
-@@ -87,7 +87,6 @@
+@@ -90,7 +90,6 @@
SHARED_OBJ_DIR = ./shared-obj
CPP = $(CC) -E
LD = $(CC)
-LDFLAGS =
AR = ar
+ STRIP = strip
SHELL = /bin/sh
- OSNAME = `uname`
-@@ -1453,7 +1452,8 @@
- $(EXTRAOBJS)
+@@ -1481,7 +1480,8 @@
+ $(STRIP) $(OBJS) $(EXTRAOBJS)
$(DYLIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS)
- @$(LD) -dynamiclib -compatibility_version $(MAJ).$(MIN) \
-+ $(LD) $(LDFLAGS) -dynamiclib -install_name $(LIBDIR)/$(DYLIBNAME) \
++ $(LD) $(LDFLAGS) -dynamiclib -install_name $(PREFIX)/lib/$(DYLIBNAME) \
+ -compatibility_version $(MAJ).$(MIN) \
-current_version $(MAJ).$(MIN).$(PLV) \
-o $(DYLIBNAME) $(OBJS) $(EXTRAOBJS)
-@@ -1847,7 +1847,7 @@
+@@ -1875,7 +1875,7 @@
# decide to try it.
Darwin:
- @make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer" LDFLAGS="-object -s"
+ @make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer"
- # NCR MP-RAS: Use the NCR cc. The "-DNCR_UST" is needed to enable threading
- # (User-Space Threads).
+ # MinGW: cc is gcc. Note that we have to use the cross-compile flags
+ # XCFLAGS rather than CFLAGS because the latter implies a native Unix
+@@ -2657,3 +2657,12 @@
+ fi
+ @if [ `uname -s` = 'CYGWIN_NT-5.0' ] ; then rm -f *.exe; fi
+ @if [ `uname -s` = 'HP-UX' ] ; then rm -f lib$(PROJ).sl; fi
++
++
++install:
++ install -d $(DESTDIR)$(PREFIX)/lib
++ install -m 644 $(LIBNAME) $(DESTDIR)$(PREFIX)/lib
++ install -m 644 $(DYLIBNAME) $(DESTDIR)$(PREFIX)/lib
++ ln -s $(DYLIBNAME) $(DESTDIR)$(PREFIX)/lib/lib$(PROJ).dylib
++ install -d $(DESTDIR)$(PREFIX)/include
++ install -m 644 cryptlib.h $(DESTDIR)$(PREFIX)/include
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131213/902cced7/attachment.html>
More information about the macports-changes
mailing list