diff options
| author | dinoex <dinoex@FreeBSD.org> | 2013-02-19 05:25:28 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2013-02-19 05:25:28 +0800 |
| commit | 197ce9363526b211f5098f58511b184b601ba8ff (patch) | |
| tree | 652e786e69e00008b66c28a4aa5fdfbd17c9fc03 /sysutils | |
| parent | d26da44fe1de0d56986a365cf21f42c98f2b6699 (diff) | |
| download | freebsd-ports-gnome-197ce9363526b211f5098f58511b184b601ba8ff.tar.gz freebsd-ports-gnome-197ce9363526b211f5098f58511b184b601ba8ff.tar.zst freebsd-ports-gnome-197ce9363526b211f5098f58511b184b601ba8ff.zip | |
- move from libnet-devel -> libnet
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/heartbeat/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/heartbeat/files/patch-configure.in | 27 |
2 files changed, 5 insertions, 30 deletions
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile index 1c8a12d484c3..298b35d33981 100644 --- a/sysutils/heartbeat/Makefile +++ b/sysutils/heartbeat/Makefile @@ -7,7 +7,7 @@ PORTNAME= heartbeat PORTVERSION= 2.1.4 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= sysutils #MASTER_SITES= http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2 MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -19,7 +19,7 @@ MAINTAINER= ports@encarnate.com COMMENT= Subsystem for High-Availability Clustering LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \ - net-1.1.6:${PORTSDIR}/net/libnet-devel \ + net:${PORTSDIR}/net/libnet \ uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \ xml2:${PORTSDIR}/textproc/libxml2 PATCH_DEPENDS= libtool:${PORTSDIR}/devel/libtool @@ -37,8 +37,8 @@ USE_PYTHON= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libnet116 -LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/libnet116 +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libnet11 +LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/libnet11 CONFIGURE_ARGS= --prefix=${PREFIX} \ --localstatedir=/var \ diff --git a/sysutils/heartbeat/files/patch-configure.in b/sysutils/heartbeat/files/patch-configure.in index 7adc6bb3a30c..fa3c8bcf0cd0 100644 --- a/sysutils/heartbeat/files/patch-configure.in +++ b/sysutils/heartbeat/files/patch-configure.in @@ -36,35 +36,10 @@ AC_SUBST(MAILCMD) AC_DEFINE_UNQUOTED(IFCONFIG, "$IFCONFIG", path to the ifconfig command) -AC_PATH_PROGS(LIBNETCONFIG, libnet-config) -+AC_PATH_PROGS(LIBNETCONFIG, libnet116-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) -@@ -725,13 +733,13 @@ - AC_MSG_RESULT(using old version of API) - dnl The old version of the API REQUIRES $LIBNETCONFIG - dnl so we can only deal with new API unless we have it. -- AC_CHECK_LIB(net, libnet_get_hwaddr, [], -+ AC_CHECK_LIB(net-1, libnet_get_hwaddr, [], - [FatalMissingThing "libnet" "You need libnet to continue." \ - "You can get libnet from http://www.packetfactory.net/libnet" \ - "Note that some RPMs split libnet up into libnet and libnet-devel." \ - "In this case you have to install libnet-devel"]) - LIBNETDEFINES="" -- LIBNETLIBS=" -lnet" -+ LIBNETLIBS=" -lnet-1" - if test "$ac_cv_lib_nsl_t_open" = yes; then - LIBNETLIBS="-lnsl $LIBNETLIBS" - fi -@@ -739,7 +747,7 @@ - LIBNETLIBS="-lsocket $LIBNETLIBS" - fi - -- libnet=net -+ libnet=net-1 - else - LIBNETDEFINES="`$LIBNETCONFIG --defines` `$LIBNETCONFIG --cflags`"; - LIBNETLIBS="`$LIBNETCONFIG --libs`"; @@ -1718,6 +1726,7 @@ AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) |