aboutsummaryrefslogtreecommitdiff
path: root/security/sectok
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2014-06-11 14:49:59 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2014-06-11 14:49:59 +0000
commit9f8b4bcde30c0ca3bf6cead5f48aa102536e0e92 (patch)
treec4f78cbaf45ab044db3e157be708afd711a4e841 /security/sectok
parent0533abe3e7aae5c19e0a0ce9c1e82ed5e94f63e8 (diff)
downloadports-9f8b4bcde30c0ca3bf6cead5f48aa102536e0e92.tar.gz
ports-9f8b4bcde30c0ca3bf6cead5f48aa102536e0e92.zip
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)
Notes
Notes: svn path=/head/; revision=357486
Diffstat (limited to 'security/sectok')
-rw-r--r--security/sectok/Makefile13
1 files changed, 7 insertions, 6 deletions
diff --git a/security/sectok/Makefile b/security/sectok/Makefile
index 2354d3165c77..2d464d19b29e 100644
--- a/security/sectok/Makefile
+++ b/security/sectok/Makefile
@@ -15,17 +15,18 @@ LIB_DEPENDS= libsectok.so:${PORTSDIR}/security/libsectok
USE_OPENSSL= yes
USE_LDCONFIG= yes
+MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+LIBS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
post-patch:
- @${REINPLACE_CMD} -e \
- '/^INCLUDES=/s|$$| $${CPPFLAGS}| ; \
- /^LIBS=/s|$$| $${LDFLAGS}| ; \
- s|^CC=|CC?=| ; \
- s|^CFLAGS=|CFLAGS?=|' ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} \
+ -e '/^INCLUDES=/s|$$| ${CPPFLAGS}|' \
+ -e '/^LIBS=/s|=|=${LDFLAGS} |' \
+ -e '/^LIBS=/s|$$| ${LIBS}|' \
+ ${WRKSRC}/Makefile
do-install:
(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \