diff options
| author | tijl <tijl@FreeBSD.org> | 2014-06-11 22:49:59 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2014-06-11 22:49:59 +0800 |
| commit | 67f12d415fec83113a7ddfbc9655db98b4e70a28 (patch) | |
| tree | c4f78cbaf45ab044db3e157be708afd711a4e841 /net/ntopng | |
| parent | 2088f53b95d04c86b1aece3d66aaca36ec5aaec2 (diff) | |
| download | freebsd-ports-gnome-67f12d415fec83113a7ddfbc9655db98b4e70a28.tar.gz freebsd-ports-gnome-67f12d415fec83113a7ddfbc9655db98b4e70a28.tar.zst freebsd-ports-gnome-67f12d415fec83113a7ddfbc9655db98b4e70a28.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)
Diffstat (limited to 'net/ntopng')
| -rw-r--r-- | net/ntopng/Makefile | 1 | ||||
| -rw-r--r-- | net/ntopng/files/patch-configure | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile index d1c432f2b62a..28483bb1e2b1 100644 --- a/net/ntopng/Makefile +++ b/net/ntopng/Makefile @@ -70,6 +70,7 @@ post-patch: @${REINPLACE_CMD} -e "s#%%INSTALL_SCRIPT%%#${INSTALL_SCRIPT}#" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s#%%INSTALL_DATA%%#${INSTALL_DATA}#" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s#%%G++%%#${CXX}#" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s#LIBS#LIBRARIES#" ${WRKSRC}/Makefile.in pre-build: cd ${WRKSRC}/third-party/json-c && ${MAKE} clean && ./configure && ${MAKE} diff --git a/net/ntopng/files/patch-configure b/net/ntopng/files/patch-configure index 3841dc597310..73c7b4962cb9 100644 --- a/net/ntopng/files/patch-configure +++ b/net/ntopng/files/patch-configure @@ -8,12 +8,9 @@ SVN_DATE GMAKE SQLITE_LIB -@@ -2953,15 +2952,15 @@ - NTOPNG_VERS=`cat ./configure.in | head -1 | grep '_INIT' | cut -d " " -f 2|cut -d ')' -f 1` - CFLAGS="${CFLAGS} -I/usr/local/include -I/opt/local/include" +@@ -2955,13 +2954,13 @@ CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include" --LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib" -+LDFLAGS="${LDFLAGS}-L/usr/local/lib -L/opt/local/lib" + LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib" -SVN_RELEASE=`svn info . | grep "^Revision"|cut -d " " -f 2` +SVN_RELEASE="6939" |