aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--textproc/raptor/Makefile18
-rw-r--r--textproc/raptor/distinfo2
-rw-r--r--textproc/raptor/files/patch-configure10
-rw-r--r--textproc/raptor/pkg-plist2
-rw-r--r--textproc/raptor2/Makefile18
-rw-r--r--textproc/raptor2/distinfo2
-rw-r--r--textproc/raptor2/files/patch-configure10
-rw-r--r--textproc/raptor2/pkg-plist2
8 files changed, 48 insertions, 16 deletions
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index c9632af211b0..a35b23124571 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= raptor
-PORTVERSION= 0.9.3
+PORTVERSION= 0.9.5
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.redland.opensource.ac.uk/dist/source/
@@ -15,13 +15,17 @@ MASTER_SITE_SUBDIR= librdf
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2 \
- xmlparse:${PORTSDIR}/www/libwww \
- gnugetopt:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
+ expat.2:${PORTSDIR}/textproc/expat2 \
+ xmlparse.1:${PORTSDIR}/www/libwww
LIBWWW_CONFIG= ${LOCALBASE}/bin/libwww-config
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include `${LIBWWW_CONFIG} --cflags`" \
- LIBS="-L${LOCALBASE}/lib -lgnugetopt `${LIBWWW_CONFIG} --libs`"
+
+USE_LIBTOOL= yes
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+INSTALLS_SHLIB= yes
+
+CPPFLAGS= -I${LOCALBASE}/include `${LIBWWW_CONFIG} --cflags`
+LDFLAGS= -L${LOCALBASE}/lib -lgnugetopt `${LIBWWW_CONFIG} --libs`
.include <bsd.port.mk>
diff --git a/textproc/raptor/distinfo b/textproc/raptor/distinfo
index d16f5fa18f6f..fdba779ecfd9 100644
--- a/textproc/raptor/distinfo
+++ b/textproc/raptor/distinfo
@@ -1 +1 @@
-MD5 (raptor-0.9.3.tar.gz) = 1651edd954fe12d1bc7b937b0b5d23c6
+MD5 (raptor-0.9.5.tar.gz) = 8d8a93323ff6de7ae4f1fed1ba80a6cb
diff --git a/textproc/raptor/files/patch-configure b/textproc/raptor/files/patch-configure
new file mode 100644
index 000000000000..08c4af342534
--- /dev/null
+++ b/textproc/raptor/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig Sat Jun 8 23:23:14 2002
++++ configure Tue Jul 16 04:34:41 2002
+@@ -5443,6 +5443,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/textproc/raptor/pkg-plist b/textproc/raptor/pkg-plist
index a78aedcb98d8..2787e8d16040 100644
--- a/textproc/raptor/pkg-plist
+++ b/textproc/raptor/pkg-plist
@@ -2,3 +2,5 @@ bin/rdfdump
include/ntriples.h
include/raptor.h
lib/libraptor.a
+lib/libraptor.so
+lib/libraptor.so.0
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index c9632af211b0..a35b23124571 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= raptor
-PORTVERSION= 0.9.3
+PORTVERSION= 0.9.5
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.redland.opensource.ac.uk/dist/source/
@@ -15,13 +15,17 @@ MASTER_SITE_SUBDIR= librdf
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2 \
- xmlparse:${PORTSDIR}/www/libwww \
- gnugetopt:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
+ expat.2:${PORTSDIR}/textproc/expat2 \
+ xmlparse.1:${PORTSDIR}/www/libwww
LIBWWW_CONFIG= ${LOCALBASE}/bin/libwww-config
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include `${LIBWWW_CONFIG} --cflags`" \
- LIBS="-L${LOCALBASE}/lib -lgnugetopt `${LIBWWW_CONFIG} --libs`"
+
+USE_LIBTOOL= yes
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+INSTALLS_SHLIB= yes
+
+CPPFLAGS= -I${LOCALBASE}/include `${LIBWWW_CONFIG} --cflags`
+LDFLAGS= -L${LOCALBASE}/lib -lgnugetopt `${LIBWWW_CONFIG} --libs`
.include <bsd.port.mk>
diff --git a/textproc/raptor2/distinfo b/textproc/raptor2/distinfo
index d16f5fa18f6f..fdba779ecfd9 100644
--- a/textproc/raptor2/distinfo
+++ b/textproc/raptor2/distinfo
@@ -1 +1 @@
-MD5 (raptor-0.9.3.tar.gz) = 1651edd954fe12d1bc7b937b0b5d23c6
+MD5 (raptor-0.9.5.tar.gz) = 8d8a93323ff6de7ae4f1fed1ba80a6cb
diff --git a/textproc/raptor2/files/patch-configure b/textproc/raptor2/files/patch-configure
new file mode 100644
index 000000000000..08c4af342534
--- /dev/null
+++ b/textproc/raptor2/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig Sat Jun 8 23:23:14 2002
++++ configure Tue Jul 16 04:34:41 2002
+@@ -5443,6 +5443,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/textproc/raptor2/pkg-plist b/textproc/raptor2/pkg-plist
index a78aedcb98d8..2787e8d16040 100644
--- a/textproc/raptor2/pkg-plist
+++ b/textproc/raptor2/pkg-plist
@@ -2,3 +2,5 @@ bin/rdfdump
include/ntriples.h
include/raptor.h
lib/libraptor.a
+lib/libraptor.so
+lib/libraptor.so.0