On 2014/12/23 11:38, Kirill Bychkov wrote:
> On Mon, December 22, 2014 21:16, Rafael Sadowski wrote:
> > On Sun Dec 21, 2014 at 09:09:07PM +0100, Rafael Sadowski wrote:
> >> Hey @ports,
> >>
> >> $cat pkg/DESCR
> >> Grive is an independent implementation of Google Drive client. It uses
> >> the Google Document List API to talk to Google's servers.
> >>
> >> Okay, feedback?
> >>
> >> Tested @amd64! Grive sync my Google Drive stuff successfully.
> >>
> >
> > Next try:
> >
> > - COMMENT fixed.
> > - GH_* bits.
> > - LIB_DEPENDS, WANTLIB fixed.
> > - More actively developed Version.
> > - Less patches.
> >
> > Thanks a lot Stuart Henderson and Kirill Bychkov!
> >
> Looks fine and works for me. If there no objections, I'll import it today.
>
tweaks: whitespace nits, actually change COMMENT, put WANTLIB in the
right place, remove the unnecessary second line of the FindJSONC patch.
This is weird:
FIND_PATH(JSONC_INCLUDE_DIR json/json.h json-c/json.h)
why does this fail to search for json-c/json.h when json/json.h is not found?
diff --git a/Makefile b/Makefile
index 1f59206..7caf58e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
# $OpenBSD$
-COMMENT = Command line Google Drive Sync
+COMMENT = third-party client for Google Drive
-VERSION = 0.3.1-pre
+VERSION = 0.3.1-pre
DISTNAME = grive-${VERSION}
-PKGNAME = grive-${VERSION:S/-pre//}
+PKGNAME = grive-${VERSION:S/-pre//}
CATEGORIES = sysutils
@@ -15,14 +15,14 @@ MAINTAINER = Rafael Sadowski <[email protected]>
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
-GH_ACCOUNT = linwiz
-GH_PROJECT = grive
-GH_COMMIT = ba8766416ed4d4fc957d0a62c168763c4bc5bac8
-
WANTLIB += boost_filesystem-mt boost_program_options-mt boost_system-mt
WANTLIB += boost_unit_test_framework-mt c curl expat gcrypt gpg-error
WANTLIB += iberty json-c m pthread yajl z
+GH_ACCOUNT = linwiz
+GH_PROJECT = grive
+GH_COMMIT = ba8766416ed4d4fc957d0a62c168763c4bc5bac8
+
MODULES = devel/cmake \
gcc4
diff --git a/patches/patch-cmake_Modules_FindJSONC_cmake
b/patches/patch-cmake_Modules_FindJSONC_cmake
index dba6188..d97741d 100644
--- a/patches/patch-cmake_Modules_FindJSONC_cmake
+++ b/patches/patch-cmake_Modules_FindJSONC_cmake
@@ -1,14 +1,15 @@
$OpenBSD$
---- cmake/Modules/FindJSONC.cmake.orig Mon Dec 22 18:28:28 2014
-+++ cmake/Modules/FindJSONC.cmake Mon Dec 22 18:29:24 2014
-@@ -6,8 +6,8 @@
+
+XXX is this a cmake bug?
+
+--- cmake/Modules/FindJSONC.cmake.orig Tue Sep 30 00:52:29 2014
++++ cmake/Modules/FindJSONC.cmake Tue Dec 23 12:37:06 2014
+@@ -6,7 +6,7 @@
# JSONC_INCLUDE_DIR - The JSON-C include directory.
# JSONC_LIBRARY - The JSON-C library to link against.
-FIND_PATH(JSONC_INCLUDE_DIR json/json.h json-c/json.h)
--FIND_LIBRARY(JSONC_LIBRARY NAMES json json-c)
+FIND_PATH(JSONC_INCLUDE_DIR json-c/json.h)
-+FIND_LIBRARY(JSONC_LIBRARY NAMES json-c)
+ FIND_LIBRARY(JSONC_LIBRARY NAMES json json-c)
IF (JSONC_INCLUDE_DIR AND JSONC_LIBRARY)
- SET(JSONC_FOUND TRUE)
