diff options
| author | gahr <gahr@FreeBSD.org> | 2013-10-02 15:19:09 +0800 |
|---|---|---|
| committer | gahr <gahr@FreeBSD.org> | 2013-10-02 15:19:09 +0800 |
| commit | 05489d87ae20a1f9092503bf5d81fd0a3f5229e2 (patch) | |
| tree | 9e500a6ea6531d8fc9e18920dc260529e8ccad05 /devel | |
| parent | 7633c651116782c2f9194a5e51a4d405e9f38ab0 (diff) | |
| download | freebsd-ports-gnome-05489d87ae20a1f9092503bf5d81fd0a3f5229e2.tar.gz freebsd-ports-gnome-05489d87ae20a1f9092503bf5d81fd0a3f5229e2.tar.zst freebsd-ports-gnome-05489d87ae20a1f9092503bf5d81fd0a3f5229e2.zip | |
- Fix pthread linker flags in pkgconf file [1]
- STAGE-clean
Reported by: acm@ [1]
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ucommon/Makefile | 11 | ||||
| -rw-r--r-- | devel/ucommon/files/patch-CMakeLists.txt | 29 | ||||
| -rw-r--r-- | devel/ucommon/pkg-plist | 9 |
3 files changed, 38 insertions, 11 deletions
diff --git a/devel/ucommon/Makefile b/devel/ucommon/Makefile index fa5551af7b38..9dff64241569 100644 --- a/devel/ucommon/Makefile +++ b/devel/ucommon/Makefile @@ -3,6 +3,7 @@ PORTNAME= ucommon PORTVERSION= 6.0.7 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= commoncpp @@ -12,18 +13,12 @@ COMMENT= Very lightweight C++ design pattern library LICENSE= LGPL3 -USES= pathfix pkgconfig cmake:outsource +USES= pathfix pkgconfig cmake:outsource CMAKE_ARGS+= -DBUILD_TESTING:BOOL=ON \ -DINSTALL_BINDIR:STRING=bin/${PORTNAME} USE_LDCONFIG= yes -MAN1= args.1 car.1 commoncpp-config.1 mdsum.1 pdetach.1 \ - scrub-files.1 sockaddr.1 ucommon-config.1 zerofill.1 - -NO_STAGE= yes -.include <bsd.port.pre.mk> - regression-test: build cd ${BUILD_WRKSRC}/test && ${MAKE} test -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/ucommon/files/patch-CMakeLists.txt b/devel/ucommon/files/patch-CMakeLists.txt index 5896fa652ae7..ae38edaef525 100644 --- a/devel/ucommon/files/patch-CMakeLists.txt +++ b/devel/ucommon/files/patch-CMakeLists.txt @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig 2013-07-28 12:32:06.000000000 +0200 -+++ CMakeLists.txt 2013-09-17 09:22:29.000000000 +0200 +--- CMakeLists.txt 2013-07-28 05:32:06.000000000 -0500 ++++ CMakeLists.txt 2013-10-01 18:00:14.000000000 -0500 @@ -30,7 +30,9 @@ # when we override default install prefix, assume full path is used... @@ -58,7 +58,30 @@ check_include_files(libintl.h HAVE_LIBINTL_H) check_include_files(netinet/in.h HAVE_NETINET_IN_H) check_include_files(net/if.h HAVE_NET_IF_H) -@@ -566,11 +574,11 @@ +@@ -411,11 +419,20 @@ + endforeach() + foreach(lib ${UCOMMON_LIBS}) + STRING(REGEX REPLACE "^[-]l" "" slib ${lib}) +- set(PACKAGE_LIBS "${PACKAGE_LIBS} -l${slib}") ++ if(${lib} STREQUAL "-pthread") ++ set(PACKAGE_LIBS "${PACKAGE_LIBS} ${slib}") ++ else() ++ set(PACKAGE_LIBS "${PACKAGE_LIBS} -l${slib}") ++ endif() ++ STRING(REGEX REPLACE "^[-]l" "" slib ${lib}) + endforeach() + foreach(lib ${SECURE_LIBS}) + STRING(REGEX REPLACE "^[-]l" "" slib ${lib}) +- set(ADDITIONAL_LIBS "${ADDITIONAL_LIBS} -l${slib}") ++ if(${lib} STREQUAL "-pthread") ++ set(ADDITIONAL_LIBS "${ADDITIONAL_LIBS} ${slib}") ++ else() ++ set(ADDITIONAL_LIBS "${ADDITIONAL_LIBS} -l${slib}") ++ endif() + endforeach() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config) +@@ -566,11 +583,11 @@ endif() if(NOT WIN32) diff --git a/devel/ucommon/pkg-plist b/devel/ucommon/pkg-plist index 446bdaf76596..aa45b334cd44 100644 --- a/devel/ucommon/pkg-plist +++ b/devel/ucommon/pkg-plist @@ -72,6 +72,15 @@ lib/libusecure.so.6 lib/libusecure.so.6.0.7 libdata/pkgconfig/commoncpp.pc libdata/pkgconfig/ucommon.pc +man/man1/args.1.gz +man/man1/car.1.gz +man/man1/commoncpp-config.1.gz +man/man1/mdsum.1.gz +man/man1/pdetach.1.gz +man/man1/scrub-files.1.gz +man/man1/sockaddr.1.gz +man/man1/ucommon-config.1.gz +man/man1/zerofill.1.gz @dirrm include/ucommon @dirrm include/commoncpp @dirrm bin/ucommon |