From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jan 19 13:50:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 80F485A2 for ; Sat, 19 Jan 2013 13:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 64B47CF4 for ; Sat, 19 Jan 2013 13:50:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r0JDo1TT020480 for ; Sat, 19 Jan 2013 13:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0JDo1Bq020476; Sat, 19 Jan 2013 13:50:01 GMT (envelope-from gnats) Resent-Date: Sat, 19 Jan 2013 13:50:01 GMT Resent-Message-Id: <201301191350.r0JDo1Bq020476@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Po-Chien Lin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id B3CBC597; Sat, 19 Jan 2013 13:49:21 +0000 (UTC) (envelope-from linpc@dev.linpc.org) Received: from dev.linpc.org (sq1.cs.nctu.edu.tw [140.113.208.226]) by mx1.freebsd.org (Postfix) with ESMTP id 33092CED; Sat, 19 Jan 2013 13:49:20 +0000 (UTC) Received: by dev.linpc.org (Postfix, from userid 1001) id 9DA0430747; Sat, 19 Jan 2013 21:49:13 +0800 (CST) Message-Id: <20130119134913.9DA0430747@dev.linpc.org> Date: Sat, 19 Jan 2013 21:49:13 +0800 (CST) From: Po-Chien Lin To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/175430: [PATCH] textproc/dwdiff: update to 2.0.4 Cc: avl@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2013 13:50:01 -0000 >Number: 175430 >Category: ports >Synopsis: [PATCH] textproc/dwdiff: update to 2.0.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Jan 19 13:50:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Po-Chien Lin >Release: FreeBSD 9.1-RELEASE amd64 >Organization: >Environment: System: FreeBSD dev.linpc.org 9.1-RELEASE FreeBSD 9.1-RELEASE #0: Sat Jan 5 22:32:49 CST >Description: - Update to 2.0.4 - Remove dead mirror site and add fossies.org to MASTER_SITES - Switch to OptionsNG - Move LICENSE section upper - Since 2.0 release, dwdiff is no longer a front-end for the diff program, so modify the description in pkg-descr ChangeLog: http://fossies.org/unix/privat/dwdiff-2.0.4.tgz:a/dwdiff-2.0.4/Changelog >How-To-Repeat: >Fix: --- dwdiff-2.0.4.patch begins here --- diff -ruN --exclude=CVS /usr/ports/textproc/dwdiff/Makefile ./Makefile --- /usr/ports/textproc/dwdiff/Makefile 2013-01-05 22:24:00.739410164 +0800 +++ ./Makefile 2013-01-19 21:36:41.353310364 +0800 @@ -1,22 +1,19 @@ -# New ports collection makefile for: dwdiff -# Date created: 30 September 2006 -# Whom: Alexander Logvinov -# +# Created by: Alexander Logvinov # $FreeBSD: head/textproc/dwdiff/Makefile 300897 2012-07-14 14:29:18Z beat $ PORTNAME= dwdiff -PORTVERSION= 1.9 -PORTREVISION= 1 +PORTVERSION= 2.0.4 CATEGORIES= textproc MASTER_SITES= http://os.ghalkes.nl/dist/ \ - http://www.logvinov.ru/files/dist/ \ + http://fossies.org/unix/privat/ \ LOCAL/avl EXTRACT_SUFX= .tgz MAINTAINER= avl@FreeBSD.org COMMENT= A delimited word diff program -OPTIONS= UNICODE "Build with Unicode support" on +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING MAKE_JOBS_SAFE= yes @@ -28,12 +25,13 @@ MAN1= ${PORTNAME}.1 dwfilter.1 PORTDOCS= COPYING Changelog README -LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/COPYING +OPTIONS_DEFINE= UNICODE +OPTIONS_DEFAULT= UNICODE +UNICODE_DESC= Build with Unicode support .include -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" MANLANG= "" nl nl.UTF-8 @@ -42,14 +40,14 @@ PLIST_SUB+= NLS="@comment " .endif -.if defined(WITH_UNICODE) +.if ${PORT_OPTIONS:MUNICODE} LIB_DEPENDS+= icudata:${PORTSDIR}/devel/icu .else CONFIGURE_ARGS+= --without-unicode .endif post-patch: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's|share/doc/${PORTNAME}-${PORTVERSION}|${DOCSDIR_REL}|' \ ${WRKSRC}/Makefile.in .else diff -ruN --exclude=CVS /usr/ports/textproc/dwdiff/distinfo ./distinfo --- /usr/ports/textproc/dwdiff/distinfo 2013-01-05 22:24:00.739410164 +0800 +++ ./distinfo 2013-01-19 21:05:01.543230130 +0800 @@ -1,2 +1,2 @@ -SHA256 (dwdiff-1.9.tgz) = 602a6728f317717041ff83d46737c92e2b08491fd44370f70d956fc7b7db6219 -SIZE (dwdiff-1.9.tgz) = 76488 +SHA256 (dwdiff-2.0.4.tgz) = 0e467dbb2cc52d81f3e070adab823ac2a9170cac1910bc02bb8edec3f75e0b3d +SIZE (dwdiff-2.0.4.tgz) = 85930 diff -ruN --exclude=CVS /usr/ports/textproc/dwdiff/pkg-descr ./pkg-descr --- /usr/ports/textproc/dwdiff/pkg-descr 2013-01-05 22:24:00.749423055 +0800 +++ ./pkg-descr 2013-01-19 21:43:26.397191297 +0800 @@ -1,15 +1,14 @@ -dwdiff is a front-end for the diff program that operates at the word level -instead of the line level. It is different from wdiff in that it allows the -user to specify what should be considered whitespace, and in that it takes an -optional list of characters that should be considered delimiters. Delimiters -are single characters that are treated as if they are words, even when there -is no whitespace separating them from preceding words or delimiters. dwdiff -is mostly commandline compatible with wdiff. Only the --autopager, --terminal +dwdiff is a diff program that operates at the word level instead of the line +level. It is different from wdiff in that it allows the user to specify what +should be considered whitespace, and in that it takes an optional list of +characters that should be considered delimiters. Delimiters are single +characters that are treated as if they are words, even when there is no +whitespace separating them from preceding words or delimiters. dwdiff is +mostly commandline compatible with wdiff. Only the --autopager, --terminal and --avoid-wraps options are not supported. The default output from dwdiff is the new text, with the deleted and inserted parts annotated with markers. Command line options are available to change both what is printed, and the markers. -Author: Gertjan Halkes WWW: http://os.ghalkes.nl/dwdiff.html diff -ruN --exclude=CVS /usr/ports/textproc/dwdiff/pkg-plist ./pkg-plist --- /usr/ports/textproc/dwdiff/pkg-plist 2013-01-05 22:24:00.739410164 +0800 +++ ./pkg-plist 2013-01-19 21:27:35.340510706 +0800 @@ -1,9 +1,9 @@ bin/dwdiff bin/dwfilter %%NLS%%share/locale/de/LC_MESSAGES/dwdiff.mo +%%NLS%%share/locale/es/LC_MESSAGES/dwdiff.mo %%NLS%%share/locale/fr/LC_MESSAGES/dwdiff.mo %%NLS%%share/locale/nl/LC_MESSAGES/dwdiff.mo -%%NLS%%share/locale/ru/LC_MESSAGES/dwdiff.mo %%NLS%%@dirrmtry man/nl.UTF-8/man1 %%NLS%%@dirrmtry man/nl.UTF-8 %%NLS%%@dirrmtry man/nl/man1 --- dwdiff-2.0.4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: