View | Details | Raw Unified | Return to bug 198785 | Differences between
and this patch

Collapse All | Expand All

(-)deskutils/owncloudclient/Makefile (-12 / +9 lines)
Lines 7-41 Link Here
7
MASTER_SITES=	http://download.owncloud.com/desktop/stable/
7
MASTER_SITES=	http://download.owncloud.com/desktop/stable/
8
8
9
MAINTAINER=	ports@FreeBSD.org
9
MAINTAINER=	ports@FreeBSD.org
10
COMMENT=	Qt based sync client for OwnCloud
10
COMMENT=	OwnCloud Desktop Syncing Client
11
11
12
LICENSE=	GPLv2
12
LICENSE=	GPLv2
13
13
14
LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify \
14
LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify \
15
		libqtkeychain.so:${PORTSDIR}/security/qtkeychain \
15
		libqt5keychain.so:${PORTSDIR}/security/qtkeychain
16
		libneon.so:${PORTSDIR}/www/neon
17
16
18
USES=		cmake:outsource compiler:c++11-lib gmake pkgconfig tar:bzip2
17
USES=           cmake:outsource compiler:c++11-lib gmake pkgconfig tar:bzip2
19
USE_QT4=	corelib dbus gui network qtestlib webkit xml \
18
USE_QT5=	buildtools_build core dbus gui linguist_build  network qmake_build  webkit xml
20
		linguisttools_build moc_build qmake_build rcc_build uic_build \
21
		sql-sqlite3_run
22
USE_OPENSSL=	yes
19
USE_OPENSSL=	yes
23
USE_SQLITE=	3
20
USE_SQLITE=	3
24
CMAKE_ARGS=	-DBUILD_WITH_QT4:BOOL=ON \
21
CMAKE_ARGS=	-DBUILD_WITH_QT4:BOOL=OFF \
25
		-DCMAKE_INSTALL_MANDIR:STRING=man \
22
		-DCMAKE_INSTALL_MANDIR:STRING=man
26
		-DWITH_STACK_PROTECTOR:BOOL=OFF
