2 files changed, 41 insertions, 44 deletions

diff --git a/textproc/liblingoteach/Makefile b/textproc/liblingoteach/Makefile
index 8ac95f3d50d0..91cacdadc82d 100644
--- a/textproc/liblingoteach/Makefile
+++ b/textproc/liblingoteach/Makefile
@@ -1,38 +1,35 @@
-# Created by: Marcus von Appen
 # $FreeBSD$
 
 PORTNAME=	liblingoteach
 PORTVERSION=	0.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	SF/lingoteach/OldFiles
 
-MAINTAINER=	mva@FreeBSD.org
-COMMENT=	A library for parsing lesson files based on the LingoTeach DTD
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Library for parsing lesson files based on the LingoTeach DTD
 
 USE_AUTOTOOLS=	libtool
 USES=		gmake pathfix pkgconfig
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+NO_STAGE=	yes
 
-.if defined(WITH_COMP)
-CONFIGURE_ARGS+=	--with-compression
-.endif
+OPTIONS_DEFINE=	DOCS ZLIB DEBUG
+OPTIONS_DEFAULT=	ZLIB
 
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug
-.endif
+DEBUG_DESC=	Additional debugging information and output
 
-NO_STAGE=	yes
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "liblingoteach can be used with the following switches:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "		WITH_COMP=yes	Enables zlib compression of"
-	@${ECHO_MSG} "				the lesson files"
-	@${ECHO_MSG} "		WITH_DEBUG=yes  Enables additional debugging"
-	@${ECHO_MSG} "				information and output"
-	@${ECHO_MSG} ""
+ZLIB_CONFIGURE_WITH=	compression
+DEBUG_CONFIGURE_ENABLE=	debug
+
+.include <bsd.port.options.mk>
+
+.if !${PORT_OPTIONS:MDOCS}
+post-patch:
+	@${REINPLACE_CMD} 's|SUBDIRS = src test doc|SUBDIRS = src test|' \
+		${WRKSRC}/Makefile.in
+.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/liblingoteach/pkg-plist b/textproc/liblingoteach/pkg-plist
index 5e55c1e7d350..f7aac833d1df 100644
--- a/textproc/liblingoteach/pkg-plist
+++ b/textproc/liblingoteach/pkg-plist
@@ -5,28 +5,28 @@ lib/liblingoteach.la
 lib/liblingoteach.so
 lib/liblingoteach.so.3
 libdata/pkgconfig/liblingoteach.pc
-share/doc/liblingoteach/html/a00010.html
-share/doc/liblingoteach/html/a00011.html
-share/doc/liblingoteach/html/a00012.html
-share/doc/liblingoteach/html/a00013.html
-share/doc/liblingoteach/html/a00014.html
-share/doc/liblingoteach/html/a00015.html
-share/doc/liblingoteach/html/a00016.html
-share/doc/liblingoteach/html/a00017.html
-share/doc/liblingoteach/html/a00018.html
-share/doc/liblingoteach/html/annotated.html
-share/doc/liblingoteach/html/classes.html
-share/doc/liblingoteach/html/doxygen.css
-share/doc/liblingoteach/html/doxygen.png
-share/doc/liblingoteach/html/files.html
-share/doc/liblingoteach/html/functions.html
-share/doc/liblingoteach/html/functions_vars.html
-share/doc/liblingoteach/html/globals.html
-share/doc/liblingoteach/html/globals_enum.html
-share/doc/liblingoteach/html/globals_eval.html
-share/doc/liblingoteach/html/globals_func.html
-share/doc/liblingoteach/html/globals_type.html
-share/doc/liblingoteach/html/index.html
-@dirrm share/doc/liblingoteach/html
-@dirrm share/doc/liblingoteach
+%%PORTDOCS%%%%DOCSDIR%%/html/a00010.html
+%%PORTDOCS%%%%DOCSDIR%%/html/a00011.html
+%%PORTDOCS%%%%DOCSDIR%%/html/a00012.html
+%%PORTDOCS%%%%DOCSDIR%%/html/a00013.html
+%%PORTDOCS%%%%DOCSDIR%%/html/a00014.html
+%%PORTDOCS%%%%DOCSDIR%%/html/a00015.html
+%%PORTDOCS%%%%DOCSDIR%%/html/a00016.html
+%%PORTDOCS%%%%DOCSDIR%%/html/a00017.html
+%%PORTDOCS%%%%DOCSDIR%%/html/a00018.html
+%%PORTDOCS%%%%DOCSDIR%%/html/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
+%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png
+%%PORTDOCS%%%%DOCSDIR%%/html/files.html
+%%PORTDOCS%%%%DOCSDIR%%/html/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_enum.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_eval.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_func.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_type.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/lingoteach