Finally all seafile packages built without warnings. Refactored all packages, switched to Github release tag, fixed interpreter errors, cleanup buildlink3s and makefiles.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Finally all seafile packages built without warnings. Refactored all packages, switched to Github release tag, fixed interpreter errors, cleanup buildlink3s and makefiles.
From: Daniel Oelschlegel <amoibos%gmail.com@localhost>
Date: Mon, 28 Nov 2016 22:20:05 +0000
Module Name:	pkgsrc-wip
Committed By:	Daniel Oelschlegel <amoibos%gmail.com@localhost>
Pushed By:	amoibos
Date:		Mon Nov 28 22:20:05 2016 +0000
Changeset:	2ad6b95db03c429048d280a54196dced16dcff64

Modified Files:
	seafile-ccnet/Makefile
	seafile-ccnet/buildlink3.mk
	seafile-ccnet/distinfo
	seafile-client/Makefile
	seafile-client/distinfo
	seafile-daemon/DESCR
	seafile-daemon/Makefile
	seafile-daemon/distinfo
	seafile-libsearpc/Makefile
	seafile-libsearpc/buildlink3.mk
	seafile-libsearpc/distinfo
Added Files:
	seafile-daemon/buildlink3.mk

Log Message:
Finally all seafile packages built without warnings.
Refactored all packages, switched to Github release tag, fixed interpreter errors, cleanup buildlink3s and makefiles.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2ad6b95db03c429048d280a54196dced16dcff64

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 seafile-ccnet/Makefile          | 18 ++++++++++--------
 seafile-ccnet/buildlink3.mk     | 14 +++++---------
 seafile-ccnet/distinfo          |  8 ++++----
 seafile-client/Makefile         | 19 ++++++++++++-------
 seafile-client/distinfo         |  8 ++++----
 seafile-daemon/DESCR            | 14 ++++++++------
 seafile-daemon/Makefile         | 26 ++++++++++++++++++--------
 seafile-daemon/buildlink3.mk    | 22 ++++++++++++++++++++++
 seafile-daemon/distinfo         |  8 ++++----
 seafile-libsearpc/Makefile      | 22 +++++++++++++++-------
 seafile-libsearpc/buildlink3.mk | 14 +++++---------
 seafile-libsearpc/distinfo      |  8 ++++----
 12 files changed, 111 insertions(+), 70 deletions(-)

diffs:
diff --git a/seafile-ccnet/Makefile b/seafile-ccnet/Makefile
index 5e24e68..bb8c83e 100644
--- a/seafile-ccnet/Makefile
+++ b/seafile-ccnet/Makefile
@@ -1,18 +1,18 @@
 # $NetBSD$
-PKGNAME=	seafile-ccnet-6.0.0
+VERSION=	6.0.0
+PKGNAME=	ccnet-${VERSION}
 CATEGORIES=	net
-GHCOMMIT=	478d9b8a6ccef878b7c886e98989ff1ff3075116
-DISTNAME=	${GHCOMMIT}
-MASTER_SITES=	${MASTER_SITE_GITHUB:=haiwen/ccnet/archive/}
-EXTRACT_SUFX=	.zip
+GITHUB_TAG=	v${VERSION}-server
+DISTNAME=	${GITHUB_TAG}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=haiwen/}
 
 MAINTAINER=	amoibos%gmail.com@localhost
 HOMEPAGE=	http://seafile.com/
 COMMENT=	Framework for writing networked applications in C
 LICENSE=	gnu-gpl-v3
 
-DIST_SUBDIR=	seafile
-WRKSRC=		${WRKDIR}/ccnet-${GHCOMMIT}
+DIST_SUBDIR=	seafile-ccnet
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}-server
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
@@ -22,7 +22,9 @@ USE_TOOLS+=	pkg-config gmake aclocal autoheader automake autoconf
 
 PY_PATCHPLIST=	yes
 
-DEPENDS+=		seafile-libsearpc-3.0{,nb*}:../../wip/seafile-libsearpc
+PYTHON_VERSIONS_INCOMPATIBLE=	30 31 32 33 34 35 36 37
+
+DEPENDS+=		libsearpc-3.0{,nb*}:../../wip/seafile-libsearpc
 
 CONFIGURE_ARGS+=	--enable-server \
 			--disable-compile-demo
diff --git a/seafile-ccnet/buildlink3.mk b/seafile-ccnet/buildlink3.mk
index e5dbb79..1670095 100644
--- a/seafile-ccnet/buildlink3.mk
+++ b/seafile-ccnet/buildlink3.mk
@@ -1,16 +1,12 @@
 # $NetBSD$
 
