1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-10 07:04:03 +00:00

Update to 1.0.17.1.

Release notes: http://librdf.org/bindings/RELEASE.html#rel1_0_17_1

This commit also brings some packaging fixes: the Perl bindings' .packlist
does not reference the staging directory, and the Ruby bindings' generated
shared library has the correct suffix.

MFH:		2014Q2
This commit is contained in:
Raphael Kubo da Costa 2014-05-11 17:05:54 +00:00
parent b9abf8a168
commit 072ab847ec
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=353719
4 changed files with 52 additions and 8 deletions

View File

@ -2,12 +2,12 @@
# $FreeBSD$
PORTNAME= redland-bindings
PORTVERSION= 1.0.16.1
CATEGORIES?= textproc
PORTVERSION= 1.0.17.1
CATEGORIES= textproc
MASTER_SITES= http://download.librdf.org/source/
MAINTAINER?= kde@FreeBSD.org
COMMENT?= Language bindings for the Redland package
MAINTAINER= kde@FreeBSD.org
COMMENT= Language bindings for the Redland package
# Even though GPLv3 is not explicitly mentioned in the port's LICENSE.html, one
# of its licenses is "GPLv2 or newer", which includes GPLv3.
@ -28,7 +28,7 @@ PERL_USES= perl5
PHP_CONFIGURE_WITH= php
PHP_USE= PHP=yes PHP_BUILD=yes
PYTHON_CONFIGURE_WITH= python
PYTHON_USE= PYTHON=2.5+
PYTHON_USE= PYTHON=yes
RUBY_CONFIGURE_WITH= ruby
RUBY_USE= RUBY=yes
@ -37,6 +37,7 @@ RUBY_USE= RUBY=yes
post-install:
.if ${PORT_OPTIONS:MPERL}
${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod
${SED} -i '' -e 's,^${STAGEDIR},,g' ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/RDF/Redland/CORE/.packlist
.endif
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (redland-bindings-1.0.16.1.tar.gz) = 065037ef61e9b78f642e75b9c2a42700eb1a87d903f2f9963d86591c7d916826
SIZE (redland-bindings-1.0.16.1.tar.gz) = 859166
SHA256 (redland-bindings-1.0.17.1.tar.gz) = ff72b587ab55f09daf81799cb3f9d263708fad5df7a5458f0c28566a2563b7f5
SIZE (redland-bindings-1.0.17.1.tar.gz) = 933290

View File

@ -0,0 +1,42 @@
Compatibility with Ruby < 2.0, where RbConfig::CONFIG['rubyarchhdrdir'] does not exist.
Submitted upstream: https://github.com/dajobe/redland-bindings/pull/8
Fetch redland.so's suffix from the right variable.
Submitted upstream: https://github.com/dajobe/redland-bindings/pull/9
--- configure.orig 2014-05-11 17:39:24.000000000 +0300
+++ configure 2014-05-11 17:39:27.000000000 +0300
@@ -12297,6 +12297,7 @@
RUBY_ARCHDIR=`$RUBY -rrbconfig -e "print RbConfig::CONFIG['archdir']"`
ruby_install_dir_config=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG['$ruby_install_dir_variable']"`
ruby_header_dir_config=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG['rubyhdrdir']"`
+ ruby_arch_config=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG['arch']"`
ruby_arch_header_dir_config=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG['rubyarchhdrdir']"`
ruby_arch_install_dir_config=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG['$ruby_arch_install_dir_variable']"`
librubyarg_shared=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG['LIBRUBYARG_SHARED']"`
@@ -12328,9 +12329,15 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Ruby headers dir" >&5
$as_echo_n "checking Ruby headers dir... " >&6; }
if test "X$ruby_header_dir_config" != "Xnil" -a "X$ruby_header_dir_config" != "X"; then
- RUBY_INCLUDES="$RUBY_INCLUDES -I$ruby_header_dir_config -I$ruby_arch_header_dir_config"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY_INCLUDES from RbConfig::CONFIG rubyhdrdir and rubyarchhdrdir" >&5
+ if test -d "$ruby_arch_header_dir_config"; then
+ RUBY_INCLUDES="$RUBY_INCLUDES -I$ruby_header_dir_config -I$ruby_arch_header_dir_config"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY_INCLUDES from RbConfig::CONFIG rubyhdrdir and rubyarchhdrdir" >&5
$as_echo "$RUBY_INCLUDES from RbConfig::CONFIG rubyhdrdir and rubyarchhdrdir" >&6; }
+ elif test -d "$ruby_header_dir_config/$ruby_arch_config"; then
+ RUBY_INCLUDES="$RUBY_INCLUDES -I$ruby_header_dir_config -I$ruby_header_dir_config/$ruby_arch_config"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY_INCLUDES from RbConfig::CONFIG rubyhdrdir and arch" >&5
+$as_echo "$RUBY_INCLUDES from RbConfig::CONFIG rubyhdrdir and arch" >&6; }
+ fi
else
if test -r "$RUBY_ARCHDIR/ruby.h"; then
RUBY_INCLUDES="$RUBY_INCLUDES -I$RUBY_ARCHDIR"
@@ -12371,7 +12378,7 @@
as_fn_error $? "No such RUBY linking type $ruby_linking" "$LINENO" 5
;;
esac
- RUBY_SO_SUFFIX=$php_linking
+ RUBY_SO_SUFFIX=$ruby_linking
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Ruby Linking" >&5
$as_echo_n "checking Ruby Linking... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: compile '$RUBY_CFLAGS' link '$RUBY_LDFLAGS' suffix $RUBY_SO_SUFFIX" >&5

View File

@ -37,8 +37,9 @@
%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland/CORE/CORE.bs
%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland/CORE/CORE.so
%%PHP%%lib/php/%%PHP_EXT_DIR%%/redland.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/Redland.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/RDF.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/Redland.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_Redland.so
%%RUBY%%%%RUBY_ARCHLIBDIR%%/redland.so
%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/constants.rb
%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/convert_owl.rb