4 files changed, 27 insertions, 89 deletions

diff --git a/graphics/frei0r/Makefile b/graphics/frei0r/Makefile
index 7d17321e380a..9a994623bb67 100644
--- a/graphics/frei0r/Makefile
+++ b/graphics/frei0r/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	frei0r
-PORTVERSION=	1.2.1
+PORTVERSION=	1.3
 DISTVERSIONPREFIX=	plugins-
 CATEGORIES=	graphics
 MASTER_SITES=	http://piksel.no/${PORTNAME}/releases/ \
@@ -27,45 +27,34 @@ MAKE_JOBS_SAFE=	yes
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-PORTDOCS=	AUTHORS ChangeLog README TODO
+PORTDOCS=	*
 
 OPTIONS=	APIDOC "Install full documentation (requires doxygen)" off \
 		MMX "Enable MMX CPU instructions" off
 
-.include <bsd.port.pre.mk>
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-.if ${ARCH} == "amd64"
-USE_GCC=	4.2+
-.endif
+.include <bsd.port.options.mk>
 
-.if defined(WITH_APIDOC)
+.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-PLIST_SUB+=	APIDOC=""
-.else
-PLIST_SUB+=	APIDOC="@comment "
 .endif
 
 .if !defined(WITH_MMX)
 CONFIGURE_ARGS+=--disable-cpuflags
 .endif
 
-post-extract:
-	@${TOUCH} ${WRKSRC}/include/config.h.in
-
 post-patch:
-.if defined(WITH_APIDOC)
+.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|include|include doc|' ${WRKSRC}/Makefile.in
 .endif
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e '/^install-data-am/s| install-docsDATA||' \
+		${WRKSRC}/Makefile.in
+.endif
 	@${REINPLACE_CMD} -e 's|^docsdir.*|docsdir = ${DOCSDIR}|' \
-			  -e '/^install-data-am/s| install-docsDATA||' \
-				${WRKSRC}/Makefile.in
+		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|^htmldocsdir.*|htmldocsdir = ${DOCSDIR}|' \
-				${WRKSRC}/doc/Makefile.in
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+		${WRKSRC}/doc/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/frei0r/distinfo b/graphics/frei0r/distinfo
index 229fc359f8ca..14ff0b97a219 100644
--- a/graphics/frei0r/distinfo
+++ b/graphics/frei0r/distinfo
@@ -1,2 +1,2 @@
-SHA256 (frei0r-plugins-1.2.1.tar.gz) = 375cd80f03a2bbcecc585487147120952cda99b9d5fe26c0232c233d3525de5b
-SIZE (frei0r-plugins-1.2.1.tar.gz) = 1018783
+SHA256 (frei0r-plugins-1.3.tar.gz) = b25da901115aa7f960cf5e541057266fddf132a7521d628e6cb344c9f16c0236
+SIZE (frei0r-plugins-1.3.tar.gz) = 1092809
diff --git a/graphics/frei0r/pkg-descr b/graphics/frei0r/pkg-descr
index 13058ea3c9ae..247562a95765 100644
--- a/graphics/frei0r/pkg-descr
+++ b/graphics/frei0r/pkg-descr
@@ -14,4 +14,4 @@ evolving field.
 The frei0r API is not meant to be a competing standard to more
 ambitious efforts.
 
-WWW: http://www.piksel.org/frei0r
+WWW: http://frei0r.dyne.org/
diff --git a/graphics/frei0r/pkg-plist b/graphics/frei0r/pkg-plist
index ac80fcd8b4e3..ab41a9cac25f 100644
--- a/graphics/frei0r/pkg-plist
+++ b/graphics/frei0r/pkg-plist
@@ -5,6 +5,7 @@ lib/frei0r-1/G.so
 lib/frei0r-1/R.so
 lib/frei0r-1/RGB.so
 lib/frei0r-1/addition.so