-BUILDLINK_TREE+=	seafile-ccnet
-BUILDLINK_TREE+=	libccnet
 BUILDLINK_TREE+=	ccnet
 
-.if !defined(SEAFILE_CCNET_BUILDLINK3_MK)
-SEAFILE_CCNET_BUILDLINK3_MK:=
+.if !defined(CCNET_BUILDLINK3_MK)
+CCNET_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.seafile-ccnet+=	seafile-ccnet>=6.00
-BUILDLINK_PKGSRCDIR.seafile-ccnet?=	../../wip/seafile-ccnet
-.endif	# SEAFILE_CCNET_BUILDLINK3_MK
+BUILDLINK_API_DEPENDS.ccnet+=	ccnet>=6.0.0
+BUILDLINK_PKGSRCDIR.ccnet?=	../../wip/seafile-ccnet
+.endif	# CCNET_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-seafile-ccnet
-BUILDLINK_TREE+=	-libccnet
 BUILDLINK_TREE+=	-ccnet
diff --git a/seafile-ccnet/distinfo b/seafile-ccnet/distinfo
index ef4cc62..15d6c0f 100644
--- a/seafile-ccnet/distinfo
+++ b/seafile-ccnet/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (seafile/478d9b8a6ccef878b7c886e98989ff1ff3075116.zip) = 97d33d84313044b6974482f81525cfbf28f204f6
-RMD160 (seafile/478d9b8a6ccef878b7c886e98989ff1ff3075116.zip) = 2d59de262aca56381e3c2ac960b422262407bd09
-SHA512 (seafile/478d9b8a6ccef878b7c886e98989ff1ff3075116.zip) = 3d9987e5e6735ee95b83f8f8524ffa8b6feea157d5c2b77bd109d2edf96ac4fcb277ff75f062cf2961ffae5165511da83d836042a63cf8429cc5745a0c885b7c
-Size (seafile/478d9b8a6ccef878b7c886e98989ff1ff3075116.zip) = 354347 bytes
+SHA1 (seafile-ccnet/v6.0.0-server.tar.gz) = 309dc27f552a16e8a13127cd5daad0eb02f9c4ad
+RMD160 (seafile-ccnet/v6.0.0-server.tar.gz) = 173de1eb928ccb03042b9c8cc6b781dfcccc5590
+SHA512 (seafile-ccnet/v6.0.0-server.tar.gz) = a72ab82e3919920630a82032ff05e4cfb5878af0d2f85c96d0ab183bfb3619b94abdb9a10733f852cf14cb59f08b323fc017487e9d2ffefeb20069759cb64f00
+Size (seafile-ccnet/v6.0.0-server.tar.gz) = 222098 bytes
diff --git a/seafile-client/Makefile b/seafile-client/Makefile
index 2ddb88b..ac72dcb 100644
--- a/seafile-client/Makefile
+++ b/seafile-client/Makefile
@@ -3,27 +3,32 @@
 CATEGORIES=	net
 GITHUB_PROJECT=	seafile-client
 VERSION=	6.0.0
+DISTNAME=	v${VERSION}
 PKGNAME=	${GITHUB_PROJECT}-${VERSION}
-
 MASTER_SITES=	${MASTER_SITE_GITHUB:=haiwen/}
+GITHUB_TAG=	v${VERSION}
+
+DIST_SUBDIR=	${GITHUB_PROJECT}
 
 MAINTAINER=	amoibos%gmail.com@localhost
 HOMEPAGE=	http://seafile.com/
 COMMENT=	Seafile client
 LICENSE=	gnu-gpl-v2
 
-DIST_SUBDIR=	seafile-client
-WRKSRC=		${WRKDIR}/seafile-client-${VERSION}
+DIST_SUBDIR=	${GITHUB_PROJECT}
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${VERSION}
 
 USE_CMAKE=	yes
 
 USE_LANGUAGES+=	c c++
 USE_TOOLS+=	pkg-config cmake
 