27
USE_LDCONFIG=	yes
23
USE_LDCONFIG=	yes
28
INSTALLS_ICONS=	yes
24
INSTALLS_ICONS=	yes
29
25
30
CFLAGS+=	-I${WRKSRC}/csync/src/httpbf/src -I${LOCALBASE}/include
31
LDFLAGS+=	-L${LOCALBASE}/lib
26
LDFLAGS+=	-L${LOCALBASE}/lib
32
27
33
OPTIONS_DEFINE=		DOCS
28
OPTIONS_DEFINE=	DOCS
34
29
35
DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
30
DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
36
DOCS_USE=		tex=dvipsk:build,latex:build
31
DOCS_USE=		tex=dvipsk:build,latex:build
37
DOCS_CMAKE_ON=		-DWITH_DOC:BOOL=ON
32
DOCS_CMAKE_ON=		-DWITH_DOC:BOOL=ON
38
33
34
PLIST_SUB=	VERSION=${PORTVERSION}
35
39
.include <bsd.port.options.mk>
36
.include <bsd.port.options.mk>
40
37
41
.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1000015
38
.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1000015
(-)deskutils/owncloudclient/pkg-descr (-2 / +2 lines)
Lines 1-4 Link Here
1
Owncloudclient is a tool to synchronize files from ownCloud Server with your
1
The ownCloud Desktop Client is a tool to synchronize files
2
computer. It uses OCSync as its syncing backend.
2
from ownCloud Server with your computer.
3
3
4
WWW: https://github.com/owncloud/client
4
WWW: https://github.com/owncloud/client
(-)deskutils/owncloudclient/pkg-plist (-7 / +1 lines)
Lines 1-7 Link Here
1
bin/owncloud
1
bin/owncloud
2
bin/owncloudcmd
2
bin/owncloudcmd
3
@sample etc/ownCloud/sync-exclude.lst.sample
3
@sample etc/ownCloud/sync-exclude.lst.sample
4
include/httpbf.h
5
include/owncloudsync/creds/abstractcredentials.h
4
include/owncloudsync/creds/abstractcredentials.h
6
include/owncloudsync/creds/httpcredentials.h
5
include/owncloudsync/creds/httpcredentials.h
7
include/owncloudsync/mirall/account.h
6
include/owncloudsync/mirall/account.h
Lines 12-28 Link Here
12
include/owncloudsync/mirall/syncfileitem.h
11
include/owncloudsync/mirall/syncfileitem.h
13
include/owncloudsync/mirall/syncjournaldb.h
12
include/owncloudsync/mirall/syncjournaldb.h
14
include/owncloudsync/mirall/syncresult.h
13
include/owncloudsync/mirall/syncresult.h
15
lib/libhttpbf.a
16
lib/libowncloudsync.so
14
lib/libowncloudsync.so
17
lib/libowncloudsync.so.0
15
lib/libowncloudsync.so.0
18
lib/libowncloudsync.so.1.8.0
16
lib/libowncloudsync.so.%%VERSION%%
19
lib/owncloud/libocsync.so
17
lib/owncloud/libocsync.so
20
lib/owncloud/libocsync.so.0
18
lib/owncloud/libocsync.so.0
21
lib/owncloud/libocsync.so.0.2.1
19
lib/owncloud/libocsync.so.0.2.1
22
%%PORTDOCS%%man/man1/owncloud.1.gz
20
%%PORTDOCS%%man/man1/owncloud.1.gz
23
%%PORTDOCS%%man/man1/owncloudcmd.1.gz
21
%%PORTDOCS%%man/man1/owncloudcmd.1.gz
24
share/applications/owncloud.desktop
22
share/applications/owncloud.desktop
25
%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/.buildinfo
26
%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client1.png
23
%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client1.png
27
%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client10.png
24
%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client10.png
28
%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client11.png
25
%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client11.png
Lines 108-114 Link Here
108
%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/searchindex.js
105
%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/searchindex.js
109
%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/troubleshooting.html
106
%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/troubleshooting.html
110
%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/visualtour.html
107
%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/visualtour.html
111
%%PORTDOCS%%%%DOCSDIR%%/latex/Makefile
112
%%PORTDOCS%%%%DOCSDIR%%/latex/client1.png
108
%%PORTDOCS%%%%DOCSDIR%%/latex/client1.png
113
%%PORTDOCS%%%%DOCSDIR%%/latex/client10.png
109
%%PORTDOCS%%%%DOCSDIR%%/latex/client10.png
114
%%PORTDOCS%%%%DOCSDIR%%/latex/client11.png
110
%%PORTDOCS%%%%DOCSDIR%%/latex/client11.png
Lines 137-144 Link Here
137
%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.idx
133
%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.idx
138
%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.ilg
134
%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.ilg
139
%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.ind
135
%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.ind
140
%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.log
141
%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.out
142
%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.pdf
136
%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.pdf
143
%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.tex
137
%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.tex
144
%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.toc
138
%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.toc
(-)security/qtkeychain/Makefile (-8 / +16 lines)
Lines 1-24 Link Here
1
# $FreeBSD: head/security/qtkeychain/Makefile 374458 2014-12-10 14:04:23Z feld $
1
# $FreeBSD: head/security/qtkeychain/Makefile 347647 2014-03-09 15:02:17Z miwi $
2
2
3
PORTNAME=	qtkeychain
3
PORTNAME=	qtkeychain
4
PORTVERSION=	0.1.0
4
PORTVERSION=	0.4.0
5
CATEGORIES=	security
5
CATEGORIES=	security
6
6
7
MAINTAINER=	6yearold@gmail.com
7
MAINTAINER=	6yearold@gmail.com
8
COMMENT=	Platform independent Qt API for storing passwords
8
COMMENT=	Platform independent Qt API for storing passwords
9
9
10
LICENSE=	BSD2CLAUSE
10
LICENSE=	BSD2CLAUSE
11
LICENSE_FILE=	${WRKSRC}/COPYING
12
11
13
USE_GITHUB=	yes
12
USE_GITHUB=	yes
14
GH_ACCOUNT=	frankosterfeld
13
GH_ACCOUNT=	frankosterfeld
15
GH_TAGNAME=	v${PORTVERSION}
14
GH_TAGNAME=	v${PORTVERSION}
16
GH_COMMIT=	bb32e45
15
GH_COMMIT=	1416233
17
16
18
CONFIGURE_ENV=	HOME=${WRKDIR}/.home
17
USES=		cmake
19
18
.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4"
20
USES=	cmake
19
CONFLICTS_INSTALL=	qtkeychain-[0-9]*
21
USE_QT4=	corelib dbus moc_build qmake_build rcc_build
20
CMAKE_ARGS+=	-DBUILD_WITH_QT4=YES
21
USE_QT4=	corelib dbus linguisttools_build moc_build rcc_build
22
PLIST_SUB+=	PLIST_QT_PREFIX_UPCASE=Qt PLIST_QT_PREFIX=qt
23
.else
24
CONFLICTS_INSTALL=	qtkeychain-qt4-[0-9]*
25
USE_QT5=	core dbus linguisttools_build buildtools_build
26
PLIST_SUB+=     PLIST_QT_PREFIX_UPCASE=Qt5 PLIST_QT_PREFIX=qt5
27
.endif
22
USE_LDCONFIG=	yes
28
USE_LDCONFIG=	yes
23
29
30
PLIST_SUB+=	VERSION=${PORTVERSION}
31
24
.include <bsd.port.mk>
32
.include <bsd.port.mk>
(-)security/qtkeychain/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (qtkeychain-0.1.0.tar.gz) = cf4fa0e9063d6df54c191e361566f5b6e5d3a5867fc0d9ab96954af393c939ef
1
SHA256 (qtkeychain-0.4.0.tar.gz) = 2b32a51ad0ace679d83f229e54f4410d704b9c98ff90ac9903b73fed1939ca32
2
SIZE (qtkeychain-0.1.0.tar.gz) = 12834
2
SIZE (qtkeychain-0.4.0.tar.gz) = 18236
(-)security/qtkeychain/files/patch-auto_ptr.h (-11 lines)
Lines 1-11 Link Here
1
--- _keychain_dbus.cpp	2013-03-25 20:32:44.801564594 +0400
2
+++ keychain_dbus.cpp	2013-03-25 20:32:49.811561714 +0400
3
@@ -10,7 +10,7 @@
4
 
