3 files changed, 21 insertions, 17 deletions

diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index e7decb24ea21..90236f36686a 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rasqal
-PORTVERSION=	0.9.30
+PORTVERSION=	0.9.31
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.librdf.org/source/ \
 		SF/librdf/${PORTNAME}/${PORTVERSION}
@@ -10,8 +10,13 @@ MASTER_SITES=	http://download.librdf.org/source/ \
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	High-level interface for RDF
 
-LIB_DEPENDS=	raptor2:${PORTSDIR}/textproc/raptor2 \
-		pcre:${PORTSDIR}/devel/pcre
+# Even though GPLv3 is not explicitly mentioned in the port's LICENSE.html, one
+# of its licenses is "GPLv2 or newer", which includes GPLv3.
+LICENSE=	AL2 GPLv2 GPLv3 LGPL21
+LICENSE_COMB=	dual
+
+LIB_DEPENDS=	libraptor2.so:${PORTSDIR}/textproc/raptor2 \
+		libpcre.so:${PORTSDIR}/devel/pcre
 
 USE_GNOME=	lthack
 USE_OPENSSL=	yes
@@ -20,25 +25,20 @@ USES=		gmake pathfix pkgconfig perl5
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-MAN1=		rasqal-config.1 roqet.1
-MAN3=		librasqal.3
-
 OPTIONS_RADIO=	DEC
 OPTIONS_RADIO_DEC=	GMP MPFR
 
 GMP_DESC=	Use GMP library for decimals
 MPFR_DESC=	Use MPFR library for decimals
 
-NO_STAGE=	yes
+GMP_CONFIGURE_ON=	--with-decimal=gmp --with-gmp=${LOCALBASE}
+GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+MPFR_CONFIGURE_ON=	--with-decimal=mpfr --with-mpfr=${LOCALBASE}
+MPFR_LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr
+
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MMPFR}
-CONFIGURE_ARGS+=--with-decimal=mpfr --with-mpfr=${LOCALBASE}
-LIB_DEPENDS+=	mpfr:${PORTSDIR}/math/mpfr
-.elif ${PORT_OPTIONS:MGMP}
-CONFIGURE_ARGS+=--with-decimal=gmp
-LIB_DEPENDS+=	gmp:${PORTSDIR}/math/gmp
-.else
+.if empty(PORT_OPTIONS:MMPFR) && empty(PORT_OPTIONS:MGMP)
 CONFIGURE_ARGS+=--with-decimal=none
 .endif
 
diff --git a/textproc/rasqal/distinfo b/textproc/rasqal/distinfo
index 4ac19a7bcf2e..adc35bd447a7 100644
--- a/textproc/rasqal/distinfo
+++ b/textproc/rasqal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rasqal-0.9.30.tar.gz) = abf0e93d80cc79bdf383fd3e904255bf98bc729356d6cf2f673bce74b08b1cfd
-SIZE (rasqal-0.9.30.tar.gz) = 1469921
+SHA256 (rasqal-0.9.31.tar.gz) = 28d743c9f1b0e5b0486ae4a945fa1e021c8495707e7adbfa0e232244b28b7fee
+SIZE (rasqal-0.9.31.tar.gz) = 1530461
diff --git a/textproc/rasqal/pkg-plist b/textproc/rasqal/pkg-plist
index 776f1dafd444..e5ef08014b39 100644
--- a/textproc/rasqal/pkg-plist
+++ b/textproc/rasqal/pkg-plist
@@ -6,6 +6,9 @@ lib/librasqal.la
 lib/librasqal.so
 lib/librasqal.so.3
 libdata/pkgconfig/rasqal.pc
+man/man1/rasqal-config.1.gz
+man/man1/roqet.1.gz
+man/man3/librasqal.3.gz
 share/gtk-doc/html/rasqal/home.png
 share/gtk-doc/html/rasqal/index.html
 share/gtk-doc/html/rasqal/index.sgml
@@ -19,6 +22,7 @@ share/gtk-doc/html/rasqal/rasqal-changes-0-9-25-to-0-9-26.html
 share/gtk-doc/html/rasqal/rasqal-changes-0-9-26-to-0-9-27.html
 share/gtk-doc/html/rasqal/rasqal-changes-0-9-28-to-0-9-29.html
 share/gtk-doc/html/rasqal/rasqal-changes-0-9-29-to-0-9-30.html
+share/gtk-doc/html/rasqal/rasqal-changes-0-9-30-to-0-9-31.html
 share/gtk-doc/html/rasqal/rasqal-changes.html
 share/gtk-doc/html/rasqal/rasqal-section-data.html
 share/gtk-doc/html/rasqal/rasqal-section-expression.html
@@ -44,7 +48,7 @@ share/gtk-doc/html/rasqal/reference-manual.html
 share/gtk-doc/html/rasqal/right.png
 share/gtk-doc/html/rasqal/style.css
 share/gtk-doc/html/rasqal/up.png
-@exec mkdir -p %D/share/gtk-doc/html/rasqal
 @dirrm share/gtk-doc/html/rasqal
+@dirrmtry share/gtk-doc/html
 @dirrmtry share/gtk-doc
 @dirrm include/rasqal