- Update to 1.4

PR:		158473
Submitted by:	Ports Fury

8 files changed, 21 insertions, 67 deletions

diff --git a/misc/grc/Makefile b/misc/grc/Makefile
index 6d3b3e661e8e..024b7807f805 100644
--- a/misc/grc/Makefile
+++ b/misc/grc/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	grc
-PORTVERSION=	1.3
+PORTVERSION=	1.4
 CATEGORIES=	misc
 MASTER_SITES=	http://kassiopeia.juls.savba.sk/~garabik/software/grc/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -15,27 +15,30 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generic Colouriser
 
-DEPRECATED=	Look like an abandonware, no more public distifles
-EXPIRATION_DATE=	2011-08-01
-
-USE_PYTHON=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 
+USE_PYTHON_RUN=	yes
+
 MAN1=	grc.1 grcat.1
 
 post-patch:
-.for file in grc grcat
-	@${REINPLACE_CMD} -e "s|%%PYTHON_CMD%%|${PYTHON_CMD}|g ; \
-		s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
+.for i in grc grcat
+	@${REINPLACE_CMD} -e \
+		's|/usr/bin/python|${SETENV} python|g ; \
+		 s|"/etc/grc|"${PREFIX}/etc/grc|g ; \
+		 s|/usr/local/share/grc|${DATADIR}|g ; \
+		 s|, "/usr/share/grc/"||g' ${WRKSRC}/${i}
+	@${REINPLACE_CMD} -e \
+		's| /etc/grc| ${PREFIX}/etc/grc|g ; \
+		 s|/usr/local/share/grc|${DATADIR}|g ; \
+		 s|, /usr/share/grc/||g' ${WRKSRC}/${i}.1
 .endfor
 
 do-install:
-.for f in grc grcat
-	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin
-.endfor
-.for i in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/${i} ${MAN1PREFIX}/man/man1
+.for i in grc grcat
+	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${i}.1 ${MAN1PREFIX}/man/man1
 .endfor
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/conf.* ${DATADIR}
diff --git a/misc/grc/distinfo b/misc/grc/distinfo
index 5ce8f2102d49..590da3483b23 100644
--- a/misc/grc/distinfo
+++ b/misc/grc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (grc_1.3.tar.gz) = cee26860a866aa1e905ff9e15b1dd5e4671263a1c109c94a2b70d836a10c0821
-SIZE (grc_1.3.tar.gz) = 23658
+SHA256 (grc_1.4.tar.gz) = bbfdc5ee074a857a8cff52f4b1941527c1dd192e1c2b45f69c624ce9fad4f4d0
+SIZE (grc_1.4.tar.gz) = 24302
diff --git a/misc/grc/files/patch-grc b/misc/grc/files/patch-grc
deleted file mode 100644
index 6ea36bc4e798..000000000000
--- a/misc/grc/files/patch-grc
+++ /dev/null
@@ -1,17 +0,0 @@
---- grc.orig	Wed Sep  4 05:01:42 2002
-+++ grc	Tue Nov 12 00:58:50 2002
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!%%PYTHON_CMD%%
- 
- import os, re, string, sys, getopt, signal
- 
-@@ -74,7 +74,7 @@
-     home = []
-     if os.environ.has_key('HOME'):
-         home = [os.environ['HOME']+"/.grc/grc.conf"]
--    conffilenames = home + ["/etc/grc.conf"]
-+    conffilenames = home + ["%%PREFIX%%/etc/grc.conf"]
-     for i in conffilenames:
-         if os.path.isfile(i):
-             conffile = i
diff --git a/misc/grc/files/patch-grc.1 b/misc/grc/files/patch-grc.1
deleted file mode 100644
index 12001107851a..000000000000
--- a/misc/grc/files/patch-grc.1
+++ /dev/null
@@ -1,14 +0,0 @@
---- grc.1.orig	Sun Mar 25 21:10:52 2001
-+++ grc.1	Sun Mar 25 21:14:38 2001
-@@ -17,9 +17,9 @@
- 
- Configuration file for 
- .BR grc
--is determined by /etc/grc.conf file.
-+is determined by %%PREFIX%%/etc/grc.conf file.
- 
--Format of /etc/grc.conf:
-+Format of %%PREFIX%%/etc/grc.conf:
- each entry consists of 2 lines, between entries there can be any number of empty 
- lines or lines beginning with # (comments)
- 
diff --git a/misc/grc/files/patch-grcat b/misc/grc/files/patch-grcat
deleted file mode 100644
index c81e4533bc7c..000000000000
--- a/misc/grc/files/patch-grcat
+++ /dev/null
@@ -1,8 +0,0 @@
---- grcat.orig	Sun Mar 25 20:48:10 2001
-+++ grcat	Sun Mar 25 20:48:51 2001
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!%%PYTHON_CMD%%
- 
- import sys, os, string, getopt, re, signal, sys
- 
diff --git a/misc/grc/files/patch-grcat.1 b/misc/grc/files/patch-grcat.1
deleted file mode 100644
index 97ff0b3e9202..000000000000
--- a/misc/grc/files/patch-grcat.1
+++ /dev/null
@@ -1,11 +0,0 @@
---- grcat.1.orig	Sun Mar 25 21:15:18 2001
-+++ grcat.1	Sun Mar 25 21:15:39 2001
-@@ -8,7 +8,7 @@
- .SH DESCRIPTION
- .I "configuration"
- is a name of a configuration file. Directories 
--~/.grc/, /usr/local/share/grc/, /usr/share/grc/
-+~/.grc/, %%PREFIX%%/share/grc/, /usr/share/grc/
- are searched for the file (in this order).
- 
- If the file is not found, it is assumed to be an absolute path of a 
diff --git a/misc/grc/pkg-descr b/misc/grc/pkg-descr
index 5f9e26dbbc18..512bf9f14ee8 100644
--- a/misc/grc/pkg-descr
+++ b/misc/grc/pkg-descr
@@ -1,4 +1,4 @@
 Generic Colouriser is yet another colouriser for beautifying your logfiles
 or output of commands.
 
-WWW: http://melkor.dnp.fmph.uniba.sk/~garabik/grc.html
+WWW: http://kassiopeia.juls.savba.sk/~garabik/software/grc.html
diff --git a/misc/grc/pkg-plist b/misc/grc/pkg-plist
index cb59eb9fab0d..05a0b95faf4a 100644
--- a/misc/grc/pkg-plist
+++ b/misc/grc/pkg-plist
@@ -1,6 +1,8 @@
 bin/grc
 bin/grcat
 etc/grc.conf
+%%DATADIR%%/conf.configure
+%%DATADIR%%/conf.cvs
 %%DATADIR%%/conf.diff
 %%DATADIR%%/conf.esperanto
 %%DATADIR%%/conf.gcc
@@ -12,5 +14,4 @@ etc/grc.conf
 %%DATADIR%%/conf.proftpd
 %%DATADIR%%/conf.traceroute
 %%DATADIR%%/conf.wdiff
-%%DATADIR%%/conf.cvs
 @dirrm %%DATADIR%%