From tkato@prontomail.com  Mon Apr 21 10:36:41 2003
Return-Path: <tkato@prontomail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7A4E137B405
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 21 Apr 2003 10:36:41 -0700 (PDT)
Received: from hfep02.dion.ne.jp (hfep02.dion.ne.jp [203.181.105.68])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2093F43FDD
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 21 Apr 2003 10:36:40 -0700 (PDT)
	(envelope-from tkato@prontomail.com)
Received: from localhost ([218.222.181.213]) by hfep02.dion.ne.jp with SMTP
          id <20030421173635111.YOIM@hfep02.dion.ne.jp>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Tue, 22 Apr 2003 02:36:35 +0900
Message-Id: <20030422023322.10412f3f.tkato@prontomail.com>
Date: Tue, 22 Apr 2003 02:33:22 +0900
From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port: textproc/redland to 0.9.12

>Number:         51238
>Category:       ports
>Synopsis:       Update port: textproc/redland to 0.9.12
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 21 10:40:16 PDT 2003
>Closed-Date:    Sat May 17 21:04:02 CDT 2003
>Last-Modified:  Sat May 17 21:04:02 CDT 2003
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 0.9.12

New file:
files/patch-ltmain.sh

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/textproc/redland/Makefile textproc/redland/Makefile
--- /usr/ports/textproc/redland/Makefile	Sat Apr 12 23:29:18 2003
+++ textproc/redland/Makefile	Fri Apr 18 22:05:09 2003
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	redland
-PORTVERSION=	0.9.11
-PORTREVISION=	2
+PORTVERSION=	0.9.12
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.redland.opensource.ac.uk/dist/source/
@@ -18,7 +17,6 @@
 COMMENT=	A high-level interface for RDF
 
 LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2 \
-		gdbm.3:${PORTSDIR}/databases/gdbm \
 		expat.4:${PORTSDIR}/textproc/expat2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xmlparse.1:${PORTSDIR}/www/libwww
@@ -27,15 +25,20 @@
 
 USE_OPENSSL=	yes
 USE_PERL5=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/db2 -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-bdb=${LOCALBASE} --with-libwww
 INSTALLS_SHLIB=	yes
 
-MAN3=		redland.3
+MAN1=		rapper.1
+MAN3=		libraptor.3 redland.3
 
-CPPFLAGS=	-I${LOCALBASE}/include/db2 -I${LOCALBASE}/include \
-		`${LIBWWW_CONFIG} --cflags`
-LDFLAGS=	-L${LOCALBASE}/lib `${LIBWWW_CONFIG} --libs`
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
+		's|\@INSTALL\@|/usr/bin/install -c|g ; \
+		 s|^CPPFLAGS = -I|CPPFLAGS = \@CPPFLAGS\@ -I|g ; \
+		 s|^LDFLAGS = \@LIBRDF_|LDFLAGS = \@LDFLAGS\@ \@LIBRDF_|g ; \
+		 s|^LIBS = \@LIBRDF_|LIBS = \@LIBS\@ \@LIBRDF_|g'
 
 .include <bsd.port.mk>
