diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2016-07-21 03:28:56 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2016-07-21 03:28:56 +0800 |
| commit | d948e4a13ddb06fc926faab65b23abd7e08ec0b6 (patch) | |
| tree | c6328e0a4bba881b883d8f63dbd20257f8b1486b /devel | |
| parent | b55f847fa3877588d5ea8e3bb94ffb77442e6b8f (diff) | |
| download | freebsd-ports-graphics-d948e4a13ddb06fc926faab65b23abd7e08ec0b6.tar.gz freebsd-ports-graphics-d948e4a13ddb06fc926faab65b23abd7e08ec0b6.tar.zst freebsd-ports-graphics-d948e4a13ddb06fc926faab65b23abd7e08ec0b6.zip | |
- Add missing depends
- Fix liblzma detection on pre 10.3
- Make documentation generation consistent (disable it)
- Fix snappy support for FreeBSD (also submitted upstream)
Approved by: vg (maintainer)
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/avro-c/Makefile | 16 | ||||
| -rw-r--r-- | devel/avro-c/files/patch-src_CMakeLists.txt | 6 | ||||
| -rw-r--r-- | devel/avro-c/files/patch-src_codec.c | 12 |
3 files changed, 28 insertions, 6 deletions
diff --git a/devel/avro-c/Makefile b/devel/avro-c/Makefile index 1cefb5021ec..545051972e5 100644 --- a/devel/avro-c/Makefile +++ b/devel/avro-c/Makefile @@ -3,6 +3,7 @@ PORTNAME= avro PORTVERSION= 1.8.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= APACHE/${PORTNAME}/stable PKGNAMESUFFIX= -c @@ -11,13 +12,24 @@ DISTNAME= ${PORTNAME}-src-${PORTVERSION} MAINTAINER= vg@FreeBSD.org COMMENT= Data serialization system for ANSI C +LIB_DEPENDS= libjansson.so:devel/jansson \ + libsnappy.so:archivers/snappy + USES= cmake pkgconfig USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME}/lang/c -pre-configure: +.include <bsd.port.pre.mk> + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1003000 +CONFIGURE_ENV+= PKG_CONFIG_PATH=${FILESDIR} +.endif + +post-patch: + @${REINPLACE_CMD} '/add_subdirectory(docs)/d' \ + ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} 's|/bin/bash|/bin/sh|g' \ ${WRKSRC}/version.sh -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/avro-c/files/patch-src_CMakeLists.txt b/devel/avro-c/files/patch-src_CMakeLists.txt index cf8c7abbbb4..81cddb617e6 100644 --- a/devel/avro-c/files/patch-src_CMakeLists.txt +++ b/devel/avro-c/files/patch-src_CMakeLists.txt @@ -1,6 +1,6 @@ --- src/CMakeLists.txt.orig 2016-05-15 00:38:52 UTC +++ src/CMakeLists.txt -@@ -82,12 +82,14 @@ source_group(Avro FILES ${AVRO_SRC}) +@@ -82,12 +82,12 @@ source_group(Avro FILES ${AVRO_SRC}) # The version.sh script gives us a SOVERSION that uses colon as a # separator; we need periods. @@ -11,8 +11,6 @@ target_link_libraries(avro-static ${JANSSON_LIBRARIES} ${CODEC_LIBRARIES} ${THREADS_LIBRARIES}) set_target_properties(avro-static PROPERTIES OUTPUT_NAME avro) -+include_directories(/usr/local/include) -+ if (NOT WIN32) # TODO: Create Windows DLLs. See http://www.cmake.org/Wiki/BuildingWinDLL add_library(avro-shared SHARED ${AVRO_SRC}) @@ -21,7 +19,7 @@ configure_file(avro-c.pc.in avro-c.pc) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/avro-c.pc - DESTINATION lib/pkgconfig) -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig) ++ DESTINATION libdata/pkgconfig) add_executable(avrocat avrocat.c) target_link_libraries(avrocat avro-static) diff --git a/devel/avro-c/files/patch-src_codec.c b/devel/avro-c/files/patch-src_codec.c new file mode 100644 index 00000000000..ae74d17ef79 --- /dev/null +++ b/devel/avro-c/files/patch-src_codec.c @@ -0,0 +1,12 @@ +--- src/codec.c.orig 2016-05-15 00:38:52 UTC ++++ src/codec.c +@@ -21,6 +21,9 @@ + # if defined(__APPLE__) + # include <libkern/OSByteOrder.h> + # define __bswap_32 OSSwapInt32 ++# elif defined(__FreeBSD__) ++# include <sys/endian.h> ++# define __bswap_32 bswap32 + # else + # include <byteswap.h> + # endif |