svn commit: r361558 - branches/2014Q3/security/razorback-archiveInflate

[Pawel Pekala]

Author: pawel
Date: Fri Jul 11 15:53:17 2014
New Revision: 361558
URL: http://svnweb.freebsd.org/changeset/ports/361558
QAT: https://qat.redports.org/buildarchive/r361558/

Log:
  MFH: r361550
  
  - Fix build with clang (overzealous -Werror)
  - Add staging support
  - Convert to new LIB_DEPENDS format, options helpers, USES=libtool
  
  Approved by:	portmgr (erwin)

Modified:
  branches/2014Q3/security/razorback-archiveInflate/Makefile
  branches/2014Q3/security/razorback-archiveInflate/pkg-plist
Directory Properties:
  branches/2014Q3/   (props changed)

Modified: branches/2014Q3/security/razorback-archiveInflate/Makefile
==============================================================================
--- branches/2014Q3/security/razorback-archiveInflate/Makefile	Fri Jul 11 15:52:23 2014	(r361557)
+++ branches/2014Q3/security/razorback-archiveInflate/Makefile	Fri Jul 11 15:53:17 2014	(r361558)
@@ -3,6 +3,7 @@
 
 PORTNAME=	archiveInflate
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF/razorbacktm/Nuggets
 PKGNAMEPREFIX=	razorback-
@@ -14,36 +15,28 @@ COMMENT=	Framework for an intelligence d
 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
 
-OPTIONS_DEFINE=	DEBUG ASSERT
-ASSERT_DESC=	Enable Asserts
-
 RB_LIBDIR?=	${PREFIX}/lib/razorback
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
-USE_AUTOTOOLS=	libtool
+USES=		libtool pkgconfig
 USE_LDCONFIG=	${RB_LIBDIR}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DEBUG ASSERT
+
+ASSERT_DESC=	Enable Asserts
+ASSERT_CONFIGURE_ENABLE=	assert
+DEBUG_CONFIGURE_ENABLE=	debug
 
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=--enable-debug
-.endif
-
-.if ${PORT_OPTIONS:MASSERT}
-CONFIGURE_ARGS+=--enable-assert
-.endif
+post-patch:
+	@${REINPLACE_CMD} '/CWARNINGS/ s|-Werror||' ${WRKSRC}/configure
 
 post-install:
-	${LN} -sf ${RB_LIBDIR}/archiveInflate.so.2 ${RB_LIBDIR}/archiveInflate.so.2.0.0
-	@if [ ! -f ${PREFIX}/etc/razorback/archive_inflate.conf ]; then \
-		${CP} -p ${PREFIX}/etc/razorback/archive_inflate.conf.sample ${PREFIX}/etc/razorback/archive_inflate.conf ; \
-	fi
+	${LN} -sf ${RB_LIBDIR}/archiveInflate.so.2 \
+		${STAGEDIR}${RB_LIBDIR}/archiveInflate.so.2.0.0
 
 .include <bsd.port.mk>

Modified: branches/2014Q3/security/razorback-archiveInflate/pkg-plist
==============================================================================
--- branches/2014Q3/security/razorback-archiveInflate/pkg-plist	Fri Jul 11 15:52:23 2014	(r361557)
+++ branches/2014Q3/security/razorback-archiveInflate/pkg-plist	Fri Jul 11 15:53:17 2014	(r361558)
@@ -1,10 +1,6 @@
- at unexec if cmp -s %D/etc/razorback/archive_inflate.conf %D/etc/razorback/archive_inflate.conf.sample; then rm -f %D/etc/razorback/archive_inflate.conf; fi
-etc/razorback/archive_inflate.conf.sample
- at exec if [ ! -f %D/etc/razorback/archive_inflate.conf ]; then cp -p %D/%F %B/archive_inflate.conf; fi
- at dirrmtry etc/razorback
+ at sample etc/razorback/archive_inflate.conf.sample
 lib/razorback/archiveInflate.so.2.0.0
 lib/razorback/archiveInflate.so.2
 lib/razorback/archiveInflate.so
-lib/razorback/archiveInflate.la
 lib/razorback/archiveInflate.a
 @dirrmtry lib/razorback