Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Jul 2014 16:52:31 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r361566 - head/security/razorback-scriptNugget
Message-ID:  <201407111652.s6BGqVOH082612@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Fri Jul 11 16:52:30 2014
New Revision: 361566
URL: http://svnweb.freebsd.org/changeset/ports/361566
QAT: https://qat.redports.org/buildarchive/r361566/

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

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

Modified: head/security/razorback-scriptNugget/Makefile
==============================================================================
--- head/security/razorback-scriptNugget/Makefile	Fri Jul 11 16:49:03 2014	(r361565)
+++ head/security/razorback-scriptNugget/Makefile	Fri Jul 11 16:52:30 2014	(r361566)
@@ -3,51 +3,40 @@
 
 PORTNAME=	scriptNugget
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF/razorbacktm/Nuggets
 PKGNAMEPREFIX=	razorback-
 DIST_SUBDIR=	razorback
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Framework for an intelligence driven security - Scripting Interface
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	razorback_api:${PORTSDIR}/security/razorback-api
+LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api
 BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
 RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget \
 		rubygem-razorback-scriptNugget>=0.5.0:${PORTSDIR}/security/rubygem-razorback-scriptNugget
 
-OPTIONS_DEFINE=	DEBUG ASSERT
-ASSERT_DESC=	Enable Asserts
-
 RB_LIBDIR?=	${PREFIX}/lib/razorback
-USES=		pkgconfig
+USES=		libtool pkgconfig
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-ruby
-USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	${RB_LIBDIR}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DEBUG ASSERT
 
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=--enable-debug
-.endif
-
-.if ${PORT_OPTIONS:MASSERT}
-CONFIGURE_ARGS+=--enable-assert
-.endif
+ASSERT_DESC=	Enable Asserts
+ASSERT_CONFIGURE_ENABLE=	assert
+DEBUG_CONFIGURE_ENABLE=	debug
 
 post-install:
-	${LN} -sf ${RB_LIBDIR}/scriptNugget.so.2 ${RB_LIBDIR}/scriptNugget.so.2.0.0
-	@if [ ! -f ${PREFIX}/etc/razorback/scriptNugget.conf ]; then \
-		${CP} -p ${PREFIX}/etc/razorback/scriptNugget.conf.sample ${PREFIX}/etc/razorback/scriptNugget.conf ; \
-	fi
+	${LN} -sf ${RB_LIBDIR}/scriptNugget.so.2 \
+		${STAGEDIR}${RB_LIBDIR}/scriptNugget.so.2.0.0
 
 .include <bsd.port.mk>

Modified: head/security/razorback-scriptNugget/pkg-plist
==============================================================================
--- head/security/razorback-scriptNugget/pkg-plist	Fri Jul 11 16:49:03 2014	(r361565)
+++ head/security/razorback-scriptNugget/pkg-plist	Fri Jul 11 16:52:30 2014	(r361566)
@@ -1,11 +1,7 @@
-@unexec if cmp -s %D/etc/razorback/scriptNugget.conf %D/etc/razorback/scriptNugget.conf.sample; then rm -f %D/etc/razorback/scriptNugget.conf; fi
-etc/razorback/scriptNugget.conf.sample
-@exec if [ ! -f %D/etc/razorback/scriptNugget.conf ] ; then cp -p %D/%F %B/scriptNugget.conf; fi
-@dirrmtry etc/razorback
+@sample etc/razorback/scriptNugget.conf.sample
 lib/razorback/scriptNugget.so.2.0.0
 lib/razorback/scriptNugget.so.2
 lib/razorback/scriptNugget.so
-lib/razorback/scriptNugget.la
 lib/razorback/scriptNugget.a
 @dirrmtry lib/razorback
 libexec/razorback/scriptNugget/test.rb



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