From 3e27fdc08a324af1d65d3aead48d8cb49fa53885 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Wed, 19 Aug 2015 19:50:56 +0000
Subject: Pullup ticket #4794 - requested by is comms/hylafax: build fix

Revisions pulled up:
- comms/hylafax/distinfo                                        1.27
- comms/hylafax/patches/patch-ae                                1.19

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Mon Aug 10 05:03:36 UTC 2015

   Modified Files:
   	pkgsrc/comms/hylafax: distinfo
   	pkgsrc/comms/hylafax/patches: patch-ae

   Log Message:
   Fix broken build, caused by wrapper reordering of .a files vs. -l options.
   Symptom: HYLAFAX_VERSION_STRING not found while linking.
---
 comms/hylafax/distinfo         |  4 ++--
 comms/hylafax/patches/patch-ae | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/comms/hylafax/distinfo b/comms/hylafax/distinfo
index 6fdc4beec2b..f56d1e9c44c 100644
--- a/comms/hylafax/distinfo
+++ b/comms/hylafax/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2014/03/14 15:59:29 adam Exp $
+$NetBSD: distinfo,v 1.26.12.1 2015/08/19 19:50:56 tron Exp $
 
 SHA1 (hylafax-6.0.6.tar.gz) = 8d8cc9a5f242ef83d7bc6f5cd200fec1351b280e
 RMD160 (hylafax-6.0.6.tar.gz) = 1f6e3022fe9886f2cde9fb406277d5496ee24f1c
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = 54f34633757a4925084d9e7e4c1e743bca48e4ba
 SHA1 (patch-ab) = 5ee930814178223fa66dd308f365ff400559fd1d
 SHA1 (patch-ac) = b2051ac2e43d0635797043605d96f128e535c976
 SHA1 (patch-ad) = a7e361980c94a025be0b326c1cf694cce3cbff72
-SHA1 (patch-ae) = 031813b7a130cb7ee99596be88aa933e6ec8786e
+SHA1 (patch-ae) = 75024769daca0657e8c0ba4a655ee7993c453120
 SHA1 (patch-af) = f1dd817fcd086bfdd354351dc0b92027250edcba
 SHA1 (patch-ag) = 52024e0184e2607c6cfb2c6c19c9f31b3c37ec95
 SHA1 (patch-ah) = 8558a0f9d970ce1cddbeb76fc87a1c450bd0941d
diff --git a/comms/hylafax/patches/patch-ae b/comms/hylafax/patches/patch-ae
index be07d3b222c..d088fdf31bc 100644
--- a/comms/hylafax/patches/patch-ae
+++ b/comms/hylafax/patches/patch-ae
@@ -1,7 +1,11 @@
-$NetBSD: patch-ae,v 1.18 2014/03/14 15:59:29 adam Exp $
+$NetBSD: patch-ae,v 1.18.12.1 2015/08/19 19:50:56 tron Exp $
 
 * Customize paths.
 * Configure for pkgsrc.
+* LIBPORT needs to be specified with -L and -l (instead of the path to
+the .a file) to match the other internal libraries. Otherwise the
+wrappers reorder it relative to the other internal libraries and some
+symbols aren't resolved at link time.
 
 --- configure.orig	2012-06-06 00:58:38.000000000 +0000
 +++ configure
@@ -160,6 +164,15 @@ $NetBSD: patch-ae,v 1.18 2014/03/14 15:59:29 adam Exp $
      capture cat t.c
      runMake t "t:; \${CC} t.c ${MACHDEPLIBS}"
  }
+@@ -3303,7 +3303,7 @@ else
+     Note "... emulate syslog&co."
+     PORTFUNCS="$PORTFUNCS syslog.c"
+ fi
+-LIBPORT='${PORT}/libport.a'
++LIBPORT='-L${PORT} -lport'
+ 
+ Note "Done checking system libraries."
+ 
 @@ -3314,19 +3314,13 @@ Note "Checking ZLIB support."
  #
  cat>t.c<<EOF
-- 
cgit v1.2.3