From 9f8b4bcde30c0ca3bf6cead5f48aa102536e0e92 Mon Sep 17 00:00:00 2001
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Wed, 11 Jun 2014 14:49:59 +0000
Subject: Support LIBS like LDFLAGS.

- Add LIBS="${LIBS}" to MAKE_ENV and CONFIGURE_ENV.
- Add an option helper for LIBS.
- Adjust all ports that already use LIBS.  Also remove references to
  PTHREAD_CFLAGS and PTHREAD_LIBS while here.
- Some ports did not support having a LIBS environment variable and
  required additional patches.

Somewhat simplified a linker command line looks like:

${CC} ${src_LDFLAGS} ${LDFLAGS} ${src_LIBS} ${LIBS}

where src_LDFLAGS and src_LIBS are controlled by upstream and LDFLAGS and
LIBS can be controlled by us.  If possible -L and -l flags need to be
added to LIBS to make sure they appear after any -L and -l flags set by
upstream.  Many ports currently add -L${LOCALBASE}/lib to LDFLAGS but this
may appear too early on the command line causing installed libraries to
be linked in instead of freshly built ones.

Additional changes:
benchmarks/netio: Replace WITH_IPV6 with an IPV6 option.
comms/gnokii: Replace some patches with USES=pathfix.  Also remove -fPIC.
graphics/gimageview: USES=libtool and install desktop file in DESKTOPDIR.
graphics/visionworkbench: Remove FreeBSD 7 support.
multimedia/libmovtar: New LIB_DEPENDS syntax.
multimedia/opencinematools: Use standard do-build.
net/siproxd: USES=libtool:keepla (port actually needs .la files for plugins)
net-mgmt/nagios: Remove -fPIC.
net-mgmt/nagios4: Remove -fPIC.
print/cups-base: Only add -lssp_nonshared on i386 and OSVERSION < 1000036.
security/p11-kit: Replace PTHREAD_LIBS in CONFIGURE_ENV with
ac_cv_func_pthread_mutexattr_init=no in CONFIGURE_ARGS.  This skips a test
in configure that falsely detects pthread_mutexattr_init in our libc.
sysutils/dar: Fix iconv detection.
x11/rxvt-unicode: Remove -lstdc++ and patch configure to remove a FreeBSD
hack and use $CXX as linker as on other platforms.

PR:		190592
Exp-run by:	antoine
Approved by:	portmgr (antoine)
---
 mail/lmtp2nntp/files/patch-configure | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'mail/lmtp2nntp/files/patch-configure')

diff --git a/mail/lmtp2nntp/files/patch-configure b/mail/lmtp2nntp/files/patch-configure
index 94dc2ec1cb13..0fd480d02db1 100644
--- a/mail/lmtp2nntp/files/patch-configure
+++ b/mail/lmtp2nntp/files/patch-configure
@@ -1,6 +1,6 @@
 --- configure.orig	Thu Feb 13 11:01:47 2003
 +++ configure	Tue Apr 13 20:58:41 2004
-@@ -5845,9 +5845,9 @@
+@@ -6204,9 +6204,9 @@
      SUBDIR_POPT=""
  else
      SUBDIR_POPT="lib_popt"
@@ -13,3 +13,15 @@
                   LIBS_EXTRA="$LIBS_EXTRA -lpopt"
  fi
  echo "$as_me:$LINENO: result: $with_popt" >&5
+@@ -6904,8 +6904,9 @@
+ echo "$as_me:$LINENO: result: $with_dmalloc" >&5
+ echo "${ECHO_T}$with_dmalloc" >&6
+ 
+-
+-LIBS="$LIBS_EXTRA $LIBS"
++LIBS_EXTRA="$LIBS_EXTRA $LIBS"
++unset LIBS
++LIBS="$LIBS_EXTRA"
+ 
+ enable_shared=no
+ export enable_shared
-- 
cgit v1.2.3