-
-DEPENDS+=	seafile-daemon-6.0.0{,nb*}:../../wip/seafile-daemon
-
-.include "../../x11/qt5-qtwebkit/buildlink3.mk"
+.include "../../textproc/jansson/buildlink3.mk"
+.include "../../wip/seafile-ccnet/buildlink3.mk"
+.include "../../wip/seafile-libsearpc/buildlink3.mk"
+.include "../../wip/seafile-daemon/buildlink3.mk"
+.include "../../devel/libuuid/buildlink3.mk"
+.include "../../x11/qt5-qtwebsockets/buildlink3.mk"
 .include "../../x11/qt5-sqlite3/buildlink3.mk"
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/seafile-client/distinfo b/seafile-client/distinfo
index a77e9a6..d9c7f2b 100644
--- a/seafile-client/distinfo
+++ b/seafile-client/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (seafile-client/seafile-client-6.0.0.tar.gz) = c4dc007625d597af70715d13999b62f04a950d8b
-RMD160 (seafile-client/seafile-client-6.0.0.tar.gz) = 94fec0102763fd1d181090f41d16c5f63e4d7e79
-SHA512 (seafile-client/seafile-client-6.0.0.tar.gz) = 4d658c78ee269d03b0bfbce10c57465ec1ae4d04b8dc31c3ec69ffcdbb59b98e3169f450d188b8c5634ad707237ec182110d2e7b2d71929d38b06cb3566194e0
-Size (seafile-client/seafile-client-6.0.0.tar.gz) = 2131535 bytes
+SHA1 (seafile-client/v6.0.0.tar.gz) = c4dc007625d597af70715d13999b62f04a950d8b
+RMD160 (seafile-client/v6.0.0.tar.gz) = 94fec0102763fd1d181090f41d16c5f63e4d7e79
+SHA512 (seafile-client/v6.0.0.tar.gz) = 4d658c78ee269d03b0bfbce10c57465ec1ae4d04b8dc31c3ec69ffcdbb59b98e3169f450d188b8c5634ad707237ec182110d2e7b2d71929d38b06cb3566194e0
+Size (seafile-client/v6.0.0.tar.gz) = 2131535 bytes
diff --git a/seafile-daemon/DESCR b/seafile-daemon/DESCR
index 707a668..252ae7c 100644
--- a/seafile-daemon/DESCR
+++ b/seafile-daemon/DESCR
@@ -1,9 +1,11 @@
 Seafile is a next-generation open source cloud storage system with
 advanced support for file syncing, privacy protection and teamwork.
-Collections of files are called libraries, and each library can be synced
-separately. A library can be encrypted with a user chosen password. This
-oassword is not stored on the server, so even then server admin cannot
-view a file's contents.
 
-Seafile allows users to create groups with file syncing, wiki, and
-discussion to enable easy collaboration around documents within a team.
+Collection of files are called libraries and each library can be
+synced separately. A library can be encrypted with a user chosen
+password. The password is not stored on the server so even the
+server admin cannot view your file contents.
+
+Seafile lets you create groups with file syncing, wiki and
+discussion - enabling easy collaboration around documents within
+a team.
diff --git a/seafile-daemon/Makefile b/seafile-daemon/Makefile
index 2776d4f..590c70f 100644
--- a/seafile-daemon/Makefile
+++ b/seafile-daemon/Makefile
@@ -1,18 +1,20 @@
 # $NetBSD$
-PKGNAME=	seafile-daemon-6.0.0
+
 CATEGORIES=	net
-GHCOMMIT=	bea8cc526ed37b8c9599e5f526d934c8ec90d288
-DISTNAME=	${GHCOMMIT}
-MASTER_SITES=	${MASTER_SITE_GITHUB:=haiwen/seafile/archive/}
-EXTRACT_SUFX=	.zip
+GITHUB_PROJECT=	seafile
+VERSION=	6.0.0
+PKGNAME=	${GITHUB_PROJECT}-daemon-${VERSION}
+GITHUB_TAG=	v${VERSION}-server
+DISTNAME=	${GITHUB_TAG}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=haiwen/}
 
 MAINTAINER=	amoibos%gmail.com@localhost
 HOMEPAGE=	http://seafile.com/
 COMMENT=	Seafile daemon
 LICENSE=	gnu-gpl-v2
 
-DIST_SUBDIR=	seafile-daemon
-WRKSRC=		${WRKDIR}/seafile-${GHCOMMIT}
+DIST_SUBDIR=	${GITHUB_PROJECT}-daemon
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${VERSION}-server
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
@@ -23,12 +25,20 @@ USE_LANGUAGES+=	c c++
 USE_TOOLS+=	pkg-config automake aclocal autoheader autoconf gmake
 
 PY_PATCHPLIST=	yes
