Import of pkgsrc-2015Q3

2016-01-21 23:42:40 +01:00
parent f641581404
commit 9d819b6d54
7578 changed files with 228313 additions and 80017 deletions
@@ -1,64 +1,67 @@
-$NetBSD: patch-Makefile.in,v 1.5 2013/04/29 16:42:25 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.6 2015/08/23 14:22:10 wiz Exp $

 Use LIBTOOL.

--- Makefile.in.orig	2013-04-24 13:26:53.000000000 +0000
+--- Makefile.in.orig	2015-04-24 17:22:03.000000000 +0000
 +++ Makefile.in
-@@ -16,13 +16,13 @@ MKDIR_P = @MKDIR_P@
+@@ -17,7 +17,7 @@ OPT_HOGWEED_OBJS = @OPT_HOGWEED_OBJS@
 
- OPT_ASM_SOURCES = @OPT_ASM_SOURCES@
+ OPT_NETTLE_SOURCES = @OPT_NETTLE_SOURCES@
 
 -SUBDIRS = tools testsuite examples
 +SUBDIRS = tools testsuite
 
 include config.make
 
- PRE_CPPFLAGS = -I.
+@@ -25,7 +25,7 @@ PRE_CPPFLAGS = -I.
+ EXTRA_CFLAGS = $(CCPIC)
+ 
 # FIXME: Add configuration of LIBEXT?
 -LIBTARGETS = @IF_STATIC@ libnettle.a @IF_HOGWEED@ libhogweed.a
 +LIBTARGETS = @IF_STATIC@ libnettle.la @IF_HOGWEED@ libhogweed.la
 SHLIBTARGETS = @IF_SHARED@ $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK)
 
 getopt_SOURCES = getopt.c getopt1.c
-@@ -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))
+@@ -234,20 +234,20 @@ nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJ
+ hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) \
+ 	       $(OPT_HOGWEED_OBJS) @IF_MINI_GMP@ mini-gmp.$(OBJEXT)
 
 -libnettle.a: $(nettle_OBJS)
 -	-rm -f $@
 -	$(AR) $(ARFLAGS) $@ $(nettle_OBJS)
 -	$(RANLIB) $@
-
-libhogweed.a: $(hogweed_OBJS)
-	-rm -f $@
-	$(AR) $(ARFLAGS) $@ $(hogweed_OBJS)
-	$(RANLIB) $@
 +libnettle.la: $(nettle_OBJS)
 +	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o libnettle.la \
 +		${nettle_OBJS:.o=.lo} -rpath ${PREFIX}/lib \
 +		-version-info ${LIBNETTLE_MAJOR}:${LIBNETTLE_MINOR}
-+
+ 	echo nettle > libnettle.stamp
+ 
+-libhogweed.a: $(hogweed_OBJS)
+-	-rm -f $@
+-	$(AR) $(ARFLAGS) $@ $(hogweed_OBJS)
+-	$(RANLIB) $@
 +libhogweed.la: $(hogweed_OBJS)
 +	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o libhogweed.la \
 +		${hogweed_OBJS:.o=.lo} -rpath ${PREFIX}/lib \
 +		-version-info ${LIBHOGWEED_MAJOR}:${LIBHOGWEED_MINOR}
+ 	echo hogweed > libhogweed.stamp
 
 .c.$(OBJEXT):
-	$(COMPILE) $(CCPIC_MAYBE) -c $< \
+-	$(COMPILE) -c $< \
 +	${LIBTOOL} --mode=compile --tag=CC $(COMPILE) $(CCPIC_MAYBE) -c $< \
 	&& $(DEP_PROCESS)
 
 # Rules building shared libraries.
-@@ -329,7 +329,7 @@ ecc-521.p$(OBJEXT): ecc-521.h
- 	&& test -s $@T && mv -f $@T $@
+@@ -372,7 +372,7 @@ ecc-25519.$(OBJEXT): ecc-25519.h
 
- .s.$(OBJEXT):
-	$(COMPILE) $(CCPIC_MAYBE) -c $<
-+	${LIBTOOL} --mode=compile $(COMPILE) $(CCPIC_MAYBE) -c $<
+ .asm.$(OBJEXT): $(srcdir)/asm.m4 machine.m4 config.m4
+ 	$(M4) $(srcdir)/asm.m4 machine.m4 config.m4 $< >$*.s
+-	$(COMPILE) -c $*.s
+	${LIBTOOL} --mode=compile $(COMPILE) -c $*.s
+ 	@echo "$@ : $< $(srcdir)/asm.m4 machine.m4 config.m4" >$@.d 
 
- .s.p$(OBJEXT):
- 	$(COMPILE) $(SHLIBCFLAGS) -c $< -o $@
-@@ -398,7 +398,7 @@ install-here: install-doc install-header
+ # Texinfo rules
+@@ -442,7 +442,7 @@ install-here: install-doc install-header
 install-static: $(LIBTARGETS)
 	$(MKDIR_P) $(DESTDIR)$(libdir)
 	for f in $(LIBTARGETS); do \