+lib/frei0r-1/addition_alpha.so
 lib/frei0r-1/alpha0ps.so
 lib/frei0r-1/alphaatop.so
 lib/frei0r-1/alphagrad.so
@@ -42,12 +43,14 @@ lib/frei0r-1/dodge.so
 lib/frei0r-1/edgeglow.so
 lib/frei0r-1/equaliz0r.so
 lib/frei0r-1/facebl0r.so
+lib/frei0r-1/facedetect.so
 lib/frei0r-1/flippo.so
 lib/frei0r-1/gamma.so
 lib/frei0r-1/glow.so
 lib/frei0r-1/grain_extract.so
 lib/frei0r-1/grain_merge.so
 lib/frei0r-1/hardlight.so
+lib/frei0r-1/hqdn3d.so
 lib/frei0r-1/hue.so
 lib/frei0r-1/hueshift0r.so
 lib/frei0r-1/invert0r.so
@@ -56,6 +59,7 @@ lib/frei0r-1/lenscorrection.so
 lib/frei0r-1/letterb0xed.so
 lib/frei0r-1/levels.so
 lib/frei0r-1/lighten.so
+lib/frei0r-1/lightgraffiti.so
 lib/frei0r-1/lissajous0r.so
 lib/frei0r-1/luminance.so
 lib/frei0r-1/mask0mate.so
@@ -79,12 +83,19 @@ lib/frei0r-1/scale0tilt.so
 lib/frei0r-1/scanline0r.so
 lib/frei0r-1/screen.so
 lib/frei0r-1/select0r.so
+lib/frei0r-1/sharpness.so
 lib/frei0r-1/sobel.so
 lib/frei0r-1/softlight.so
 lib/frei0r-1/sopsat.so
 lib/frei0r-1/squareblur.so
 lib/frei0r-1/subtract.so
 lib/frei0r-1/tehroxx0r.so
+lib/frei0r-1/test_pat_B.so
+lib/frei0r-1/test_pat_C.so
+lib/frei0r-1/test_pat_G.so
+lib/frei0r-1/test_pat_I.so
+lib/frei0r-1/test_pat_L.so
+lib/frei0r-1/test_pat_R.so
 lib/frei0r-1/three_point_balance.so
 lib/frei0r-1/threelay0r.so
 lib/frei0r-1/threshold0r.so
@@ -97,66 +108,4 @@ lib/frei0r-1/vectorscope.so
 lib/frei0r-1/vertigo.so
 lib/frei0r-1/xfade0r.so
 libdata/pkgconfig/frei0r.pc