+PYTHON_VERSIONS_INCOMPATIBLE= 30 31 32 33 34 35 36 37
+
 
 CONFIGURE_ARGS+=	--disable-fuse \
 			--disable-server
 
 DEPENDS+=	${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
-DEPENDS+=	seafile-libsearpc-3.0{,nb*}:../../wip/seafile-libsearpc
+DEPENDS+=	libsearpc-3.0{,nb*}:../../wip/seafile-libsearpc
+
+SUBST_CLASSES+=		python
+SUBST_STAGE.python=	pre-configure
+SUBST_FILES.python=	app/seaf-cli
+
+SUBST_SED.python=	-e 's,/usr/bin/env python,${PYTHONBIN},'
 
 pre-configure:
 	set -e; cd ${WRKSRC}; \
diff --git a/seafile-daemon/buildlink3.mk b/seafile-daemon/buildlink3.mk
new file mode 100644
index 0000000..12b7e1e
--- /dev/null
+++ b/seafile-daemon/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD$
+
+BUILDLINK_TREE+=	seafile-daemon
+BUILDLINK_TREE+=	libseafile
+
+.if !defined(SEAFILE_DAEMON_BUILDLINK3_MK)
+SEAFILE_DAEMON_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.seafile-daemon+=	seafile-daemon>=6.0.0
+BUILDLINK_PKGSRCDIR.seafile-daemon?=	../../wip/seafile-daemon
+.endif	# SEAFILE_DAEMON_BUILDLINK3_MK
+
+
+.if !defined(LIBSEAFILE_BUILDLINK3_MK)
+LIBSEAFILE_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libseafile+=	seafile-daemon>=6.0.0
+BUILDLINK_PKGSRCDIR.libseafile?=	../../wip/seafile-daemon
+.endif	# LIBSEAFILE_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-libseafile
+BUILDLINK_TREE+=	-seafile-daemon
diff --git a/seafile-daemon/distinfo b/seafile-daemon/distinfo
index 38c74a4..f1ddb00 100644
--- a/seafile-daemon/distinfo
+++ b/seafile-daemon/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (seafile-daemon/bea8cc526ed37b8c9599e5f526d934c8ec90d288.zip) = 96b06cf74a9e12a9a6e78dca49dbe4458700aba0
-RMD160 (seafile-daemon/bea8cc526ed37b8c9599e5f526d934c8ec90d288.zip) = 366fcee5372146af431f1dbe7d95860512b9594d
-SHA512 (seafile-daemon/bea8cc526ed37b8c9599e5f526d934c8ec90d288.zip) = a6021391914068edd84fe5f98feea555ca4d564dfccb76cb3e7fc6bd03509a271c47f58224ce2892470543bc7457919c73c798e4f22372f987b56d0002d0bee5
-Size (seafile-daemon/bea8cc526ed37b8c9599e5f526d934c8ec90d288.zip) = 1468287 bytes
+SHA1 (seafile-daemon/v6.0.0-server.tar.gz) = 91874446860b202db7856d11e1c5e9f147f15fe7
+RMD160 (seafile-daemon/v6.0.0-server.tar.gz) = 305582cd8a9f95b22e1629b8e721de48ef899c3c
+SHA512 (seafile-daemon/v6.0.0-server.tar.gz) = a842497838349c8a18407da50ab81abee68385332b3ef91935a19265780cd7f90ae537a7023156481f0a8c1722f841a7b1425e793a866e7485c059e3c02206f6
+Size (seafile-daemon/v6.0.0-server.tar.gz) = 1149598 bytes
 SHA1 (patch-daemon_Makefile.am) = d0a43e73e12c584e24e240f430a759f8f5c7d67c
 SHA1 (patch-daemon_http_tx_mgr.c) = 8edb6e8b15e661eca0e31ddd75878967063843c6
 SHA1 (patch-lib_utils.h) = 37a61821d65385dff8141f42e5545990bc2ed57f
diff --git a/seafile-libsearpc/Makefile b/seafile-libsearpc/Makefile
index df79d6f..8711385 100644
--- a/seafile-libsearpc/Makefile
+++ b/seafile-libsearpc/Makefile
@@ -1,18 +1,18 @@
 # $NetBSD$
-PKGNAME=	seafile-libsearpc-3.0
+VERSION=	3.0
+PKGNAME=	libsearpc-${VERSION}
 CATEGORIES=	net
-GHCOMMIT=	258d508e6cbc7e80e3e3f51a66390c162049deff
-DISTNAME=	${GHCOMMIT}
-MASTER_SITES=	${MASTER_SITE_GITHUB:=haiwen/libsearpc/archive/}
-EXTRACT_SUFX=	.zip
+GITHUB_TAG=	v${VERSION}-latest
+DISTNAME=	${GITHUB_TAG}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=haiwen/}
 
 MAINTAINER=	amoibos%gmail.com@localhost
 HOMEPAGE=	http://seafile.com/
 COMMENT=	Simple RPC framework based on GObject system
 LICENSE=	apache-2.0
 
