Attachment 153534 Details for Bug 198025 – Proposed patch (since 313635 revision): textproc/xxdiff

[patch] Proposed patch (since 313635 revision): textproc/xxdiff

xxdiff_3.2,7-4.0.diff (text/plain), 3.00 KB, created by lightside on 2015-02-25 21:25:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

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

Size: 3.00 KB

patch

obsolete

>diff -ruN xxdiff.orig/Makefile xxdiff/Makefile
>--- xxdiff.orig/Makefile	2013-03-08 15:32:11.670161000 +0400
>+++ xxdiff/Makefile	2015-02-26 00:17:08.000000000 +0400
>@@ -2,54 +2,39 @@
> # $FreeBSD: head/textproc/xxdiff/Makefile 313635 2013-03-08 11:32:11Z bapt $
> 
> PORTNAME=	xxdiff
>-PORTVERSION=	3.2
>-PORTREVISION=	7
>+PORTVERSION=	4.0
> CATEGORIES=	textproc
> MASTER_SITES=	SF
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	QT interface to view/merge differences between 2 or 3 files
> 
>-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake \
>-		${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-DEPRECATED=	Depends on QT3; unmaintained
>-EXPIRATION_DATE=	2013-07-01
>+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
> 
>-QMAKE=		${LOCALBASE}/bin/qmake
>-SPEC=		${LOCALBASE}/share/qt/mkspecs/freebsd-g++
>-USE_BZIP2=	yes
>-USES=		bison
>-USE_GMAKE=	yes
>-USE_QT_VER=	3
>+USES=		bison gmake tar:bz2
>+USE_QT4=	gui moc_build qmake_build uic_build
> MAKE_ENV+=	QTDIR=${QT_PREFIX}
> BUILD_WRKSRC=	${WRKSRC}/src
> 
>-DOCFILES=	xxdiff-doc.html xxdiff-integration.html xxdiff-scripts.html xxdiff-secrets.html \
>-		equals.png horiz.png perhunk.png rma.png screenshot-sql-schema-compare.png select.png
>-SSDIR=		${DOCSDIR}/screenshots
>-SSFILES=	allindex.cidx allindex.html dirindex.html sortindex.html \
>-		${SSNAPS_EXT:S/^/xxdiff-snap-/}
>-SSNAPS=		about dirs2 doc files2 files3 merged opt1 opt2 opt3 opt4 opt5
>-SSNAPS_EXT=	${SSNAPS:S/$/--thumb.jpg/} ${SSNAPS:S/$/.desc/} \
>-		${SSNAPS:S/$/.html/} ${SSNAPS:S/$/.jpg/}
>-
> PLIST_FILES=	bin/xxdiff
> PORTDOCS=	*
> 
>+OPTIONS_DEFINE=	DOCS
>+
> post-patch:
>-	@${REINPLACE_CMD} -e 's!flex!${LOCALBASE}/bin/flex!' ${BUILD_WRKSRC}/xxdiff.pro
>-	@${REINPLACE_CMD} -e 's!?= /usr/qt/3!= ${LOCALBASE}!' ${BUILD_WRKSRC}/Makefile.bootstrap
>+	@${REINPLACE_CMD} -e 's!flex!${LOCALBASE}/bin/flex!' \
>+		${BUILD_WRKSRC}/xxdiff.pro
> 
> pre-build:
>-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} QMAKESPEC=${SPEC} ${MAKE} -f Makefile.bootstrap ${MAKE_ARGS} Makefile)
>+	(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} QMAKE=${QMAKE} \
>+	QMAKESPEC=${QMAKESPEC} ${GMAKE} -f Makefile.bootstrap ${MAKE_ARGS} Makefile)
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/bin/xxdiff ${PREFIX}/bin/
>-.if !defined(NOPORTDOCS)
>-	@${INSTALL} -d ${DOCSDIR} ${SSDIR}
>-	${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
>-	${INSTALL_DATA} ${SSFILES:S,^,${WRKSRC}/doc/screenshots/,} ${SSDIR}/
>-.endif
>+	${INSTALL_PROGRAM} ${WRKSRC}/bin/xxdiff ${STAGEDIR}${PREFIX}/bin
>+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "${PORTDOCS} ! -name Makefile" \
>+		${STAGEDIR}/${DOCSDIR})
> 
> .include <bsd.port.mk>
>diff -ruN xxdiff.orig/distinfo xxdiff/distinfo
>--- xxdiff.orig/distinfo	2012-07-14 18:29:18.662529000 +0400
>+++ xxdiff/distinfo	2015-02-25 04:51:24.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

Actions: View | Diff

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