On Wed 05/02/2020 10:52, Landry Breuil wrote: > On Wed, Feb 05, 2020 at 10:42:50AM +0100, Björn Ketelaars wrote: > > On Tue 04/02/2020 22:03, Rafael Sadowski wrote: > > > Read this https://marc.info/?l=openbsd-ports&m=158084331321590&w=2 and > > > s/beediff/xxdiff. > > > > > > OK to remove xxdiff? > > > > xxdiff is a RDEP of devel/git-cola. It could be that alternative diff > > tools work as well, but these have not been tested. As such, for now, I > > would like to propose to NOT remove xxdiff. > > and per https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=875241 > apparently upstream (or a fork) has a QT5 version, archlinux takes it from > https://bitbucket.org/blais/xxdiff/
Instead of removing xxdiff we could choose to update it to HEAD, which indeed provides a QT5 version. Run tested on amd64. Comments/OK? diff --git Makefile Makefile index 3c7df35ce04..8f90da313b1 100644 --- Makefile +++ Makefile @@ -2,40 +2,37 @@ COMMENT= graphical file comparator and merge tool -DISTNAME= xxdiff-4.0.1 +PKGNAME= xxdiff-4.0.1.20170623 +DISTNAME= 5e5f885dfc43559549a81c59e9e8c9525306356a + CATEGORIES= textproc x11 -REVISION= 1 HOMEPAGE= http://furius.ca/xxdiff/ # GPL PERMIT_PACKAGE= Yes -WANTLIB += ICE QtGui SM X11 Xext Xi Xinerama Xrender c fontconfig -WANTLIB += freetype m pthread ${COMPILER_LIBCXX} +WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Widgets c m -COMPILER = base-clang ports-gcc base-gcc +MASTER_SITES= https://bitbucket.org/blais/xxdiff/get/ -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xxdiff/} -EXTRACT_SUFX= .tar.bz2 +COMPILER= base-clang ports-gcc base-gcc MODULES= devel/qmake \ lang/python \ - x11/qt4 + x11/qt5 + BUILD_DEPENDS= devel/bison +MAKE_FLAGS= MAKEDIR=${WRKDIST} + SEPARATE_BUILD= No MODPY_ADJ_FILES= ../bin/termdiff NO_TEST= Yes -WRKDIST= ${WRKDIR}/${DISTNAME}/src - -post-extract: - @rm ${WRKSRC}/getopt.h - @rm ${WRKSRC}/getopt.c - @rm ${WRKSRC}/getopt1.c +WRKDIST= ${WRKDIR}/blais-xxdiff-${DISTNAME:C/([0-9a-f]{12}).*/\1/}/src post-configure: cat ${WRKSRC}/Makefile.extra >>${WRKBUILD}/Makefile diff --git distinfo distinfo index 563604a65e8..e6a978a78ed 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (xxdiff-4.0.1.tar.bz2) = v1jd2p16iH9PXK4gBw7V8uDWX1da8ghgc4xuJ0LDoAA= -SIZE (xxdiff-4.0.1.tar.bz2) = 1981869 +SHA256 (5e5f885dfc43559549a81c59e9e8c9525306356a.tar.gz) = hnS2wxB+EIfYMbVwdwv9U35p/h4NDitbrB8/dOlHo0M= +SIZE (5e5f885dfc43559549a81c59e9e8c9525306356a.tar.gz) = 2044525 diff --git pkg/PLIST pkg/PLIST index 163f6be89ae..c6f5ccaafcd 100644 --- pkg/PLIST +++ pkg/PLIST @@ -94,5 +94,5 @@ lib/python${MODPY_VERSION}/site-packages/xxdiff/utils.py lib/python${MODPY_VERSION}/site-packages/xxdiff/utils.pyc lib/python${MODPY_VERSION}/site-packages/xxdiff/xformloop.py lib/python${MODPY_VERSION}/site-packages/xxdiff/xformloop.pyc -lib/python${MODPY_VERSION}/site-packages/xxdiff_scripts-4.0.1-py${MODPY_VERSION}.egg-info +lib/python${MODPY_VERSION}/site-packages/xxdiff_scripts-5.0b1-py${MODPY_VERSION}.egg-info @man man/man1/xxdiff.1
