svn commit: r332105 - in head/sysutils/metalog: . files

[Jason E. Hale]

Author: jhale
Date: Wed Oct 30 13:12:08 2013
New Revision: 332105
URL: http://svnweb.freebsd.org/changeset/ports/332105

Log:
  - Update to 3
  - Support staging
  - Use new LIB_DEPENDS syntax
  - Make installation of sample config non-optional and install it
    in ${PREFIX}/etc instead of ${EXAMPLESDIR}
  - Convert from PLIST_FILES to pkg-plist
  
  PR:		ports/183414
  Requested by:	Zsolt Udvari <udvzsolt at gmail.com>

Added:
  head/sysutils/metalog/files/patch-src__metalog.c   (contents, props changed)
  head/sysutils/metalog/pkg-plist   (contents, props changed)
Modified:
  head/sysutils/metalog/Makefile
  head/sysutils/metalog/distinfo   (contents, props changed)

Modified: head/sysutils/metalog/Makefile
==============================================================================
--- head/sysutils/metalog/Makefile	Wed Oct 30 13:04:14 2013	(r332104)
+++ head/sysutils/metalog/Makefile	Wed Oct 30 13:12:08 2013	(r332105)
@@ -2,49 +2,36 @@
 # $FreeBSD$
 
 PORTNAME=	metalog
-DISTVERSION=	0.8
-PORTREVISION=	3
+PORTVERSION=	3
 PORTEPOCH=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	SF/${PORTNAME}/old
+MASTER_SITES=	SF/${PORTNAME}
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Modern syslogd replacement with PCRE support
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
-USE_BZIP2=	yes
+USES=		pkgconfig
+USE_XZ=		yes
 USE_RC_SUBR=	${PORTNAME}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-MAN5=		metalog.conf.5
-MAN8=		metalog.8
 PORTDOCS=	AUTHORS NEWS README
-PORTEXAMPLES=	metalog.conf
-PLIST_FILES=	sbin/metalog
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFINE=	DOCS UNICODE
 
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|' ${WRKSRC}/man/*[58]
+UNICODE_CONFIGURE_WITH=	unicode
 
-.include <bsd.port.options.mk>
+post-patch:
+	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|' ${WRKSRC}/man/*[58].in
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/,} ${EXAMPLESDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/metalog.conf ${STAGEDIR}${PREFIX}/etc/metalog.conf.sample
 
 .include <bsd.port.mk>

Modified: head/sysutils/metalog/distinfo
==============================================================================
--- head/sysutils/metalog/distinfo	Wed Oct 30 13:04:14 2013	(r332104)
+++ head/sysutils/metalog/distinfo	Wed Oct 30 13:12:08 2013	(r332105)
@@ -1,2 +1,2 @@
-SHA256 (metalog-0.8.tar.bz2) = d264742ec0d379385e80d231d3ac3cc591a1d5282c677cf80ac2fd6cd9ae078b
-SIZE (metalog-0.8.tar.bz2) = 105471
+SHA256 (metalog-3.tar.xz) = 0c3a1e19008b3d525eab6e5548a4e8cbb0fb235f2804dc41aace82c67ceeebe0
+SIZE (metalog-3.tar.xz) = 360784

Added: head/sysutils/metalog/files/patch-src__metalog.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/metalog/files/patch-src__metalog.c	Wed Oct 30 13:12:08 2013	(r332105)
@@ -0,0 +1,12 @@
+--- ./src/metalog.c.orig	2013-10-29 09:50:12.000000000 -0400
++++ ./src/metalog.c	2013-10-29 09:52:28.000000000 -0400
+@@ -6,6 +6,9 @@
+ #ifdef WITH_DMALLOC
+ # include <dmalloc.h>
+ #endif
++#if defined(__FreeBSD__)
++#define fflush_unlocked fflush
++#endif
+ 
+ static int spawn_recursion = 0;
+ static int dolog_queue[2];

Added: head/sysutils/metalog/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/metalog/pkg-plist	Wed Oct 30 13:12:08 2013	(r332105)
@@ -0,0 +1,6 @@
+man/man5/metalog.conf.5.gz
+man/man8/metalog.8.gz
+sbin/metalog
+ at unexec if cmp -s %D/etc/metalog.conf %D/etc/metalog.conf.sample ; then rm -f %D/etc/metalog.conf ; fi
+etc/metalog.conf.sample
+ at exec if [ ! -f %D/etc/metalog.conf ]; then cp -p %D/%F %B/metalog.conf; fi