Attachment 64448 Details for Bug 95828 – xxdiff.diff

[patch] xxdiff.diff

xxdiff.diff (text/plain), 7.85 KB, created by Andrew Pantyukhin on 2006-04-15 21:00:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Pantyukhin

Created: 2006-04-15 21:00:29 UTC

Size: 7.85 KB

patch

obsolete

>diff -urN /usr/ports/textproc/xxdiff/Makefile xxdiff/Makefile
>--- /usr/ports/textproc/xxdiff/Makefile	Sat Apr 15 00:45:43 2006
>+++ xxdiff/Makefile	Sat Apr 15 23:48:44 2006
>@@ -2,11 +2,11 @@
> # Date created:				11 August 2001
> # Whom:					Pete Fritchman <petef@databits.net>
> #
>-# $FreeBSD: ports/textproc/xxdiff/Makefile,v 1.15 2006/04/14 20:45:43 linimon Exp $
>+# $FreeBSD: ports/textproc/xxdiff/Makefile,v 1.14 2004/11/07 20:46:58 petef Exp $
> #
> 
> PORTNAME=	xxdiff
>-PORTVERSION=	3.0.3
>+PORTVERSION=	3.0.4
> CATEGORIES=	textproc
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -21,7 +21,7 @@
> USE_QT_VER=	3
> TMAKEENV=	TMAKEPATH=${LOCALBASE}/share/tmake/freebsd-g++ QTDIR=${X11BASE}
> MAKE_ENV+=	QTDIR=${X11BASE} PTHREAD_LIBS=${PTHREAD_LIBS}
>-WRKSRC=	${WRKDIR}/xxdiff-${PORTVERSION}/src
>+WRKSRC=		${WRKDIR}/xxdiff-${PORTVERSION}/src
> 
> DOCFILES=	xxdiff-cvs-diff.html xxdiff-doc.html \
> 		xxdiff-encrypted.html xxdiff-find-grep-sed.html \
>@@ -31,28 +31,17 @@
> 
> SSDIR=		${DOCSDIR}/screenshots
> SSFILES=	allindex.cidx allindex.html dirindex.html sortindex.html \
>-		xxdiff-snap-about--thumb.jpg xxdiff-snap-about.desc \
>-		xxdiff-snap-about.html xxdiff-snap-about.jpg \
>-		xxdiff-snap-dirs2--thumb.jpg xxdiff-snap-dirs2.desc \
>-		xxdiff-snap-dirs2.html xxdiff-snap-dirs2.jpg \
>-		xxdiff-snap-doc--thumb.jpg xxdiff-snap-doc.desc \
>-		xxdiff-snap-doc.html xxdiff-snap-doc.jpg \
>-		xxdiff-snap-files2--thumb.jpg xxdiff-snap-files2.desc \
>-		xxdiff-snap-files2.html xxdiff-snap-files2.jpg \
>-		xxdiff-snap-files3--thumb.jpg xxdiff-snap-files3.desc \
>-		xxdiff-snap-files3.html xxdiff-snap-files3.jpg \
>-		xxdiff-snap-merged--thumb.jpg xxdiff-snap-merged.desc \
>-		xxdiff-snap-merged.html xxdiff-snap-merged.jpg \
>-		xxdiff-snap-opt1--thumb.jpg xxdiff-snap-opt1.desc \
>-		xxdiff-snap-opt1.html xxdiff-snap-opt1.jpg \
>-		xxdiff-snap-opt2--thumb.jpg xxdiff-snap-opt2.desc \
>-		xxdiff-snap-opt2.html xxdiff-snap-opt2.jpg \
>-		xxdiff-snap-opt3--thumb.jpg xxdiff-snap-opt3.desc \
>-		xxdiff-snap-opt3.html xxdiff-snap-opt3.jpg \
>-		xxdiff-snap-opt4--thumb.jpg xxdiff-snap-opt4.desc \
>-		xxdiff-snap-opt4.html xxdiff-snap-opt4.jpg \
>-		xxdiff-snap-opt5--thumb.jpg xxdiff-snap-opt5.desc \
>-		xxdiff-snap-opt5.html xxdiff-snap-opt5.jpg
>+		${SSSNAPS:S/^/xxdiff-snap-/}
>+SSSNAPS=	about--thumb.jpg about.desc about.html about.jpg dirs2--thumb.jpg dirs2.desc \
>+		dirs2.html dirs2.jpg doc--thumb.jpg doc.desc doc.html doc.jpg files2--thumb.jpg \
>+		files2.desc files2.html files2.jpg files3--thumb.jpg files3.desc files3.html \
>+		files3.jpg merged--thumb.jpg merged.desc merged.html merged.jpg opt1--thumb.jpg \
>+		opt1.desc opt1.html opt1.jpg opt2--thumb.jpg opt2.desc opt2.html opt2.jpg \
>+		opt3--thumb.jpg opt3.desc opt3.html opt3.jpg opt4--thumb.jpg opt4.desc opt4.html \
>+		opt4.jpg opt5--thumb.jpg opt5.desc opt5.html opt5.jpg
>+
>+PLIST_FILES=	bin/xxdiff
>+PORTDOCS=	*
> 
> .include <bsd.port.pre.mk>
> 
>@@ -65,8 +54,8 @@
> 	${INSTALL_PROGRAM} ${WRKSRC}/../bin/xxdiff ${PREFIX}/bin
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR} ${SSDIR}
>-	${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/../doc/,} ${DOCSDIR}
>-	${INSTALL_DATA} ${SSFILES:S,^,${WRKSRC}/../doc/screenshots/,} ${SSDIR}
>+	${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/../doc/,} ${DOCSDIR}/
>+	${INSTALL_DATA} ${SSFILES:S,^,${WRKSRC}/../doc/screenshots/,} ${SSDIR}/
> .endif
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/textproc/xxdiff/distinfo xxdiff/distinfo
>--- /usr/ports/textproc/xxdiff/distinfo	Tue Jan 24 06:10:23 2006
>+++ xxdiff/distinfo	Sat Apr 15 23:23:37 2006
>@@ -1,3 +1,3 @@
>-MD5 (xxdiff-3.0.3.tar.gz) = 979059f234a25a4c58db1922d5673e46
>-SHA256 (xxdiff-3.0.3.tar.gz) = 2d4dbfe085033f49043a95e5b0576f5c8951c0714d5a11c553bb0165aef1eb04
>-SIZE (xxdiff-3.0.3.tar.gz) = 1069910
>+MD5 (xxdiff-3.0.4.tar.gz) = 664b8960dad26c7f16d180a08d1a7e8e
>+SHA256 (xxdiff-3.0.4.tar.gz) = 5a9cbcae8491ad7660294b93bf986224ab2d5d7ba1b2665af8c6aa9b315b9f34
>+SIZE (xxdiff-3.0.4.tar.gz) = 1069916
>diff -urN /usr/ports/textproc/xxdiff/pkg-descr xxdiff/pkg-descr
>--- /usr/ports/textproc/xxdiff/pkg-descr	Wed Nov  7 13:40:28 2001
>+++ xxdiff/pkg-descr	Sat Apr 15 23:24:04 2006
>@@ -2,7 +2,7 @@
> two or three files, or between two directories, and can be used to
> produce a merged version.
> 
>-WWW: http://xxdiff.sourceforge.net/
>+WWW: http://furius.ca/xxdiff/
> 
> - Pete
> petef@FreeBSD.org
>diff -urN /usr/ports/textproc/xxdiff/pkg-plist xxdiff/pkg-plist
>--- /usr/ports/textproc/xxdiff/pkg-plist	Tue Apr 20 04:15:46 2004
>+++ xxdiff/pkg-plist	Thu Jan  1 03:00:00 1970
>@@ -1,62 +0,0 @@
>-@comment $FreeBSD: ports/textproc/xxdiff/pkg-plist,v 1.2 2004/04/20 00:15:46 petef Exp $
>-bin/xxdiff
>-%%PORTDOCS%%%%DOCSDIR%%/xxdiff-cvs-diff.html
>-%%PORTDOCS%%%%DOCSDIR%%/xxdiff-doc.html
>-%%PORTDOCS%%%%DOCSDIR%%/xxdiff-encrypted.html
>-%%PORTDOCS%%%%DOCSDIR%%/xxdiff-find-grep-sed.html
>-%%PORTDOCS%%%%DOCSDIR%%/xxdiff-integration.html
>-%%PORTDOCS%%%%DOCSDIR%%/xxdiff-match.html
>-%%PORTDOCS%%%%DOCSDIR%%/xxdiff-patch-UNFINISHED.html
>-%%PORTDOCS%%%%DOCSDIR%%/xxdiff-secrets.html
>-%%PORTDOCS%%%%DOCSDIR%%/equals.png
>-%%PORTDOCS%%%%DOCSDIR%%/select.png
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/allindex.cidx
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/allindex.html
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/dirindex.html
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/sortindex.html
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-about--thumb.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-about.desc
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-about.html
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-about.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-dirs2--thumb.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-dirs2.desc
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-dirs2.html
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-dirs2.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-doc--thumb.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-doc.desc
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-doc.html
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-doc.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-files2--thumb.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-files2.desc
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-files2.html
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-files2.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-files3--thumb.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-files3.desc
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-files3.html
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-files3.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-merged--thumb.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-merged.desc
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-merged.html
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-merged.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt1--thumb.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt1.desc
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt1.html
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt1.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt2--thumb.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt2.desc
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt2.html
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt2.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt3--thumb.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt3.desc
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt3.html
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt3.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt4--thumb.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt4.desc
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt4.html
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt4.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt5--thumb.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt5.desc
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt5.html
>-%%PORTDOCS%%%%DOCSDIR%%/screenshots/xxdiff-snap-opt5.jpg
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/screenshots
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 95828: 64448