diff options
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/xxdiff/Makefile | 58 | ||||
| -rw-r--r-- | textproc/xxdiff/distinfo | 4 | ||||
| -rw-r--r-- | textproc/xxdiff/files/patch-builderDirs2.cpp | 13 | ||||
| -rw-r--r-- | textproc/xxdiff/files/patch-builderFiles2.cpp | 14 | ||||
| -rw-r--r-- | textproc/xxdiff/files/patch-builderFiles3.cpp | 13 | ||||
| -rw-r--r-- | textproc/xxdiff/files/patch-exceptions.h | 29 | ||||
| -rw-r--r-- | textproc/xxdiff/files/patch-src::xxdiff.pro | 17 | ||||
| -rw-r--r-- | textproc/xxdiff/pkg-plist | 63 |
8 files changed, 101 insertions, 110 deletions
diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile index de6ebbfa9448..1b61509a76e5 100644 --- a/textproc/xxdiff/Makefile +++ b/textproc/xxdiff/Makefile @@ -6,37 +6,55 @@ # PORTNAME= xxdiff -PORTVERSION= 2.0.3 -PORTREVISION= 1 +PORTVERSION= 3.0.2 CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_LOCAL:S/%SUBDIR%/petef/g} \ - ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -.if !defined(NOPORTDOCS) -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} xxdiff-${PORTVERSION}.html -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -.endif - MAINTAINER= petef@FreeBSD.org COMMENT= QT interface to view/merge differences between 2 or 3 files BUILD_DEPENDS= tmake:${PORTSDIR}/devel/tmake -BROKEN= "Inconsistent dependencies (qt 2.x and 3.x)" - USE_BISON= yes USE_GMAKE= yes -USE_QT_VER= 2 +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 -.include <bsd.port.pre.mk> +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 -.if ${OSVERSION} >= 502000 -BROKEN= "Does not compile" -.endif +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 + +.include <bsd.port.pre.mk> do-build: (cd ${WRKSRC}; ${SETENV} ${TMAKEENV} tmake -o Makefile xxdiff.pro) @@ -44,11 +62,11 @@ do-build: ${MAKEFILE} ${MAKE_ARGS}) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/xxdiff ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/../bin/xxdiff ${PREFIX}/bin .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DISTDIR}/xxdiff-${PORTVERSION}.html \ - ${DOCSDIR}/xxdiff.html + @${MKDIR} ${DOCSDIR} ${SSDIR} + ${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/../doc/,} ${DOCSDIR} + ${INSTALL_DATA} ${SSFILES:S,^,${WRKSRC}/../doc/screenshots/,} ${SSDIR} .endif .include <bsd.port.post.mk> diff --git a/textproc/xxdiff/distinfo b/textproc/xxdiff/distinfo index a7d3b04e2b6b..e2873496663d 100644 --- a/textproc/xxdiff/distinfo +++ b/textproc/xxdiff/distinfo @@ -1,4 +1,4 @@ -MD5 (xxdiff-2.0.3.tar.gz) = 9fdc8ebae7f9242a5dd05949dc8110f3 -SIZE (xxdiff-2.0.3.tar.gz) = 748194 +MD5 (xxdiff-3.0.2.tar.gz) = 3c3eeedc2c710a43794894d29c1d5db7 +SIZE (xxdiff-3.0.2.tar.gz) = 1064508 MD5 (xxdiff-2.0.3.html) = f995e3692a01d9252c1d8adee7bffb49 SIZE (xxdiff-2.0.3.html) = 46210 diff --git a/textproc/xxdiff/files/patch-builderDirs2.cpp b/textproc/xxdiff/files/patch-builderDirs2.cpp deleted file mode 100644 index 561b29eaf48d..000000000000 --- a/textproc/xxdiff/files/patch-builderDirs2.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- builderDirs2.cpp.orig Mon Jun 30 17:32:25 2003 -+++ builderDirs2.cpp Mon Jun 30 17:32:46 2003 -@@ -94,6 +94,8 @@ - const char* buf - ); - -+ ~XxParseDiffError() throw() { } -+ - }; - - /*============================================================================== diff --git a/textproc/xxdiff/files/patch-builderFiles2.cpp b/textproc/xxdiff/files/patch-builderFiles2.cpp deleted file mode 100644 index 6b8da63d6532..000000000000 --- a/textproc/xxdiff/files/patch-builderFiles2.cpp +++ /dev/null @@ -1,14 +0,0 @@ -$FreeBSD$ - ---- builderFiles2.cpp~ Tue Nov 6 07:30:32 2001 -+++ builderFiles2.cpp Mon Jun 30 17:40:21 2003 -@@ -150,6 +150,8 @@ - const XxFln f2n2 - ); - -+ ~XxParseDiffError() throw() { } -+ - }; - - //------------------------------------------------------------------------------ - diff --git a/textproc/xxdiff/files/patch-builderFiles3.cpp b/textproc/xxdiff/files/patch-builderFiles3.cpp deleted file mode 100644 index b5903c4d7088..000000000000 --- a/textproc/xxdiff/files/patch-builderFiles3.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- builderFiles3.cpp.orig Mon Jun 30 17:31:39 2003 -+++ builderFiles3.cpp Mon Jun 30 17:32:00 2003 -@@ -73,6 +73,8 @@ - const XxFln f3n2 - ); - -+ ~XxParseDiffError() throw() { } -+ - }; - - //------------------------------------------------------------------------------ diff --git a/textproc/xxdiff/files/patch-exceptions.h b/textproc/xxdiff/files/patch-exceptions.h deleted file mode 100644 index 002255371cdf..000000000000 --- a/textproc/xxdiff/files/patch-exceptions.h +++ /dev/null @@ -1,29 +0,0 @@ -$FreeBSD$ - ---- exceptions.h.orig Mon Jun 30 17:27:19 2003 -+++ exceptions.h Mon Jun 30 17:29:00 2003 -@@ -116,6 +116,8 @@ - // Returns true if this is a benine exception. - bool isBenine() const; - -+ ~XxUsageError() throw() { } -+ - private: - - /*----- data members -----*/ -@@ -142,6 +144,7 @@ - const QString& msg = QString::null // use errno string only. - ); - -+ ~XxIoError() throw() { } - }; - - /*============================================================================== -@@ -161,6 +164,8 @@ - XxInternalError( - XX_EXC_PARAMS_DECL(file,line) - ); -+ -+ ~XxInternalError() throw() { } - - }; diff --git a/textproc/xxdiff/files/patch-src::xxdiff.pro b/textproc/xxdiff/files/patch-src::xxdiff.pro deleted file mode 100644 index 355670493b8d..000000000000 --- a/textproc/xxdiff/files/patch-src::xxdiff.pro +++ /dev/null @@ -1,17 +0,0 @@ -$FreeBSD$ - ---- xxdiff.pro.orig Tue Nov 6 15:00:01 2001 -+++ xxdiff.pro Wed Nov 7 02:22:25 2001 -@@ -80,6 +80,12 @@ - solaris-cc:TMAKE_CXXFLAGS += -DCOMPILER_SUNWSPRO - - -+# -+# FreeBSD -+# -+freebsd-g++:TMAKE_LIBS += ${PTHREAD_LIBS} -+ -+ - # Add diff files to link against directly - DIFFUTILS_DIR = ../diffutils-2.7 - diff --git a/textproc/xxdiff/pkg-plist b/textproc/xxdiff/pkg-plist index 1bbad7691884..b24869a7b2e4 100644 --- a/textproc/xxdiff/pkg-plist +++ b/textproc/xxdiff/pkg-plist @@ -1,3 +1,62 @@ +@comment $FreeBSD$ bin/xxdiff -%%PORTDOCS%%share/doc/xxdiff/xxdiff.html -%%PORTDOCS%%@dirrm share/doc/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%% |