Attachment 153505 Details for Bug 198025 – Proposed patch (since 300897 revision): textproc/xxdiff-scripts

[patch] Proposed patch (since 300897 revision): textproc/xxdiff-scripts

xxdiff-scripts_3.2,5-4.0.diff (text/plain), 6.61 KB, created by lightside on 2015-02-25 07:02:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2015-02-25 07:02:08 UTC

Size: 6.61 KB

patch

obsolete

>diff -ruN xxdiff-scripts.orig/Makefile xxdiff-scripts/Makefile
>--- xxdiff-scripts.orig/Makefile	2012-07-14 18:29:18.662529000 +0400
>+++ xxdiff-scripts/Makefile	2015-02-25 09:47:04.000000000 +0400
>@@ -1,13 +1,8 @@
>-# New ports collection makefile for:	xxdiff-scripts
>-# Date created:		13 August 2006
>-# Whom:			Andrew Pantyukgin <infofarmer@FreeBSD.org>
>-#
>+# Created by: Andrew Pantyukgin <infofarmer@FreeBSD.org>
> # $FreeBSD: head/textproc/xxdiff-scripts/Makefile 300897 2012-07-14 14:29:18Z beat $
>-#
> 
> PORTNAME=	xxdiff
>-PORTVERSION=	3.2
>-PORTREVISION=	5
>+PORTVERSION=	4.0
> CATEGORIES=	textproc
> MASTER_SITES=	SF
> PKGNAMESUFFIX=	-scripts
>@@ -15,11 +10,13 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Helper scripts for xxdiff
> 
>-BUILD_DEPENDS=	xxdiff:${PORTSDIR}/textproc/xxdiff
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USE_BZIP2=	yes
>-USE_PYTHON=	yes
>-USE_PYDISTUTILS=yes
>+RUN_DEPENDS=	xxdiff:${PORTSDIR}/textproc/xxdiff
>+
>+USES=	python:2 tar:bz2
>+USE_PYTHON=	autoplist distutils
> PYDISTUTILS_PKGNAME=	xxdiff-scripts
> 
> .include <bsd.port.mk>
>diff -ruN xxdiff-scripts.orig/distinfo xxdiff-scripts/distinfo
>--- xxdiff-scripts.orig/distinfo	2012-07-14 18:29:18.662529000 +0400
>+++ xxdiff-scripts/distinfo	2015-02-25 05:51:08.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (xxdiff-3.2.tar.bz2) = 965534bab462aea8aacb6c35c0683c1079f06d055ff13820584ac862134db2b8
>-SIZE (xxdiff-3.2.tar.bz2) = 1341967
>+SHA256 (xxdiff-4.0.tar.bz2) = 91501544e82bc89983d07eeb086419645fbfa78fc906b50ff7ab6cdf39431330
>+SIZE (xxdiff-4.0.tar.bz2) = 1768460
>diff -ruN xxdiff-scripts.orig/pkg-plist xxdiff-scripts/pkg-plist
>--- xxdiff-scripts.orig/pkg-plist	2012-07-14 18:29:18.662529000 +0400
>+++ xxdiff-scripts/pkg-plist	1970-01-01 03:00:00.000000000 +0300
>@@ -1,116 +0,0 @@
>-bin/svn-foreign
>-bin/xx-cond-replace
>-bin/xx-cvs-diff
>-bin/xx-cvs-revcmp
>-bin/xx-diff-proxy
>-bin/xx-encrypted
>-bin/xx-filter
>-bin/xx-find-grep-sed
>-bin/xx-match
>-bin/xx-pyline
>-bin/xx-rename
>-bin/xx-sql-schemas
>-bin/xx-svn-diff
>-bin/xx-svn-resolve
>-%%PYTHON_SITELIBDIR%%/xxdiff/__init__.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/__init__.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/__init__.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/backup.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/backup.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/backup.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/checkout.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/checkout.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/checkout.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/condrepl.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/condrepl.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/condrepl.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/editor.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/editor.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/editor.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/history.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/history.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/history.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/invoke.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/invoke.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/invoke.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/mapcompare.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/mapcompare.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/mapcompare.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/patches.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/patches.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/patches.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/resilient.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/resilient.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/resilient.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scm/__init__.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scm/__init__.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scm/__init__.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scm/clearcase.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scm/clearcase.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scm/clearcase.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scm/cvs.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scm/cvs.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scm/cvs.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scm/subversion.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scm/subversion.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scm/subversion.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/__init__.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/__init__.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/__init__.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/condreplace.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/condreplace.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/condreplace.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/cvsdiff.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/cvsdiff.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/cvsdiff.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/cvsrevcmp.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/cvsrevcmp.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/cvsrevcmp.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/diffproxy.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/diffproxy.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/diffproxy.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/encrypted.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/encrypted.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/encrypted.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/filter.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/filter.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/filter.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/findgrepsed.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/findgrepsed.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/findgrepsed.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/match.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/match.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/match.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/patch.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/patch.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/patch.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/pyline.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/pyline.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/pyline.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/rename.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/rename.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/rename.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/sqlschemas.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/sqlschemas.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/sqlschemas.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/svndiff.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/svndiff.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/svndiff.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/svnforeign.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/svnforeign.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/svnforeign.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/svnresolve.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/svnresolve.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/scripts/svnresolve.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/selectfiles.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/selectfiles.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/selectfiles.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/utils.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/utils.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/utils.pyo
>-%%PYTHON_SITELIBDIR%%/xxdiff/xformloop.py
>-%%PYTHON_SITELIBDIR%%/xxdiff/xformloop.pyc
>-%%PYTHON_SITELIBDIR%%/xxdiff/xformloop.pyo
>-@dirrm %%PYTHON_SITELIBDIR%%/xxdiff/scm
>-@dirrm %%PYTHON_SITELIBDIR%%/xxdiff/scripts
>-@dirrm %%PYTHON_SITELIBDIR%%/xxdiff

Actions: View | Diff

Attachments on bug 198025: 153504 | 153505 | 153506 | 153507 | 153534 | 156161