Index: head/multimedia/xawtv/Makefile
===================================================================
--- head/multimedia/xawtv/Makefile	(revision 400535)
+++ head/multimedia/xawtv/Makefile	(revision 400536)
@@ -1,93 +1,97 @@
 # Created by: George Reid <greid@ukug.uk.freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	xawtv
 PORTVERSION=	3.103
 PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://linuxtv.org/downloads/xawtv/
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	TV viewing application and a few TV utilities
 
 BUILD_DEPENDS=	${LOCALBASE}/share/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
 OPTIONS_DEFINE=	AALIB DV QUICKTIME ZVBI
 OPTIONS_DEFINE_i386=	MMX
 OPTIONS_DEFAULT=	AALIB
 ZVBI_DESC=	Enable libzvbi support
 
 USES=		gmake iconv jpeg motif perl5 tar:bzip2
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xaw
 CPPFLAGS+=	-I${WRKSRC}/common
 LIBS+=		-L${LOCALBASE}/lib
 MAKE_ENV=	verbose=yes
 USE_LDCONFIG=	yes
 ONLY_FOR_ARCHS=	amd64 i386
 
 FILES_LIBJPEG=	console/Subdir.mk x11/Subdir.mk libng/plugins/Subdir.mk
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MAALIB}
 CONFIGURE_ARGS+=--enable-aa
 LIB_DEPENDS+=	libaa.so:${PORTSDIR}/graphics/aalib
 PLIST_SUB+=	AA=""
 .else
 CONFIGURE_ARGS+=--disable-aa
 PLIST_SUB+=	AA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MZVBI}
 LIB_DEPENDS+=	libzvbi.so:${PORTSDIR}/devel/libzvbi
 CONFIGURE_ARGS+=--enable-zvbi
 PLIST_SUB+=	ZVBI="" ZVBI5=""
 .else
 CONFIGURE_ARGS+=--enable-zvbi=no
 PLIST_SUB+=	ZVBI="@comment " ZVBI5="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDV}
 LIB_DEPENDS+=	libdv.so:${PORTSDIR}/multimedia/libdv
 CONFIGURE_ARGS+=--enable-dv
 PLIST_SUB+=	DV=
 .else
 CONFIGURE_ARGS+=--enable-dv=no
 PLIST_SUB+=	DV="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMMX}
 CONFIGURE_ARGS+=--enable-mmx
 CFLAGS+=	-DMMX=1
 .endif
 
 .if ${PORT_OPTIONS:MQUICKTIME}
 CONFIGURE_ARGS+=--enable-quicktime
 LIB_DEPENDS+=	libquicktime.so:${PORTSDIR}/multimedia/libquicktime
 PLIST_SUB+=	QT=
 .else
 CONFIGURE_ARGS+=--enable-quicktime=no
 PLIST_SUB+=	QT="@comment "
 .endif
 
 PLIST_SUB+=	X11PREFIX=${LOCALBASE}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g; \
 		s|/usr/local|${LOCALBASE}|g; \
 		s|-lquicktime|-L${LOCALBASE}/lib &|g; \
 		s|LIBV4L="yes"|LIBV4L="no"|g' \
 		${WRKSRC}/configure
 
 	@${REINPLACE_CMD} -e 's|-ldl||g' \
 		${WRKSRC}/console/Subdir.mk \
 		${WRKSRC}/x11/Subdir.mk
 
+	@${REINPLACE_CMD} -e 's|\(@CFLAGS@.*\)\$$(LIB_FLAGS) |\$$(LIB_FLAGS) \1|g; \
+		s|-Llibng||g' \
+		${WRKSRC}/Makefile.in
+
 .for i in ${FILES_LIBJPEG}
 	@${REINPLACE_CMD} -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" ${WRKSRC}/$i
 .endfor
 
 .include <bsd.port.post.mk>