4 files changed, 24 insertions, 24 deletions
diff --git a/security/nettle/patches/patch-Makefile.in b/security/nettle/patches/patch-Makefile.in
index 050e3824cce..781a7eb4aaf 100644
--- a/security/nettle/patches/patch-Makefile.in
+++ b/security/nettle/patches/patch-Makefile.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-Makefile.in,v 1.4 2013/03/15 18:22:03 drochner Exp $
+$NetBSD: patch-Makefile.in,v 1.5 2013/04/29 16:42:25 adam Exp $
 
 Use LIBTOOL.
 
---- Makefile.in.orig	2013-01-14 21:44:12.000000000 +0000
+--- Makefile.in.orig	2013-04-24 13:26:53.000000000 +0000
 +++ Makefile.in
-@@ -14,13 +14,13 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = $(INSTALL_PROGRAM) -s
- MKDIR_P = @MKDIR_P@
+@@ -16,13 +16,13 @@ MKDIR_P = @MKDIR_P@
+ 
+ OPT_ASM_SOURCES = @OPT_ASM_SOURCES@
  
 -SUBDIRS = tools testsuite examples
 +SUBDIRS = tools testsuite
@@ -20,8 +20,8 @@ Use LIBTOOL.
  SHLIBTARGETS = @IF_SHARED@ $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK)
  
  getopt_SOURCES = getopt.c getopt1.c
-@@ -169,18 +169,18 @@ nettle_PURE_OBJS = $(nettle_OBJS:.$(OBJE
- hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT))
+@@ -186,18 +186,18 @@ nettle_PURE_OBJS = $(nettle_OBJS:.$(OBJE
+ hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) $(OPT_ASM_SOURCES:.asm=.$(OBJEXT))
  hogweed_PURE_OBJS = $(hogweed_OBJS:.$(OBJEXT)=.p$(OBJEXT))
  
 -libnettle.a: $(nettle_OBJS)
@@ -49,16 +49,16 @@ Use LIBTOOL.
  	&& $(DEP_PROCESS)
  
  # Rules building shared libraries.
-@@ -244,7 +244,7 @@ des.$(OBJEXT): des.c des.h $(des_headers
- .asm.$(OBJEXT):
- 	$(M4) $(srcdir)/asm.m4 machine.m4 config.m4 \
- 		$< >$*.s
--	$(COMPILE) $(CCPIC_MAYBE) -c $*.s
-+	${LIBTOOL} --mode=compile --tag=CC $(COMPILE) $(CCPIC_MAYBE) -c $*.s
- 	echo "$@ : $< $(srcdir)/asm.m4 machine.m4 config.m4" >$@.d 
+@@ -329,7 +329,7 @@ ecc-521.p$(OBJEXT): ecc-521.h
+ 	&& test -s $@T && mv -f $@T $@
+ 
+ .s.$(OBJEXT):
+-	$(COMPILE) $(CCPIC_MAYBE) -c $<
++	${LIBTOOL} --mode=compile $(COMPILE) $(CCPIC_MAYBE) -c $<
  
- .asm.p$(OBJEXT):
-@@ -317,7 +317,7 @@ install-here: install-doc install-header
+ .s.p$(OBJEXT):
+ 	$(COMPILE) $(SHLIBCFLAGS) -c $< -o $@
+@@ -398,7 +398,7 @@ install-here: install-doc install-header
  install-static: $(LIBTARGETS)
  	$(MKDIR_P) $(DESTDIR)$(libdir)
  	for f in $(LIBTARGETS); do \
diff --git a/security/nettle/patches/patch-aa b/security/nettle/patches/patch-aa
index 405ff05585b..17f18a8d97d 100644
--- a/security/nettle/patches/patch-aa
+++ b/security/nettle/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2013/03/15 18:22:03 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2013/04/29 16:42:25 adam Exp $
 
---- configure.orig	2013-01-14 21:44:12.000000000 +0000
+--- configure.orig	2013-04-24 13:26:53.000000000 +0000
 +++ configure
-@@ -6886,7 +6886,7 @@ fi
+@@ -7183,7 +7183,7 @@ fi
      enable_documentation=yes
  
    else
diff --git a/security/nettle/patches/patch-config.make.in b/security/nettle/patches/patch-config.make.in
index 725e5ccbb6c..25b72c2a5e4 100644
--- a/security/nettle/patches/patch-config.make.in
+++ b/security/nettle/patches/patch-config.make.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-config.make.in,v 1.1.1.1 2011/04/26 08:59:33 adam Exp $
+$NetBSD: patch-config.make.in,v 1.2 2013/04/29 16:42:25 adam Exp $
 
 Use LIBTOOL.
 
 --- config.make.in.orig	2011-04-26 08:41:17.000000000 +0000
 +++ config.make.in
-@@ -63,8 +63,8 @@ infodir =	@infodir@
+@@ -73,8 +73,8 @@ infodir =	@infodir@
  
  COMPILE = $(CC) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(CCPIC) $(DEP_FLAGS)
  COMPILE_CXX = $(CXX) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(CCPIC) $(DEP_FLAGS)
diff --git a/security/nettle/patches/patch-testsuite_Makefile.in b/security/nettle/patches/patch-testsuite_Makefile.in
index 7e63ebb7784..e5ec9d99533 100644
--- a/security/nettle/patches/patch-testsuite_Makefile.in
+++ b/security/nettle/patches/patch-testsuite_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-testsuite_Makefile.in,v 1.3 2013/03/15 18:22:03 drochner Exp $
+$NetBSD: patch-testsuite_Makefile.in,v 1.4 2013/04/29 16:42:25 adam Exp $
 
 Use LIBTOOL.
 
 --- testsuite/Makefile.in.orig	2013-01-14 21:44:13.000000000 +0000
 +++ testsuite/Makefile.in
-@@ -70,9 +70,9 @@ all: $(TARGETS) $(EXTRA_TARGETS)
+@@ -73,9 +73,9 @@ all: $(TARGETS) $(EXTRA_TARGETS)
  # to use suffix rules to build the test executables. So we use an
  # explicit rule for each and every executable.
  
@@ -16,7 +16,7 @@ Use LIBTOOL.
  
  ../nettle-internal.$(OBJEXT):
  	( cd .. && $(MAKE) nettle-internal.$(OBJEXT) )
-@@ -93,7 +93,7 @@ test-rules:
+@@ -96,7 +96,7 @@ test-rules:
  include $(srcdir)/.test-rules.make
  
  $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \