Index: head/devel/libzvbi/Makefile
===================================================================
--- head/devel/libzvbi/Makefile	(revision 408421)
+++ head/devel/libzvbi/Makefile	(revision 408422)
@@ -1,32 +1,39 @@
 # Created by: Oliver Lehmann <oliver@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libzvbi
 PORTVERSION=	0.2.35
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	SF/zapping/zvbi/${PORTVERSION}
 DISTNAME=	${PORTNAME:S/lib//}-${PORTVERSION}
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Routines to access raw VBI capture devices
 
+LICENSE=	GPLv2+
+
 LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
 		libunicode.so:${PORTSDIR}/devel/libunicode
 
-USES=		gettext libtool pathfix pkgconfig tar:bzip2
+USES=		iconv libtool localbase pathfix tar:bzip2
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--without-doxygen
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+
+NLS_CONFIGURE_ENABLE=nls
+NLS_USES=	gettext-runtime
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|#cpu (\([^)]*\))|defined(__\1__)|g' \
 		${WRKSRC}/src/misc.h \
 		${WRKSRC}/src/exp-gfx.c
 	@${REINPLACE_CMD} -e 's|, ts|, \&ts|' ${WRKSRC}/test/date.c
 	@${REINPLACE_CMD} -e 's|zvbi-atsc-cc$$(EXEEXT)||g; \
 		s|zvbi-atsc-cc\.1||g' ${WRKSRC}/contrib/Makefile.in
 
 .include <bsd.port.mk>
Index: head/devel/libzvbi/pkg-plist
===================================================================
--- head/devel/libzvbi/pkg-plist	(revision 408421)
+++ head/devel/libzvbi/pkg-plist	(revision 408422)
@@ -1,16 +1,16 @@
 bin/zvbi-ntsc-cc
 include/libzvbi.h
 lib/libzvbi.a
 lib/libzvbi.so
 lib/libzvbi.so.0
 lib/libzvbi.so.0.13.2
 libdata/pkgconfig/zvbi-0.2.pc
 man/man1/zvbi-ntsc-cc.1.gz
-share/locale/de/LC_MESSAGES/zvbi.mo
-share/locale/en@boldquot/LC_MESSAGES/zvbi.mo
-share/locale/en@quot/LC_MESSAGES/zvbi.mo
-share/locale/es/LC_MESSAGES/zvbi.mo
-share/locale/fr/LC_MESSAGES/zvbi.mo
-share/locale/it/LC_MESSAGES/zvbi.mo
-share/locale/nl/LC_MESSAGES/zvbi.mo
-share/locale/pl/LC_MESSAGES/zvbi.mo
+%%NLS%%share/locale/de/LC_MESSAGES/zvbi.mo
+%%NLS%%share/locale/en@boldquot/LC_MESSAGES/zvbi.mo
+%%NLS%%share/locale/en@quot/LC_MESSAGES/zvbi.mo
+%%NLS%%share/locale/es/LC_MESSAGES/zvbi.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/zvbi.mo
+%%NLS%%share/locale/it/LC_MESSAGES/zvbi.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/zvbi.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/zvbi.mo