8 files changed, 24 insertions, 300 deletions
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index fe9c99811de0..eae26890d0cd 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	raptor
-PORTVERSION=	1.4.13
-PORTREVISION=	1
+PORTVERSION=	1.4.15
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://download.librdf.org/source/
diff --git a/textproc/raptor/distinfo b/textproc/raptor/distinfo
index 8583eadf1ad8..6e291e148087 100644
--- a/textproc/raptor/distinfo
+++ b/textproc/raptor/distinfo
@@ -1,3 +1,3 @@
-MD5 (raptor-1.4.13.tar.gz) = a00b9685dd42d29537a4ff6bc94efabd
-SHA256 (raptor-1.4.13.tar.gz) = f017a49515e19527914770e8659e7b1a487ee829bf85d6698fdf25ef81883533
-SIZE (raptor-1.4.13.tar.gz) = 1412413
+MD5 (raptor-1.4.15.tar.gz) = 658fac0c25d50274c879f6cc49c3364b
+SHA256 (raptor-1.4.15.tar.gz) = df391e58c8ee3cd1efd8f1bef7ae6dc103c1479ec9e54511e5a933d057983efc
+SIZE (raptor-1.4.15.tar.gz) = 1445553
diff --git a/textproc/raptor/files/patch-configure b/textproc/raptor/files/patch-configure
index 9501209fda7c..29193e463246 100644
--- a/textproc/raptor/files/patch-configure
+++ b/textproc/raptor/files/patch-configure
@@ -1,81 +1,15 @@
---- configure.orig	Mon Dec 11 15:16:01 2006
-+++ configure	Mon Dec 11 15:28:29 2006
-@@ -19868,6 +19868,74 @@
+--- configure.orig	Thu Jul 12 20:58:13 2007
++++ configure	Thu Jul 12 20:59:37 2007
+@@ -19368,6 +19368,8 @@
  
  
  