-DIST_SUBDIR=	seafile
-WRKSRC=		${WRKDIR}/libsearpc-${GHCOMMIT}
+DIST_SUBDIR=	seafile-libsearpc
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}-latest
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
@@ -25,6 +25,14 @@ DEPENDS+=	${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
 
 PY_PATCHPLIST=	yes
 
+PYTHON_VERSIONS_INCOMPATIBLE=	30 31 32 33 34 35 36 37
+
+SUBST_CLASSES+=		python
+SUBST_STAGE.python=	pre-configure
+SUBST_FILES.python=	lib/searpc-codegen.py
+
+SUBST_SED.python=	-e 's,/usr/bin/env python2,${PYTHONBIN},'
+
 pre-configure:
 	set -e; cd ${WRKSRC}; libtoolize; aclocal; autoheader; automake -a --foreign -i; autoconf
 
diff --git a/seafile-libsearpc/buildlink3.mk b/seafile-libsearpc/buildlink3.mk
index 49dd8c0..c06cd12 100644
--- a/seafile-libsearpc/buildlink3.mk
+++ b/seafile-libsearpc/buildlink3.mk
@@ -1,16 +1,12 @@
 # $NetBSD$
 
-BUILDLINK_TREE+=	seafile-libsearpc
 BUILDLINK_TREE+=	libsearpc
-BUILDLINK_TREE+=	searpc
 
-.if !defined(SEAFILE_LIBSEARPC_BUILDLINK3_MK)
-SEAFILE_LIBSEARPC_BUILDLINK3_MK:=
+.if !defined(LIBSEARPC_BUILDLINK3_MK)
+LIBSEARPC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.seafile-libsearpc+=	seafile-libsearpc>=3.00
-BUILDLINK_PKGSRCDIR.seafile-libsearpc?=	../../wip/seafile-libsearpc
-.endif	# SEAFILE_LIBSEARPC_BUILDLINK3_MK
+BUILDLINK_API_DEPENDS.libsearpc+=	libsearpc>=3.0
+BUILDLINK_PKGSRCDIR.libsearpc?=	../../wip/seafile-libsearpc
+.endif	# LIBSEARPC_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-seafile-libsearpc
 BUILDLINK_TREE+=	-libsearpc
-BUILDLINK_TREE+=	-searpc
diff --git a/seafile-libsearpc/distinfo b/seafile-libsearpc/distinfo
index c421ecd..c785081 100644
--- a/seafile-libsearpc/distinfo
+++ b/seafile-libsearpc/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (seafile/258d508e6cbc7e80e3e3f51a66390c162049deff.zip) = e97ad7daa4f1039a15e3c167a884392640731f9b
-RMD160 (seafile/258d508e6cbc7e80e3e3f51a66390c162049deff.zip) = 37b798fef424667a5a7c678a8782d78dfffba36f
-SHA512 (seafile/258d508e6cbc7e80e3e3f51a66390c162049deff.zip) = b0047de42f2d86b34d97c76335e45197faff15a0306e9ccf117545b0a02cca07cbfee3ec581ff7e9ad4ee811f429e81b3d3687af92e326ff69393146cd21cf85
-Size (seafile/258d508e6cbc7e80e3e3f51a66390c162049deff.zip) = 69666 bytes
+SHA1 (seafile-libsearpc/v3.0-latest.tar.gz) = cdff106886441205f46a592100ae324314127107
+RMD160 (seafile-libsearpc/v3.0-latest.tar.gz) = b20f046f1f7659c98b32d0f3c942e71b82b68b63
+SHA512 (seafile-libsearpc/v3.0-latest.tar.gz) = f5706d5490eb6abd05a25963ae204b358e7ebdcf153ab4bfe76819fd4538f1a957d7eaf84d8e60e076d978f9c1605adb2e6ec7ded55950c551304eb7665b15e8
+Size (seafile-libsearpc/v3.0-latest.tar.gz) = 43275 bytes
Prev by Date: bitcoin: Prune/fix flags and add comments
Next by Date: Inverted rule for the accepted Python versions.
Previous by Thread: bitcoin: Prune/fix flags and add comments
Next by Thread: Inverted rule for the accepted Python versions.
Indexes:
Home | Main Index | Thread Index | Old Index