Fix linking fdpassing.

3 files changed, 44 insertions, 5 deletions

diff --git a/security/libassuan/distinfo b/security/libassuan/distinfo
index 2973ef578c5..2575bad1fa6 100644
--- a/security/libassuan/distinfo
+++ b/security/libassuan/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2008/09/07 02:40:53 bjs Exp $
+$NetBSD: distinfo,v 1.11 2013/02/26 11:00:59 joerg Exp $
 
 SHA1 (libassuan-1.0.5.tar.bz2) = f6c36e9d99736883a8ce5b80b0a51d854cbbbc70
 RMD160 (libassuan-1.0.5.tar.bz2) = 7c4a75c71a3117cf140ea66ca89765349f39218e
@@ -6,4 +6,5 @@ Size (libassuan-1.0.5.tar.bz2) = 297786 bytes
 SHA1 (patch-aa) = 89707efd069a5113fbdaba2464405e91c9173ca6
 SHA1 (patch-ab) = c6af201ae6c8030310c8af7be5af88a7ce02c6c5
 SHA1 (patch-ac) = 8dbb703833c8b0a63b5b355309c91cd189235468
-SHA1 (patch-ad) = e0fa944fa8ac1e5e4f1b9ba0df934fe15e26e655
+SHA1 (patch-ad) = a44a1486852d88b098a860cb8aa41ed41f98e35b
+SHA1 (patch-tests_Makefile.in) = 941d2d6073024e61c8830a18a6cc470fac0e393b
diff --git a/security/libassuan/patches/patch-ad b/security/libassuan/patches/patch-ad
index 4ec56a780ca..4a136b9a4b6 100644
--- a/security/libassuan/patches/patch-ad
+++ b/security/libassuan/patches/patch-ad
@@ -1,11 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2008/09/07 02:40:53 bjs Exp $
+$NetBSD: patch-ad,v 1.2 2013/02/26 11:00:59 joerg Exp $
 
---- tests/Makefile.am.orig	2007-07-05 13:10:06.000000000 -0400
+--- tests/Makefile.am.orig	2007-07-05 17:10:06.000000000 +0000
 +++ tests/Makefile.am
-@@ -35,5 +35,5 @@ AM_CFLAGS = # $(GPG_ERROR_CFLAGS)
+@@ -35,5 +35,7 @@ AM_CFLAGS = # $(GPG_ERROR_CFLAGS)
  
  noinst_HEADERS = common.h
  noinst_PROGRAMS = $(TESTS)
 -LDADD =  ../src/libassuan.a  $(NETLIBS) # $(GPG_ERROR_LIBS)
 +LDADD =  ../src/libassuan.la  $(NETLIBS) # $(GPG_ERROR_LIBS)
  
++fdpassing$(EXEEXT): fdpassing.$(OBJEXT)
++	$(CCLD) fdpassing.$(OBJEXT) -o fdpassing$(EXEEXT) $(LDADD)
diff --git a/security/libassuan/patches/patch-tests_Makefile.in b/security/libassuan/patches/patch-tests_Makefile.in
new file mode 100644
index 00000000000..ab91afe3a59
--- /dev/null
+++ b/security/libassuan/patches/patch-tests_Makefile.in
@@ -0,0 +1,36 @@
+$NetBSD: patch-tests_Makefile.in,v 1.1 2013/02/26 11:00:59 joerg Exp $
+
+--- tests/Makefile.in.orig	2008-05-25 08:00:34.000000000 +0000
++++ tests/Makefile.in
+@@ -74,13 +74,13 @@ fdpassing_SOURCES = fdpassing.c
+ fdpassing_OBJECTS = fdpassing.$(OBJEXT)
+ fdpassing_LDADD = $(LDADD)
+ am__DEPENDENCIES_1 =
+-fdpassing_DEPENDENCIES = ../src/libassuan.a $(am__DEPENDENCIES_1)
++fdpassing_DEPENDENCIES = ../src/libassuan.la $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
++CCLD = libtool --mode=link $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = fdpassing.c
+ DIST_SOURCES = fdpassing.c
+@@ -199,7 +199,7 @@ BUILT_SOURCES = 
+ CLEANFILES = 
+ AM_CFLAGS = # $(GPG_ERROR_CFLAGS)
+ noinst_HEADERS = common.h
+-LDADD = ../src/libassuan.a  $(NETLIBS) # $(GPG_ERROR_LIBS)
++LDADD = ../src/libassuan.la  $(NETLIBS) # $(GPG_ERROR_LIBS)
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+@@ -518,3 +518,6 @@ uninstall-am:
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
++
++fdpassing$(EXEEXT): fdpassing.$(OBJEXT)
++	$(CCLD) fdpassing.$(OBJEXT) -o fdpassing$(EXEEXT) $(LDADD)