diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2006-11-05 18:29:07 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2006-11-05 18:29:07 +0000 |
| commit | 2decae9e93fb5811d8a953d7873ce53b3c3f1ea7 (patch) | |
| tree | 3e3b2811cf4eae17869aaa5a53ae86c7d2e8ba5c /textproc/kdiff3 | |
| parent | 46dc83529fb73eefd4032e28e629320b710bc6db (diff) | |
| download | ports-2decae9e93fb5811d8a953d7873ce53b3c3f1ea7.tar.gz ports-2decae9e93fb5811d8a953d7873ce53b3c3f1ea7.zip | |
Notes
Diffstat (limited to 'textproc/kdiff3')
| -rw-r--r-- | textproc/kdiff3/Makefile | 11 | ||||
| -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 | 16 |
4 files changed, 31 insertions, 13 deletions
diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile index e356443470f4..e775390652df 100644 --- a/textproc/kdiff3/Makefile +++ b/textproc/kdiff3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdiff3 -PORTVERSION= 0.9.90 +PORTVERSION= 0.9.91 CATEGORIES= textproc kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -22,13 +22,4 @@ CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" MAN1= kdiff3.1 -pre-configure: -.for i in config.h.in Makefile.in - ${TOUCH} ${WRKSRC}/${i} -.endfor - -post-patch: - @${REINPLACE_CMD} -e 's|-O2 ||g; s|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/${CONFIGURE_SCRIPT} - .include <bsd.port.mk> diff --git a/textproc/kdiff3/distinfo b/textproc/kdiff3/distinfo index 1313b96438c6..feb17a14cdec 100644 --- a/textproc/kdiff3/distinfo +++ b/textproc/kdiff3/distinfo @@ -1,3 +1,3 @@ -MD5 (kdiff3-0.9.90.tar.gz) = 7224d636e1f1fa577abfbc17192e71bd -SHA256 (kdiff3-0.9.90.tar.gz) = 39ce3880a4ff586a96460dac32a483cc081979ffcc82508ea39ace4f39ce6000 -SIZE (kdiff3-0.9.90.tar.gz) = 1846495 +MD5 (kdiff3-0.9.91.tar.gz) = e56613506475f23b8ab713f325dea6e3 +SHA256 (kdiff3-0.9.91.tar.gz) = b22deb1ed23049b303427d8ac81d1e6010166fd6d5eb1dbdd6a075ee770ad9d3 +SIZE (kdiff3-0.9.91.tar.gz) = 2173290 diff --git a/textproc/kdiff3/files/patch-src-mergeresultwindow.cpp b/textproc/kdiff3/files/patch-src-mergeresultwindow.cpp new file mode 100644 index 000000000000..7441307ecf94 --- /dev/null +++ b/textproc/kdiff3/files/patch-src-mergeresultwindow.cpp @@ -0,0 +1,11 @@ +--- 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 6ad3700d849e..54eeca161e48 100644 --- a/textproc/kdiff3/pkg-plist +++ b/textproc/kdiff3/pkg-plist @@ -219,15 +219,31 @@ share/locale/tr/LC_MESSAGES/kdiff3.mo share/locale/zh_CN/LC_MESSAGES/kdiff3.mo share/services/kdiff3part.desktop @dirrm share/doc/HTML/sv/kdiff3 +@dirrmtry share/doc/HTML/sv @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/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 @dirrm share/doc/HTML/kdiff3 +@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 |