Bug 170828
| Summary: | [patch] update devel/kdesvn-kde4 from 1.5.5 to 1.6.0 | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | David Naylor <naylor.b.david> | ||||
| Component: | Individual Port(s) | Assignee: | Raphael Kubo da Costa <rakuco> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | ||||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
Responsible Changed From-To: freebsd-ports-bugs->rakuco I'll take it. Aren't you supposed to define DOCS and NLS as options so `make config' can configure them and then include bsd.port.options.mk? On Saturday, 25 August 2012 03:10:57 Raphael Kubo da Costa wrote:
> Aren't you supposed to define DOCS and NLS as options so `make config'
> can configure them and then include bsd.port.options.mk?
DOCS and NLS are part of (the still pending) ALL_OPTIONS. The options are
automatically included into PORT_OPTIONS, controlled, currently, by NOPORTDOCS
and WITHOUT_NLS, although my understanding eventually those controls will be
dropped in favor of PORT_OPTIONS:
# cd kdesvn-kde4
# make -V PORT_OPTIONS
DOCS EXAMPLES NLS
# make -V PORT_OPTIONS -D WITHOUT_NLS
DOCS EXAMPLES
# make -V PORT_OPTIONS -D NOPORTDOCS
EXAMPLES NLS
I am not sure what is the prescribed method to implement this?
David Naylor <naylor.b.david@gmail.com> writes: > I am not sure what is the prescribed method to implement this? Indeed, I guess there isn't much of a standard for this yet -- some ports do seem to set NLS and/or DOCS in their Makefiles while others do not. Since this patch is only a translation between old-OPTIONS to OptionsNG, I guess it's fine to commit it as-is. Author: rakuco Date: Sun Aug 26 00:55:44 2012 New Revision: 303170 URL: http://svn.freebsd.org/changeset/ports/303170 Log: - Update to 1.6.0 - Convert to the new options framework. PR: ports/170828 Submitted by: David Naylor <naylor.b.david@gmail.com> (maintainer) Deleted: head/devel/kdesvn-kde4/files/patch-src__svnfrontend__graphtree__revgraphview.h Modified: head/devel/kdesvn-kde4/Makefile head/devel/kdesvn-kde4/distinfo head/devel/kdesvn-kde4/pkg-plist Modified: head/devel/kdesvn-kde4/Makefile ============================================================================== --- head/devel/kdesvn-kde4/Makefile Sun Aug 26 00:40:13 2012 (r303169) +++ head/devel/kdesvn-kde4/Makefile Sun Aug 26 00:55:44 2012 (r303170) @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= kdesvn -DISTVERSION= 1.5.5 -PORTREVISION= 2 +DISTVERSION= 1.6.0 CATEGORIES= devel kde MASTER_SITES= http://kdesvn.alwins-world.de/downloads/ @@ -22,7 +21,6 @@ CONFLICTS= qsvn-[0-9]* USE_BZIP2= yes USE_CMAKE= yes CMAKE_ARGS+= -DSUBVERSION_INCLUDE_DIR=${LOCALBASE}/include/subversion-1 -USE_GETTEXT= yes USE_KDE4= kdelibs kdeprefix automoc4 USE_LDCONFIG= yes USE_QT4= corelib gui xml network dbus svg qt3support sql \ @@ -31,17 +29,26 @@ MAKE_JOBS_SAFE= yes MAN1= kdesvn.1 kdesvnaskpass.1 +.include <bsd.port.pre.mk> + +.if ${PORT_OPTIONS:MNLS} +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +.else +PLIST_SUB+= NLS="@comment " +.endif + post-patch: ${RM} ${WRKSRC}/src/kiosvn/svn*.protocol -.if defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${ECHO} "ADD_SUBDIRECTORY(man)" > ${WRKSRC}/doc/CMakeLists.txt -.else -#Fix build with kdelibs>=4.5.0 - ${REINPLACE_CMD} -e 's,V4.1.2-Based,V4.2-Based,g' \ - ${WRKSRC}/doc/nl/index.docbook +.endif +.if empty(PORT_OPTIONS:MNLS) + ${REINPLACE_CMD} -e 's,ADD_SUBDIRECTORY(po), ,g' \ + ${WRKSRC}/CMakeLists.txt .endif post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/devel/kdesvn-kde4/distinfo ============================================================================== --- head/devel/kdesvn-kde4/distinfo Sun Aug 26 00:40:13 2012 (r303169) +++ head/devel/kdesvn-kde4/distinfo Sun Aug 26 00:55:44 2012 (r303170) @@ -1,2 +1,2 @@ -SHA256 (kdesvn-1.5.5.tar.bz2) = 67fee0374c9e3ac0514d2ef2b0fdd0b072dca173f1eeae2742cd37022e194b0b -SIZE (kdesvn-1.5.5.tar.bz2) = 1746344 +SHA256 (kdesvn-1.6.0.tar.bz2) = 05686f246b76810f90a9f80f1d45cdccf812b42e18fa10a16b14e7d27d370f96 +SIZE (kdesvn-1.6.0.tar.bz2) = 1863823 Modified: head/devel/kdesvn-kde4/pkg-plist ============================================================================== --- head/devel/kdesvn-kde4/pkg-plist Sun Aug 26 00:40:13 2012 (r303169) +++ head/devel/kdesvn-kde4/pkg-plist Sun Aug 26 00:55:44 2012 (r303170) @@ -11,6 +11,7 @@ include/svnqt/check.h include/svnqt/client.h include/svnqt/client_annotate_parameter.h include/svnqt/client_commit_parameter.h +include/svnqt/client_update_parameter.h include/svnqt/client_parameter.h include/svnqt/commititem.h include/svnqt/conflictdescription.h @@ -31,6 +32,7 @@ include/svnqt/repoparameter.cpp include/svnqt/repoparameter.h include/svnqt/repository.h include/svnqt/repositorylistener.h +include/svnqt/reposnotify.h include/svnqt/revision.h include/svnqt/shared_pointer.h include/svnqt/smart_pointer.h @@ -48,8 +50,8 @@ lib/kde4/kded_kdesvnd.so lib/kde4/kdesvnpart.so lib/kde4/kio_ksvn.so lib/libsvnqt.so -lib/libsvnqt.so.6 -lib/libsvnqt.so.6.0.3 +lib/libsvnqt.so.7 +lib/libsvnqt.so.7.0.1 share/applications/kde4/kdesvn.desktop share/apps/kconf_update/kdesvn-use-external-update.sh share/apps/kconf_update/kdesvnpartrc-use-external.upd @@ -372,13 +374,17 @@ share/kde4/services/ksvn+http.protocol share/kde4/services/ksvn+https.protocol share/kde4/services/ksvn+ssh.protocol share/kde4/services/ksvn.protocol -share/locale/de/LC_MESSAGES/kdesvn.mo -share/locale/es/LC_MESSAGES/kdesvn.mo -share/locale/fr/LC_MESSAGES/kdesvn.mo -share/locale/ja/LC_MESSAGES/kdesvn.mo -share/locale/lt/LC_MESSAGES/kdesvn.mo -share/locale/pt_BR/LC_MESSAGES/kdesvn.mo -share/locale/ro/LC_MESSAGES/kdesvn.mo +%%NLS%%share/locale/cs/LC_MESSAGES/kdesvn.mo +%%NLS%%share/locale/de/LC_MESSAGES/kdesvn.mo +%%NLS%%share/locale/el/LC_MESSAGES/kdesvn.mo +%%NLS%%share/locale/es/LC_MESSAGES/kdesvn.mo +%%NLS%%share/locale/fr/LC_MESSAGES/kdesvn.mo +%%NLS%%share/locale/it/LC_MESSAGES/kdesvn.mo +%%NLS%%share/locale/ja/LC_MESSAGES/kdesvn.mo +%%NLS%%share/locale/lt/LC_MESSAGES/kdesvn.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/kdesvn.mo +%%NLS%%share/locale/ro/LC_MESSAGES/kdesvn.mo +%%NLS%%share/locale/ru/LC_MESSAGES/kdesvn.mo share/svnqt/i18n/svnqt_de.qm share/svnqt/i18n/svnqt_en_GB.qm @dirrm share/svnqt/i18n _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" State Changed From-To: open->closed Committed. Thanks! Author: rakuco Date: Sun Aug 26 01:11:21 2012 New Revision: 303171 URL: http://svn.freebsd.org/changeset/ports/303171 Log: Fix reversal in the condition check introduced in r303170. We need to check if DOCS is _not_ defined. Hat tips to avilla@ for noticing the mistake. PR: ports/170828 Modified: head/devel/kdesvn-kde4/Makefile Modified: head/devel/kdesvn-kde4/Makefile ============================================================================== --- head/devel/kdesvn-kde4/Makefile Sun Aug 26 00:55:44 2012 (r303170) +++ head/devel/kdesvn-kde4/Makefile Sun Aug 26 01:11:21 2012 (r303171) @@ -40,7 +40,7 @@ PLIST_SUB+= NLS="@comment " post-patch: ${RM} ${WRKSRC}/src/kiosvn/svn*.protocol -.if ${PORT_OPTIONS:MDOCS} +.if empty(PORT_OPTIONS:MDOCS) ${ECHO} "ADD_SUBDIRECTORY(man)" > ${WRKSRC}/doc/CMakeLists.txt .endif .if empty(PORT_OPTIONS:MNLS) _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" On Sunday, 26 August 2012 02:51:33 Raphael Kubo da Costa wrote:
> David Naylor <naylor.b.david@gmail.com> writes:
> > I am not sure what is the prescribed method to implement this?
>
> Indeed, I guess there isn't much of a standard for this yet -- some
> ports do seem to set NLS and/or DOCS in their Makefiles while others do
> not. Since this patch is only a translation between old-OPTIONS to
> OptionsNG, I guess it's fine to commit it as-is.
Thanks for committing the changes. Looking through the wiki and
bsd.options.mk it appears DOCS, EXAMPLES and NLS are implicit options and that
a port can indicate that those options have no affect by using
OPTIONS_EXCLUDE. This is, at least, my understanding...
|
Thanks to arrowdodger for the patch... version 1.6.0: * User may add (or remove) patterns to ignore recursive * greek translation * modified for working with subversion 1.7 interface * removed support for subversion less than version 1.5 * revert commit in working copy from within logwindow * fixed some problems with non canonical pathes and Urls which comes with subversion 1.7 * re-added russian translation Fix: Patch attached with submission follows: