aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeech Rintoul <beech@FreeBSD.org>2007-09-21 21:24:58 +0000
committerBeech Rintoul <beech@FreeBSD.org>2007-09-21 21:24:58 +0000
commit021a6e7a9d586a984d7fe63a4f794bd68cf77aa0 (patch)
treeb4e51f0010b7499c32b995671df83cfd11b4e9b7
parent3a9ac11757958216c32047a5fdc1b402a2cd73ae (diff)
downloadports-021a6e7a9d586a984d7fe63a4f794bd68cf77aa0.tar.gz
ports-021a6e7a9d586a984d7fe63a4f794bd68cf77aa0.zip
Notes
-rw-r--r--UPDATING9
-rw-r--r--sysutils/grok/Makefile22
-rw-r--r--sysutils/grok/distinfo6
-rw-r--r--sysutils/grok/files/grok.sh.in1
-rw-r--r--sysutils/grok/pkg-plist1
5 files changed, 31 insertions, 8 deletions
diff --git a/UPDATING b/UPDATING
index 5c148859f490..9108e79f69a5 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,15 @@ You should get into the habit of checking this file for changes each
time you update your ports collection, before attempting any port
upgrades.
+20070921:
+ AFFECTS: users of sysutils/grok
+ AUTHOR: Wesley Shields <wxs@atarininja.org>
+
+ The new version of grok has changed the meaning of a couple of
+ pre-defined patterns.
+ Please see /usr/local/share/doc/grok/CHANGELIST for more
+ information. Existing grok.conf may be broken by these changes.
+
20070919:
AFFECTS: users of net/samba3
AUTHOR: timur@FreeBSD.org
diff --git a/sysutils/grok/Makefile b/sysutils/grok/Makefile
index 3aec805fbba2..c7055e62ca36 100644
--- a/sysutils/grok/Makefile
+++ b/sysutils/grok/Makefile
@@ -1,12 +1,12 @@
# Ports collection makefile for: grok
# Date created: 07 March 2006
-# Whom: Wesley Shields <wxs@csh.rit.edu>
+# Whom: Wesley Shields <wxs@atarininja.org>
#
# $FreeBSD$
#
PORTNAME= grok
-PORTVERSION= 20070402
+PORTVERSION= 20070915
CATEGORIES= sysutils
MASTER_SITES= http://www.semicomplete.com/files/grok/ \
http://www.atarininja.org/~wxs/distfiles/
@@ -27,17 +27,29 @@ NO_BUILD= yes
SUB_FILES= pkg-message
SUB_LIST= PERL=${PERL}
+PORTDOCS= CHANGELIST
+PORTEXAMPLES= line-to-byte-offset.conf
MAN1= grok.1
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/grok ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/grok.conf ${PREFIX}/etc/grok.conf.sample
- ${INSTALL_MAN} ${WRKSRC}/grok.1 ${PREFIX}/man/man1
+ @${INSTALL_SCRIPT} ${WRKSRC}/grok ${PREFIX}/bin
+ @${INSTALL_SCRIPT} ${WRKSRC}/grok_patfind.pl ${PREFIX}/bin
+ @${INSTALL_DATA} ${WRKSRC}/grok.conf ${PREFIX}/etc/grok.conf.sample
+ @${INSTALL_MAN} ${WRKSRC}/grok.1 ${MANPREFIX}/man/man1
post-install:
@if [ ! -f ${PREFIX}/etc/grok.conf ]; then \
${CP} -p ${PREFIX}/etc/grok.conf.sample ${PREFIX}/etc/grok.conf ; \
fi
+.if !defined(NOPORTDOCS)
+ @${INSTALL} -d ${DOCSDIR}
+ @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
+ @${INSTALL} -d ${EXAMPLESDIR}/
+ @cd ${WRKSRC}/examples/ && \
+ ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}/
+.endif
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/sysutils/grok/distinfo b/sysutils/grok/distinfo
index eebc8dfb6d26..c9844aab7a59 100644
--- a/sysutils/grok/distinfo
+++ b/sysutils/grok/distinfo
@@ -1,3 +1,3 @@
-MD5 (grok-20070402.tar.gz) = 45c20f7e1bea840d635d2211279f4260
-SHA256 (grok-20070402.tar.gz) = 377a7de114bb536a80f794feb4a705a5c643a012cfd26025cceb32a4353b33e2
-SIZE (grok-20070402.tar.gz) = 129536
+MD5 (grok-20070915.tar.gz) = ce19c29d0eca6ed0129286cab9ade282
+SHA256 (grok-20070915.tar.gz) = 8b1c1ef1940b493ebd14ac12fbf16985d277c36e10ad64ae01aed46dc70c3ec6
+SIZE (grok-20070915.tar.gz) = 163840
diff --git a/sysutils/grok/files/grok.sh.in b/sysutils/grok/files/grok.sh.in
index e0036be5a03e..b5979f1d633b 100644
--- a/sysutils/grok/files/grok.sh.in
+++ b/sysutils/grok/files/grok.sh.in
@@ -23,5 +23,6 @@ load_rc_config $name
command_interpreter=%%PERL%%
command=%%PREFIX%%/bin/grok
command_args="-f $grok_config -b -d"
+required_files=%%PREFIX%%/etc/grok.conf
run_rc_command "$1"
diff --git a/sysutils/grok/pkg-plist b/sysutils/grok/pkg-plist
index 24b56d0b43ca..be6afdd0eb1c 100644
--- a/sysutils/grok/pkg-plist
+++ b/sysutils/grok/pkg-plist
@@ -1,4 +1,5 @@
bin/grok
+bin/grok_patfind.pl
@unexec if cmp -s %D/etc/grok.conf.sample %D/etc/grok.conf; then rm -f %D/etc/grok.conf; fi
etc/grok.conf.sample
@exec if [ ! -f %D/etc/grok.conf ] ; then cp -p %D/%F %B/grok.conf; fi