Date: Mon, 18 Feb 2013 21:25:28 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312529 - in head/sysutils/heartbeat: . files Message-ID: <201302182125.r1ILPS69023597@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Mon Feb 18 21:25:28 2013 New Revision: 312529 URL: http://svnweb.freebsd.org/changeset/ports/312529 Log: - move from libnet-devel -> libnet Modified: head/sysutils/heartbeat/Makefile head/sysutils/heartbeat/files/patch-configure.in Modified: head/sysutils/heartbeat/Makefile ============================================================================== --- head/sysutils/heartbeat/Makefile Mon Feb 18 21:20:54 2013 (r312528) +++ head/sysutils/heartbeat/Makefile Mon Feb 18 21:25:28 2013 (r312529) @@ -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 \ Modified: head/sysutils/heartbeat/files/patch-configure.in ============================================================================== --- head/sysutils/heartbeat/files/patch-configure.in Mon Feb 18 21:20:54 2013 (r312528) +++ head/sysutils/heartbeat/files/patch-configure.in Mon Feb 18 21:25:28 2013 (r312529) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302182125.r1ILPS69023597>