svn commit: r329019 - in head/devel/ucommon: . files

[Pietro Cerutti]

Author: gahr
Date: Wed Oct  2 07:19:09 2013
New Revision: 329019
URL: http://svnweb.freebsd.org/changeset/ports/329019

Log:
  - Fix pthread linker flags in pkgconf file [1]
  - STAGE-clean
  
  Reported by:	acm@ [1]

Modified:
  head/devel/ucommon/Makefile
  head/devel/ucommon/files/patch-CMakeLists.txt
  head/devel/ucommon/pkg-plist

Modified: head/devel/ucommon/Makefile
==============================================================================
--- head/devel/ucommon/Makefile	Wed Oct  2 07:06:08 2013	(r329018)
+++ head/devel/ucommon/Makefile	Wed Oct  2 07:19:09 2013	(r329019)
@@ -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 pat
 
 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>

Modified: head/devel/ucommon/files/patch-CMakeLists.txt
==============================================================================
--- head/devel/ucommon/files/patch-CMakeLists.txt	Wed Oct  2 07:06:08 2013	(r329018)
+++ head/devel/ucommon/files/patch-CMakeLists.txt	Wed Oct  2 07:19:09 2013	(r329019)
@@ -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)

Modified: head/devel/ucommon/pkg-plist
==============================================================================
--- head/devel/ucommon/pkg-plist	Wed Oct  2 07:06:08 2013	(r329018)
+++ head/devel/ucommon/pkg-plist	Wed Oct  2 07:19:09 2013	(r329019)
@@ -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