Bug 194286
| Summary: | [MAINTAINER] textproc/kdiff3 update | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | luca.pizzamiglio | ||||||
| Component: | Individual Port(s) | Assignee: | Max Brazhnikov <makc> | ||||||
| Status: | Closed FIXED | ||||||||
| Severity: | Affects Many People | CC: | makc | ||||||
| Priority: | --- | ||||||||
| Version: | Latest | ||||||||
| Hardware: | Any | ||||||||
| OS: | Any | ||||||||
| Attachments: |
|
||||||||
This: -COMMENT= KDE4 graphical frontend for diff +COMMENT= A KDE4 graphical frontend for diff That changes the COMMENT from acceptable to unacceptable. It cannot start with an indefinite article. Please create diff vs up-to-date portstree or use subversion as described in the Porters Handbook http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/port-upgrading.html#svn-diff Created attachment 148230 [details]
The recreated patch
Recreating the patch
I followed the same instruction also for the first submitted patch, as usual.
Hoping this time it's OK.
I've also fixed the comment line, as requested.
Are you sure you need this:
@@ -11,6 +11,7 @@
COMMENT= KDE4 graphical frontend for diff
LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
USE_KDE4= kdelibs libkonq kdeprefix kdehier automoc4
USE_QT4= moc_build qmake_build rcc_build uic_build
@@ -27,4 +28,9 @@
DOCS_CMAKE_OFF= -DBUILD_doc:BOOL=FALSE
DOCS_CMAKE_ON= -DBUILD_doc:BOOL=TRUE
+post-patch:
+#Fix build with kdelibs>=4.5.0
+ ${REINPLACE_CMD} -e 's,V4.1.2-Based,V4.2-Based,g' \
+ ${WRKSRC}/doc/*/index.docbook
It looks like you started from the outdated port, this snippet was removed once:
http://svnweb.freebsd.org/ports/head/textproc/kdiff3/Makefile?r1=339314&r2=339808
Hi Max,
The ${REINPLACE_CMD} line is not needed, you're right.
rakuco removed that and I didn't sync my copy. My fault. Thanks.
No problem. Btw, take a look how to deal with svn (link to the Porters Handbook above), it greatly simplifies workflow. Thanks for the support. I Really appreciate it. What's exactly the problem with patch file? I followed the instruction and the patch is generated using "svn diff" (as I usually do for every ports I maintain) Am I still missing something? I didn't explicitely mentioned in the PR the filename of removed file, that's true. A commit references this bug: Author: makc Date: Wed Oct 15 21:43:24 UTC 2014 New revision: 370957 URL: https://svnweb.freebsd.org/changeset/ports/370957 Log: textproc/kdiff3: - update to 0.9.98 - remove upstreamed patches - add patch for proper DOCS and NLS options support - add LICENSE_FILE - drop @dirrm from plist - while I'm here, remove USE_KDE4=kdehier (to be deprecated soon) and switch to out-of-source build PR: 194286 Submitted by: luca.pizzamiglio@gmail.com (maintainer) Changes: head/textproc/kdiff3/Makefile head/textproc/kdiff3/distinfo head/textproc/kdiff3/files/patch-CMakeLists.txt head/textproc/kdiff3/files/patch-src-QT4__fileaccess.cpp head/textproc/kdiff3/files/patch-src-QT4__kdiff3.cpp head/textproc/kdiff3/pkg-plist (In reply to luca.pizzamiglio from comment #7) > Thanks for the support. I Really appreciate it. > > What's exactly the problem with patch file? I followed the instruction and > the patch is generated using "svn diff" (as I usually do for every ports I > maintain) > Am I still missing something? Have you started with clean checkout before working on update? The problem was that your patch tried to revert changes made by rakuco in r339808 (compare your patch in https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=185807 and the committed version). > > I didn't explicitely mentioned in the PR the filename of removed file, > that's true. Not required, but it could be helpful for committer. I've committed the update with minor modifications. Thanks! |
Created attachment 148167 [details] The patch for the update Updating the port to the last version (0.9.98) * Removing a fix already present in the upstream * Added/fixed the support to DOCS and NLS * removing @dirrm* * added LICENSE_FILE