Attachment #146981 for bug #193411

View | Details | Raw Unified | Return to bug 193411
Collapse All | Expand All




LICENSE=	BSD2CLAUSE RUBY
LICENSE_COMB=	dual

LIB_DEPENDS=	libyaml.so:${PORTSDIR}/textproc/libyaml
		libyaml.so:${PORTSDIR}/textproc/libyaml

# Using LIB_DEPENDS finds the libffi from gcc which causes problems
BUILD_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi


.include <bsd.port.options.mk>

USES=		cpe execinfo tar:bzip2

CPE_VENDOR=	ruby-lang
CPE_VERSION=	${RUBY_RELVERSION}

	#
	# Eliminate all leftovers
	#
#	@${FIND} ${WRKSRC}/ -name "*.orig" -delete

#
# Remove modules we don't want




--- configure.in.orig	2014-02-14 20:52:53.000000000 +0900
+++ configure.in	2014-09-07 15:25:14.000000000 +0900
@@ -1184,11 +1184,11 @@
 [superux*], [	ac_cv_func_setitimer=no
 		],
 [	LIBS="-lm $LIBS"])

 if test "${enable_win95}" = maybe; then
     AC_HAVE_LIBRARY(unicows, [enable_win95=yes], [enable_win95=no])
 fi
@@ -1834,7 +1834,7 @@
 fi
 
 if test x"$enable_pthread" = xyes; then

 	AC_CHECK_LIB($pthread_lib, pthread_kill,
 		     rb_with_pthread=yes, rb_with_pthread=no)
 	if test "$rb_with_pthread" = "yes"; then break; fi
@@ -1848,6 +1848,7 @@
 	[c],    [],
 	[root], [],
 	[c_r],  [MAINLIBS="-pthread $MAINLIBS"],

 	        [AS_CASE(["$target_os"],
 		    [openbsd*], [LIBS="-pthread $LIBS"],
 		    [LIBS="-l$pthread_lib $LIBS"])])
@@ -1933,11 +1934,8 @@
 
 AS_CASE(["$target_os"],
 [freebsd*], [
-    AC_CHECK_HEADERS([/usr/local/include/execinfo.h])
-    if test "x$ac_cv_header__usr_local_include_execinfo_h" = xyes; then :
-	RUBY_APPEND_OPTION(CPPFLAGS, -I/usr/local/include)
-	LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib"
-	DLDFLAGS="${DLDFLAGS:+$DLDFLAGS }-L/usr/local/lib"
+    AC_CHECK_HEADERS([execinfo.h])
+    if test "x$ac_cv_header_execinfo_h" = xyes; then :
 	AC_CHECK_LIB([execinfo], [backtrace])
     fi])
 AC_CHECK_FUNCS(backtrace)
@@ -2086,7 +2084,6 @@
 			: ${LDSHARED='$(CC) -shared'}
 			if test "$rb_cv_binary_elf" = yes; then
 			    LDFLAGS="$LDFLAGS -rdynamic"

 			else
 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
 			fi
