diff options
| author | Max Brazhnikov <makc@FreeBSD.org> | 2010-08-08 07:35:45 +0000 |
|---|---|---|
| committer | Max Brazhnikov <makc@FreeBSD.org> | 2010-08-08 07:35:45 +0000 |
| commit | 9ed39ea0ff97e24d8bcfba4f3269803c4dbb086b (patch) | |
| tree | e1ffe6da0039567f4a278ce496737068baa8be61 /deskutils | |
| parent | ccbd2c89ce05b7347bce082b0821b7a629c8d91d (diff) | |
| download | ports-9ed39ea0ff97e24d8bcfba4f3269803c4dbb086b.tar.gz ports-9ed39ea0ff97e24d8bcfba4f3269803c4dbb086b.zip | |
Notes
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/kdepim4/Makefile | 22 | ||||
| -rw-r--r-- | deskutils/kdepim4/pkg-plist | 7 | ||||
| -rw-r--r-- | deskutils/kdepim44/Makefile | 22 | ||||
| -rw-r--r-- | deskutils/kdepim44/pkg-plist | 7 |
4 files changed, 2 insertions, 56 deletions
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index 1bda3676a603..dd4c117013c3 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/Makefile @@ -33,28 +33,8 @@ 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> - -# kitchensync is disabled in KDE 4.2 -# .if defined(WITH_KITCHENSYNC) -# LIB_DEPENDS+= opensync.1:${PORTSDIR}/devel/libopensync -# PLIST_SUB+= KITCHENSYNC="" -# .else -# CMAKE_ARGS+= -DWITH_Opensync:BOOL=off -# 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 +#cannot be built with assuan2 CMAKE_ARGS+= -DWITH_Assuan:BOOL=off -PLIST_SUB+= WITH_ASSUAN="@comment " -.endif pre-configure: # respect prefix diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist index a8bb613e427f..a2e29046c73b 100644 --- a/deskutils/kdepim4/pkg-plist +++ b/deskutils/kdepim4/pkg-plist @@ -167,12 +167,6 @@ lib/libkgroupwaredav.so.5.0.1 lib/libkleo.so lib/libkleo.so.5 lib/libkleo.so.5.0.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 +867,6 @@ 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 -%%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 diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile index 1bda3676a603..dd4c117013c3 100644 --- a/deskutils/kdepim44/Makefile +++ b/deskutils/kdepim44/Makefile @@ -33,28 +33,8 @@ 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> - -# kitchensync is disabled in KDE 4.2 -# .if defined(WITH_KITCHENSYNC) -# LIB_DEPENDS+= opensync.1:${PORTSDIR}/devel/libopensync -# PLIST_SUB+= KITCHENSYNC="" -# .else -# CMAKE_ARGS+= -DWITH_Opensync:BOOL=off -# 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 +#cannot be built with assuan2 CMAKE_ARGS+= -DWITH_Assuan:BOOL=off -PLIST_SUB+= WITH_ASSUAN="@comment " -.endif pre-configure: # respect prefix diff --git a/deskutils/kdepim44/pkg-plist b/deskutils/kdepim44/pkg-plist index a8bb613e427f..a2e29046c73b 100644 --- a/deskutils/kdepim44/pkg-plist +++ b/deskutils/kdepim44/pkg-plist @@ -167,12 +167,6 @@ lib/libkgroupwaredav.so.5.0.1 lib/libkleo.so lib/libkleo.so.5 lib/libkleo.so.5.0.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 +867,6 @@ 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 -%%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 |