View | Details | Raw Unified | Return to bug 192949 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/bsd.ruby.mk (-1 / +4 lines)
Lines 481-486 Link Here
481
do-install:
481
do-install:
482
	(cd ${BUILD_WRKSRC}; ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install ${RUBYGEM_ARGS} ${GEMFILES} -- --build-args ${CONFIGURE_ARGS})
482
	(cd ${BUILD_WRKSRC}; ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install ${RUBYGEM_ARGS} ${GEMFILES} -- --build-args ${CONFIGURE_ARGS})
483
	${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info/
483
	${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info/
484
	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f -name '*.so' -exec ${STRIP_CMD} {} +
485
	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f \( -name mkmf.log -or -name gem_make.out \) -print -delete
486
	${RM} -rf ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext \
487
		${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null || ${TRUE}
484
	${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null || ${TRUE}
488
	${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null || ${TRUE}
485
.if defined(NOPORTDOCS)
489
.if defined(NOPORTDOCS)
486
	-@${RMDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}
490
	-@${RMDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}
Lines 489-495 Link Here
489
. if defined(RUBYGEM_AUTOPLIST)
493
. if defined(RUBYGEM_AUTOPLIST)
490
.  if !target(post-install-script)
494
.  if !target(post-install-script)
491
post-install-script:
495
post-install-script:
492
	@${ECHO} ${GEM_CACHE} >> ${TMPPLIST}
493
	@${ECHO} ${GEM_SPEC} >> ${TMPPLIST}
496
	@${ECHO} ${GEM_SPEC} >> ${TMPPLIST}
494
.if !defined(NOPORTDOCS)
497
.if !defined(NOPORTDOCS)
495
	@${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print | ${SED} -E -e \
498
	@${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print | ${SED} -E -e \
(-)accessibility/rubygem-atk/Makefile (+4 lines)
Lines 18-21 Link Here
18
USE_RUBYGEMS=	yes
18
USE_RUBYGEMS=	yes
19
RUBYGEM_AUTOPLIST=	yes
19
RUBYGEM_AUTOPLIST=	yes
20
20
21
CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/
22
23
GEM_ENV=	CFLAGS="${CFLAGS}"
24
21
.include <bsd.port.mk>
25
.include <bsd.port.mk>
(-)devel/rubygem-cairo-gobject/Makefile (+5 lines)
Lines 18-21 Link Here
18
USE_RUBYGEMS=	yes
18
USE_RUBYGEMS=	yes
19
RUBYGEM_AUTOPLIST=	yes
19
RUBYGEM_AUTOPLIST=	yes
20
20
21
CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/ \
22
		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/cairo-1.14.1/
23
24
GEM_ENV=	CFLAGS="${CFLAGS}"
25
21
.include <bsd.port.mk>
26
.include <bsd.port.mk>
(-)devel/rubygem-gio2/Makefile (+5 lines)
Lines 18-21 Link Here
18
USE_RUBYGEMS=	yes
18
USE_RUBYGEMS=	yes
19
RUBYGEM_AUTOPLIST=	yes
19
RUBYGEM_AUTOPLIST=	yes
20
20
21
CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/ \
22
	-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/gobject-introspection-2.2.5/
23
24
GEM_ENV=	CFLAGS="${CFLAGS}"
25
21
.include <bsd.port.mk>
26
.include <bsd.port.mk>
(-)devel/rubygem-gobject-introspection/Makefile (+4 lines)
Lines 18-21 Link Here
18
USE_RUBYGEMS=	yes
18
USE_RUBYGEMS=	yes
19
RUBYGEM_AUTOPLIST=	yes
19
RUBYGEM_AUTOPLIST=	yes
20
20
21
CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/
22
23
GEM_ENV=	CFLAGS="${CFLAGS}"
24
21
.include <bsd.port.mk>
25
.include <bsd.port.mk>
(-)graphics/rubygem-gdk_pixbuf2/Makefile (+4 lines)
Lines 18-21 Link Here
18
USE_RUBYGEMS=	yes
18
USE_RUBYGEMS=	yes
19
RUBYGEM_AUTOPLIST=	yes
19
RUBYGEM_AUTOPLIST=	yes
20
20
21
CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/
22
23
GEM_ENV=	CFLAGS="${CFLAGS}"
24
21
.include <bsd.port.mk>
25
.include <bsd.port.mk>
(-)graphics/rubygem-rsvg2/Makefile (+5 lines)
Lines 19-22 Link Here
19
USE_RUBYGEMS=	yes
19
USE_RUBYGEMS=	yes
20
RUBYGEM_AUTOPLIST=	yes
20
RUBYGEM_AUTOPLIST=	yes
21
21
22
CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/ \
23
		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/cairo-1.14.1/
24
25
GEM_ENV=	CFLAGS="${CFLAGS}"
26
22
.include <bsd.port.mk>
27
.include <bsd.port.mk>
(-)multimedia/rubygem-gstreamer/Makefile (+5 lines)
Lines 19-22 Link Here
19
USE_RUBYGEMS=	yes
19
USE_RUBYGEMS=	yes
20
RUBYGEM_AUTOPLIST=	yes
20
RUBYGEM_AUTOPLIST=	yes
21
21
22
CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/ \
23
	-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/gobject-introspection-2.2.5/
24
25
GEM_ENV=	CFLAGS="${CFLAGS}"
26
22
.include <bsd.port.mk>
27
.include <bsd.port.mk>
(-)x11-toolkits/rubygem-gtk2/Makefile (+6 lines)
Lines 20-23 Link Here
20
USE_RUBYGEMS=	yes
20
USE_RUBYGEMS=	yes
21
RUBYGEM_AUTOPLIST=	yes
21
RUBYGEM_AUTOPLIST=	yes
22
22
23
CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/ \
24
		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/cairo-1.14.1/ \
25
		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/pango-2.2.5
26
27
GEM_ENV=	CFLAGS="${CFLAGS}"
28
23
.include <bsd.port.mk>
29
.include <bsd.port.mk>
(-)x11-toolkits/rubygem-gtk3/Makefile (+7 lines)
Lines 23-26 Link Here
23
USE_RUBYGEMS=	yes
23
USE_RUBYGEMS=	yes
24
RUBYGEM_AUTOPLIST=	yes
24
RUBYGEM_AUTOPLIST=	yes
25
25
26
CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/ \
27
		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/cairo-1.14.1/ \
28
		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/pango-2.2.5 \
29
		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/gdk_pixbuf2-2.2.5
30
31
GEM_ENV=	CFLAGS="${CFLAGS}"
32
26
.include <bsd.port.mk>
33
.include <bsd.port.mk>
(-)x11-toolkits/rubygem-pango/Makefile (+5 lines)
Lines 19-22 Link Here
19
USE_RUBYGEMS=	yes
19
USE_RUBYGEMS=	yes
20
RUBYGEM_AUTOPLIST=	yes
20
RUBYGEM_AUTOPLIST=	yes
21
21
22
CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/ \
23
		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/cairo-1.14.1/
24
25
GEM_ENV=	CFLAGS="${CFLAGS}"
26
22
.include <bsd.port.mk>
27
.include <bsd.port.mk>
(-)x11-toolkits/rubygem-poppler/Makefile (+5 lines)
Lines 19-22 Link Here
19
USE_RUBYGEMS=	yes
19
USE_RUBYGEMS=	yes
20
RUBYGEM_AUTOPLIST=	yes
20
RUBYGEM_AUTOPLIST=	yes
21
21
22
CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/ \
23
		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/cairo-1.14.1/
24
25
GEM_ENV=	CFLAGS="${CFLAGS}"
26
22
.include <bsd.port.mk>
27
.include <bsd.port.mk>
(-)x11-toolkits/rubygem-gtksourceview2/Makefile (-1 / +7 lines)
Lines 18-21 Link Here
18
USE_RUBYGEMS=	yes
18
USE_RUBYGEMS=	yes
19
RUBYGEM_AUTOPLIST=	yes
19
RUBYGEM_AUTOPLIST=	yes
20
20
21
.include <bsd.port.mk>
21
CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/cairo-1.14.1/ \
22
	-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/gtk2-2.2.5 \
23
	-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/ \
24
25
GEM_ENV=	CFLAGS="${CFLAGS}"
26
27
.include<bsd.port.mk>
(-)x11-toolkits/rubygem-gtksourceview3/Makefile (+6 lines)
Lines 18-21 Link Here
18
USE_RUBYGEMS=	yes
18
USE_RUBYGEMS=	yes
19
RUBYGEM_AUTOPLIST=	yes
19
RUBYGEM_AUTOPLIST=	yes
20
20
21
CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/cairo-1.14.1 \
22
		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/gtk3-2.2.5 \
23
		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5
24
25
GEM_ENV=	CFLAGS="${CFLAGS}"
26
21
.include <bsd.port.mk>
27
.include <bsd.port.mk>
(-)x11-toolkits/rubygem-vte/Makefile (+5 lines)
Lines 18-21 Link Here
18
USE_RUBYGEMS=	yes
18
USE_RUBYGEMS=	yes
19
RUBYGEM_AUTOPLIST=	yes
19
RUBYGEM_AUTOPLIST=	yes
20
20
21
CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/gtk2-2.2.5 \
22
		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5
23
24
GEM_ENV=	CFLAGS="${CFLAGS}"
25
21
.include <bsd.port.mk>
26
.include <bsd.port.mk>
(-)graphics/rubygem-goocanvas/Makefile (+4 lines)
Lines 19-22 Link Here
19
USE_RUBYGEMS=	yes
19
USE_RUBYGEMS=	yes
20
RUBYGEM_AUTOPLIST=	yes
20
RUBYGEM_AUTOPLIST=	yes
21
21
22
CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/cairo-1.14.1 \
23
		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5
24
GEM_ENV=	CFLAGS="${CFLAGS}"
25
22
.include <bsd.port.mk>
26
.include <bsd.port.mk>
(-)textproc/rubygem-nokogiri/Makefile (-5 lines)
Lines 19-27 Link Here
19
19
20
PLIST_FILES=	bin/nokogiri
20
PLIST_FILES=	bin/nokogiri
21
21
22
post-install:
23
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext/nokogiri/*.o
24
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext/nokogiri/*.so
25
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/lib/nokogiri/*.so
26
27
.include <bsd.port.mk>
22
.include <bsd.port.mk>
(-)textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb (+46 lines)
Line 0 Link Here
1
--- ext/nokogiri/extconf.rb.orig	2015-07-26 20:13:45 UTC
2
+++ ext/nokogiri/extconf.rb
3
@@ -584,6 +584,43 @@ if ENV['CPUPROFILE']
4
   end
5
 end
6
 
7
+$INSTALLFILES = [
8
+  ['html_document.h', '$(archdir)'],
9
+  ['html_element_description.h', '$(archdir)'],
10
+  ['html_entity_lookup.h', '$(archdir)'],
11
+  ['html_sax_parser_context.h', '$(archdir)'],
12
+  ['html_sax_push_parser.h', '$(archdir)'],
13
+  ['nokogiri.h', '$(archdir)'],
14
+  ['xml_attr.h', '$(archdir)'],
15
+  ['xml_attribute_decl.h', '$(archdir)'],
16
+  ['xml_cdata.h', '$(archdir)'],
17
+  ['xml_comment.h', '$(archdir)'],
18
+  ['xml_document.h', '$(archdir)'],
19
+  ['xml_document_fragment.h', '$(archdir)'],
20
+  ['xml_dtd.h', '$(archdir)'],
21
+  ['xml_element_content.h', '$(archdir)'],
22
+  ['xml_element_decl.h', '$(archdir)'],
23
+  ['xml_encoding_handler.h', '$(archdir)'],
24
+  ['xml_entity_decl.h', '$(archdir)'],
25
+  ['xml_entity_reference.h', '$(archdir)'],
26
+  ['xml_io.h', '$(archdir)'],
27
+  ['xml_libxml2_hacks.h', '$(archdir)'],
28
+  ['xml_namespace.h', '$(archdir)'],
29
+  ['xml_node.h', '$(archdir)'],
30
+  ['xml_node_set.h', '$(archdir)'],
31
+  ['xml_processing_instruction.h', '$(archdir)'],
32
+  ['xml_reader.h', '$(archdir)'],
33
+  ['xml_relax_ng.h', '$(archdir)'],
34
+  ['xml_sax_parser.h', '$(archdir)'],
35
+  ['xml_sax_parser_context.h', '$(archdir)'],
36
+  ['xml_sax_push_parser.h', '$(archdir)'],
37
+  ['xml_schema.h', '$(archdir)'],
38
+  ['xml_syntax_error.h', '$(archdir)'],
39
+  ['xml_text.h', '$(archdir)'],
40
+  ['xml_xpath_context.h', '$(archdir)'],
41
+  ['xslt_stylesheet.h', '$(archdir)'],
42
+]
43
+
44
 create_makefile('nokogiri/nokogiri')
45
 
46
 if enable_config('clean', true)
(-)textproc/rubygem-nokogumbo/Makefile (+2 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	nokogumbo
4
PORTNAME=	nokogumbo
5
PORTVERSION=	1.4.2
5
PORTVERSION=	1.4.2
6
PORTREVISION=	1
6
CATEGORIES=	textproc rubygems
7
CATEGORIES=	textproc rubygems
7
MASTER_SITES=	RG
8
MASTER_SITES=	RG
8
9
Lines 12-17 Link Here
12
LICENSE=	APACHE20
13
LICENSE=	APACHE20
13
14
14
RUN_DEPENDS=	rubygem-nokogiri>=0:${PORTSDIR}/textproc/rubygem-nokogiri
15
RUN_DEPENDS=	rubygem-nokogiri>=0:${PORTSDIR}/textproc/rubygem-nokogiri
16
LIB_DEPENDS=	libgumbo.so:${PORTSDIR}/devel/gumbo
15
17
16
USE_RUBY=	yes
18
USE_RUBY=	yes
17
USE_RUBYGEMS=	yes
19
USE_RUBYGEMS=	yes
(-)textproc/rubygem-nokogumbo/files/patch-ext_nokogumboc_extconf.rb (+16 lines)
Line 0 Link Here
1
--- ext/nokogumboc/extconf.rb.orig	2015-07-26 21:04:54 UTC
2
+++ ext/nokogumboc/extconf.rb
3
@@ -1,3 +1,4 @@
4
+require 'rubygems'
5
 require 'mkmf'
6
 $CFLAGS += " -std=c99"
7
 
8
@@ -10,7 +11,7 @@ if have_library('xml2', 'xmlNewDoc')
9
     select { |name| name.match(%r{gems/nokogiri-([\d.]+)/lib/nokogiri}) }.
10
     sort_by {|name| name[/nokogiri-([\d.]+)/,1].split('.').map(&:to_i)}.last
11
   if nokogiri_lib
12
-    nokogiri_ext = nokogiri_lib.sub(%r(lib/nokogiri(.rb)?$), 'ext/nokogiri')
13
+    nokogiri_ext = Gem::Specification.find_by_name('nokogiri').extension_dir + "/nokogiri"
14
 
15
     # if that doesn't work, try workarounds found in Nokogiri's extconf
16
     unless find_header('nokogiri.h', nokogiri_ext)

Return to bug 192949