@@ -2393,6 +2390,7 @@
     [freebsd*|dragonfly*], [
 	SOLIBS='$(LIBS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'

Return to bug 193411

Lines 17-24 Link Here

(-)Makefile (-4 / +3 lines)
17	LICENSE= BSD2CLAUSE RUBY	17	LICENSE= BSD2CLAUSE RUBY
18	LICENSE_COMB= dual	18	LICENSE_COMB= dual
19		19
20	LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \	20	LIB_DEPENDS= libyaml.so:${PORTSDIR}/textproc/libyaml
21	libyaml.so:${PORTSDIR}/textproc/libyaml
22		21
23	# Using LIB_DEPENDS finds the libffi from gcc which causes problems	22	# Using LIB_DEPENDS finds the libffi from gcc which causes problems
24	BUILD_DEPENDS= libffi>=0:${PORTSDIR}/devel/libffi	23	BUILD_DEPENDS= libffi>=0:${PORTSDIR}/devel/libffi
Lines 69-75 Link Here
69		68
70	.include <bsd.port.options.mk>	69	.include <bsd.port.options.mk>
71		70
72	USES= tar:bzip2 cpe	71	USES= cpe execinfo tar:bzip2
73		72
74	CPE_VENDOR= ruby-lang	73	CPE_VENDOR= ruby-lang
75	CPE_VERSION= ${RUBY_RELVERSION}	74	CPE_VERSION= ${RUBY_RELVERSION}
Lines 141-147 Link Here
141	#	140	#
142	# Eliminate all leftovers	141	# Eliminate all leftovers
143	#	142	#
144	@${FIND} ${WRKSRC}/ -name "*.orig" -delete	143	# @${FIND} ${WRKSRC}/ -name "*.orig" -delete
145		144
146	#	145	#
147	# Remove modules we don't want	146	# Remove modules we don't want

Lines 1-6 Link Here

(-)files/patch-configure.in (-7 / +21 lines)
1	--- configure.in.orig 2014-03-20 05:49:55.847385089 +0000	1	--- configure.in.orig 2014-02-14 20:52:53.000000000 +0900
2	+++ configure.in 2014-03-20 05:50:09.238383528 +0000	2	+++ configure.in 2014-09-07 15:25:14.000000000 +0900
3	@@ -1139,11 +1139,11 @@	3	@@ -1184,11 +1184,11 @@
4	[superux*], [ ac_cv_func_setitimer=no	4	[superux*], [ ac_cv_func_setitimer=no
5	],	5	],
6	[ LIBS="-lm $LIBS"])	6	[ LIBS="-lm $LIBS"])
Lines 17-23 Link Here
17	if test "${enable_win95}" = maybe; then	17	if test "${enable_win95}" = maybe; then
18	AC_HAVE_LIBRARY(unicows, [enable_win95=yes], [enable_win95=no])	18	AC_HAVE_LIBRARY(unicows, [enable_win95=yes], [enable_win95=no])
19	fi	19	fi
20	@@ -1789,7 +1789,7 @@	20	@@ -1834,7 +1834,7 @@
21	fi	21	fi
22		22
23	if test x"$enable_pthread" = xyes; then	23	if test x"$enable_pthread" = xyes; then
Lines 26-32 Link Here
26	AC_CHECK_LIB($pthread_lib, pthread_kill,	26	AC_CHECK_LIB($pthread_lib, pthread_kill,
27	rb_with_pthread=yes, rb_with_pthread=no)	27	rb_with_pthread=yes, rb_with_pthread=no)
28	if test "$rb_with_pthread" = "yes"; then break; fi	28	if test "$rb_with_pthread" = "yes"; then break; fi
29	@@ -1803,6 +1803,7 @@	29	@@ -1848,6 +1848,7 @@
30	[c], [],	30	[c], [],
31	[root], [],	31	[root], [],
32	[c_r], [MAINLIBS="-pthread $MAINLIBS"],	32	[c_r], [MAINLIBS="-pthread $MAINLIBS"],
Lines 34-40 Link Here
34	[AS_CASE(["$target_os"],	34	[AS_CASE(["$target_os"],
35	[openbsd*], [LIBS="-pthread $LIBS"],	35	[openbsd*], [LIBS="-pthread $LIBS"],
36	[LIBS="-l$pthread_lib $LIBS"])])	36	[LIBS="-l$pthread_lib $LIBS"])])
37	@@ -2041,7 +2042,6 @@	37	@@ -1933,11 +1934,8 @@
		38
		39	AS_CASE(["$target_os"],
		40	[freebsd*], [
		41	- AC_CHECK_HEADERS([/usr/local/include/execinfo.h])
		42	- if test "x$ac_cv_header__usr_local_include_execinfo_h" = xyes; then :
		43	- RUBY_APPEND_OPTION(CPPFLAGS, -I/usr/local/include)
		44	- LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib"
		45	- DLDFLAGS="${DLDFLAGS:+$DLDFLAGS }-L/usr/local/lib"
		46	+ AC_CHECK_HEADERS([execinfo.h])
		47	+ if test "x$ac_cv_header_execinfo_h" = xyes; then :
		48	AC_CHECK_LIB([execinfo], [backtrace])
		49	fi])
		50	AC_CHECK_FUNCS(backtrace)
		51	@@ -2086,7 +2084,6 @@
38	: ${LDSHARED='$(CC) -shared'}	52	: ${LDSHARED='$(CC) -shared'}
39	if test "$rb_cv_binary_elf" = yes; then	53	if test "$rb_cv_binary_elf" = yes; then
40	LDFLAGS="$LDFLAGS -rdynamic"	54	LDFLAGS="$LDFLAGS -rdynamic"
Lines 42-48 Link Here
42	else	56	else
43	test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes \|\| LDSHARED="ld -Bshareable"	57	test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes \|\| LDSHARED="ld -Bshareable"
44	fi	58	fi
45	@@ -2348,6 +2348,7 @@	59	@@ -2393,6 +2390,7 @@
46	[freebsd\|dragonfly], [	60	[freebsd\|dragonfly], [
47	SOLIBS='$(LIBS)'	61	SOLIBS='$(LIBS)'
48	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'	62	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'