Ticket #31024: patch-redland-pixilla.diff

File patch-redland-pixilla.diff, 5.1 KB (added by pixilla (Bradley Giesbrecht), 13 years ago)

  • www/redland/files/patch-configure.diff

     
    1 diff -ru a/configure b/configure
    2 --- a/configure 2011-07-20 08:09:48.000000000 -0700
    3 +++ b/configure 2011-07-20 08:12:04.000000000 -0700
    4 @@ -12789,6 +12789,8 @@
     1--- a/configure 2011-07-31 14:59:53.000000000 -0700
     2+++ b/configure 2011-07-31 15:00:21.000000000 -0700
     3@@ -13661,6 +13661,8 @@
    54        done
    65      done
    76 
    … …  
    98+    bdb_version=`sed -ne 's/^.*DB_VERSION_STRING.*Berkeley DB \(...\).*/\1/p' $bdb_include_dir/db.h`
    109   fi
    1110 
    12    { $as_echo "$as_me:${as_lineno-$LINENO}: checking BDB version" >&5
    13 diff -ru a/configure.ac b/configure.ac
    14 --- a/configure.ac      2011-07-20 08:09:48.000000000 -0700
    15 +++ b/configure.ac      2011-07-20 08:11:41.000000000 -0700
    16 @@ -283,6 +283,8 @@
    17         done
    18       done
    19  
    20 +  else
    21 +    bdb_version=`sed -ne 's/^.*DB_VERSION_STRING.*Berkeley DB \(...\).*/\1/p' $bdb_include_dir/db.h`
    22    fi
    23  
    24    AC_MSG_CHECKING(BDB version)
     11   { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle Berkeley DB (BDB) version" >&5

  • www/redland/files/patch-redland-raptor2-headers.diff

     
    1 diff -ur a/src/librdf.h b/src/librdf.h
    2 --- a/src/librdf.h      2011-07-19 16:54:49.000000000 -0700
    3 +++ b/src/librdf.h      2011-07-19 18:06:34.000000000 -0700
    4 @@ -28,7 +28,7 @@
    5  
    6  #ifndef LIBRDF_OBJC_FRAMEWORK
    7  /* raptor */
    8 -#include <raptor.h>
    9 +#include <raptor2/raptor2.h>
    10  /* rasqal: uses raptor */
    11  #include <rasqal.h>
    12  /* librdf: uses rasqal and raptor */
    13 diff -ur a/src/librdf.h.in b/src/librdf.h.in
    14 --- a/src/librdf.h.in   2011-07-19 16:54:49.000000000 -0700
    15 +++ b/src/librdf.h.in   2011-07-19 18:06:34.000000000 -0700
    16 @@ -28,7 +28,7 @@
    17  
    18  #ifndef LIBRDF_OBJC_FRAMEWORK
    19  /* raptor */
    20 -#include <raptor.h>
    21 +#include <raptor2/raptor2.h>
    22  /* rasqal: uses raptor */
    23  #include <rasqal.h>
    24  /* librdf: uses rasqal and raptor */
    25 diff -ur a/src/rdf_log.h b/src/rdf_log.h
    26 --- a/src/rdf_log.h     2011-07-19 16:54:49.000000000 -0700
    27 +++ b/src/rdf_log.h     2011-07-19 18:06:34.000000000 -0700
    28 @@ -30,7 +30,7 @@
    29  extern "C" {
    30  #endif
    31  
    32 -#include <raptor.h>
    33 +#include <raptor2/raptor2.h>
    34  
    35  /**
    36   * librdf_log_level:
    37 diff -ur a/src/rdf_serializer.h b/src/rdf_serializer.h
    38 --- a/src/rdf_serializer.h      2011-07-19 16:54:49.000000000 -0700
    39 +++ b/src/rdf_serializer.h      2011-07-19 18:06:34.000000000 -0700
    40 @@ -36,7 +36,7 @@
    41  extern "C" {
    42  #endif
    43  
    44 -#include <raptor.h>
    45 +#include <raptor2/raptor2.h>
    46  
    47  /* class methods */
    48  REDLAND_API
    49 diff -ur a/src/rdf_serializer_internal.h b/src/rdf_serializer_internal.h
    50 --- a/src/rdf_serializer_internal.h     2011-07-19 16:54:49.000000000 -0700
    51 +++ b/src/rdf_serializer_internal.h     2011-07-19 18:06:34.000000000 -0700
    52 @@ -32,7 +32,7 @@
    53  extern "C" {
    54  #endif
    55  
    56 -#include <raptor.h>
    57 +#include <raptor2/raptor2.h>
    58  
    59  struct librdf_serializer_factory_s
    60  {
    61 diff -ur a/utils/rdfproc.c b/utils/rdfproc.c
    62 --- a/utils/rdfproc.c   2011-07-19 16:54:49.000000000 -0700
    63 +++ b/utils/rdfproc.c   2011-07-19 18:06:34.000000000 -0700
    64 @@ -46,7 +46,7 @@
    65  #include <unistd.h>
    66  
    67  #include <redland.h>
    68 -#include <raptor.h>
    69 +#include <raptor2/raptor2.h>
    70  
    71  #ifdef NEED_OPTIND_DECLARATION
    72  extern int optind;
    73 diff -ur a/utils/redland-virtuoso-test.c b/utils/redland-virtuoso-test.c
    74 --- a/utils/redland-virtuoso-test.c     2011-07-19 16:54:49.000000000 -0700
    75 +++ b/utils/redland-virtuoso-test.c     2011-07-19 18:06:32.000000000 -0700
    76 @@ -76,7 +76,7 @@
    77  #include <unistd.h>
    78  
    79  #include <redland.h>
    80 -#include <raptor.h>
    81 +#include <raptor2/raptor2.h>
    82  
    83  
    84  int add_triple(librdf_world *world, librdf_node *context, librdf_model* model, const char *s, const char *p, const char *o);

  • www/redland/Portfile

     
     1# -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
    12# $Id$
    23
    34PortSystem 1.0
    … …  
    23name                redland
    3 version             1.0.13
    4 revision            1
     4version             1.0.14
     5revision            2
    56description         Redland RDF Library
    … …  
    1314homepage            http://librdf.org/
    1415master_sites        http://download.librdf.org/source/
    1516
    16 checksums           sha1    f1b0db76eb02946a1f794b35db726ddfdc936ad6 \
    17                     rmd160  1ebc4a9eb73e022691a34677c5eaf5f17da56d32
     17checksums           sha1    2561bf73f00f88e39f5c7b3a9b78f8d4ce7da955 \
     18                    rmd160  1c58f81106682da3174c05e66a0c77567587be35
    1819
    19 patchfiles          patch-configure.diff \
    20                     patch-redland-raptor2-headers.diff
    21 
     20patchfiles          patch-configure.diff
    2221patch.pre_args      -p1
    2322
    2423depends_lib         port:curl \