Attachment #184230 for bug #220471




# $FreeBSD$

PORTNAME=	leatherman
PORTVERSION=	1.0.0
CATEGORIES=	devel

MAINTAINER=	jslagle@gmail.com

USE_GITHUB=	yes
GH_ACCOUNT=	puppetlabs

USES=		cmake gettext
USE_RUBY=	yes
CMAKE_ARGS=	-DLEATHERMAN_SHARED:BOOL=ON
USE_LDCONFIG=	yes
TEST_TARGET=	test

PLIST_SUB=	PORTVERSION=${PORTVERSION}


Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1483588778	1	TIMESTAMP = 1499512611
2	SHA256 (puppetlabs-leatherman-0.10.1_GH0.tar.gz) = 79b0eded49a02cb8f6ce6260ae39e3f1bdd2dc2c62c02f661308e04c08edb69e	2	SHA256 (puppetlabs-leatherman-1.0.0_GH0.tar.gz) = 4bcb8eaf08429e9e62cc6fcbfc1f216bd2eff800f751dbacabbec7d714ed21a2
3	SIZE (puppetlabs-leatherman-0.10.1_GH0.tar.gz) = 423218	3	SIZE (puppetlabs-leatherman-1.0.0_GH0.tar.gz) = 423859




--- cmake/leatherman.cmake.orig	2016-12-06 01:37:41 UTC
+++ cmake/leatherman.cmake
@@ -78,11 +78,6 @@ macro(leatherman_install)
         RUNTIME DESTINATION bin
         LIBRARY DESTINATION lib${LIB_SUFFIX}
         ARCHIVE DESTINATION lib${LIB_SUFFIX})
-    foreach(ARG ${ARGV})
-        if (TARGET ${ARG})
-            set_target_properties(${ARG} PROPERTIES PREFIX "" IMPORT_PREFIX "")
-        endif()
-    endforeach()
 endmacro()
 
 # Usage: add_cppcheck_dirs(dir1 dir2)
yes
native
text/plain





$FreeBSD$

--- cmake/leatherman.cmake.in.orig
+++ cmake/leatherman.cmake.in
@@ -83,11 +83,6 @@
         RUNTIME DESTINATION bin
         LIBRARY DESTINATION lib${LIB_SUFFIX}
         ARCHIVE DESTINATION lib${LIB_SUFFIX})
-    foreach(ARG ${ARGV})
-        if (TARGET ${ARG})
-            set_target_properties(${ARG} PROPERTIES PREFIX "" IMPORT_PREFIX "")
-        endif()
-    endforeach()
 endmacro()
 
 # Usage: add_cppcheck_dirs(dir1 dir2)
yes
native
text/plain

Lines 107-109 Link Here

(-)pkg-plist (+2 lines)
107	lib/libleatherman_ruby.so.%%PORTVERSION%%	107	lib/libleatherman_ruby.so.%%PORTVERSION%%
108	lib/libleatherman_util.so	108	lib/libleatherman_util.so
109	lib/libleatherman_util.so.%%PORTVERSION%%	109	lib/libleatherman_util.so.%%PORTVERSION%%
		110	share/locale/fr/LC_MESSAGES/leatherman_locale.mo
		111	share/locale/fr/LC_MESSAGES/leatherman_logging.mo

Return to bug 220471

Lines 1-7 Link Here

(-)Makefile (-2 / +3 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= leatherman	3	PORTNAME= leatherman
4	PORTVERSION= 0.10.1	4	PORTVERSION= 1.0.0
5	CATEGORIES= devel	5	CATEGORIES= devel
6		6
7	MAINTAINER= jslagle@gmail.com	7	MAINTAINER= jslagle@gmail.com
Lines 15-24 Link Here
15	USE_GITHUB= yes	15	USE_GITHUB= yes
16	GH_ACCOUNT= puppetlabs	16	GH_ACCOUNT= puppetlabs
17		17
18	USES= cmake	18	USES= cmake gettext
19	USE_RUBY= yes	19	USE_RUBY= yes
20	CMAKE_ARGS= -DLEATHERMAN_SHARED:BOOL=ON	20	CMAKE_ARGS= -DLEATHERMAN_SHARED:BOOL=ON
21	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
		22	TEST_TARGET= test
22		23
23	PLIST_SUB= PORTVERSION=${PORTVERSION}	24	PLIST_SUB= PORTVERSION=${PORTVERSION}
24		25

Lines 1-14 Link Here

(-)files/patch-cmake_leatherman.cmake (-17 lines)
1	--- cmake/leatherman.cmake.orig 2016-12-06 01:37:41 UTC
2	+++ cmake/leatherman.cmake
3	@@ -78,11 +78,6 @@ macro(leatherman_install)
4	RUNTIME DESTINATION bin
5	LIBRARY DESTINATION lib${LIB_SUFFIX}
6	ARCHIVE DESTINATION lib${LIB_SUFFIX})
7	- foreach(ARG ${ARGV})
8	- if (TARGET ${ARG})
9	- set_target_properties(${ARG} PROPERTIES PREFIX "" IMPORT_PREFIX "")
10	- endif()
11	- endforeach()
12	endmacro()
13
14	# Usage: add_cppcheck_dirs(dir1 dir2)
15	yes
16	native
17	text/plain

Line 0 Link Here

(-)files/patch-cmake_leatherman.cmake.in (+20 lines)
	1
	2	$FreeBSD$
	3
	4	--- cmake/leatherman.cmake.in.orig
	5	+++ cmake/leatherman.cmake.in
	6	@@ -83,11 +83,6 @@
	7	RUNTIME DESTINATION bin
	8	LIBRARY DESTINATION lib${LIB_SUFFIX}
	9	ARCHIVE DESTINATION lib${LIB_SUFFIX})
	10	- foreach(ARG ${ARGV})
	11	- if (TARGET ${ARG})
	12	- set_target_properties(${ARG} PROPERTIES PREFIX "" IMPORT_PREFIX "")
	13	- endif()
	14	- endforeach()
	15	endmacro()
	16
	17	# Usage: add_cppcheck_dirs(dir1 dir2)
	18	yes
	19	native
	20	text/plain