diff options
| author | tijl <tijl@FreeBSD.org> | 2016-03-20 18:53:08 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2016-03-20 18:53:08 +0800 |
| commit | 9bf09f69cf8a3acf95e51a0a1e8d6eedfd31e3ca (patch) | |
| tree | c30aa05ffe4be67ca3bb38317073b7e6603daa7c /sysutils/heartbeat | |
| parent | 6af0c041428d493f447a328f9e81efe5b6d72273 (diff) | |
| download | freebsd-ports-gnome-9bf09f69cf8a3acf95e51a0a1e8d6eedfd31e3ca.tar.gz freebsd-ports-gnome-9bf09f69cf8a3acf95e51a0a1e8d6eedfd31e3ca.tar.zst freebsd-ports-gnome-9bf09f69cf8a3acf95e51a0a1e8d6eedfd31e3ca.zip | |
Install net/libnet headers and libraries back in the location where other
ports expect it. The files were put in a different location to avoid a
conflict with net/libnet10 but this port has been removed a while ago now.
PR: 208122
Exp-run by: antoine
Approved by: portmgr (antoine)
Diffstat (limited to 'sysutils/heartbeat')
| -rw-r--r-- | sysutils/heartbeat/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/heartbeat/files/patch-configure.in | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile index 5893fe7175db..3985711fe331 100644 --- a/sysutils/heartbeat/Makefile +++ b/sysutils/heartbeat/Makefile @@ -41,8 +41,8 @@ INSTALL_TARGET= install-strip USERS= hacluster GROUPS= haclient -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libnet11 -LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/libnet11 +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --localstatedir=/var \ --with-miBsdir=${PREFIX}/snmp/mibs \ diff --git a/sysutils/heartbeat/files/patch-configure.in b/sysutils/heartbeat/files/patch-configure.in index eb918671bd45..f5023631bf2f 100644 --- a/sysutils/heartbeat/files/patch-configure.in +++ b/sysutils/heartbeat/files/patch-configure.in @@ -50,15 +50,6 @@ AC_CHECK_PROGS(MAKE, gmake make) AC_MSG_CHECKING(for gmake or make) if test x"${MAKE}" = x""; then -@@ -542,7 +538,7 @@ - AC_PATH_PROGS(MAILCMD, mail, mailx) - AC_SUBST(MAILCMD) - AC_DEFINE_UNQUOTED(IFCONFIG, "$IFCONFIG", path to the ifconfig command) --AC_PATH_PROGS(LIBNETCONFIG, libnet-config) -+AC_PATH_PROGS(LIBNETCONFIG, libnet11-config) - AC_PATH_PROGS(GETENT, getent) - AC_PATH_PROGS(IP2UTIL, ip, /sbin/ip) - AC_PATH_PROGS(XML2CONFIG, xml2-config) @@ -1718,6 +1714,7 @@ AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) |