From owner-svn-ports-head@freebsd.org Fri Jan 22 12:01:35 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1375BA8DE84; Fri, 22 Jan 2016 12:01:35 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C7C7A1D4C; Fri, 22 Jan 2016 12:01:34 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MC1XZv050964; Fri, 22 Jan 2016 12:01:33 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MC1Xct050957; Fri, 22 Jan 2016 12:01:33 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201601221201.u0MC1Xct050957@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Fri, 22 Jan 2016 12:01:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406925 - in head: . textproc textproc/xxdiff textproc/xxdiff-scripts X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jan 2016 12:01:35 -0000 Author: danfe Date: Fri Jan 22 12:01:32 2016 New Revision: 406925 URL: https://svnweb.freebsd.org/changeset/ports/406925 Log: Resurrect `textproc/xxdiff' and `textproc/xxdiff-scripts' which were removed from the tree when Qt 3.x had reached EoL. Version 4.0 adds support for Qt4 now and thus allows to revive the port(s). While here, modernize Makefiles, define LICENSE (GPLv2), clean up dependencies, and augment port description. PR: 198025 Added: head/textproc/xxdiff/ - copied from r323747, head/textproc/xxdiff/ head/textproc/xxdiff-scripts/ - copied from r323747, head/textproc/xxdiff-scripts/ Deleted: head/textproc/xxdiff-scripts/pkg-plist Modified: head/MOVED head/textproc/Makefile head/textproc/xxdiff-scripts/Makefile head/textproc/xxdiff-scripts/distinfo head/textproc/xxdiff/Makefile head/textproc/xxdiff/distinfo head/textproc/xxdiff/pkg-descr Modified: head/MOVED ============================================================================== --- head/MOVED Fri Jan 22 11:54:09 2016 (r406924) +++ head/MOVED Fri Jan 22 12:01:32 2016 (r406925) @@ -4756,8 +4756,6 @@ textproc/kbedic||2013-07-26|Has expired: textproc/skim||2013-07-26|Has expired: Depends on Qt 3.x textproc/uim-kde||2013-07-26|Has expired: Depends on Qt 3.x textproc/uim-qt||2013-07-26|Has expired: Depends on Qt 3.x -textproc/xxdiff||2013-07-26|Has expired: Depends on Qt 3.x -textproc/xxdiff-scripts||2013-07-26|Has expired: Depends on Qt 3.x ukrainian/kde3-i18n||2013-07-26|Has expired: Depends on Qt 3.x vietnamese/kde3-i18n||2013-07-26|Has expired: Depends on Qt 3.x www/kdewebdev||2013-07-26|Has expired: Depends on Qt 3.x Modified: head/textproc/Makefile ============================================================================== --- head/textproc/Makefile Fri Jan 22 11:54:09 2016 (r406924) +++ head/textproc/Makefile Fri Jan 22 12:01:32 2016 (r406925) @@ -1688,6 +1688,8 @@ SUBDIR += xsv SUBDIR += xt SUBDIR += xwindiff + SUBDIR += xxdiff + SUBDIR += xxdiff-scripts SUBDIR += y2l SUBDIR += yali SUBDIR += yamcha Modified: head/textproc/xxdiff-scripts/Makefile ============================================================================== --- head/textproc/xxdiff-scripts/Makefile Fri Jul 26 19:14:50 2013 (r323747) +++ head/textproc/xxdiff-scripts/Makefile Fri Jan 22 12:01:32 2016 (r406925) @@ -1,13 +1,8 @@ -# New ports collection makefile for: xxdiff-scripts -# Date created: 13 August 2006 -# Whom: Andrew Pantyukgin -# +# Created by: Andrew Pantyukhin # $FreeBSD$ -# PORTNAME= xxdiff -PORTVERSION= 3.2 -PORTREVISION= 5 +PORTVERSION= 4.0 CATEGORIES= textproc MASTER_SITES= SF PKGNAMESUFFIX= -scripts @@ -15,11 +10,13 @@ PKGNAMESUFFIX= -scripts 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:bzip2 +USE_PYTHON= autoplist distutils PYDISTUTILS_PKGNAME= xxdiff-scripts .include Modified: head/textproc/xxdiff-scripts/distinfo ============================================================================== --- head/textproc/xxdiff-scripts/distinfo Fri Jul 26 19:14:50 2013 (r323747) +++ head/textproc/xxdiff-scripts/distinfo Fri Jan 22 12:01:32 2016 (r406925) @@ -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 Modified: head/textproc/xxdiff/Makefile ============================================================================== --- head/textproc/xxdiff/Makefile Fri Jul 26 19:14:50 2013 (r323747) +++ head/textproc/xxdiff/Makefile Fri Jan 22 12:01:32 2016 (r406925) @@ -2,54 +2,46 @@ # $FreeBSD$ 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 +COMMENT= Graphical file and directories comparator and merge tool -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 +USES= bison gmake tar:bz2 +USE_QT4= gui moc_build qmake_build uic_build -QMAKE= ${LOCALBASE}/bin/qmake -SPEC= ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ -USE_BZIP2= yes -USES= bison -USE_GMAKE= yes -USE_QT_VER= 3 -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 + +.include + +# base flex(1) v2.5.4 is not sufficient +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033 +BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex + 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/&!' \ + ${BUILD_WRKSRC}/xxdiff.pro +.endif 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} \ + ${MAKE_CMD} -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 + +do-install-DOCS-on: + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "${PORTDOCS} ! -name Makefile" \ + ${STAGEDIR}/${DOCSDIR} -.include +.include Modified: head/textproc/xxdiff/distinfo ============================================================================== --- head/textproc/xxdiff/distinfo Fri Jul 26 19:14:50 2013 (r323747) +++ head/textproc/xxdiff/distinfo Fri Jan 22 12:01:32 2016 (r406925) @@ -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 Modified: head/textproc/xxdiff/pkg-descr ============================================================================== --- head/textproc/xxdiff/pkg-descr Fri Jul 26 19:14:50 2013 (r323747) +++ head/textproc/xxdiff/pkg-descr Fri Jan 22 12:01:32 2016 (r406925) @@ -1,5 +1,22 @@ -xxdiff is a graphical browser for viewing the differences between -two or three files, or between two directories, and can be used to -produce a merged version. +xxdiff is a graphical tool for viewing the differences between two or three +files, or between two directories, and can produce a merged version thereof. + +Some of its features: + + - Comparing two files, three files, or two directories (shallow and + recursive) + - Horizontal diffs highlighting + - Files can be merged interactively and resulting output visualized + and saved + - Has features to assist in performing merge reviews/policing + - Can unmerge CVS conflicts in automatically merged file and display + them as two files, to help resolve conflicts + - Uses external diff program to compute differences: works with GNU + diff, SGI diff and ClearCase's cleardiff, and any other diff whose + output is similar to those + - Fully customizable with a resource file + - Look-and-feel similar to Rudy Wortel's/SGI xdiff; it is desktop + agnostic (i.e. will work equally well with KDE or GNOME) + - Features and output that ease integration with scripts WWW: http://furius.ca/xxdiff/