-+# Check whether --with-curl-config was given.
-+if test "${with_curl_config+set}" = set; then
-+  withval=$with_curl_config; curl_config="$withval"
-+else
-+  curl_config=""
-+fi
-+
-+
-+if test "X$curl_config" != "X" ; then
-+  { echo "$as_me:$LINENO: checking for $curl_config" >&5
-+echo $ECHO_N "checking for $curl_config... $ECHO_C" >&6; }
-+
-+  if test -f $curl_config ; then
-+    CURL_CONFIG=$curl_config
-+    { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+  else
-+    { echo "$as_me:$LINENO: result: no - searching PATH" >&5
-+echo "${ECHO_T}no - searching PATH" >&6; }
-+  fi
-+fi
-+if test "X$CURL_CONFIG" = "X"; then
-+  for ac_prog in curl-config
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CURL_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$CURL_CONFIG"; then
-+  ac_cv_prog_CURL_CONFIG="$CURL_CONFIG" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CURL_CONFIG="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CURL_CONFIG=$ac_cv_prog_CURL_CONFIG
-+if test -n "$CURL_CONFIG"; then
-+  { echo "$as_me:$LINENO: result: $CURL_CONFIG" >&5
-+echo "${ECHO_T}$CURL_CONFIG" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+  test -n "$CURL_CONFIG" && break
-+done
-+
-+fi
-+
 +oCPPFLAGS="$CPPFLAGS"
 +CPPFLAGS="$CPPFLAGS `$CURL_CONFIG --cflags`"
  
  for ac_header in errno.h stdlib.h unistd.h string.h limits.h dmalloc.h getopt.h sys/stat.h curl/curl.h libxml/nanohttp.h sys/param.h sys/time.h
  do
-@@ -20037,6 +20105,9 @@
+@@ -19513,6 +19515,9 @@
  
  done
  
@@ -85,80 +19,7 @@
  { echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
  echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
  if test "${ac_cv_header_time+set}" = set; then
-@@ -23931,72 +24002,6 @@
- fi
- 
- 
--# Check whether --with-curl-config was given.
--if test "${with_curl_config+set}" = set; then
--  withval=$with_curl_config; curl_config="$withval"
--else
--  curl_config=""
--fi
--
--
--if test "X$curl_config" != "X" ; then
--  { echo "$as_me:$LINENO: checking for $curl_config" >&5
--echo $ECHO_N "checking for $curl_config... $ECHO_C" >&6; }
--
--  if test -f $curl_config ; then
--    CURL_CONFIG=$curl_config
--    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--  else
--    { echo "$as_me:$LINENO: result: no - searching PATH" >&5
--echo "${ECHO_T}no - searching PATH" >&6; }
--  fi
--fi
--if test "X$CURL_CONFIG" = "X"; then
--  for ac_prog in curl-config
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_CURL_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$CURL_CONFIG"; then
--  ac_cv_prog_CURL_CONFIG="$CURL_CONFIG" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_prog_CURL_CONFIG="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--fi
--fi
--CURL_CONFIG=$ac_cv_prog_CURL_CONFIG
--if test -n "$CURL_CONFIG"; then
--  { echo "$as_me:$LINENO: result: $CURL_CONFIG" >&5
--echo "${ECHO_T}$CURL_CONFIG" >&6; }
--else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
--  test -n "$CURL_CONFIG" && break
--done
--
--fi
--
- 
- oLIBS="$LIBS"
- 
-@@ -25623,7 +25628,9 @@
+@@ -24381,7 +24386,9 @@
  
  oCPPFLAGS="$CPPFLAGS"
  if test "X$CURL_CONFIG" != X; then
@@ -168,7 +29,7 @@
    LIBS="$LIBS `$CURL_CONFIG --libs`"
    { echo "$as_me:$LINENO: checking for curl_easy_init" >&5
  echo $ECHO_N "checking for curl_easy_init... $ECHO_C" >&6; }
-@@ -25728,6 +25735,7 @@
+@@ -24470,6 +24477,7 @@
    have_curl_easy_init=no
  fi
  
diff --git a/textproc/raptor/pkg-plist b/textproc/raptor/pkg-plist
index 03f523c1c52f..4084a7bab739 100644
--- a/textproc/raptor/pkg-plist
+++ b/textproc/raptor/pkg-plist
@@ -45,11 +45,13 @@ share/gtk-doc/html/raptor/reference-manual.html
 share/gtk-doc/html/raptor/restrict-parser-network-access.html
 share/gtk-doc/html/raptor/right.png
 share/gtk-doc/html/raptor/serializer-atom.html
+share/gtk-doc/html/raptor/serializer-dot.html
 share/gtk-doc/html/raptor/serializer-ntriples.html
 share/gtk-doc/html/raptor/serializer-rdfxml-abbrev.html
 share/gtk-doc/html/raptor/serializer-rdfxml-xmp.html
 share/gtk-doc/html/raptor/serializer-rdfxml.html
 share/gtk-doc/html/raptor/serializer-rss-1-0.html
+share/gtk-doc/html/raptor/serializer-turtle.html
 share/gtk-doc/html/raptor/style.css
 share/gtk-doc/html/raptor/tutorial-initialising-finishing.html
 share/gtk-doc/html/raptor/tutorial-serializer-get-triples.html
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index fe9c99811de0..eae26890d0cd 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	raptor
-PORTVERSION=	1.4.13
-PORTREVISION=	1
+PORTVERSION=	1.4.15
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://download.librdf.org/source/
diff --git a/textproc/raptor2/distinfo b/textproc/raptor2/distinfo
index 8583eadf1ad8..6e291e148087 100644
--- a/textproc/raptor2/distinfo
+++ b/textproc/raptor2/distinfo
@@ -1,3 +1,3 @@
-MD5 (raptor-1.4.13.tar.gz) = a00b9685dd42d29537a4ff6bc94efabd
-SHA256 (raptor-1.4.13.tar.gz) = f017a49515e19527914770e8659e7b1a487ee829bf85d6698fdf25ef81883533
-SIZE (raptor-1.4.13.tar.gz) = 1412413
+MD5 (raptor-1.4.15.tar.gz) = 658fac0c25d50274c879f6cc49c3364b
+SHA256 (raptor-1.4.15.tar.gz) = df391e58c8ee3cd1efd8f1bef7ae6dc103c1479ec9e54511e5a933d057983efc
+SIZE (raptor-1.4.15.tar.gz) = 1445553
diff --git a/textproc/raptor2/files/patch-configure b/textproc/raptor2/files/patch-configure
index 9501209fda7c..29193e463246 100644
--- a/textproc/raptor2/files/patch-configure
+++ b/textproc/raptor2/files/patch-configure
@@ -1,81 +1,15 @@
---- configure.orig	Mon Dec 11 15:16:01 2006
-+++ configure	Mon Dec 11 15:28:29 2006
-@@ -19868,6 +19868,74 @@
+--- configure.orig	Thu Jul 12 20:58:13 2007
++++ configure	Thu Jul 12 20:59:37 2007
+@@ -19368,6 +19368,8 @@
  
  
  
-+# Check whether --with-curl-config was given.
-+if test "${with_curl_config+set}" = set; then
-+  withval=$with_curl_config; curl_config="$withval"
-+else
-+  curl_config=""
-+fi
-+
-+
-+if test "X$curl_config" != "X" ; then
-+  { echo "$as_me:$LINENO: checking for $curl_config" >&5
-+echo $ECHO_N "checking for $curl_config... $ECHO_C" >&6; }
-+
-+  if test -f $curl_config ; then
-+    CURL_CONFIG=$curl_config
-+    { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+  else
-+    { echo "$as_me:$LINENO: result: no - searching PATH" >&5
-+echo "${ECHO_T}no - searching PATH" >&6; }
-+  fi
-+fi
-+if test "X$CURL_CONFIG" = "X"; then
-+  for ac_prog in curl-config
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CURL_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$CURL_CONFIG"; then
-+  ac_cv_prog_CURL_CONFIG="$CURL_CONFIG" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CURL_CONFIG="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CURL_CONFIG=$ac_cv_prog_CURL_CONFIG
-+if test -n "$CURL_CONFIG"; then
-+  { echo "$as_me:$LINENO: result: $CURL_CONFIG" >&5
-+echo "${ECHO_T}$CURL_CONFIG" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+  test -n "$CURL_CONFIG" && break
-+done
-+
-+fi
-+
 +oCPPFLAGS="$CPPFLAGS"
 +CPPFLAGS="$CPPFLAGS `$CURL_CONFIG --cflags`"
  
  for ac_header in errno.h stdlib.h unistd.h string.h limits.h dmalloc.h getopt.h sys/stat.h curl/curl.h libxml/nanohttp.h sys/param.h sys/time.h
  do
-@@ -20037,6 +20105,9 @@
+@@ -19513,6 +19515,9 @@
  
  done
  
@@ -85,80 +19,7 @@
  { echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
  echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
  if test "${ac_cv_header_time+set}" = set; then
-@@ -23931,72 +24002,6 @@
- fi
- 
- 
--# Check whether --with-curl-config was given.
--if test "${with_curl_config+set}" = set; then
--  withval=$with_curl_config; curl_config="$withval"
--else
--  curl_config=""
--fi
--
--
--if test "X$curl_config" != "X" ; then
--  { echo "$as_me:$LINENO: checking for $curl_config" >&5
--echo $ECHO_N "checking for $curl_config... $ECHO_C" >&6; }
--
--  if test -f $curl_config ; then
--    CURL_CONFIG=$curl_config
--    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--  else
--    { echo "$as_me:$LINENO: result: no - searching PATH" >&5
--echo "${ECHO_T}no - searching PATH" >&6; }
--  fi
--fi
--if test "X$CURL_CONFIG" = "X"; then
--  for ac_prog in curl-config
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_CURL_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$CURL_CONFIG"; then
--  ac_cv_prog_CURL_CONFIG="$CURL_CONFIG" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_prog_CURL_CONFIG="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--fi
--fi
--CURL_CONFIG=$ac_cv_prog_CURL_CONFIG
--if test -n "$CURL_CONFIG"; then
--  { echo "$as_me:$LINENO: result: $CURL_CONFIG" >&5
--echo "${ECHO_T}$CURL_CONFIG" >&6; }
--else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
--  test -n "$CURL_CONFIG" && break
--done
--
--fi
--
- 
- oLIBS="$LIBS"
- 
-@@ -25623,7 +25628,9 @@
+@@ -24381,7 +24386,9 @@
  
  oCPPFLAGS="$CPPFLAGS"
  if test "X$CURL_CONFIG" != X; then
@@ -168,7 +29,7 @@
    LIBS="$LIBS `$CURL_CONFIG --libs`"
    { echo "$as_me:$LINENO: checking for curl_easy_init" >&5
  echo $ECHO_N "checking for curl_easy_init... $ECHO_C" >&6; }
-@@ -25728,6 +25735,7 @@
+@@ -24470,6 +24477,7 @@
    have_curl_easy_init=no
  fi
  
diff --git a/textproc/raptor2/pkg-plist b/textproc/raptor2/pkg-plist
index 03f523c1c52f..4084a7bab739 100644
--- a/textproc/raptor2/pkg-plist
+++ b/textproc/raptor2/pkg-plist
@@ -45,11 +45,13 @@ share/gtk-doc/html/raptor/reference-manual.html
 share/gtk-doc/html/raptor/restrict-parser-network-access.html
 share/gtk-doc/html/raptor/right.png
 share/gtk-doc/html/raptor/serializer-atom.html
+share/gtk-doc/html/raptor/serializer-dot.html
 share/gtk-doc/html/raptor/serializer-ntriples.html
 share/gtk-doc/html/raptor/serializer-rdfxml-abbrev.html
 share/gtk-doc/html/raptor/serializer-rdfxml-xmp.html
 share/gtk-doc/html/raptor/serializer-rdfxml.html
 share/gtk-doc/html/raptor/serializer-rss-1-0.html
+share/gtk-doc/html/raptor/serializer-turtle.html
 share/gtk-doc/html/raptor/style.css
 share/gtk-doc/html/raptor/tutorial-initialising-finishing.html
 share/gtk-doc/html/raptor/tutorial-serializer-get-triples.html