svn commit: r361285 - in head/security/fwlogwatch: . files

[Pawel Pekala]

Author: pawel
Date: Tue Jul  8 19:57:36 2014
New Revision: 361285
URL: http://svnweb.freebsd.org/changeset/ports/361285
QAT: https://qat.redports.org/buildarchive/r361285/

Log:
  - Add staging support
  - Convert to USES=tar:bzip2

Modified:
  head/security/fwlogwatch/Makefile
  head/security/fwlogwatch/files/patch-Makefile
  head/security/fwlogwatch/pkg-plist

Modified: head/security/fwlogwatch/Makefile
==============================================================================
--- head/security/fwlogwatch/Makefile	Tue Jul  8 19:55:26 2014	(r361284)
+++ head/security/fwlogwatch/Makefile	Tue Jul  8 19:57:36 2014	(r361285)
@@ -7,21 +7,18 @@ PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.kybs.de/boris/sw/
 
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Packet filter and firewall log analyzer
 
-USES=		gettext
-USE_BZIP2=	yes
+USES=		gettext tar:bzip2
 MAKE_ENV=	MKDIR="${MKDIR}"
 INSTALL_TARGET=	install install-config install-i18n
 
-MAN8=	fwlogwatch.8
-
-NO_STAGE=	yes
 post-patch:
-	@${REINPLACE_CMD} -e "s,/etc,${PREFIX}/etc,g" ${WRKSRC}/${MAN8}
+	@${REINPLACE_CMD} -e "s,/etc,${PREFIX}/etc,g" ${WRKSRC}/fwlogwatch.8
 
 post-install:
-	@${INSTALL_SCRIPT} ${FILESDIR}/fwlogwatch.sh.sample ${PREFIX}/etc/rc.d
+	${INSTALL_SCRIPT} ${FILESDIR}/fwlogwatch.sh.sample \
+		${STAGEDIR}${PREFIX}/etc/rc.d
 
 .include <bsd.port.mk>

Modified: head/security/fwlogwatch/files/patch-Makefile
==============================================================================
--- head/security/fwlogwatch/files/patch-Makefile	Tue Jul  8 19:55:26 2014	(r361284)
+++ head/security/fwlogwatch/files/patch-Makefile	Tue Jul  8 19:57:36 2014	(r361285)
@@ -1,5 +1,5 @@
---- Makefile.orig	Wed Mar  8 20:36:02 2006
-+++ Makefile	Sat Oct 21 20:44:00 2006
+--- Makefile.orig	2006-03-08 20:36:02.000000000 +0100
++++ Makefile	2014-07-08 21:18:54.475126894 +0200
 @@ -2,10 +2,10 @@
  # $Id: Makefile,v 1.76 2006/03/08 19:36:02 bw Exp $
  
@@ -21,9 +21,9 @@
  #LIBS = -L/usr/local/lib -lcrypt -lz -lintl
 +CC ?= gcc
 +CFLAGS += -DHAVE_ZLIB -DHAVE_GETTEXT -I${LOCALBASE}/include \
-+	-DINSTALL_DIR=\"${INSTALL_DIR}\" \
-+	-DCONF_DIR=\"${CONF_DIR}\" \
-+	-DLOCALE_DIR=\"${LOCALE_DIR}\"
++	-DINSTALL_DIR=\"${PREFIX}\" \
++	-DCONF_DIR=\"${PREFIX}/etc\" \
++	-DLOCALE_DIR=\"${PREFIX}\"
 +LIBS = -L${LOCALBASE}/lib -lcrypt -lz -lintl
  
  # You might want to add -DSHORT_NAMES to CFLAGS if you only intend to analyze
@@ -47,7 +47,7 @@
 +INSTALL_PROGRAM = ${BSD_INSTALL_PROGRAM}
 +INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
 +INSTALL_DATA = ${BSD_INSTALL_DATA}
-+INSTALL_DIR = ${PREFIX}
++INSTALL_DIR = ${DESTDIR}${PREFIX}
 +CONF_DIR = ${INSTALL_DIR}/etc
 +LOCALE_DIR = ${INSTALL_DIR}
  

Modified: head/security/fwlogwatch/pkg-plist
==============================================================================
--- head/security/fwlogwatch/pkg-plist	Tue Jul  8 19:55:26 2014	(r361284)
+++ head/security/fwlogwatch/pkg-plist	Tue Jul  8 19:57:36 2014	(r361285)
@@ -1,6 +1,7 @@
 etc/fwlogwatch.config
 etc/fwlogwatch.template
 etc/rc.d/fwlogwatch.sh.sample
+man/man8/fwlogwatch.8.gz
 sbin/fwlogwatch
 sbin/fwlw_notify
 sbin/fwlw_respond