2 files changed, 23 insertions, 159 deletions

diff --git a/audio/libnjb/Makefile b/audio/libnjb/Makefile
index c916a69e7c69..00762b9a6f0b 100644
--- a/audio/libnjb/Makefile
+++ b/audio/libnjb/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libnjb
-# Date created:				16 July 2006
-# Whom:					adrianm
-#
+# Created by: adrianm
 # $FreeBSD$
-#
 
 PORTNAME=	libnjb
 PORTVERSION=	2.2.7
@@ -14,30 +10,39 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C library, API for communicating with Creative and Dell audio players
 
-BROKEN=		incomplete plist
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
+OPTIONS_DEFINE=	DOCS
+
+USE_GNOME=	gnomehack
 USE_AUTOTOOLS=	libtool
-GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_LDCONFIG=	yes
 
-.include <bsd.port.pre.mk>
+PORTDOCS=	*
 
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
-.endif
+.include <bsd.port.options.mk>
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
 .else
-NODOC=		/^SUBDIRS/s|doc||
+CONFIGURE_ENV+=	ac_cv_prog_HAVE_DOXYGEN=no
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 800069
+LIB_DEPENDS+=	usb-0.1:${PORTSDIR}/devel/libusb
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|;\
-		${NODOC}' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e '/^SHOW_DIRECTORIES/d' ${WRKSRC}/doc/Doxyfile.in
+	@${REINPLACE_CMD} -e \
+		'/^SHOW_DIRECTORIES/d' ${WRKSRC}/doc/Doxyfile.in
+	@${REINPLACE_CMD} -e \
+		'/pkgdocdir/s|-$$(VERSION)||g' ${WRKSRC}/doc/Makefile.in
 
 .include <bsd.port.post.mk>
diff --git a/audio/libnjb/pkg-plist b/audio/libnjb/pkg-plist
index 0f8be375c792..c1151afdcd15 100644
--- a/audio/libnjb/pkg-plist
+++ b/audio/libnjb/pkg-plist
@@ -26,144 +26,3 @@ lib/libnjb.la
 lib/libnjb.so
 lib/libnjb.so.6
 libdata/pkgconfig/libnjb.pc
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/annotated.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/base_8c.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/base_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bc_s.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bdwn.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/byteorder_8c.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/byteorder_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/classes.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/closed.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cursesplay_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/datafile_8c.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/datafile_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/defs_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/delfile_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/deltr_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/dumpeax_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/dumptime_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/eax_8c.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/eax_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/examples.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/examples_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/files.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/files_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/functions.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/functions_vars.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/fwupgrade_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/getfile_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/getowner_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gettr_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/getusage_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_0x64.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_0x65.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_0x66.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_0x67.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_0x6c.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_0x6e.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_0x6f.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_0x74.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_0x75.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_defs.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_enum.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_func.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_func_0x64.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_func_0x65.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_func_0x66.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_func_0x67.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_func_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_func_0x6e.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_func_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_func_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_func_0x74.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_func_0x75.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_type.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/globals_vars.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/group__basic.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/group__codecs.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/group__datatagapi.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/group__debugflags.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/group__eaxapi.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/group__errors.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/group__frames.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/group__frametypes.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/group__internals.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/group__njbboxes.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/group__playapi.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/group__playlistapi.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/group__tagapi.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/group__timeapi.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/group__turboflags.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/group__types.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/group__unicodeflags.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/handshake_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ioutil_8c.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ioutil_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/jquery.js
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/libnjb_8h.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/libnjb_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mainpage_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/modules.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/nav_f.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/nav_h.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/njb__error_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/njbtime_8c.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/njbtime_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/open.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/pl_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/play_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/playlist_8c.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/playlist_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/playlists_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/procedure_8c.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/procedure_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/protocol3_8c.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/protocol3_8h.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/protocol3_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/protocol_8c.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/protocol_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sendfile_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sendtr_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/setowner_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/setpbm_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/settime_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/songid_8c.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/songid_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/structnjb3__state__t.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/structnjb__datafile__struct.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/structnjb__device__entry.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/structnjb__eax__struct.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/structnjb__error__stack__struct.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/structnjb__keyval__struct.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/structnjb__playlist__struct.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/structnjb__playlist__track__struct.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/structnjb__songid__frame__struct.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/structnjb__songid__struct.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/structnjb__state__t.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/structnjb__struct.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/structnjb__time__struct.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/structnjbdfhdr__t.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/structnjblibctr__t.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/structnjbplhdr__t.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/structnjbttaghdr__t.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tab_a.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tab_b.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tab_h.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tab_s.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tabs.css
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tagtr_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tracks_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/unicode_8c.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/unicode_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/usb__io_8c.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/usb__io_8h_source.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%