4 files changed, 93 insertions, 56 deletions

diff --git a/multimedia/libkate/Makefile b/multimedia/libkate/Makefile
index 73b9fc21889e..9bba0bd27314 100644
--- a/multimedia/libkate/Makefile
+++ b/multimedia/libkate/Makefile
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	libkate
-PORTVERSION=	0.3.8
+PORTVERSION=	0.4.1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	barbara.xxx1975@libero.it
 COMMENT=	Codec for karaoke and text encapsulation for Ogg
 
+LICENSE=	BSD
+
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config
 LIB_DEPENDS=	ogg.7:${PORTSDIR}/audio/libogg \
 		png.6:${PORTSDIR}/graphics/png
@@ -21,28 +23,76 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
-USE_PYTHON=	yes
 
 CFLAGS+=	"-I${LOCALBASE}/include"
 
-MAN1=	kateenc.1 katedec.1
+MAN1=		katalyzer.1 kateenc.1 katedec.1
 
 OPTIONS=	DOXYGEN "Build docs with doxygen (requires TeX, QT, etc.)" off \
-		HTMLDOCS "Install bundled html documentation" off
+		HTMLDOCS "Install bundled html documentation" off \
+		KATEDJ "Install KateDJ (requires wxPython - WARNING!)" off
 
 PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
-.ifdef(WITH_DOXYGEN)
+.if defined(WITH_DOXYGEN)
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
 .else
 CONFIGURE_ARGS+=	--disable-doc
 .endif
 
+.if defined(WITH_KATEDJ)
+RUN_DEPENDS=	${LOCALBASE}/bin/oggz:${PORTSDIR}/audio/liboggz
+USE_PYTHON=	yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+USE_WX=		2.8
+WX_COMPS=	wx contrib python:lib
+MAN1+=		KateDJ.1
+PLIST_SUB+=	KATEDJ=""
+.else
+PLIST_SUB+=	KATEDJ="@comment "
+.endif
+
 post-patch:
+.if !defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -E -e "s|^(katepcdir =).*|\1 ${LOCALBASE}/libdata/pkgconfig|" \
 	${WRKSRC}/Makefile.in
+. if !defined(WITH_HTMLDOCS) && !defined(WITH_DOXYGEN)
+.  if !defined(WITH_KATEDJ)
+	@${REINPLACE_CMD} -E -e \
+		's|^(install-data-am: )(install-data-local )(install-man)|\1\3|; \
+		s| man/KateDJ.1||' \
+	${WRKSRC}/doc/Makefile.in
+.  else
+	@${REINPLACE_CMD} -E -e \
+		's|^(install-data-am: )(install-data-local )(install-man)|\1\3|' \
+	${WRKSRC}/doc/Makefile.in
+.  endif
+. else
+.  if !defined(WITH_KATEDJ)
+	@${REINPLACE_CMD} -E -e \
+		' s| man/KateDJ.1||' \
+	${WRKSRC}/doc/Makefile.in
+.  endif
+. endif
+.else
+	@${REINPLACE_CMD} -E -e "s|^(katepcdir =).*|\1 ${LOCALBASE}/libdata/pkgconfig|; \
+		s|^(SUBDIRS =.*) doc|\1|" \
+	${WRKSRC}/Makefile.in
+. if !defined(WITH_KATEDJ)
+	@${REINPLACE_CMD} -E -e \
+		' s| man/KateDJ.1||' \
+	${WRKSRC}/doc/Makefile.in
+. endif
+.endif
+
+.if !defined(WITH_KATEDJ)
+	@${REINPLACE_CMD} -e \
+		"s|  HAVE_PYTHON_TRUE=$$|  HAVE_PYTHON_TRUE='#'|; \
+		s|  HAVE_PYTHON_FALSE=\'#\'$$|  HAVE_PYTHON_FALSE=|" \
+	${WRKSRC}/configure
+.endif
 
 post-install:
 .for f in ${MAN1}