-%%APIDOC%%%%DOCSDIR%%/html/annotated.html
-%%APIDOC%%%%DOCSDIR%%/html/bc_s.png
-%%APIDOC%%%%DOCSDIR%%/html/classes.html
-%%APIDOC%%%%DOCSDIR%%/html/closed.png
-%%APIDOC%%%%DOCSDIR%%/html/dir_a8bede1800020592fb2480c268d77cfe.html
-%%APIDOC%%%%DOCSDIR%%/html/dir_a8bede1800020592fb2480c268d77cfe_dep.map
-%%APIDOC%%%%DOCSDIR%%/html/dir_a8bede1800020592fb2480c268d77cfe_dep.md5
-%%APIDOC%%%%DOCSDIR%%/html/dir_a8bede1800020592fb2480c268d77cfe_dep.png
-%%APIDOC%%%%DOCSDIR%%/html/dirs.html
-%%APIDOC%%%%DOCSDIR%%/html/doxygen.css
-%%APIDOC%%%%DOCSDIR%%/html/doxygen.png
-%%APIDOC%%%%DOCSDIR%%/html/files.html
-%%APIDOC%%%%DOCSDIR%%/html/frei0r_8h.html
-%%APIDOC%%%%DOCSDIR%%/html/frei0r_8h__incl.map
-%%APIDOC%%%%DOCSDIR%%/html/frei0r_8h__incl.md5
-%%APIDOC%%%%DOCSDIR%%/html/frei0r_8h__incl.png
-%%APIDOC%%%%DOCSDIR%%/html/frei0r_8h_source.html
-%%APIDOC%%%%DOCSDIR%%/html/ftv2blank.png
-%%APIDOC%%%%DOCSDIR%%/html/ftv2doc.png
-%%APIDOC%%%%DOCSDIR%%/html/ftv2folderclosed.png
-%%APIDOC%%%%DOCSDIR%%/html/ftv2folderopen.png
-%%APIDOC%%%%DOCSDIR%%/html/ftv2lastnode.png
-%%APIDOC%%%%DOCSDIR%%/html/ftv2link.png
-%%APIDOC%%%%DOCSDIR%%/html/ftv2mlastnode.png
-%%APIDOC%%%%DOCSDIR%%/html/ftv2mnode.png
-%%APIDOC%%%%DOCSDIR%%/html/ftv2node.png
-%%APIDOC%%%%DOCSDIR%%/html/ftv2plastnode.png
-%%APIDOC%%%%DOCSDIR%%/html/ftv2pnode.png
-%%APIDOC%%%%DOCSDIR%%/html/ftv2vertline.png
-%%APIDOC%%%%DOCSDIR%%/html/functions.html
-%%APIDOC%%%%DOCSDIR%%/html/functions_vars.html
-%%APIDOC%%%%DOCSDIR%%/html/globals.html
-%%APIDOC%%%%DOCSDIR%%/html/globals_defs.html
-%%APIDOC%%%%DOCSDIR%%/html/globals_func.html
-%%APIDOC%%%%DOCSDIR%%/html/globals_type.html
-%%APIDOC%%%%DOCSDIR%%/html/graph_legend.html
-%%APIDOC%%%%DOCSDIR%%/html/graph_legend.md5
-%%APIDOC%%%%DOCSDIR%%/html/graph_legend.png
-%%APIDOC%%%%DOCSDIR%%/html/group___c_o_l_o_r___m_o_d_e_l.html
-%%APIDOC%%%%DOCSDIR%%/html/group___p_a_r_a_m___t_y_p_e.html
-%%APIDOC%%%%DOCSDIR%%/html/group___p_l_u_g_i_n___t_y_p_e.html
-%%APIDOC%%%%DOCSDIR%%/html/group__concurrency.html
-%%APIDOC%%%%DOCSDIR%%/html/group__icons.html
-%%APIDOC%%%%DOCSDIR%%/html/group__pluglocations.html
-%%APIDOC%%%%DOCSDIR%%/html/index.html
-%%APIDOC%%%%DOCSDIR%%/html/main.html
-%%APIDOC%%%%DOCSDIR%%/html/modules.html
-%%APIDOC%%%%DOCSDIR%%/html/nav_f.png
-%%APIDOC%%%%DOCSDIR%%/html/nav_h.png
-%%APIDOC%%%%DOCSDIR%%/html/open.png
-%%APIDOC%%%%DOCSDIR%%/html/structf0r__param__color.html
-%%APIDOC%%%%DOCSDIR%%/html/structf0r__param__info.html
-%%APIDOC%%%%DOCSDIR%%/html/structf0r__param__position.html
-%%APIDOC%%%%DOCSDIR%%/html/structf0r__plugin__info.html
-%%APIDOC%%%%DOCSDIR%%/html/tab_a.png
-%%APIDOC%%%%DOCSDIR%%/html/tab_b.png
-%%APIDOC%%%%DOCSDIR%%/html/tab_h.png
-%%APIDOC%%%%DOCSDIR%%/html/tab_s.png
-%%APIDOC%%%%DOCSDIR%%/html/tabs.css
-%%APIDOC%%%%DOCSDIR%%/html/tree.html
-%%APIDOC%%@dirrm %%DOCSDIR%%/html
-%%APIDOC%%@dirrmtry %%DOCSDIR%%
 @dirrm lib/frei0r-1