Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/crypto
In directory vz-cvs-3.sog:/tmp/cvs-serv25652
Modified Files:
nettle4.info nettle4.patch
Log Message:
sync. w/ 10.!4/stable, validated on powerpc-darwin8
Index: nettle4.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/crypto/nettle4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nettle4.patch 29 Nov 2011 19:06:01 -0000 1.2
+++ nettle4.patch 16 Mar 2012 04:27:00 -0000 1.3
@@ -20,8 +20,8 @@
- LIBHOGWEED_LIBS=''
+ LIBHOGWEED_SONAME='libhogweed.$(LIBHOGWEED_MAJOR).dylib'
+ LIBHOGWEED_FILE='libhogweed.$(LIBHOGWEED_MAJOR).$(LIBHOGWEED_MINOR).dylib'
-+ LIBHOGWEED_LINK='$(CC) -dynamiclib -L. $(LDFLAGS) -install_name
${libdir}/$(LIBHOGWEED_SONAME) -compatibility_version $(LIBHOGWEED_MAJOR)
-current_version $(LIBHOGWEED_MAJOR).$(LIBHOGWEED_MINOR)'
-+ LIBHOGWEED_LIBS='$(LIBS) -lnettle -gmp'
++ LIBHOGWEED_LINK='$(CC) -dynamiclib $(LDFLAGS) -install_name
${libdir}/$(LIBHOGWEED_SONAME) -compatibility_version $(LIBHOGWEED_MAJOR)
-current_version $(LIBHOGWEED_MAJOR).$(LIBHOGWEED_MINOR)'
++ LIBHOGWEED_LIBS='$(LIBS) libnettle.dylib -gmp'
;;
solaris*)
# Sun's ld uses -h to set the soname, and this option is passed
Index: nettle4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/crypto/nettle4.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nettle4.info 29 Nov 2011 19:06:00 -0000 1.2
+++ nettle4.info 16 Mar 2012 04:27:00 -0000 1.3
@@ -1,6 +1,6 @@
Package: nettle4
Version: 2.4
-Revision: 2
+Revision: 5
#
License: GPL
Maintainer: Hans-Christoph Steiner <[email protected]>
@@ -10,31 +10,40 @@
Source-MD5: 450be8c4886d46c09f49f568ad6fa013
#
PatchFile: %n.patch
-PatchFile-MD5: 3107e08688a4b0a105229fa7a3d0f9cf
+PatchFile-MD5: 959110883e44c8d2a8724af73d6459cd
+PatchScript: <<
+ %{default_script}
+ perl -pi -e 's,-L\.\.,,g' */Makefile.in
+ perl -pi -e 's,-l(hogweed|nettle),../lib\1.dylib,g' */Makefile.in
+<<
#
Depends: %N-shlibs (= %v-%r), libhogweed (= %v-%r)
-BuildDepends: gmp5, fink (>= 0.24.12)
+BuildDepends: autoconf2.6, gmp5, fink (>= 0.24.12)
BuildDependsOnly: True
Conflicts: nettle
Replaces: nettle
#
ConfigureParams: --enable-shared
+CompileScript: <<
+ autoconf
+ %{default_script}
+<<
#
InstallScript: <<
%{default_script}
install_name_tool -id %p/lib/libnettle.4.3.dylib %i/lib/libnettle.4.3.dylib
install_name_tool -id %p/lib/libhogweed.2.1.dylib %i/lib/libhogweed.2.1.dylib
chmod +x %i/lib/libnettle.4.3.dylib %i/lib/libhogweed.2.1.dylib
- install_name_tool -change %i/lib/libnettle.4.dylib
%p/lib/libnettle.4.3.dylib %i/lib/libhogweed.2.1.dylib
+ install_name_tool -change %p/lib/libnettle.4.dylib
%p/lib/libnettle.4.3.dylib %i/lib/libhogweed.2.1.dylib
# bin utils
- install_name_tool -change %i/lib/libnettle.4.dylib
%p/lib/libnettle.4.3.dylib %i/bin/nettle-hash
- install_name_tool -change %i/lib/libhogweed.2.dylib
%p/lib/libhogweed.2.1.dylib %i/bin/nettle-hash
- install_name_tool -change %i/lib/libnettle.4.dylib
%p/lib/libnettle.4.3.dylib %i/bin/nettle-lfib-stream
- install_name_tool -change %i/lib/libhogweed.2.dylib
%p/lib/libhogweed.2.1.dylib %i/bin/nettle-lfib-stream
- install_name_tool -change %i/lib/libnettle.4.dylib
%p/lib/libnettle.4.3.dylib %i/bin/pkcs1-conv
- install_name_tool -change %i/lib/libhogweed.2.dylib
%p/lib/libhogweed.2.1.dylib %i/bin/pkcs1-conv
- install_name_tool -change %i/lib/libnettle.4.dylib
%p/lib/libnettle.4.3.dylib %i/bin/sexp-conv
- install_name_tool -change %i/lib/libhogweed.2.dylib
%p/lib/libhogweed.2.1.dylib %i/bin/sexp-conv
+ install_name_tool -change %p/lib/libnettle.4.dylib
%p/lib/libnettle.4.3.dylib %i/bin/nettle-hash
+ install_name_tool -change %p/lib/libhogweed.2.dylib
%p/lib/libhogweed.2.1.dylib %i/bin/nettle-hash
+ install_name_tool -change %p/lib/libnettle.4.dylib
%p/lib/libnettle.4.3.dylib %i/bin/nettle-lfib-stream
+ install_name_tool -change %p/lib/libhogweed.2.dylib
%p/lib/libhogweed.2.1.dylib %i/bin/nettle-lfib-stream
+ install_name_tool -change %p/lib/libnettle.4.dylib
%p/lib/libnettle.4.3.dylib %i/bin/pkcs1-conv
+ install_name_tool -change %p/lib/libhogweed.2.dylib
%p/lib/libhogweed.2.1.dylib %i/bin/pkcs1-conv
+ install_name_tool -change %p/lib/libnettle.4.dylib
%p/lib/libnettle.4.3.dylib %i/bin/sexp-conv
+ install_name_tool -change %p/lib/libhogweed.2.dylib
%p/lib/libhogweed.2.1.dylib %i/bin/sexp-conv
# delete these unnecessary symlinks with only the major version
# rm -- %i/lib/libnettle.4.dylib
# rm -- %i/lib/libhogweed.2.dylib
@@ -79,7 +88,7 @@
SplitOff3: <<
Package: libhogweed
DocFiles: COPYING.LIB README
- Depends: gmp5-shlibs
+ Depends: gmp5-shlibs, %N-shlibs (>= %v-%r)
Files: <<
lib/libhogweed.2.1.dylib
<<
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
