diff options
| author | pgollucci <pgollucci@FreeBSD.org> | 2011-07-03 07:29:35 +0800 |
|---|---|---|
| committer | pgollucci <pgollucci@FreeBSD.org> | 2011-07-03 07:29:35 +0800 |
| commit | 7651fe0fff92c9474cc95febace00e3f2da2927c (patch) | |
| tree | aaab9f6b15f3cdda8d4785dfb8ca689bab55c7e2 /sysutils/rsyslog6-devel | |
| parent | 97f874ca36ed28b9482f8f72d8d9fb73f00ec6f9 (diff) | |
| download | freebsd-ports-gnome-7651fe0fff92c9474cc95febace00e3f2da2927c.tar.gz freebsd-ports-gnome-7651fe0fff92c9474cc95febace00e3f2da2927c.tar.zst freebsd-ports-gnome-7651fe0fff92c9474cc95febace00e3f2da2927c.zip | |
- Fix 6.x plugins
Reported by: pointyhat via pav
Diffstat (limited to 'sysutils/rsyslog6-devel')
| -rw-r--r-- | sysutils/rsyslog6-devel/Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sysutils/rsyslog6-devel/Makefile b/sysutils/rsyslog6-devel/Makefile index 29b3c818151c..ef36b9d21b9e 100644 --- a/sysutils/rsyslog6-devel/Makefile +++ b/sysutils/rsyslog6-devel/Makefile @@ -18,13 +18,14 @@ COMMENT?= Syslogd supporting SQL, TCP and TLS USE_LDCONFIG= yes +LIB_DEPENDS+= ee:${PORTSDIR}/devel/libee \ + estr:${PORTSDIR}/devel/libestr + .ifdef MNAME RUN_DEPENDS= rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog6-devel PLIST= ${.CURDIR}/pkg-plist LATEST_LINK= rsyslog6-devel-${MNAME} .else -LIB_DEPENDS= ee:${PORTSDIR}/devel/libee \ - estr:${PORTSDIR}/devel/libestr LATEST_LINK= rsyslog6-devel .endif @@ -39,7 +40,8 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sane-hostname .endif CONFLICTS= rsyslog-devel-[!6].[0-9]* -CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes @@ -48,10 +50,12 @@ CONFIGURE_ARGS+=--enable-rtinst --enable-debug .endif .include <bsd.port.pre.mk> + .if ${ARCH} == "i386" CPPFLAGS+=-march=i686 .endif -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" LIBESTR_CFLAGS="${CPPFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CPPFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee" + +CONFIGURE_ENV+= CFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee" .ifndef MNAME MAN8= rsyslogd.8 @@ -60,7 +64,7 @@ MAN5= rsyslog.conf.5 USE_RC_SUBR= ${PORTNAME}d SUB_FILES= pkg-message -CONFIGURE_ARGS+=--enable-imfile --enable-mail --enable-imtemplate --enable-testbench=no +CONFIGURE_ARGS+= --enable-imfile --enable-mail --enable-imtemplate --enable-testbench=no post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure |