2 files changed, 73 insertions, 95 deletions

diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index df591ac0dc54..10485caad276 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jackit
 PORTVERSION=	0.116.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://jackaudio.org/downloads/
 DISTNAME=	jack-audio-connection-kit-${PORTVERSION}
@@ -19,8 +20,6 @@ LIB_DEPENDS=	portaudio.0:${PORTSDIR}/audio/portaudio \
 		samplerate.1:${PORTSDIR}/audio/libsamplerate \
 		celt.0:${PORTSDIR}/audio/celt
 
-OPTIONS=	DOCS "Build HTML documentation. Requires doxygen/TeX." off
-
 LATEST_LINK=	jack
 CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}" LDFLAGS="-L${LOCALBASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
@@ -36,32 +35,16 @@ MAN1=		jackd.1 jackstart.1
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/bin/doxygen) && !defined(WITH_GNOKII)
-DOCS_OVERRIDE=	yes
-WITH_DOCS=	yes
-.endif
-
-.if defined(WITH_DOCS) || defined(PACKAGE_BUILDING)
+.if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-PLIST_SUB+=	DOCS=""
 .else
 CONFIGURE_ENV+=	ac_cv_prog_HAVE_DOXYGEN="false"
-PLIST_SUB+=	DOCS="@comment "
 .endif
 
 .if exists(${LOCALBASE}/lib/libreadline.so.5)
 LIB_DEPENDS+=	readline.5:${PORTSDIR}/devel/readline
 .endif
 
-pre-everything::
-.if defined(DOCS_OVERRIDE)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "**********************************************************"
-	@${ECHO_MSG} "* Doxygen has been detected, documentation will be built *"
-	@${ECHO_MSG} "**********************************************************"
-	@${ECHO_MSG}
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|define USE_MLOCK|undef USE_MLOCK|' \
 		${WRKSRC}/configure
@@ -76,6 +59,7 @@ post-patch:
 		${WRKSRC}/example-clients/Makefile.in
 	@${REINPLACE_CMD} -e 's|md5sum|md5 -q|g' \
 		${WRKSRC}/jackd/Makefile.in
+	@${RM} -f ${WRKSRC}/doc/reference/html/*
 
 post-build:
 	@${RM} -f ${WRKSRC}/doc/reference/html/dir__2F*
diff --git a/audio/jack/pkg-plist b/audio/jack/pkg-plist
index 9321304a8404..dbb1240b4321 100644
--- a/audio/jack/pkg-plist
+++ b/audio/jack/pkg-plist
@@ -46,81 +46,75 @@ lib/libjackserver.la
 lib/libjackserver.so
 lib/libjackserver.so.0
 libdata/pkgconfig/jack.pc
-%%DOCS%%share/jack-audio-connection-kit/reference/html/annotated.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/classes.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/deprecated.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/files.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/functions.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/functions_vars.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x65.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x69.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6a.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6d.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6f.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x70.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x72.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x73.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x74.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_defs.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_enum.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_eval.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_func.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_type.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_vars.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/index.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/inprocess_8c.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/intclient_8h-source.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/intclient_8h.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/jack_8h-source.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/jack_8h.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/mainpage_8dox.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/midiport_8h-source.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/midiport_8h.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/pages.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/porting-guide.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/porting_8dox.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/ringbuffer_8h-source.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/ringbuffer_8h.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/simple__client_8c.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/statistics_8h-source.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/statistics_8h.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/struct__jack__midi__event.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__position__t.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__ringbuffer__data__t.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__ringbuffer__t.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__transport__info__t.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/structport__pair__t.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/thread_8h-source.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/thread_8h.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/transport-design.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/transport_8dox.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/transport_8h-source.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/transport_8h.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/types_8h-source.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/types_8h.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/doxygen.png
-%%DOCS%%share/jack-audio-connection-kit/reference/html/fsm.png
-%%DOCS%%share/jack-audio-connection-kit/reference/html/doxygen.css
-%%DOCS%%share/jack-audio-connection-kit/reference/html/group__ClientCallbacks.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/group__ClientFunctions.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/group__ClientThreads.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/group__ErrorOutput.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/group__Functions.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/group__MIDIAPI.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/group__NonCallbackAPI.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/group__PortFunctions.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/group__PortSearching.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/group__ServerControl.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/group__Setting.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/group__The.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/group__TimeFunctions.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/group__TransportControl.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/modules.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/structPOST__PACKED__STRUCTURE.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/struct____attribute____.html
-%%DOCS%%@dirrm share/jack-audio-connection-kit/reference/html
-%%DOCS%%@dirrm share/jack-audio-connection-kit/reference
-%%DOCS%%@dirrm share/jack-audio-connection-kit
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/annotated.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/classes.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/deprecated.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/doxygen.css
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/doxygen.png
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/files.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/fsm.png
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/functions.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/functions_vars.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_0x65.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_0x69.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6a.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6d.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6f.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_0x70.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_0x73.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_0x74.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_defs.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_enum.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_eval.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_func.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_type.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/globals_vars.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__ClientCallbacks.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__ClientFunctions.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__ClientThreads.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__ErrorOutput.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__MIDIAPI.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__NonCallbackAPI.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__PortFunctions.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__PortSearching.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__ServerControl.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__TimeFunctions.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/group__TransportControl.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/index.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/inprocess_8c.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/intclient_8h.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/intclient_8h_source.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/jack_8h.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/jack_8h_source.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/mainpage_8dox.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/midiport_8h.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/midiport_8h_source.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/modules.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/pages.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/porting-guide.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/porting_8dox.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/ringbuffer_8h.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/ringbuffer_8h_source.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/simple__client_8c.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/statistics_8h.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/statistics_8h_source.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structPOST__PACKED__STRUCTURE.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/struct__jack__midi__event.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structjack__ringbuffer__data__t.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structjack__ringbuffer__t.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structjack__transport__info__t.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/structport__pair__t.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/thread_8h.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/thread_8h_source.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/transport-design.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/transport_8dox.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/transport_8h.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/transport_8h_source.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/types_8h.html
+%%PORTDOCS%%share/jack-audio-connection-kit/reference/html/types_8h_source.html
+%%PORTDOCS%%@dirrm share/jack-audio-connection-kit/reference/html
+%%PORTDOCS%%@dirrm share/jack-audio-connection-kit/reference
+%%PORTDOCS%%@dirrm share/jack-audio-connection-kit
 @dirrm lib/jack
 @dirrm include/jack