- Update to 0.3.7

- Make HTML docs optional

PR:		ports/145236
Submitted by:	myself
Approved by:	maintainer (timeout)

3 files changed, 22 insertions, 113 deletions

diff --git a/multimedia/libkate/Makefile b/multimedia/libkate/Makefile
index 386356921b70..5a9944599aa4 100644
--- a/multimedia/libkate/Makefile
+++ b/multimedia/libkate/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libkate
-PORTVERSION=	0.1.12
-PORTREVISION=	3
+PORTVERSION=	0.3.7
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -23,35 +22,39 @@ USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include"
+CFLAGS+=	"-I${LOCALBASE}/include"
 
 MAN1=	kateenc.1 katedec.1
 
-OPTIONS=	DOXYGEN "Build docs with doxygen (requires TeX, QT, etc.)" off
+OPTIONS=	DOXYGEN "Build docs with doxygen (requires TeX, QT, etc.)" off \
+		HTMLDOCS "Install bundled html documentation" off
+
+PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
-.ifdef(WITH_DOXYGEN || exists(${LOCALBASE}/bin/doxygen))
+.ifdef(WITH_DOXYGEN)
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-PLIST_SUB+=	DOXYGEN=""
 .else
-PLIST_SUB+=	DOXYGEN="@comment "
+CONFIGURE_ARGS+=	--disable-doc
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -E -e "s|^(katepcdir =).*|\1 ${LOCALBASE}/libdata/pkgconfig|" \
 	${WRKSRC}/Makefile.in
-.ifdef(NOPORTDOCS)
-	@${REINPLACE_CMD} -E \
-		-e 's|^([[:space:]]*SUBDIRS[[:space:]]*=.*)doc|\1|' \
-		${BUILD_WRKSRC}/Makefile.in
-.endif
 
 post-install:
-.ifdef(NOPORTDOCS)
 .for f in ${MAN1}
 	${INSTALL_MAN}  ${WRKSRC}/doc/man/${f}  ${PREFIX}/man/man1
 .endfor
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+. for FILE in README AUTHORS COPYING THANKS ChangeLog
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+. endfor
+. if defined(WITH_HTMLDOCS)
+	${CP} -RPpn ${WRKSRC}/doc/html ${DOCSDIR}/html
+. endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/libkate/distinfo b/multimedia/libkate/distinfo
index e6cce0b59940..5934b94120cb 100644
--- a/multimedia/libkate/distinfo
+++ b/multimedia/libkate/distinfo
@@ -1,3 +1,3 @@
-MD5 (libkate-0.1.12.tar.gz) = a4771bbb74fc5b1b61c2d15a8cd6ba90
-SHA256 (libkate-0.1.12.tar.gz) = f74e261ce621729413fd32da9ee4479f598bc456852175edeac897b3fc816618
-SIZE (libkate-0.1.12.tar.gz) = 871941
+MD5 (libkate-0.3.7.tar.gz) = e5c287b4f40498e5bde48c0a52225292
+SHA256 (libkate-0.3.7.tar.gz) = b9af203bb731de961807ad13820911fab57230d42da877336cf98c12c11c3c51
+SIZE (libkate-0.3.7.tar.gz) = 728239
diff --git a/multimedia/libkate/pkg-plist b/multimedia/libkate/pkg-plist
index f5544b1ea4a5..b91350d87968 100644
--- a/multimedia/libkate/pkg-plist
+++ b/multimedia/libkate/pkg-plist
@@ -1,111 +1,17 @@
+bin/katalyzer
 bin/katedec
 bin/kateenc
-%%PORTDOCS%%%%DOCSDIR%%/html/Format.html
-%%PORTDOCS%%%%DOCSDIR%%/html/HOWTO.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Support.html
-%%PORTDOCS%%%%DOCSDIR%%/html/annotated.html
-%%PORTDOCS%%%%DOCSDIR%%/html/categories.html
-%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/classes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/config_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/decoding_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%/html/encoding_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%/html/errors.html
-%%PORTDOCS%%%%DOCSDIR%%/html/examples.html
-%%PORTDOCS%%%%DOCSDIR%%/html/files.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_0x00.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_0x01.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_0x7f.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_0x80.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_0x81.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_0x82.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_0x83.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_0x84.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_0x85.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_0x86.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_0x87.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_0x88.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_32v.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_bitmap.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_color.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_curve.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_font_range.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_fp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_motion.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_palette.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_region.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_rle.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_style.html
-%%PORTDOCS%%%%DOCSDIR%%/html/format_warp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/html/globals.html
-%%PORTDOCS%%%%DOCSDIR%%/html/globals_defs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/globals_enum.html
-%%PORTDOCS%%%%DOCSDIR%%/html/globals_eval.html
-%%PORTDOCS%%%%DOCSDIR%%/html/globals_func.html
-%%PORTDOCS%%%%DOCSDIR%%/html/granule.html
-%%PORTDOCS%%%%DOCSDIR%%/html/group__comments.html
-%%PORTDOCS%%%%DOCSDIR%%/html/group__decoding.html
-%%PORTDOCS%%%%DOCSDIR%%/html/group__encoding.html
-%%PORTDOCS%%%%DOCSDIR%%/html/group__font.html
-%%PORTDOCS%%%%DOCSDIR%%/html/group__granule.html
-%%PORTDOCS%%%%DOCSDIR%%/html/group__high.html
-%%PORTDOCS%%%%DOCSDIR%%/html/group__info.html
-%%PORTDOCS%%%%DOCSDIR%%/html/group__misc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/group__ogg__decode.html
-%%PORTDOCS%%%%DOCSDIR%%/html/group__ogg__encode.html
-%%PORTDOCS%%%%DOCSDIR%%/html/group__packet.html
-%%PORTDOCS%%%%DOCSDIR%%/html/group__text.html
-%%PORTDOCS%%%%DOCSDIR%%/html/group__tracker.html
-%%PORTDOCS%%%%DOCSDIR%%/html/group__version.html
-%%PORTDOCS%%%%DOCSDIR%%/html/high_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/kate_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/kate_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/kate__config_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/modules.html
-%%PORTDOCS%%%%DOCSDIR%%/html/oggkate_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/oggkate_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pages.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structkate__bitmap.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structkate__color.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structkate__comment.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tab_b.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/structkate__curve.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structkate__event.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structkate__font__mapping.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structkate__font__range.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structkate__info.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structkate__motion.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structkate__packet.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structkate__palette.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structkate__region.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structkate__state.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structkate__style.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structkate__tracker.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tab_l.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/tab_r.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/tabs.css
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 include/kate/kate.h
 include/kate/kate_config.h
 include/kate/oggkate.h
-lib/libkate.so.1
+lib/libkate.so.3
 lib/libkate.so
 lib/libkate.la
 lib/libkate.a
 lib/liboggkate.a
 lib/liboggkate.la
-lib/liboggkate.so.1
+lib/liboggkate.so.3
 lib/liboggkate.so
 libdata/pkgconfig/kate.pc
 libdata/pkgconfig/oggkate.pc
 @dirrm include/kate
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%