diff options
| -rw-r--r-- | textproc/kdiff3/Makefile | 20 | ||||
| -rw-r--r-- | textproc/kdiff3/distinfo | 6 | ||||
| -rw-r--r-- | textproc/kdiff3/files/patch-src-mergeresultwindow.cpp | 11 | ||||
| -rw-r--r-- | textproc/kdiff3/pkg-plist | 202 |
4 files changed, 43 insertions, 196 deletions
diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile index 4dc39f3b2b44..a138369dc214 100644 --- a/textproc/kdiff3/Makefile +++ b/textproc/kdiff3/Makefile @@ -6,22 +6,18 @@ # PORTNAME= kdiff3 -PORTVERSION= 0.9.92 -PORTREVISION= 5 +PORTVERSION= 0.9.95 CATEGORIES= textproc kde MASTER_SITES= SF -MAINTAINER= h.eichmann@gmx.de -COMMENT= A KDE3 graphical frontend for diff +MAINTAINER= brucec@FreeBSD.org +COMMENT= A KDE4 graphical frontend for diff -USE_KDEBASE_VER=3 -USE_AUTOTOOLS= libtool:22 +USE_KDE4= kdebase kdeprefix kdehier automoc4 +USE_CMAKE= yes +USE_QT_VER= 4 +QT_COMPONENTS= moc_build qmake_build rcc_build uic_build USE_GETTEXT= yes -INSTALLS_ICONS= yes -USE_LDCONFIG= ${PREFIX}/lib/kde3 - -CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" - -MAN1= kdiff3.1 +MAKE_JOBS_SAFE= yes .include <bsd.port.mk> diff --git a/textproc/kdiff3/distinfo b/textproc/kdiff3/distinfo index 19c913c020ab..d2cb9fbfc3fd 100644 --- a/textproc/kdiff3/distinfo +++ b/textproc/kdiff3/distinfo @@ -1,3 +1,3 @@ -MD5 (kdiff3-0.9.92.tar.gz) = c7b52bfee6a085393de0c4f83732e8f0 -SHA256 (kdiff3-0.9.92.tar.gz) = ec9cc646f6411497cfd5d76ae081b12ff2b11265967ad936d304bd6c452864e4 -SIZE (kdiff3-0.9.92.tar.gz) = 2220173 +MD5 (kdiff3-0.9.95.tar.gz) = 652a98bf79ba762a8a646d4a0fddb323 +SHA256 (kdiff3-0.9.95.tar.gz) = 0372cebc8957f256a98501a4ac3c3634c7ecffb486ece7e7819c90d876202f0f +SIZE (kdiff3-0.9.95.tar.gz) = 1508467 diff --git a/textproc/kdiff3/files/patch-src-mergeresultwindow.cpp b/textproc/kdiff3/files/patch-src-mergeresultwindow.cpp deleted file mode 100644 index 7441307ecf94..000000000000 --- a/textproc/kdiff3/files/patch-src-mergeresultwindow.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mergeresultwindow.cpp.orig Sun Oct 29 18:42:07 2006 -+++ src/mergeresultwindow.cpp Sun Nov 5 13:56:47 2006 -@@ -3136,7 +3136,7 @@ - - void WindowTitleWidget::slotSetModified( bool bModified ) - { -- m_pModifiedLabel->setText( bModified ? i18n("[Modified]") : "" ); -+ m_pModifiedLabel->setText( bModified ? i18n("[Modified]") : QString("") ); - } - - bool WindowTitleWidget::eventFilter( QObject* o, QEvent* e ) diff --git a/textproc/kdiff3/pkg-plist b/textproc/kdiff3/pkg-plist index d1c8b150d7a0..48c98e2295e5 100644 --- a/textproc/kdiff3/pkg-plist +++ b/textproc/kdiff3/pkg-plist @@ -1,258 +1,120 @@ bin/kdiff3 -lib/kde3/libkdiff3part.a -lib/kde3/libkdiff3part.la -lib/kde3/libkdiff3part.so -lib/kde3/libkdiff3plugin.a -lib/kde3/libkdiff3plugin.la -lib/kde3/libkdiff3plugin.so -share/applnk/.hidden/kdiff3plugin.desktop -share/applnk/Development/kdiff3.desktop +lib/kde4/libkdiff3part.so +lib/kde4/libkdiff3plugin.so +share/applications/kde4/kdiff3.desktop +share/apps/kdiff3/kdiff3_part.rc share/apps/kdiff3/kdiff3_shell.rc -share/apps/kdiff3part/kdiff3_part.rc share/doc/HTML/da/kdiff3/common -share/doc/HTML/da/kdiff3/dirbrowser.png -share/doc/HTML/da/kdiff3/dirmergebig.png share/doc/HTML/da/kdiff3/index.cache.bz2 share/doc/HTML/da/kdiff3/index.docbook -share/doc/HTML/da/kdiff3/iteminfo.png -share/doc/HTML/da/kdiff3/letter_by_letter.png -share/doc/HTML/da/kdiff3/merge_current.png -share/doc/HTML/da/kdiff3/new.png -share/doc/HTML/da/kdiff3/open_dialog.png -share/doc/HTML/da/kdiff3/screenshot_diff.png -share/doc/HTML/da/kdiff3/screenshot_merge.png -share/doc/HTML/da/kdiff3/triple_diff.png -share/doc/HTML/da/kdiff3/white_space.png share/doc/HTML/de/kdiff3/common -share/doc/HTML/de/kdiff3/dirbrowser.png -share/doc/HTML/de/kdiff3/dirmergebig.png share/doc/HTML/de/kdiff3/index.cache.bz2 share/doc/HTML/de/kdiff3/index.docbook -share/doc/HTML/de/kdiff3/iteminfo.png -share/doc/HTML/de/kdiff3/letter_by_letter.png -share/doc/HTML/de/kdiff3/merge_current.png -share/doc/HTML/de/kdiff3/new.png -share/doc/HTML/de/kdiff3/open_dialog.png -share/doc/HTML/de/kdiff3/screenshot_diff.png -share/doc/HTML/de/kdiff3/screenshot_merge.png -share/doc/HTML/de/kdiff3/triple_diff.png -share/doc/HTML/de/kdiff3/white_space.png share/doc/HTML/en/kdiff3/common -share/doc/HTML/en/kdiff3/compilation.html -share/doc/HTML/en/kdiff3/credits.html share/doc/HTML/en/kdiff3/dirbrowser.png -share/doc/HTML/en/kdiff3/dirmerge.html share/doc/HTML/en/kdiff3/dirmergebig.png -share/doc/HTML/en/kdiff3/dirmergeoptions.html -share/doc/HTML/en/kdiff3/dirmergevisible.html -share/doc/HTML/en/kdiff3/documentation.html -share/doc/HTML/en/kdiff3/dothemerge.html -share/doc/HTML/en/kdiff3/faq.html -share/doc/HTML/en/kdiff3/features.html -share/doc/HTML/en/kdiff3/find.html share/doc/HTML/en/kdiff3/index.cache.bz2 share/doc/HTML/en/kdiff3/index.docbook -share/doc/HTML/en/kdiff3/index.html -share/doc/HTML/en/kdiff3/installation.html -share/doc/HTML/en/kdiff3/interpretinginformation.html -share/doc/HTML/en/kdiff3/introduction.html share/doc/HTML/en/kdiff3/iteminfo.png -share/doc/HTML/en/kdiff3/kdiff3.1 -share/doc/HTML/en/kdiff3/kpart.html share/doc/HTML/en/kdiff3/letter_by_letter.png share/doc/HTML/en/kdiff3/merge_current.png -share/doc/HTML/en/kdiff3/merging.html -share/doc/HTML/en/kdiff3/misc.html -share/doc/HTML/en/kdiff3/navigation.html share/doc/HTML/en/kdiff3/new.png share/doc/HTML/en/kdiff3/open_dialog.png -share/doc/HTML/en/kdiff3/opendialog.html -share/doc/HTML/en/kdiff3/options.html -share/doc/HTML/en/kdiff3/other.html -share/doc/HTML/en/kdiff3/pasteinput.html -share/doc/HTML/en/kdiff3/preprocessors.html -share/doc/HTML/en/kdiff3/printing.html -share/doc/HTML/en/kdiff3/requirements.html -share/doc/HTML/en/kdiff3/saving.html share/doc/HTML/en/kdiff3/screenshot_diff.png share/doc/HTML/en/kdiff3/screenshot_merge.png -share/doc/HTML/en/kdiff3/screenshots.html -share/doc/HTML/en/kdiff3/selections.html -share/doc/HTML/en/kdiff3/startingdirmerge.html share/doc/HTML/en/kdiff3/triple_diff.png share/doc/HTML/en/kdiff3/white_space.png share/doc/HTML/es/kdiff3/common -share/doc/HTML/es/kdiff3/dirbrowser.png -share/doc/HTML/es/kdiff3/dirmergebig.png share/doc/HTML/es/kdiff3/index.cache.bz2 share/doc/HTML/es/kdiff3/index.docbook -share/doc/HTML/es/kdiff3/iteminfo.png -share/doc/HTML/es/kdiff3/letter_by_letter.png -share/doc/HTML/es/kdiff3/merge_current.png -share/doc/HTML/es/kdiff3/new.png -share/doc/HTML/es/kdiff3/open_dialog.png -share/doc/HTML/es/kdiff3/screenshot_diff.png -share/doc/HTML/es/kdiff3/screenshot_merge.png -share/doc/HTML/es/kdiff3/triple_diff.png -share/doc/HTML/es/kdiff3/white_space.png share/doc/HTML/et/kdiff3/common -share/doc/HTML/et/kdiff3/dirbrowser.png -share/doc/HTML/et/kdiff3/dirmergebig.png share/doc/HTML/et/kdiff3/index.cache.bz2 share/doc/HTML/et/kdiff3/index.docbook -share/doc/HTML/et/kdiff3/iteminfo.png -share/doc/HTML/et/kdiff3/letter_by_letter.png -share/doc/HTML/et/kdiff3/merge_current.png -share/doc/HTML/et/kdiff3/new.png -share/doc/HTML/et/kdiff3/open_dialog.png -share/doc/HTML/et/kdiff3/screenshot_diff.png -share/doc/HTML/et/kdiff3/screenshot_merge.png -share/doc/HTML/et/kdiff3/triple_diff.png -share/doc/HTML/et/kdiff3/white_space.png share/doc/HTML/fr/kdiff3/common -share/doc/HTML/fr/kdiff3/dirbrowser.png -share/doc/HTML/fr/kdiff3/dirmergebig.png share/doc/HTML/fr/kdiff3/index.cache.bz2 share/doc/HTML/fr/kdiff3/index.docbook -share/doc/HTML/fr/kdiff3/iteminfo.png -share/doc/HTML/fr/kdiff3/letter_by_letter.png -share/doc/HTML/fr/kdiff3/merge_current.png -share/doc/HTML/fr/kdiff3/new.png -share/doc/HTML/fr/kdiff3/open_dialog.png -share/doc/HTML/fr/kdiff3/screenshot_diff.png -share/doc/HTML/fr/kdiff3/screenshot_merge.png -share/doc/HTML/fr/kdiff3/triple_diff.png -share/doc/HTML/fr/kdiff3/white_space.png share/doc/HTML/it/kdiff3/common -share/doc/HTML/it/kdiff3/dirbrowser.png -share/doc/HTML/it/kdiff3/dirmergebig.png share/doc/HTML/it/kdiff3/index.cache.bz2 share/doc/HTML/it/kdiff3/index.docbook -share/doc/HTML/it/kdiff3/iteminfo.png -share/doc/HTML/it/kdiff3/letter_by_letter.png -share/doc/HTML/it/kdiff3/merge_current.png -share/doc/HTML/it/kdiff3/new.png -share/doc/HTML/it/kdiff3/open_dialog.png -share/doc/HTML/it/kdiff3/screenshot_diff.png -share/doc/HTML/it/kdiff3/screenshot_merge.png -share/doc/HTML/it/kdiff3/triple_diff.png -share/doc/HTML/it/kdiff3/white_space.png -share/doc/HTML/kdiff3/README -share/doc/HTML/kdiff3/createpdfdoc share/doc/HTML/nl/kdiff3/common -share/doc/HTML/nl/kdiff3/dirbrowser.png -share/doc/HTML/nl/kdiff3/dirmergebig.png share/doc/HTML/nl/kdiff3/index.cache.bz2 share/doc/HTML/nl/kdiff3/index.docbook -share/doc/HTML/nl/kdiff3/iteminfo.png -share/doc/HTML/nl/kdiff3/letter_by_letter.png -share/doc/HTML/nl/kdiff3/merge_current.png -share/doc/HTML/nl/kdiff3/new.png -share/doc/HTML/nl/kdiff3/open_dialog.png -share/doc/HTML/nl/kdiff3/screenshot_diff.png -share/doc/HTML/nl/kdiff3/screenshot_merge.png -share/doc/HTML/nl/kdiff3/triple_diff.png -share/doc/HTML/nl/kdiff3/white_space.png share/doc/HTML/pt/kdiff3/common -share/doc/HTML/pt/kdiff3/dirbrowser.png -share/doc/HTML/pt/kdiff3/dirmergebig.png share/doc/HTML/pt/kdiff3/index.cache.bz2 share/doc/HTML/pt/kdiff3/index.docbook -share/doc/HTML/pt/kdiff3/iteminfo.png -share/doc/HTML/pt/kdiff3/letter_by_letter.png -share/doc/HTML/pt/kdiff3/merge_current.png -share/doc/HTML/pt/kdiff3/new.png -share/doc/HTML/pt/kdiff3/open_dialog.png -share/doc/HTML/pt/kdiff3/screenshot_diff.png -share/doc/HTML/pt/kdiff3/screenshot_merge.png -share/doc/HTML/pt/kdiff3/triple_diff.png -share/doc/HTML/pt/kdiff3/white_space.png -share/doc/HTML/sv/kdiff3/common -share/doc/HTML/sv/kdiff3/dirbrowser.png -share/doc/HTML/sv/kdiff3/dirmergebig.png -share/doc/HTML/sv/kdiff3/index.cache.bz2 -share/doc/HTML/sv/kdiff3/index.docbook -share/doc/HTML/sv/kdiff3/iteminfo.png -share/doc/HTML/sv/kdiff3/letter_by_letter.png -share/doc/HTML/sv/kdiff3/merge_current.png -share/doc/HTML/sv/kdiff3/new.png -share/doc/HTML/sv/kdiff3/open_dialog.png -share/doc/HTML/sv/kdiff3/screenshot_diff.png -share/doc/HTML/sv/kdiff3/screenshot_merge.png -share/doc/HTML/sv/kdiff3/triple_diff.png -share/doc/HTML/sv/kdiff3/white_space.png share/icons/hicolor/16x16/apps/kdiff3.png share/icons/hicolor/32x32/apps/kdiff3.png share/icons/locolor/16x16/apps/kdiff3.png share/icons/locolor/32x32/apps/kdiff3.png +share/kde4/services/kdiff3_plugin.desktop +share/kde4/services/kdiff3part.desktop share/locale/ar/LC_MESSAGES/kdiff3.mo -share/locale/az/LC_MESSAGES/kdiff3.mo share/locale/bg/LC_MESSAGES/kdiff3.mo share/locale/br/LC_MESSAGES/kdiff3.mo -share/locale/ca/LC_MESSAGES/kdiff3.mo share/locale/cs/LC_MESSAGES/kdiff3.mo +share/locale/cs/LC_MESSAGES/kdiff3plugin.mo share/locale/cy/LC_MESSAGES/kdiff3.mo share/locale/da/LC_MESSAGES/kdiff3.mo share/locale/de/LC_MESSAGES/kdiff3.mo +share/locale/de/LC_MESSAGES/kdiff3plugin.mo share/locale/el/LC_MESSAGES/kdiff3.mo +share/locale/el/LC_MESSAGES/kdiff3plugin.mo share/locale/en_GB/LC_MESSAGES/kdiff3.mo share/locale/es/LC_MESSAGES/kdiff3.mo +share/locale/es/LC_MESSAGES/kdiff3plugin.mo share/locale/et/LC_MESSAGES/kdiff3.mo +share/locale/et/LC_MESSAGES/kdiff3plugin.mo share/locale/fr/LC_MESSAGES/kdiff3.mo +share/locale/fr/LC_MESSAGES/kdiff3plugin.mo share/locale/ga/LC_MESSAGES/kdiff3.mo +share/locale/ga/LC_MESSAGES/kdiff3plugin.mo share/locale/gl/LC_MESSAGES/kdiff3.mo +share/locale/gl/LC_MESSAGES/kdiff3plugin.mo share/locale/hi/LC_MESSAGES/kdiff3.mo share/locale/hu/LC_MESSAGES/kdiff3.mo -share/locale/is/LC_MESSAGES/kdiff3.mo share/locale/it/LC_MESSAGES/kdiff3.mo share/locale/ja/LC_MESSAGES/kdiff3.mo share/locale/ka/LC_MESSAGES/kdiff3.mo share/locale/lt/LC_MESSAGES/kdiff3.mo share/locale/nb/LC_MESSAGES/kdiff3.mo +share/locale/nb/LC_MESSAGES/kdiff3plugin.mo +share/locale/nds/LC_MESSAGES/kdiff3.mo +share/locale/nds/LC_MESSAGES/kdiff3plugin.mo share/locale/nl/LC_MESSAGES/kdiff3.mo +share/locale/nl/LC_MESSAGES/kdiff3plugin.mo share/locale/pl/LC_MESSAGES/kdiff3.mo share/locale/pt/LC_MESSAGES/kdiff3.mo +share/locale/pt/LC_MESSAGES/kdiff3plugin.mo share/locale/pt_BR/LC_MESSAGES/kdiff3.mo +share/locale/pt_BR/LC_MESSAGES/kdiff3plugin.mo share/locale/ro/LC_MESSAGES/kdiff3.mo +share/locale/ro/LC_MESSAGES/kdiff3plugin.mo share/locale/ru/LC_MESSAGES/kdiff3.mo share/locale/rw/LC_MESSAGES/kdiff3.mo -share/locale/sk/LC_MESSAGES/kdiff3.mo -share/locale/sr/LC_MESSAGES/kdiff3.mo -share/locale/sr@Latn/LC_MESSAGES/kdiff3.mo share/locale/sv/LC_MESSAGES/kdiff3.mo +share/locale/sv/LC_MESSAGES/kdiff3plugin.mo share/locale/ta/LC_MESSAGES/kdiff3.mo share/locale/tg/LC_MESSAGES/kdiff3.mo share/locale/tr/LC_MESSAGES/kdiff3.mo +share/locale/tr/LC_MESSAGES/kdiff3plugin.mo share/locale/uk/LC_MESSAGES/kdiff3.mo +share/locale/uk/LC_MESSAGES/kdiff3plugin.mo share/locale/zh_CN/LC_MESSAGES/kdiff3.mo -share/services/kdiff3_plugin.desktop -share/services/kdiff3part.desktop -@dirrm share/doc/HTML/sv/kdiff3 -@dirrmtry share/doc/HTML/sv +share/locale/zh_CN/LC_MESSAGES/kdiff3plugin.mo +@dirrm share/locale/rw/LC_MESSAGES +@dirrm share/locale/rw +@dirrm share/icons/locolor/32x32/apps +@dirrm share/icons/locolor/32x32 +@dirrm share/icons/locolor/16x16/apps +@dirrm share/icons/locolor/16x16 +@dirrm share/icons/locolor @dirrm share/doc/HTML/pt/kdiff3 -@dirrmtry share/doc/HTML/pt @dirrm share/doc/HTML/nl/kdiff3 -@dirrmtry share/doc/HTML/nl -@dirrm share/doc/HTML/kdiff3 @dirrm share/doc/HTML/it/kdiff3 -@dirrmtry share/doc/HTML/it @dirrm share/doc/HTML/fr/kdiff3 -@dirrmtry share/doc/HTML/fr @dirrm share/doc/HTML/et/kdiff3 -@dirrmtry share/doc/HTML/et @dirrm share/doc/HTML/es/kdiff3 -@dirrmtry share/doc/HTML/es @dirrm share/doc/HTML/en/kdiff3 -@dirrmtry share/doc/HTML/en @dirrm share/doc/HTML/de/kdiff3 -@dirrmtry share/doc/HTML/de @dirrm share/doc/HTML/da/kdiff3 -@dirrmtry share/doc/HTML/da -@dirrmtry share/doc/HTML -@dirrmtry share/doc -@dirrm share/apps/kdiff3part @dirrm share/apps/kdiff3 -@dirrmtry share/apps -@dirrmtry share/applnk/Development -@dirrmtry share/applnk -@dirrmtry share |