3 files changed, 104 insertions, 81 deletions

diff --git a/www/flickcurl/Makefile b/www/flickcurl/Makefile
index 80fa03ebb3e7..17f59a8ae529 100644
--- a/www/flickcurl/Makefile
+++ b/www/flickcurl/Makefile
@@ -2,21 +2,44 @@
 # $FreeBSD$
 
 PORTNAME=	flickcurl
-PORTVERSION=	1.23
+PORTVERSION=	1.24
 CATEGORIES=	www
 MASTER_SITES=	http://download.dajobe.org/flickcurl/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C library for the Flickr API
 
+LICENSE=	AL2 GPLv2 LGPL21
+LICENSE_COMB=	dual
+
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
+OPTIONS_DEFINE=	RAPTOR DOCS
+OPTIONS_DEFAULT=RAPTOR
+RAPTOR_DESC=	Use Raptor to serialize to triples
+
+USES=		pathfix pkgconfig
+USE_GNOME=	ltverhack libxml2
 USE_AUTOTOOLS=	libtool
-USES=        pathfix
-USE_GNOME=	ltverhack libxml2 pkgconfig
+CONFIGURE_ARGS=	--with-html-dir=${WRKDIR}/tmproot
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
+MAKE_JOBS_SAFE=	yes
+
+MAN1=		flickcurl.1 flickcurl-config.1 flickrdf.1
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MRAPTOR}
+LIB_DEPENDS+=	raptor2:${PORTSDIR}/textproc/raptor2
+CONFIGURE_ARGS+=--with-raptor=2
+.else
+CONFIGURE_ARGS+=--with-raptor=no
+.endif
 
-MAN1=		flickrdf.1 flickcurl.1 flickcurl-config.1
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	@(cd ${WRKDIR}/tmproot/flickcurl && ${COPYTREE_SHARE} . ${DOCSDIR})
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/flickcurl/distinfo b/www/flickcurl/distinfo
index a7b8c3f4bf3d..e4fc48d8e3b7 100644
--- a/www/flickcurl/distinfo
+++ b/www/flickcurl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (flickcurl-1.23.tar.gz) = e0fb01deef517149fcb76f775e34b7264465e03d6c57b2f265bbb2eb71483285
-SIZE (flickcurl-1.23.tar.gz) = 1847951
+SHA256 (flickcurl-1.24.tar.gz) = 61f1a908ae2342490218dd9b435fc408bc5d22ce5f046c7cf9f742cab68502a8
+SIZE (flickcurl-1.24.tar.gz) = 1852406
diff --git a/www/flickcurl/pkg-plist b/www/flickcurl/pkg-plist
index 17f3508c1b66..fea3ffec4419 100644
--- a/www/flickcurl/pkg-plist
+++ b/www/flickcurl/pkg-plist
@@ -7,77 +7,77 @@ lib/libflickcurl.la
 lib/libflickcurl.so
 lib/libflickcurl.so.0
 libdata/pkgconfig/flickcurl.pc
