diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2010-06-22 07:50:03 +0000 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2010-06-22 07:50:03 +0000 |
| commit | 48f0f5ebdd1d96efcafba315e425e7a77b259929 (patch) | |
| tree | edbc46e48ff1b55362db5bdf45febbb61cbf1384 /deskutils/kdepim4 | |
| parent | da6797116b173722a80ca978860fa2bb3ec525f7 (diff) | |
| download | ports-48f0f5ebdd1d96efcafba315e425e7a77b259929.tar.gz ports-48f0f5ebdd1d96efcafba315e425e7a77b259929.zip | |
- Make libassuan-1 support optional and mark port IGNORE with libassuan-1
support requested (it conflicts with libassuan2)
- Unbreak package build without libassuan-1 installed
Noticed by: pointyhat via pav
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=256822
Diffstat (limited to 'deskutils/kdepim4')
| -rw-r--r-- | deskutils/kdepim4/Makefile | 13 | ||||
| -rw-r--r-- | deskutils/kdepim4/pkg-plist | 14 |
2 files changed, 18 insertions, 9 deletions
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index 3f656220758f..658dccbc280f 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/Makefile @@ -6,7 +6,7 @@ PORTNAME= kdepim PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -15,7 +15,6 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Libraries for KDE-PIM applications -BUILD_DEPENDS= libassuan-1>=1.0.5:${PORTSDIR}/security/libassuan-1 LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ sasl2:${PORTSDIR}/security/cyrus-sasl2 \ boost_thread:${PORTSDIR}/devel/boost-libs \ @@ -35,6 +34,7 @@ MAKE_JOBS_SAFE= yes MAN1= kabcclient.1 +#OPTIONS= ASSUAN "Kleopatra support for libassuan-1" off #OPTIONS= KITCHENSYNC "PIM synchronization utility" off .include <bsd.port.options.mk> @@ -48,6 +48,15 @@ MAN1= kabcclient.1 # PLIST_SUB+= KITCHENSYNC="@comment " # .endif +.if defined(WITH_ASSUAN) +IGNORE= Conflicts with libassuan2 +BUILD_DEPENDS= libassuan-1>=1.0.5:${PORTSDIR}/security/libassuan-1 +PLIST_SUB+= WITH_ASSUAN="" +.else +CMAKE_ARGS+= -DWITH_Assuan:BOOL=off +PLIST_SUB+= WITH_ASSUAN="@comment " +.endif + pre-configure: # respect prefix ${FIND} ${PATCH_WRKSRC} -type f -name CMakeLists.txt | ${XARGS} \ diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist index d7d6dd9b9342..a8bb613e427f 100644 --- a/deskutils/kdepim4/pkg-plist +++ b/deskutils/kdepim4/pkg-plist @@ -167,12 +167,12 @@ lib/libkgroupwaredav.so.5.0.1 lib/libkleo.so lib/libkleo.so.5 lib/libkleo.so.5.0.1 -lib/libkleopatraclientcore.so -lib/libkleopatraclientcore.so.0 -lib/libkleopatraclientcore.so.0.2.1 -lib/libkleopatraclientgui.so -lib/libkleopatraclientgui.so.0 -lib/libkleopatraclientgui.so.0.2.1 +%%WITH_ASSUAN%%lib/libkleopatraclientcore.so +%%WITH_ASSUAN%%lib/libkleopatraclientcore.so.0 +%%WITH_ASSUAN%%lib/libkleopatraclientcore.so.0.2.1 +%%WITH_ASSUAN%%lib/libkleopatraclientgui.so +%%WITH_ASSUAN%%lib/libkleopatraclientgui.so.0 +%%WITH_ASSUAN%%lib/libkleopatraclientgui.so.0.2.1 lib/libkmailprivate.so.5 lib/libkmailprivate.so.5.0.1 lib/libknodecommon.so @@ -873,7 +873,7 @@ share/kde4/services/kleopatra_config_appear.desktop share/kde4/services/kleopatra_config_dirserv.desktop share/kde4/services/kleopatra_config_dnorder.desktop share/kde4/services/kleopatra_config_gnupgsystem.desktop -share/kde4/services/kleopatra_config_smimevalidation.desktop +%%WITH_ASSUAN%%share/kde4/services/kleopatra_config_smimevalidation.desktop share/kde4/services/kleopatra_decryptverifyfiles.desktop share/kde4/services/kleopatra_decryptverifyfolders.desktop share/kde4/services/kleopatra_signencryptfiles.desktop |