* Patch to OpenSSL 0.9.7h to make it build on Mac OS X.

svn path=/nixpkgs/trunk/; revision=4070

maintainers/docs/todo.txt

@@ -12,10 +12,3 @@
 * Add gettext to glib propagatedBuildInputs?  Glib's `gi18n.h' doesn't
   seem to like Glibc `libintl.h'; needs the gettext one instead.
   [Move from libbonoboui]
-
-* In libxml2: python2.3 -> python2.4 (or even better, make this
-  generic; also in bittorrent).
-
-* Packages that need ncurses almost always need special flags.  They
-  expect "ncurses.h" rather than "ncurses/ncurses.h" to be in the
-  include path.  Fix this.

pkgs/development/libraries/openssl/darwin-makefile.patch

@@ -0,0 +1,37 @@
+diff -rc openssl-0.9.7h-orig/Makefile.org openssl-0.9.7h/Makefile.org
+*** openssl-0.9.7h-orig/Makefile.org	2005-06-20 06:29:54.000000000 +0200
+--- openssl-0.9.7h/Makefile.org	2005-10-12 09:38:00.000000000 +0200
+***************
+*** 258,264 ****
+  libcrypto$(SHLIB_EXT): libcrypto.a
+  	@if [ "$(SHLIB_TARGET)" != "" ]; then \
+  		$(MAKE) SHLIBDIRS=crypto build-shared; \
+!         	if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
+                      fips/sha/fips_standalone_sha1 -binary $@ > $@.$${HMAC_EXT:-sha1}; \
+  		fi; \
+  	else \
+--- 258,264 ----
+  libcrypto$(SHLIB_EXT): libcrypto.a
+  	@if [ "$(SHLIB_TARGET)" != "" ]; then \
+  		$(MAKE) SHLIBDIRS=crypto build-shared; \
+! 		if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
+                      fips/sha/fips_standalone_sha1 -binary $@ > $@.$${HMAC_EXT:-sha1}; \
+  		fi; \
+  	else \
+***************
+*** 325,331 ****
+  	if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \
+  		libs="$(LIBKRB5) $$libs"; \
+  	fi; \
+! 	( set -x; ${CC} ${SHARED_LDFLAGS}
+  		--verbose -dynamiclib -o lib$$i${SHLIB_EXT} \
+  		lib$$i.a $$libs -all_load -current_version ${SHLIB_MAJOR}.${SHLIB_MINOR} \
+  		-compatibility_version ${SHLIB_MAJOR}.`echo ${SHLIB_MINOR} | cut -d. -f1` \
+--- 325,331 ----
+  	if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \
+  		libs="$(LIBKRB5) $$libs"; \
+  	fi; \
+! 	( set -x; ${CC} ${SHARED_LDFLAGS} \
+  		--verbose -dynamiclib -o lib$$i${SHLIB_EXT} \
+  		lib$$i.a $$libs -all_load -current_version ${SHLIB_MAJOR}.${SHLIB_MINOR} \
+  		-compatibility_version ${SHLIB_MAJOR}.`echo ${SHLIB_MINOR} | cut -d. -f1` \

pkgs/development/libraries/openssl/default.nix

@@ -6,4 +6,5 @@
     sha1 = "9fe535fce89af967b29c4727dedd25f2b4cc2f0d";
   };
   buildInputs = [perl];
+  patches = [./darwin-makefile.patch];
 }