Page MenuHomeFreeBSD
Files F167309126

D7434.id19108.diff
No OneTemporary
Actions

D7434.id19108.diff
View Options

Index: Mk/Uses/grantlee.mk
===================================================================
--- /dev/null
+++ Mk/Uses/grantlee.mk
@@ -0,0 +1,56 @@
+# $FreeBSD$
+#
+# Provide %%GRANTLEE_VER%% depending on the version,
+# and pull in the correct port.
+#
+# Raison d'être: ports depending on grantlee tend to install
+# files into subdirectories /GRANTLEE_VERSION/, and therefore
+# need to be modified on each update of grantlee. By providing
+# a plist-substitution via the Uses/ framework, we can avoid
+# these "unnecessary" changes, and only need to change the
+# version in one single location.
+#
+# Feature: grantlee
+# Usage: USES=grantlee:version[,build]
+# Valid ARGS: 4 5 build
+#
+# MAINTAINER: kde.org
+#
+
+.if ! defined(_INCLUDE_USES_GRANTLEE_MK)
+_INCLUDE_USES_GRANTLEE_MK= YES
+
+GRANTLEE_SUPPORTED= 4 5
+
+GRANTLEE4_VER= 0.5.1
+GRANTLEE5_VER= 5.1.0
+
+GRANTLEE4_LIB= libgrantlee_core.so:devel/grantlee
+GRANTLEE5_LIB= libGrantlee_Templates.so:devel/grantlee5
+
+_grantlee_version= #
+. for ver in ${GRANTLEE_SUPPORTED:O:u}
+. if ${grantlee_ARGS:M${ver}}
+. if empty(_grantlee_version)
+_grantlee_version= ${ver}
+. else
+IGNORE= Incorrect USES=grantlee:${grantlee_ARGS} - multiple versions defined
+. endif
+. endif
+. endfor
+
+. if empty(_grantlee_version)
+IGNORE= Incorrect USES=grantlee:${grantlee_ARGS} - no version defined
+. endif
+
+GRANTLEE_VERSION= ${GRANTLEE${_grantlee_version}_VER}
+GRANTLEE_LIBRARY= ${GRANTLEE${_grantlee_version}_LIB}
+
+. if ${grantlee_ARGS:Mbuild}
+PLIST_SUB+= SHLIB_VER=${GRANTLEE_VERSION}
+. else
+LIB_DEPENDS+= ${GRANTLEE${_grantlee_version}_LIB}
+. endif
+PLIST_SUB+= GRANTLEE_VER=${GRANTLEE_VERSION:R}
+
+.endif
Index: deskutils/kdepim4/Makefile
===================================================================
--- deskutils/kdepim4/Makefile
+++ deskutils/kdepim4/Makefile
@@ -3,6 +3,7 @@
PORTNAME= kdepim
PORTVERSION= ${KDE4_KDELIBS_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde
MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
@@ -14,7 +15,6 @@
libassuan.so:security/libassuan \
libsasl2.so:security/cyrus-sasl2 \
libboost_thread.so:devel/boost-libs \
- libgrantlee_gui.so:devel/grantlee \
libkgapi2.so:devel/libkgapi
RUN_DEPENDS= ${KDE4_PREFIX}/bin/accountwizard:deskutils/kdepim4-runtime \
${LOCALBASE}/bin/gmd5sum:sysutils/coreutils
@@ -24,7 +24,7 @@
USE_GNOME= libxml2 libxslt:build
USE_KDE4= kdelibs pimlibs kactivities \
akonadi automoc4 soprano nepomuk-widgets baloo
-USES= cmake:outsource gmake iconv shebangfix tar:xz
+USES= cmake:outsource gmake grantlee:4 iconv shebangfix tar:xz
SHEBANG_FILES= agents/mailfilteragent/kconf_update/migrate-kmail-filters.pl \
kalarm/*.pl kmail/kconf_update/*.pl \
libkpgp/kconf_update/kpgp-3.1-upgrade-address-data.pl
@@ -40,8 +40,6 @@
USE_LDCONFIG= yes
MAKE_ENV= XDG_CONFIG_HOME=/dev/null
-PLIST_SUB= GRANTLEE_VER=0.5
-
post-patch:
# Remove BOM
${REINPLACE_CMD} -e '1 s|^.*/|/|g' \
Index: devel/grantlee/Makefile
===================================================================
--- devel/grantlee/Makefile
+++ devel/grantlee/Makefile
@@ -1,16 +1,9 @@
# Created by: Dima Panov <fluffy@FreeBSD.org>
# $FreeBSD$
-# Some ports install files into versioned grantlee directory (GRANTLEE_VER)
-# they must be fixed whenever grantlee gets version bump
-# Known ports:
-# deskutils/kdepim4
-# devel/kdevplatform
-# finance/skrooge
-#
-
PORTNAME= grantlee
-DISTVERSION= 0.5.1
+DISTVERSION= ${GRANTLEE_VERSION}
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://downloads.${PORTNAME}.org/ \
http://www.loegria.net/${PORTNAME}/
@@ -22,11 +15,19 @@
USE_QT4= corelib gui qtestlib_build script \
qmake_build moc_build rcc_build uic_build
-USES= cmake:outsource
+USES= cmake:outsource grantlee:4,build
CMAKE_ARGS+= -DBUILD_TESTS:BOOL=FALSE
USE_LDCONFIG= yes
-PLIST_SUB= SHLIB_VER=${PORTVERSION} \
- GRANTLEE_VER=${PORTVERSION:R}
+# fix the header-file location in the cmake generators (first one puts them
+# to include/grantlee4, the second one ensures that include/grantlee4 gets
+# added to CFLAGS for dependent ports).
+post-patch:
+ ${REINPLACE_CMD} -e '/INCLUDE_INSTALL_DIR/ s#include#include/grantlee4#' \
+ ${WRKSRC}/CMakeLists.txt
+ ${REINPLACE_CMD} -e '/INCLUDES DESTINATION/ s#include#include/grantlee4#' \
+ ${WRKSRC}/templates/lib/CMakeLists.txt \
+ ${WRKSRC}/textdocument/lib/CMakeLists.txt
+
.include <bsd.port.mk>
Index: devel/grantlee/pkg-plist
===================================================================
--- devel/grantlee/pkg-plist
+++ devel/grantlee/pkg-plist
@@ -1,37 +1,37 @@
-include/grantlee/abstractlocalizer.h
-include/grantlee/abstractmarkupbuilder.h
-include/grantlee/bbcodebuilder.h
-include/grantlee/cachingloaderdecorator.h
-include/grantlee/containeraccessor.h
-include/grantlee/context.h
-include/grantlee/engine.h
-include/grantlee/exception.h
-include/grantlee/filter.h
-include/grantlee/filterexpression.h
-include/grantlee/grantlee_core_export.h
-include/grantlee/grantlee_gui_export.h
-include/grantlee/grantlee_version.h
-include/grantlee/markupdirector.h
-include/grantlee/mediawikimarkupbuilder.h
-include/grantlee/metatype.h
-include/grantlee/node.h
-include/grantlee/outputstream.h
-include/grantlee/parser.h
-include/grantlee/plaintextmarkupbuilder.h
-include/grantlee/qtlocalizer.h
-include/grantlee/rendercontext.h
-include/grantlee/safestring.h
-include/grantlee/taglibraryinterface.h
-include/grantlee/template.h
-include/grantlee/templateloader.h
-include/grantlee/texthtmlbuilder.h
-include/grantlee/token.h
-include/grantlee/typeaccessor.h
-include/grantlee/util.h
-include/grantlee/variable.h
-include/grantlee_core.h
-include/grantlee_templates.h
-include/grantlee_textdocument.h
+include/grantlee4/grantlee/abstractlocalizer.h
+include/grantlee4/grantlee/abstractmarkupbuilder.h
+include/grantlee4/grantlee/bbcodebuilder.h
+include/grantlee4/grantlee/cachingloaderdecorator.h
+include/grantlee4/grantlee/containeraccessor.h
+include/grantlee4/grantlee/context.h
+include/grantlee4/grantlee/engine.h
+include/grantlee4/grantlee/exception.h
+include/grantlee4/grantlee/filter.h
+include/grantlee4/grantlee/filterexpression.h
+include/grantlee4/grantlee/grantlee_core_export.h
+include/grantlee4/grantlee/grantlee_gui_export.h
+include/grantlee4/grantlee/grantlee_version.h
+include/grantlee4/grantlee/markupdirector.h
+include/grantlee4/grantlee/mediawikimarkupbuilder.h
+include/grantlee4/grantlee/metatype.h
+include/grantlee4/grantlee/node.h
+include/grantlee4/grantlee/outputstream.h
+include/grantlee4/grantlee/parser.h
+include/grantlee4/grantlee/plaintextmarkupbuilder.h
+include/grantlee4/grantlee/qtlocalizer.h
+include/grantlee4/grantlee/rendercontext.h
+include/grantlee4/grantlee/safestring.h
+include/grantlee4/grantlee/taglibraryinterface.h
+include/grantlee4/grantlee/template.h
+include/grantlee4/grantlee/templateloader.h
+include/grantlee4/grantlee/texthtmlbuilder.h
+include/grantlee4/grantlee/token.h
+include/grantlee4/grantlee/typeaccessor.h
+include/grantlee4/grantlee/util.h
+include/grantlee4/grantlee/variable.h
+include/grantlee4/grantlee_core.h
+include/grantlee4/grantlee_templates.h
+include/grantlee4/grantlee_textdocument.h
lib/cmake/grantlee/GrantleeConfig.cmake
lib/cmake/grantlee/GrantleeConfigVersion.cmake
lib/cmake/grantlee/GrantleeTargets-%%CMAKE_BUILD_TYPE%%.cmake
Index: devel/grantlee5/Makefile
===================================================================
--- /dev/null
+++ devel/grantlee5/Makefile
@@ -0,0 +1,30 @@
+# Created by: Tobias C. Berner <tcberner@gmail.com>
+# $FreeBSD$
+
+PORTNAME= grantlee
+PORTVERSION= ${GRANTLEE_VERSION}
+CATEGORIES= devel
+MASTER_SITES= http://downloads.${PORTNAME}.org/
+PKGNAMESUFFIX= 5
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= String template engine for Qt 5
+
+LICENSE= LGPL21
+
+USE_QT5= buildtools_build core gui qmake_build script
+USES= cmake:outsource compiler:c++11-lib grantlee:5,build
+CMAKE_ARGS+= -DBUILD_TESTS:BOOL=FALSE
+USE_LDCONFIG= yes
+
+# fix the header-file location in the cmake generators (first one puts them
+# to include/grantlee5, the second one ensures that include/grantlee5 gets
+# added to CFLAGS for dependent ports).
+post-patch:
+ ${REINPLACE_CMD} -e '/INCLUDE_INSTALL_DIR/ s#include#include/grantlee5#' \
+ ${WRKSRC}/CMakeLists.txt
+ ${REINPLACE_CMD} -e '/INCLUDES DESTINATION/ s#include#include/grantlee5#' \
+ ${WRKSRC}/templates/lib/CMakeLists.txt \
+ ${WRKSRC}/textdocument/lib/CMakeLists.txt
+
+.include <bsd.port.mk>
Index: devel/grantlee5/distinfo
===================================================================
--- /dev/null
+++ devel/grantlee5/distinfo
@@ -0,0 +1,2 @@
+SHA256 (grantlee-5.1.0.tar.gz) = ea2e402466c74bb533eee2c7252209ec61cd93a5d236fecd625b4a0eb13a1478
+SIZE (grantlee-5.1.0.tar.gz) = 1175380
Index: devel/grantlee5/pkg-descr
===================================================================
--- /dev/null
+++ devel/grantlee5/pkg-descr
@@ -0,0 +1,4 @@
+Grantlee is a string template engine based on the Django template
+system and written using the Qt framework.
+
+WWW: http://gitorious.org/grantlee/pages/Home
Index: devel/grantlee5/pkg-plist
===================================================================
--- /dev/null
+++ devel/grantlee5/pkg-plist
@@ -0,0 +1,47 @@
+include/grantlee5/grantlee/abstractlocalizer.h
+include/grantlee5/grantlee/abstractmarkupbuilder.h
+include/grantlee5/grantlee/bbcodebuilder.h
+include/grantlee5/grantlee/cachingloaderdecorator.h
+include/grantlee5/grantlee/context.h
+include/grantlee5/grantlee/engine.h
+include/grantlee5/grantlee/exception.h
+include/grantlee5/grantlee/filter.h
+include/grantlee5/grantlee/filterexpression.h
+include/grantlee5/grantlee/grantlee_templates_export.h
+include/grantlee5/grantlee/grantlee_textdocument_export.h
+include/grantlee5/grantlee/grantlee_version.h
+include/grantlee5/grantlee/markupdirector.h
+include/grantlee5/grantlee/mediawikimarkupbuilder.h
+include/grantlee5/grantlee/metatype.h
+include/grantlee5/grantlee/node.h
+include/grantlee5/grantlee/outputstream.h
+include/grantlee5/grantlee/parser.h
+include/grantlee5/grantlee/plaintextmarkupbuilder.h
+include/grantlee5/grantlee/qtlocalizer.h
+include/grantlee5/grantlee/rendercontext.h
+include/grantlee5/grantlee/safestring.h
+include/grantlee5/grantlee/taglibraryinterface.h
+include/grantlee5/grantlee/template.h
+include/grantlee5/grantlee/templateloader.h
+include/grantlee5/grantlee/texthtmlbuilder.h
+include/grantlee5/grantlee/token.h
+include/grantlee5/grantlee/typeaccessor.h
+include/grantlee5/grantlee/util.h
+include/grantlee5/grantlee/variable.h
+include/grantlee5/grantlee_templates.h
+include/grantlee5/grantlee_textdocument.h
+lib/cmake/Grantlee5/Grantlee5Config.cmake
+lib/cmake/Grantlee5/Grantlee5ConfigVersion.cmake
+lib/cmake/Grantlee5/GrantleeMacros.cmake
+lib/cmake/Grantlee5/GrantleeTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Grantlee5/GrantleeTargets.cmake
+lib/grantlee/%%GRANTLEE_VER%%/grantlee_defaultfilters.so
+lib/grantlee/%%GRANTLEE_VER%%/grantlee_defaulttags.so
+lib/grantlee/%%GRANTLEE_VER%%/grantlee_i18ntags.so
+lib/grantlee/%%GRANTLEE_VER%%/grantlee_loadertags.so
+lib/libGrantlee_Templates.so
+lib/libGrantlee_Templates.so.5
+lib/libGrantlee_Templates.so.%%SHLIB_VER%%
+lib/libGrantlee_TextDocument.so
+lib/libGrantlee_TextDocument.so.5
+lib/libGrantlee_TextDocument.so.%%SHLIB_VER%%
Index: devel/kdevplatform/Makefile
===================================================================
--- devel/kdevplatform/Makefile
+++ devel/kdevplatform/Makefile
@@ -3,6 +3,7 @@
PORTNAME= kdevplatform
PORTVERSION= ${KDEVELOP_VERSION:S/4./1./}
+PORTREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= KDE/${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
DIST_SUBDIR= KDE/kdevelop/${KDEVELOP_VERSION}
@@ -12,20 +13,18 @@
LIB_DEPENDS= libsvn_client-1.so:devel/subversion \
libboost_thread.so:devel/boost-libs \
- libqjson.so:devel/qjson \
- libgrantlee_gui.so:devel/grantlee
+ libqjson.so:devel/qjson
USE_KDE4= kate_run kdelibs automoc4
USE_QT4= qmake_build moc_build uic_build rcc_build \
corelib designer_build gui webkit
-USES= cmake:outsource compiler:c++11-lib shebangfix tar:bz2
+USES= cmake:outsource compiler:c++11-lib grantlee:4 shebangfix tar:bz2
USE_LDCONFIG= yes
SHEBANG_FILES= util/kdev_format_source util/kdevplatform_shell_environment.sh
PLIST_SUB+= SHLIB_VER=8.0.0 \
- SHLIB_SHVER=8 \
- GRANTLEE_VER=0.5
+ SHLIB_SHVER=8
OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
Index: finance/skrooge/Makefile
===================================================================
--- finance/skrooge/Makefile
+++ finance/skrooge/Makefile
@@ -2,6 +2,7 @@
PORTNAME= skrooge
PORTVERSION= 1.12.5
+PORTREVISION= 1
CATEGORIES= finance kde
MASTER_SITES= KDE/stable/${PORTNAME}
@@ -11,17 +12,15 @@
BUILD_DEPENDS= xsltproc:textproc/libxslt
LIB_DEPENDS= libofx.so:finance/libofx \
libqca.so:devel/qca \
- libgrantlee_gui.so:devel/grantlee \
libkactivities.so:x11/kactivities
-USES= cmake:outsource gettext shared-mime-info sqlite:3 tar:xz
+USES= cmake:outsource gettext grantlee:4 shared-mime-info sqlite:3 tar:xz
USE_QT4= qmake_build moc_build uic_build rcc_build designer_build \
corelib dbus gui script sql webkit xml sql-sqlite3_run
USE_KDE4= automoc4 kdelibs pimlibs
USE_LDCONFIG= yes
-PLIST_SUB= VERSION=${PORTVERSION} \
- GRANTLEE_VER=0.5
+PLIST_SUB= VERSION=${PORTVERSION}
# Skrooge creates several empty directories due to how it calls CMake's
# install(DIRECTORY ...) function, so we need some code to remove them.
Index: math/rocs/Makefile
===================================================================
--- math/rocs/Makefile
+++ math/rocs/Makefile
@@ -2,7 +2,7 @@
PORTNAME= rocs
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
@@ -10,11 +10,10 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Graph theory IDE
-LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
- libgrantlee_gui.so:devel/grantlee
+LIB_DEPENDS= libboost_thread.so:devel/boost-libs
USE_KDE4= kdelibs automoc4
-USES= cmake:outsource tar:xz
+USES= cmake:outsource grantlee:4 tar:xz
USE_QT4= gui qtestlib script scripttools webkit xml \
moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
Index: x11/kdelibs4/Makefile
===================================================================
--- x11/kdelibs4/Makefile
+++ x11/kdelibs4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE4_KDELIBS_VERSION}
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11 kde
MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
@@ -20,8 +20,7 @@
libhal.so:sysutils/hal \
libqca.so:devel/qca \
libpolkit-qt-core-1.so:sysutils/polkit-qt \
- libdbusmenu-qt.so:devel/libdbusmenu-qt \
- libgrantlee_gui.so:devel/grantlee
+ libdbusmenu-qt.so:devel/libdbusmenu-qt
BUILD_DEPENDS= docbook-xml>0:textproc/docbook-xml \
${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl
@@ -34,7 +33,7 @@
USE_GNOME= libxml2 libxslt
USE_KDE4= oxygen \
attica automoc4 ontologies soprano strigi
-USES= cmake:outsource fam gettext jpeg perl5 shared-mime-info \
+USES= cmake:outsource fam gettext grantlee:4 jpeg perl5 shared-mime-info \
shebangfix tar:xz
USE_OPENSSL= yes
USE_QT4= corelib dbus declarative designer_build gui \

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 21, 8:10 PM (11 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37051012
Default Alt Text
D7434.id19108.diff (15 KB)

Event Timeline