svn commit: r361559 - head/security/razorback-dispatcher

[Pawel Pekala]

Author: pawel
Date: Fri Jul 11 15:59:42 2014
New Revision: 361559
URL: http://svnweb.freebsd.org/changeset/ports/361559
QAT: https://qat.redports.org/buildarchive/r361559/

Log:
  - Add staging support
  - Convert to new LIB_DEPENDS format, options helpers, USES=libtool
  - Use @sample for config file

Modified:
  head/security/razorback-dispatcher/Makefile
  head/security/razorback-dispatcher/pkg-plist

Modified: head/security/razorback-dispatcher/Makefile
==============================================================================
--- head/security/razorback-dispatcher/Makefile	Fri Jul 11 15:53:17 2014	(r361558)
+++ head/security/razorback-dispatcher/Makefile	Fri Jul 11 15:59:42 2014	(r361559)
@@ -9,22 +9,17 @@ MASTER_SITES=	SF/razorbacktm/Dispatcher
 PKGNAMEPREFIX=	razorback-
 DIST_SUBDIR=	razorback
 
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Framework for an intelligence driven security - Dispatcher
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	razorback_api:${PORTSDIR}/security/razorback-api \
-		memcached:${PORTSDIR}/databases/libmemcached \
-		cli:${PORTSDIR}/devel/libcli
+LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
+		libmemcached.so:${PORTSDIR}/databases/libmemcached \
+		libcli.so:${PORTSDIR}/devel/libcli
 
-OPTIONS_DEFINE=	DEBUG ASSERT ACTIVEMQ
-ASSERT_DESC=	Enable Asserts
-ACTIVEMQ_DESC=	ActiveMQ runs locally
-
-USES=	pathfix pkgconfig
-USE_AUTOTOOLS=	libtool
+USES=		libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_MYSQL=	yes
 USE_RC_SUBR=	dispatcher dispatcher_safed
@@ -35,16 +30,14 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 USERS?=		razorback
 GROUPS?=	razorback
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DEBUG ASSERT ACTIVEMQ
 
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=--enable-debug
-.endif
+ASSERT_DESC=	Enable Asserts
+ASSERT_CONFIGURE_ENABLE=	assert
+ACTIVEMQ_DESC=	ActiveMQ runs locally
+DEBUG_CONFIGURE_ENABLE=	debug
 
-.if ${PORT_OPTIONS:MASSERT}
-CONFIGURE_ARGS+=--enable-assert
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MACTIVEMQ}
 RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/activemq:${PORTSDIR}/net/activemq
@@ -57,10 +50,4 @@ SUB_LIST=	ACTIVEMQ="" ACTIVEMQ_LOC="remo
 		ACTIVEMQ_CONFIG=""
 .endif
 
-post-install:
-	@if [ ! -f ${PREFIX}/etc/razorback/dispatcher.conf ]; then \
-		${CP} -p ${PREFIX}/etc/razorback/dispatcher.conf.sample ${PREFIX}/etc/razorback/dispatcher.conf ; \
-	fi
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>

Modified: head/security/razorback-dispatcher/pkg-plist
==============================================================================
--- head/security/razorback-dispatcher/pkg-plist	Fri Jul 11 15:53:17 2014	(r361558)
+++ head/security/razorback-dispatcher/pkg-plist	Fri Jul 11 15:59:42 2014	(r361559)
@@ -1,9 +1,6 @@
 bin/dispatcher
 bin/dispatcher_safed
- at unexec if cmp -s %D/etc/razorback/dispatcher.conf %D/etc/razorback/dispatcher.conf.sample; then rm -f %D/etc/razorback/dispatcher.conf; fi
-etc/razorback/dispatcher.conf.sample
- at exec if [ ! -f %D/etc/razorback/dispatcher.conf ]; then cp -p %D/%F %B/dispatcher.conf; fi
- at dirrmtry etc/razorback
+ at sample etc/razorback/dispatcher.conf.sample
 share/razorback/razorback.sql
 share/razorback/razorback-data.sql
 share/razorback/truncate.sql