Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Feb 2014 20:54:45 +0000 (UTC)
From:      Emanuel Haupt <ehaupt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r343385 - in head/security/bsmtrace: . files
Message-ID:  <201402082054.s18KsjOR074649@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ehaupt
Date: Sat Feb  8 20:54:44 2014
New Revision: 343385
URL: http://svnweb.freebsd.org/changeset/ports/343385
QAT: https://qat.redports.org/buildarchive/r343385/

Log:
  - Support staging
  - Respect CC
  - Respect CFLAGS
  - Fix build with PCRE option
  - Convert to OPTIONSng

Added:
  head/security/bsmtrace/files/patch-Makefile   (contents, props changed)
Modified:
  head/security/bsmtrace/Makefile
  head/security/bsmtrace/pkg-plist

Modified: head/security/bsmtrace/Makefile
==============================================================================
--- head/security/bsmtrace/Makefile	Sat Feb  8 20:36:09 2014	(r343384)
+++ head/security/bsmtrace/Makefile	Sat Feb  8 20:54:44 2014	(r343385)
@@ -3,7 +3,7 @@
 
 PORTNAME=	bsmtrace
 PORTVERSION=	1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	csjp
@@ -12,30 +12,30 @@ MAINTAINER=	alm@FreeBSD.org
 COMMENT=	BSM based intrusion detection system
 
 SUB_FILES=	pkg-message
-MAN1=		bsmtrace.1
-MAN5=		bsmtrace.conf.5
 
 MAKE_JOBS_UNSAFE=	yes
 
-.if defined(WITH_PCRE)
-LIB_DEPENDS+=	pcre.3:${PORTSDIR}/devel/pcre
-MAKE_ENV+=	PCRE=1
+OPTIONS_DEFINE=	PCRE EXAMPLES
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MPCRE}
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+MAKE_ENV+=	PCRE=1 LIBS="-lpcre -L${LOCALBASE}/lib"
+CFLAGS+=	-I${LOCALBASE}/include
 .endif
 
-NO_STAGE=	yes
 pre-build:
 	${REINPLACE_CMD} -e \
 		's,/etc/bsmtrace.conf,${PREFIX}/etc/bsmtrace.conf,' \
 		${WRKSRC}/config.h
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bsmtrace ${PREFIX}/sbin
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/bsmtrace.conf ${EXAMPLESDIR}
-	${INSTALL_MAN} ${WRKSRC}/bsmtrace.1 ${MAN1PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/bsmtrace.conf.5 ${MAN5PREFIX}/man/man5
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.conf.5 \
+		${STAGEDIR}${MAN5PREFIX}/man/man5
 
 .include <bsd.port.mk>

Added: head/security/bsmtrace/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/bsmtrace/files/patch-Makefile	Sat Feb  8 20:54:44 2014	(r343385)
@@ -0,0 +1,16 @@
+--- ./Makefile.orig	2011-06-03 17:48:11.000000000 +0200
++++ ./Makefile	2014-02-08 21:49:46.465613358 +0100
+@@ -1,11 +1,10 @@
+ # $Id: Makefile,v 1.8 2007/07/13 00:03:50 csjp Exp $
+ 
+-CC	= gcc
+-CFLAGS 	= -Wall -g
++CC	?= gcc
+ TARGETS = bsmtrace
+ OBJ	= bsm.o bsmtrace.o conf.o y.tab.o lex.yy.o log.o pipe.o trigger.o fcache.o
+ PREFIX	= /usr/local
+-LIBS	= -lbsm
++LIBS	+= -lbsm
+ 
+ #.ifdef PCRE
+ #CFLAGS	+= -I /usr/local/include

Modified: head/security/bsmtrace/pkg-plist
==============================================================================
--- head/security/bsmtrace/pkg-plist	Sat Feb  8 20:36:09 2014	(r343384)
+++ head/security/bsmtrace/pkg-plist	Sat Feb  8 20:54:44 2014	(r343385)
@@ -1,3 +1,5 @@
 sbin/bsmtrace
+man/man1/bsmtrace.1.gz
+man/man5/bsmtrace.conf.5.gz
 %%EXAMPLESDIR%%/bsmtrace.conf
 @dirrm %%EXAMPLESDIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402082054.s18KsjOR074649>