-%%DOCSDIR%%/appgarden-commercial-picker.png
-%%DOCSDIR%%/appgarden-edit-auth-flow-mobile.png
-%%DOCSDIR%%/appgarden-edit-auth-flow.png
-%%DOCSDIR%%/appgarden-get-your-api-key.png
-%%DOCSDIR%%/appgarden-mobile-auth-page.png
-%%DOCSDIR%%/appgarden-new-api-key-secret.png
-%%DOCSDIR%%/appgarden-tell-us-about-your-app.png
-%%DOCSDIR%%/appgarden-test-app-page.png
-%%DOCSDIR%%/flickcurl-auth-authenticate.html
-%%DOCSDIR%%/flickcurl-auth-build.html
-%%DOCSDIR%%/flickcurl-auth-register.html
-%%DOCSDIR%%/flickcurl-auth-upgrade.html
-%%DOCSDIR%%/flickcurl-auth-use.html
-%%DOCSDIR%%/flickcurl-auth.html
-%%DOCSDIR%%/flickcurl-legacy-auth-authenticate.html
-%%DOCSDIR%%/flickcurl-legacy-auth-build.html
-%%DOCSDIR%%/flickcurl-legacy-auth-register.html
-%%DOCSDIR%%/flickcurl-legacy-auth-use.html
-%%DOCSDIR%%/flickcurl-legacy-auth.html
-%%DOCSDIR%%/flickcurl-searching-search-example.html
-%%DOCSDIR%%/flickcurl-searching-search-extras.html
-%%DOCSDIR%%/flickcurl-searching-search-paging.html
-%%DOCSDIR%%/flickcurl-searching-search-parameters.html
-%%DOCSDIR%%/flickcurl-searching-search-result-formats.html
-%%DOCSDIR%%/flickcurl-searching-search-results.html
-%%DOCSDIR%%/flickcurl-searching-search-run.html
-%%DOCSDIR%%/flickcurl-searching.html
-%%DOCSDIR%%/flickcurl-section-activity.html
-%%DOCSDIR%%/flickcurl-section-auth.html
-%%DOCSDIR%%/flickcurl-section-blogs.html
-%%DOCSDIR%%/flickcurl-section-category.html
-%%DOCSDIR%%/flickcurl-section-collections.html
-%%DOCSDIR%%/flickcurl-section-config.html
-%%DOCSDIR%%/flickcurl-section-comment.html
-%%DOCSDIR%%/flickcurl-section-commons.html
-%%DOCSDIR%%/flickcurl-section-contact.html
-%%DOCSDIR%%/flickcurl-section-context.html
-%%DOCSDIR%%/flickcurl-section-core.html
-%%DOCSDIR%%/flickcurl-section-exif.html
-%%DOCSDIR%%/flickcurl-section-favorite.html
-%%DOCSDIR%%/flickcurl-section-gallery.html
-%%DOCSDIR%%/flickcurl-section-general.html
-%%DOCSDIR%%/flickcurl-section-group.html
-%%DOCSDIR%%/flickcurl-section-machinetags.html
-%%DOCSDIR%%/flickcurl-section-misc.html
-%%DOCSDIR%%/flickcurl-section-note.html
-%%DOCSDIR%%/flickcurl-section-panda.html
-%%DOCSDIR%%/flickcurl-section-people.html
-%%DOCSDIR%%/flickcurl-section-person.html
-%%DOCSDIR%%/flickcurl-section-photo.html
-%%DOCSDIR%%/flickcurl-section-photos-people.html
-%%DOCSDIR%%/flickcurl-section-photoset.html
-%%DOCSDIR%%/flickcurl-section-photoslist.html
-%%DOCSDIR%%/flickcurl-section-place.html
-%%DOCSDIR%%/flickcurl-section-prefs.html
-%%DOCSDIR%%/flickcurl-section-reflection.html
-%%DOCSDIR%%/flickcurl-section-tag.html
-%%DOCSDIR%%/flickcurl-section-serializer.html
-%%DOCSDIR%%/flickcurl-section-stats.html
-%%DOCSDIR%%/flickcurl-section-test.html
-%%DOCSDIR%%/flickcurl-section-upload.html
-%%DOCSDIR%%/flickcurl-section-urls.html
-%%DOCSDIR%%/flickcurl-section-video.html
-%%DOCSDIR%%/flickcurl.devhelp2
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/indexes.html
-%%DOCSDIR%%/introduction.html
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/appgarden-commercial-picker.png
+%%PORTDOCS%%%%DOCSDIR%%/appgarden-edit-auth-flow-mobile.png
+%%PORTDOCS%%%%DOCSDIR%%/appgarden-edit-auth-flow.png
+%%PORTDOCS%%%%DOCSDIR%%/appgarden-get-your-api-key.png
+%%PORTDOCS%%%%DOCSDIR%%/appgarden-mobile-auth-page.png
+%%PORTDOCS%%%%DOCSDIR%%/appgarden-new-api-key-secret.png
+%%PORTDOCS%%%%DOCSDIR%%/appgarden-tell-us-about-your-app.png
+%%PORTDOCS%%%%DOCSDIR%%/appgarden-test-app-page.png
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-auth-authenticate.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-auth-build.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-auth-register.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-auth-upgrade.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-auth-use.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-auth.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-legacy-auth-authenticate.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-legacy-auth-build.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-legacy-auth-register.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-legacy-auth-use.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-legacy-auth.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-searching-search-example.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-searching-search-extras.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-searching-search-paging.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-searching-search-parameters.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-searching-search-result-formats.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-searching-search-results.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-searching-search-run.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-searching.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-activity.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-auth.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-blogs.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-category.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-collections.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-comment.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-commons.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-config.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-contact.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-context.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-core.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-exif.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-favorite.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-gallery.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-general.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-group.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-machinetags.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-misc.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-note.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-panda.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-people.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-person.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-photo.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-photos-people.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-photoset.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-photoslist.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-place.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-prefs.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-reflection.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-serializer.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-stats.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-tag.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-test.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-upload.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-urls.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl-section-video.html
+%%PORTDOCS%%%%DOCSDIR%%/flickcurl.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%/home.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%/indexes.html
+%%PORTDOCS%%%%DOCSDIR%%/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/left.png
+%%PORTDOCS%%%%DOCSDIR%%/right.png
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/up.png
+%%PORTDOCS%%@dirrm %%DOCSDIR%%