diff --git a/multimedia/libkate/distinfo b/multimedia/libkate/distinfo
index a5cd791e5aaa..69220cf1bcae 100644
--- a/multimedia/libkate/distinfo
+++ b/multimedia/libkate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libkate-0.3.8.tar.gz) = 56e8990f44a8494d61437e825279f4c7c49d093d2b258cd64a8a86f18229a601
-SIZE (libkate-0.3.8.tar.gz) = 745633
+SHA256 (libkate-0.4.1.tar.gz) = c40e81d5866c3d4bf744e76ce0068d8f388f0e25f7e258ce0c8e76d7adc87b68
+SIZE (libkate-0.4.1.tar.gz) = 906896
diff --git a/multimedia/libkate/files/patch-doc-Makefile.in b/multimedia/libkate/files/patch-doc-Makefile.in
deleted file mode 100644
index 80eabb9df3d8..000000000000
--- a/multimedia/libkate/files/patch-doc-Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- doc/Makefile.in.orig	2010-08-10 15:19:04.000000000 +0200
-+++ doc/Makefile.in	2011-07-01 12:28:47.000000000 +0200
-@@ -519,8 +519,7 @@
- @HAVE_DOXYGEN_TRUE@	doxygen kate.doxygen
- @HAVE_DOXYGEN_TRUE@	touch .doc-dummy-target
- @HAVE_DOXYGEN_FALSE@.doc-dummy-target:
--@HAVE_DOXYGEN_FALSE@	echo "doxygen not found, cannot build docs"
--@HAVE_DOXYGEN_FALSE@	/bin/false
-+@HAVE_DOXYGEN_FALSE@   echo "doxygen not found, oops"
- 
- dist-hook: .doc-dummy-target
- 	cp -fR * $(distdir)
diff --git a/multimedia/libkate/pkg-plist b/multimedia/libkate/pkg-plist
index 22d6b56e4957..20df1e915720 100644
--- a/multimedia/libkate/pkg-plist
+++ b/multimedia/libkate/pkg-plist
@@ -1,4 +1,4 @@
-bin/KateDJ
+%%KATEDJ%%bin/KateDJ
 bin/katalyzer
 bin/katedec
 bin/kateenc
@@ -8,46 +8,45 @@ include/kate/oggkate.h
 lib/libkate.a
 lib/libkate.la
 lib/libkate.so
-lib/libkate.so.3
+lib/libkate.so.4
 lib/liboggkate.a
 lib/liboggkate.la
 lib/liboggkate.so
 lib/liboggkate.so.3
 libdata/pkgconfig/kate.pc
 libdata/pkgconfig/oggkate.pc
-%%PYTHON_SITELIBDIR%%/kdj/__init__.py
-%%PYTHON_SITELIBDIR%%/kdj/__init__.pyc
-%%PYTHON_SITELIBDIR%%/kdj/__init__.pyo
-%%PYTHON_SITELIBDIR%%/kdj/constants.py
-%%PYTHON_SITELIBDIR%%/kdj/constants.pyc
-%%PYTHON_SITELIBDIR%%/kdj/constants.pyo
-%%PYTHON_SITELIBDIR%%/kdj/demuxer.py
-%%PYTHON_SITELIBDIR%%/kdj/demuxer.pyc
-%%PYTHON_SITELIBDIR%%/kdj/demuxer.pyo
-%%PYTHON_SITELIBDIR%%/kdj/finder.py
-%%PYTHON_SITELIBDIR%%/kdj/finder.pyc
-%%PYTHON_SITELIBDIR%%/kdj/finder.pyo
-%%PYTHON_SITELIBDIR%%/kdj/muxer.py
-%%PYTHON_SITELIBDIR%%/kdj/muxer.pyc
-%%PYTHON_SITELIBDIR%%/kdj/muxer.pyo
-%%PYTHON_SITELIBDIR%%/kdj/options.py
-%%PYTHON_SITELIBDIR%%/kdj/options.pyc
-%%PYTHON_SITELIBDIR%%/kdj/options.pyo
-%%PYTHON_SITELIBDIR%%/kdj/tester.py
-%%PYTHON_SITELIBDIR%%/kdj/tester.pyc
-%%PYTHON_SITELIBDIR%%/kdj/tester.pyo
-%%PYTHON_SITELIBDIR%%/kdj/tools.py
-%%PYTHON_SITELIBDIR%%/kdj/tools.pyc
-%%PYTHON_SITELIBDIR%%/kdj/tools.pyo
-%%PYTHON_SITELIBDIR%%/kdj/ui_editor.py
-%%PYTHON_SITELIBDIR%%/kdj/ui_editor.pyc
-%%PYTHON_SITELIBDIR%%/kdj/ui_editor.pyo
-%%PYTHON_SITELIBDIR%%/kdj/ui_main.py
-%%PYTHON_SITELIBDIR%%/kdj/ui_main.pyc
-%%PYTHON_SITELIBDIR%%/kdj/ui_main.pyo
-%%PYTHON_SITELIBDIR%%/kdj/ui_options.py
-%%PYTHON_SITELIBDIR%%/kdj/ui_options.pyc
-%%PYTHON_SITELIBDIR%%/kdj/ui_options.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/kdj
-@dirrmtry %%PYTHON_SITELIBDIR%%
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/__init__.py
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/__init__.pyc
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/__init__.pyo
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/constants.py
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/constants.pyc
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/constants.pyo
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/demuxer.py
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/demuxer.pyc
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/demuxer.pyo
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/finder.py
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/finder.pyc
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/finder.pyo
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/muxer.py
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/muxer.pyc
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/muxer.pyo
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/options.py
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/options.pyc
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/options.pyo
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/tester.py
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/tester.pyc
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/tester.pyo
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/tools.py
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/tools.pyc
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/tools.pyo
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_editor.py
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_editor.pyc
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_editor.pyo
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_main.py
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_main.pyc
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_main.pyo
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_options.py
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_options.pyc
+%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_options.pyo
+%%KATEDJ%%@dirrm %%PYTHON_SITELIBDIR%%/kdj
 @dirrm include/kate