5
 #include <QSettings>
6
 
7
-#include <auto_ptr.h>
8
+#include <memory>
9
 
10
 using namespace QKeychain;
11
 
(-)security/qtkeychain/pkg-plist (-12 / +15 lines)
Lines 1-12 Link Here
1
include/qtkeychain/keychain.h
1
include/qt5keychain/keychain.h
2
include/qtkeychain/qkeychain_export.h
2
include/qt5keychain/qkeychain_export.h
3
lib/cmake/QtKeychain/QtKeychainConfig.cmake
3
lib/cmake/Qt5Keychain/Qt5KeychainConfig.cmake
4
lib/cmake/QtKeychain/QtKeychainConfigVersion.cmake
4
lib/cmake/Qt5Keychain/Qt5KeychainConfigVersion.cmake
5
lib/cmake/QtKeychain/QtKeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
5
lib/cmake/Qt5Keychain/Qt5KeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
6
lib/cmake/QtKeychain/QtKeychainLibraryDepends.cmake
6
lib/cmake/Qt5Keychain/Qt5KeychainLibraryDepends.cmake
7
lib/libqtkeychain.so
7
lib/libqt5keychain.so
8
lib/libqtkeychain.so.0
8
lib/libqt5keychain.so.0
9
lib/libqtkeychain.so.0.1.0
9
lib/libqt5keychain.so.%%VERSION%%
10
@dirrm lib/cmake/QtKeychain
10
%%QT_L10NDIR%%/qtkeychain_de.qm
11
@dirrmtry lib/cmake
11
%%QT_L10NDIR%%/qtkeychain_ro.qm
12
@dirrm include/qtkeychain
12
@dirrm include/qt5keychain
13
@dirrm lib/cmake/Qt5Keychain
14
@dirrmtry %%QT_L10NDIR%%
15
@dirrmtry %%QT_DATADIR%%
(-)security/qtkeychain-qt4/Makefile (+8 lines)
Line 0 Link Here
1
# $FreeBSD$
2
3
PKGNAMESUFFIX=	-qt4
4
5
MASTERDIR=	${.CURDIR}/../qtkeychain
6
PLIST=		${.CURDIR}/pkg-plist
7
8
.include "${MASTERDIR}/Makefile"
(-)security/qtkeychain-qt4/pkg-plist (+15 lines)
Line 0 Link Here
1
include/qtkeychain/keychain.h
2
include/qtkeychain/qkeychain_export.h
3
lib/cmake/QtKeychain/QtKeychainConfig.cmake
4
lib/cmake/QtKeychain/QtKeychainConfigVersion.cmake
5
lib/cmake/QtKeychain/QtKeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
6
lib/cmake/QtKeychain/QtKeychainLibraryDepends.cmake
7
lib/libqtkeychain.so
8
lib/libqtkeychain.so.0
9
lib/libqtkeychain.so.%%VERSION%%
10
%%QT_L10NDIR%%/qtkeychain_de.qm
11
%%QT_L10NDIR%%/qtkeychain_ro.qm
12
@dirrm include/qtkeychain
13
@dirrm lib/cmake/QtKeychain
14
@dirrmtry %%QT_L10NDIR%%
15
@dirrmtry %%QT_DATADIR%%

Return to bug 198785