diff options
| author | pav <pav@FreeBSD.org> | 2007-01-31 14:09:55 +0000 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2007-01-31 14:09:55 +0000 |
| commit | ccd12ccd577604add511aad4ea4e71c32b3e2f06 (patch) | |
| tree | 25b833c135dd7f2323045f819dc7121e621103fc /sysutils | |
| parent | e2f15954f8960a944e8d5b2c28982257d8c6e91f (diff) | |
| download | FreeBSD-ports-ccd12ccd577604add511aad4ea4e71c32b3e2f06.zip FreeBSD-ports-ccd12ccd577604add511aad4ea4e71c32b3e2f06.tar.gz | |
- Patch net/libnet* to versioned libraries and header files, so they can
coexist
PR: ports/103861
Submitted by: alepulver
Tested by: pointyhat
With hat: portmgr
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/heartbeat/Makefile | 12 | ||||
| -rw-r--r-- | sysutils/heartbeat2/Makefile | 12 |
2 files changed, 20 insertions, 4 deletions
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile index 06fbbeb..70b130a 100644 --- a/sysutils/heartbeat/Makefile +++ b/sysutils/heartbeat/Makefile @@ -7,14 +7,14 @@ PORTNAME= heartbeat PORTVERSION= 1.2.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://linux-ha.org/download/ MAINTAINER= scott-ports@tummy.com COMMENT= Subsystem for High-Availability Clustering -BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet +BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \ xml2.5:${PORTSDIR}/textproc/libxml2 @@ -28,6 +28,7 @@ CONFIGURE_ARGS+= --disable-fatal-warnings \ --with-initdir=${PREFIX}/etc/rc.d \ --localstatedir=/var \ --with-group-id=275 --with-ccmuser-id=275 +CONFIGURE_ENV= CPPFLAGS="`${LIBNET_CONFIG} --cflags`" SUB_FILES= pkg-install PKGDEINSTALL= ${PKGINSTALL} @@ -36,6 +37,8 @@ MAN1= cl_status.1 hb_standby.1 hb_takeover.1 MAN8= apphbd.8 heartbeat.8 ldirectord.8 meatclient.8 \ stonith.8 supervise-ldirectord-config.8 +LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config + .include <bsd.port.pre.mk> .if ${OSVERSION} < 500000 @@ -47,6 +50,11 @@ post-patch: ${WRKSRC}/heartbeat/Makefile.in \ ${WRKSRC}/ldirectord/Makefile.in + @${REINPLACE_CMD} -e \ + 's|libnet-config|${LIBNET_CONFIG}|; \ + s|-lnet|`${LIBNET_CONFIG} --libs`|' \ + ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} + .if ${OSVERSION} < 500000 @${REINPLACE_CMD} -e 's|<sys/\(resource.h\)>|"\1"|' \ ${WRKSRC}/lib/clplumbing/coredumps.c diff --git a/sysutils/heartbeat2/Makefile b/sysutils/heartbeat2/Makefile index 06fbbeb..70b130a 100644 --- a/sysutils/heartbeat2/Makefile +++ b/sysutils/heartbeat2/Makefile @@ -7,14 +7,14 @@ PORTNAME= heartbeat PORTVERSION= 1.2.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://linux-ha.org/download/ MAINTAINER= scott-ports@tummy.com COMMENT= Subsystem for High-Availability Clustering -BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet +BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \ xml2.5:${PORTSDIR}/textproc/libxml2 @@ -28,6 +28,7 @@ CONFIGURE_ARGS+= --disable-fatal-warnings \ --with-initdir=${PREFIX}/etc/rc.d \ --localstatedir=/var \ --with-group-id=275 --with-ccmuser-id=275 +CONFIGURE_ENV= CPPFLAGS="`${LIBNET_CONFIG} --cflags`" SUB_FILES= pkg-install PKGDEINSTALL= ${PKGINSTALL} @@ -36,6 +37,8 @@ MAN1= cl_status.1 hb_standby.1 hb_takeover.1 MAN8= apphbd.8 heartbeat.8 ldirectord.8 meatclient.8 \ stonith.8 supervise-ldirectord-config.8 +LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config + .include <bsd.port.pre.mk> .if ${OSVERSION} < 500000 @@ -47,6 +50,11 @@ post-patch: ${WRKSRC}/heartbeat/Makefile.in \ ${WRKSRC}/ldirectord/Makefile.in + @${REINPLACE_CMD} -e \ + 's|libnet-config|${LIBNET_CONFIG}|; \ + s|-lnet|`${LIBNET_CONFIG} --libs`|' \ + ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} + .if ${OSVERSION} < 500000 @${REINPLACE_CMD} -e 's|<sys/\(resource.h\)>|"\1"|' \ ${WRKSRC}/lib/clplumbing/coredumps.c |