@@ -1,22 +0,0 @@
-$NetBSD: patch-arm_v6_sha256-compress.asm,v 1.1 2014/11/21 14:11:19 joerg Exp $
-
--- arm/v6/sha256-compress.asm.orig	2014-11-20 20:28:47.000000000 +0000
-+++ arm/v6/sha256-compress.asm
-@@ -112,7 +112,7 @@ define(<NOEXPN>, <
- PROLOGUE(_nettle_sha256_compress)
- 	push	{r4,r5,r6,r7,r8,r10,r11,r14}
- 	sub	sp, sp, #68
-	str	STATE, [sp, +#64]
-+	str	STATE, [sp, #64]
- 
- 	C Load data up front, since we don't have enough registers
- 	C to load and shift on-the-fly
-@@ -185,7 +185,7 @@ PROLOGUE(_nettle_sha256_compress)
- 	EXPN(15) ROUND(SB,SC,SD,SE,SF,SG,SH,SA)
- 	bne	.Loop2
- 
-	ldr	STATE, [sp, +#64]
-+	ldr	STATE, [sp, #64]
- 	C No longer needed registers
- 	ldm	STATE, {r1,r2,r12,r14}
- 	add	SA, SA, r1
@@ -1,13 +1,13 @@
-$NetBSD: patch-config.make.in,v 1.2 2013/04/29 16:42:25 adam Exp $
+$NetBSD: patch-config.make.in,v 1.3 2015/08/23 14:22:10 wiz Exp $

 Use LIBTOOL.

--- config.make.in.orig	2011-04-26 08:41:17.000000000 +0000
+--- config.make.in.orig	2015-04-24 17:22:03.000000000 +0000
 +++ config.make.in
-@@ -73,8 +73,8 @@ infodir =	@infodir@
+@@ -70,8 +70,8 @@ infodir =	@infodir@
 
- COMPILE = $(CC) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(CCPIC) $(DEP_FLAGS)
- COMPILE_CXX = $(CXX) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(CCPIC) $(DEP_FLAGS)
+ COMPILE = $(CC) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(DEP_FLAGS)
+ COMPILE_CXX = $(CXX) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(DEP_FLAGS)
 -LINK = $(CC) $(CFLAGS) $(PRE_LDFLAGS) $(LDFLAGS)
 -LINK_CXX = $(CXX) $(CXXFLAGS) $(PRE_LDFLAGS) $(LDFLAGS)
 +LINK = ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(PRE_LDFLAGS) $(LDFLAGS)
@@ -1,10 +1,10 @@
-$NetBSD: patch-testsuite_Makefile.in,v 1.4 2013/04/29 16:42:25 adam Exp $
+$NetBSD: patch-testsuite_Makefile.in,v 1.5 2015/08/23 14:22:10 wiz Exp $

 Use LIBTOOL.

--- testsuite/Makefile.in.orig	2013-01-14 21:44:13.000000000 +0000
+--- testsuite/Makefile.in.orig	2014-06-07 06:15:01.000000000 +0000
 +++ testsuite/Makefile.in
-@@ -73,9 +73,9 @@ all: $(TARGETS) $(EXTRA_TARGETS)
+@@ -76,9 +76,9 @@ all: $(EXTRA_TARGETS)
 # to use suffix rules to build the test executables. So we use an
 # explicit rule for each and every executable.
 
@@ -16,12 +16,3 @@ Use LIBTOOL.
 
 ../nettle-internal.$(OBJEXT):
 	( cd .. && $(MAKE) nettle-internal.$(OBJEXT) )
-@@ -96,7 +96,7 @@ test-rules:
- include $(srcdir)/.test-rules.make
- 
- $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
-	../libnettle.a @IF_HOGWEED@ ../libhogweed.a
-+	../libnettle.la @IF_HOGWEED@ ../libhogweed.la
- 
- # For use as, e.g.,
- #
@@ -1,39 +1,10 @@
-$NetBSD: patch-tools_Makefile.in,v 1.3 2013/03/15 18:22:03 drochner Exp $
+$NetBSD: patch-tools_Makefile.in,v 1.4 2015/08/23 14:22:10 wiz Exp $

 Use LIBTOOL.

--- tools/Makefile.in.orig	2013-01-14 21:44:12.000000000 +0000
+--- tools/Makefile.in.orig	2014-06-07 06:15:01.000000000 +0000
 +++ tools/Makefile.in
-@@ -34,20 +34,20 @@ SOURCES = $(sexp_conv_SOURCES) nettle-ha
- DISTFILES = $(SOURCES) Makefile.in input.h misc.h output.h parse.h
- 
- sexp_conv_OBJS = $(sexp_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
-sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../libnettle.a
-	$(LINK) $(sexp_conv_OBJS) -lnettle $(LIBS) -o $@
-+sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../libnettle.la
-+	$(LINK) $(sexp_conv_OBJS) ../libnettle.la $(LIBS) -o $@
- 
-nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../libnettle.a
-	$(LINK) nettle-lfib-stream.$(OBJEXT) -lnettle $(LIBS) -o $@
-+nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../libnettle.la
-+	$(LINK) nettle-lfib-stream.$(OBJEXT) ../libnettle.la $(LIBS) -o $@
- 
- pkcs1_conv_OBJS = $(pkcs1_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
-pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../libnettle.a ../libhogweed.a
-	$(LINK) $(pkcs1_conv_OBJS) -lhogweed -lnettle $(LIBS) -o $@
-+pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../libnettle.la ../libhogweed.la
-+	$(LINK) $(pkcs1_conv_OBJS) ../libhogweed.la ../libnettle.la $(LIBS) -o $@
- 
- # FIXME: Avoid linking with gmp
- nettle_hash_OBJS = $(nettle_hash_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
-nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle.a
-	$(LINK) $(nettle_hash_OBJS) -lnettle $(LIBS) -o $@
-+nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle.la
-+	$(LINK) $(nettle_hash_OBJS) ../libnettle.la $(LIBS) -o $@
- 
- 
- .c.$(OBJEXT):
-@@ -69,7 +69,7 @@ check:
+@@ -75,7 +75,7 @@ check:
 install: $(TARGETS)
 	$(MKDIR_P) $(DESTDIR)$(bindir)
 	for f in $(TARGETS) ; do \