- Update to 3.2

2 files changed, 29 insertions, 34 deletions

diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile
index 56139e4e263f..319a70f76a60 100644
--- a/textproc/xxdiff/Makefile
+++ b/textproc/xxdiff/Makefile
@@ -6,56 +6,51 @@
 #
 
 PORTNAME=	xxdiff
-PORTVERSION=	3.0.4
+PORTVERSION=	3.2
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	QT interface to view/merge differences between 2 or 3 files
 
-BUILD_DEPENDS=	tmake:${PORTSDIR}/devel/tmake
+BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake \
+		bison:${PORTSDIR}/devel/bison2 \
+		${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 
+QMAKE=		${LOCALBASE}/bin/qmake
+SPEC=		${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+USE_BZIP2=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
 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
-
-DOCFILES=	xxdiff-cvs-diff.html xxdiff-doc.html \
-		xxdiff-encrypted.html xxdiff-find-grep-sed.html \
-		xxdiff-integration.html xxdiff-match.html \
-		xxdiff-patch-UNFINISHED.html xxdiff-secrets.html \
-		equals.png select.png
+MAKE_ENV+=	QTDIR=${X11BASE}
+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 \
-		${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
+		${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=	*
 
-.include <bsd.port.pre.mk>
+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
 
-do-build:
-	(cd ${WRKSRC}; ${SETENV} ${TMAKEENV} tmake -o Makefile xxdiff.pro)
-	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
-		${MAKEFILE} ${MAKE_ARGS})
+pre-build:
+	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} QMAKESPEC=${SPEC} ${MAKE} -f Makefile.bootstrap ${MAKE_ARGS} Makefile)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/../bin/xxdiff ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/xxdiff ${TARGETDIR}/bin/
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR} ${SSDIR}
-	${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/../doc/,} ${DOCSDIR}/
-	${INSTALL_DATA} ${SSFILES:S,^,${WRKSRC}/../doc/screenshots/,} ${SSDIR}/
+	@${INSTALL} -d ${DOCSDIR} ${SSDIR}
+	${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
+	${INSTALL_DATA} ${SSFILES:S,^,${WRKSRC}/doc/screenshots/,} ${SSDIR}/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/xxdiff/distinfo b/textproc/xxdiff/distinfo
index 330c183cef66..38469c1daa98 100644
--- a/textproc/xxdiff/distinfo
+++ b/textproc/xxdiff/distinfo
@@ -1,3 +1,3 @@
-MD5 (xxdiff-3.0.4.tar.gz) = 664b8960dad26c7f16d180a08d1a7e8e
-SHA256 (xxdiff-3.0.4.tar.gz) = 5a9cbcae8491ad7660294b93bf986224ab2d5d7ba1b2665af8c6aa9b315b9f34
-SIZE (xxdiff-3.0.4.tar.gz) = 1069916
+MD5 (xxdiff-3.2.tar.bz2) = 301ff399a1e4be8b68c38c3e27c0b1ad
+SHA256 (xxdiff-3.2.tar.bz2) = 965534bab462aea8aacb6c35c0683c1079f06d055ff13820584ac862134db2b8
+SIZE (xxdiff-3.2.tar.bz2) = 1341967