diff -urN /usr/ports/textproc/redland/distinfo textproc/redland/distinfo
--- /usr/ports/textproc/redland/distinfo	Tue Sep 10 20:28:56 2002
+++ textproc/redland/distinfo	Fri Apr 18 18:25:16 2003
@@ -1 +1 @@
-MD5 (redland-0.9.11.tar.gz) = 3aa452e98b6a16f804843ba9df106daf
+MD5 (redland-0.9.12.tar.gz) = 545ffc5e1da2e240392b0dbe32afa821
diff -urN /usr/ports/textproc/redland/files/patch-configure textproc/redland/files/patch-configure
--- /usr/ports/textproc/redland/files/patch-configure	Tue Jul 16 06:43:23 2002
+++ textproc/redland/files/patch-configure	Fri Apr 18 21:32:57 2003
@@ -1,10 +1,50 @@
---- configure.orig	Sun Jun  9 05:34:13 2002
-+++ configure	Tue Jul 16 04:47:28 2002
-@@ -5610,6 +5610,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+--- configure.orig	Thu Feb 13 11:00:47 2003
++++ configure	Fri Apr 18 21:32:50 2003
+@@ -6626,9 +6626,9 @@
+ 
+ fi
+ 
+-CPPFLAGS="$LIBRDF_CPPFLAGS"
+-LDFLAGS="$LIBRDF_LDFLAGS"
+-LIBS="$LIBRDF_LIBS"
++CPPFLAGS="$LIBRDF_CPPFLAGS $CPPFLAGS"
++LDFLAGS="$LIBRDF_LDFLAGS $LDFLAGS"
++LIBS="$LIBRDF_LIBS $LIBS"
+ 
+ 
+ if test "$have_libdb" != yes; then
+@@ -7294,9 +7294,9 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-CPPFLAGS="$LIBRDF_CPPFLAGS"
+-LDFLAGS="$LIBRDF_LDFLAGS"
+-LIBS="$LIBRDF_LIBS"
++CPPFLAGS="$LIBRDF_CPPFLAGS $CPPFLAGS"
++LDFLAGS="$LIBRDF_LDFLAGS $LDFLAGS"
++LIBS="$LIBRDF_LIBS $LIBS"
+ 
+ 
+ 
+@@ -7730,7 +7730,7 @@
+       have_libxml=0
+     fi
+ 
+-    CPPFLAGS="$LIBRDF_CPPFLAGS"
++    CPPFLAGS="$LIBRDF_CPPFLAGS $CPPFLAGS"
+ 
+   else
+     echo "$ac_t""no" 1>&6
+@@ -8328,9 +8328,9 @@
+   CFLAGS="$MAINTAINER_CFLAGS $CFLAGS"
+ fi
+ 
+-LIBS=
+-CPPFLAGS=
+-LDFLAGS=
++#LIBS=
++#CPPFLAGS=
++#LDFLAGS=
+ 
+ 
  
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff -urN /usr/ports/textproc/redland/files/patch-ltmain.sh textproc/redland/files/patch-ltmain.sh
--- /usr/ports/textproc/redland/files/patch-ltmain.sh	Thu Jan  1 09:00:00 1970
+++ textproc/redland/files/patch-ltmain.sh	Fri Apr 18 21:33:33 2003
@@ -0,0 +1,15 @@
+--- ltmain.sh.orig	Fri Jul 19 07:09:02 2002
++++ ltmain.sh	Fri Apr 18 21:33:19 2003
+@@ -4274,10 +4274,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff -urN /usr/ports/textproc/redland/pkg-plist textproc/redland/pkg-plist
--- /usr/ports/textproc/redland/pkg-plist	Tue Jan 14 18:48:51 2003
+++ textproc/redland/pkg-plist	Fri Apr 18 21:42:37 2003
@@ -1,11 +1,15 @@
+bin/rapper
+bin/raptor-config
 bin/redland-config
+bin/redland-db-upgrade
 include/librdf.h
+include/ntriples.h
+include/raptor.h
 include/rdf_concepts.h
 include/rdf_digest.h
 include/rdf_files.h
 include/rdf_hash.h
 include/rdf_hash_bdb.h
-include/rdf_hash_gdbm.h
 include/rdf_hash_memory.h
 include/rdf_heuristics.h
 include/rdf_init.h
@@ -26,7 +30,9 @@
 include/rdf_uri.h
 include/rdf_utf8.h
 include/redland.h
+lib/libraptor.a
+lib/libraptor.so
+lib/libraptor.so.0
 lib/librdf.a
 lib/librdf.so
 lib/librdf.so.0
-@dirrm share/redland
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: petef 
State-Changed-When: Sat May 17 21:04:01 CDT 2003 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=51238 
>Unformatted:
