Attachment 116520 Details for Bug 158473 – file.diff

[patch] file.diff

file.diff (text/plain), 5.30 KB, created by tkato432 on 2011-06-29 19:30:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2011-06-29 19:30:12 UTC

Size: 5.30 KB

patch

obsolete

>diff -urN /usr/ports/misc/grc/Makefile misc/grc/Makefile
>--- /usr/ports/misc/grc/Makefile	2011-06-18 18:35:36.000000000 +0900
>+++ misc/grc/Makefile	2011-06-29 18:50:03.000000000 +0900
>@@ -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 @@
> 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 -urN /usr/ports/misc/grc/distinfo misc/grc/distinfo
>--- /usr/ports/misc/grc/distinfo	2011-03-20 02:43:59.000000000 +0900
>+++ misc/grc/distinfo	2011-05-16 15:51:11.000000000 +0900
>@@ -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 -urN /usr/ports/misc/grc/files/patch-grc misc/grc/files/patch-grc
>--- /usr/ports/misc/grc/files/patch-grc	2002-11-18 19:55:01.000000000 +0900
>+++ misc/grc/files/patch-grc	1970-01-01 09:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/misc/grc/files/patch-grc.1 misc/grc/files/patch-grc.1
>--- /usr/ports/misc/grc/files/patch-grc.1	2001-03-25 22:17:54.000000000 +0900
>+++ misc/grc/files/patch-grc.1	1970-01-01 09:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/misc/grc/files/patch-grcat misc/grc/files/patch-grcat
>--- /usr/ports/misc/grc/files/patch-grcat	2001-03-25 22:17:54.000000000 +0900
>+++ misc/grc/files/patch-grcat	1970-01-01 09:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/misc/grc/files/patch-grcat.1 misc/grc/files/patch-grcat.1
>--- /usr/ports/misc/grc/files/patch-grcat.1	2001-03-25 22:17:54.000000000 +0900
>+++ misc/grc/files/patch-grcat.1	1970-01-01 09:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/misc/grc/pkg-descr misc/grc/pkg-descr
>--- /usr/ports/misc/grc/pkg-descr	2001-03-25 22:17:54.000000000 +0900
>+++ misc/grc/pkg-descr	2011-06-18 18:57:52.000000000 +0900
>@@ -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 -urN /usr/ports/misc/grc/pkg-plist misc/grc/pkg-plist
>--- /usr/ports/misc/grc/pkg-plist	2007-10-24 01:33:20.000000000 +0900
>+++ misc/grc/pkg-plist	2011-05-16 16:06:50.000000000 +0900
>@@ -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 @@
> %%DATADIR%%/conf.proftpd
> %%DATADIR%%/conf.traceroute
> %%DATADIR%%/conf.wdiff
>-%%DATADIR%%/conf.cvs
> @dirrm %%DATADIR%%

Actions: View | Diff

Attachments on bug 158473: 116520