diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2016-08-15 15:36:19 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2016-08-15 15:36:19 +0000 |
| commit | 8bd38ffae8e2ed60118c1053d5dde6ca4ef7fc90 (patch) | |
| tree | 846e4a8aef1ef6a96234bbd3dee3b2437dae21be /deskutils | |
| parent | Pet MOVEDlint. (diff) | |
New port: devel/grantlee5 and Uses/grantlee.mk
The upcoming KDE Frameworks ports need grantlee5
* Add devel/grantlee5 and move installed headers into a subdirectory include/grantlee5
* Move header files from devel/grantlee into a subdirectory
include/grantlee4
to make sure ports do not pick up the wrong headers
* Add Uses/grantlee.mk to handle the PLIST_SUB and LIB_DEEPENDS needed
by ports using grantlee (before we set the PLIST_SUB manual in very
of the depending ports, which now should not be needed anymore).
* The ports depending on devel/grantlee have been modified from
LIB_DEPENDS=libgrantlee_gui.so:devel/grantlee
to
USES=grantlee:4
as this does not affect the package no version bumped was made.
Reviewed by: mat, rakuco
Approved by: rakuco (mentor)
Differential Revision: https://reviews.freebsd.org/D7434
Notes
Notes:
svn path=/head/; revision=420244
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/kdepim4/Makefile | 5 | ||||
| -rw-r--r-- | deskutils/kdepim4/pkg-plist | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index 30bd3bff84d2..6436f29715f8 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/Makefile @@ -14,7 +14,6 @@ LIB_DEPENDS= libgpgme.so:security/gpgme \ 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 +23,7 @@ CONFLICTS_INSTALL= kdepim44-4.* 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 +39,6 @@ CXXFLAGS+= -Wno-error=return-type 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' \ diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist index 4210fd11ddf1..3b4e716d2e89 100644 --- a/deskutils/kdepim4/pkg-plist +++ b/deskutils/kdepim4/pkg-plist @@ -158,7 +158,7 @@ lib/kde4/plugins/accessible/messagevieweraccessiblewidgetfactory.so lib/kde4/plugins/designer/kdepimwidgets.so lib/kde4/plugins/designer/mailcommonwidgets.so lib/kde4/plugins/designer/pimcommonwidgets.so -lib/kde4/plugins/grantlee/%%GRANTLEE_VER%%/grantlee_messageheaderfilters.so +lib/kde4/plugins/grantlee/%%GRANTLEE_VERSION_SHORT%%/grantlee_messageheaderfilters.so lib/libakonadi_next.so lib/libakonadi_next.so.4 lib/libakonadi_next.so.%%KDE4_KDELIBS_VERSION%% |