Index: head/comms/lirc/Makefile
===================================================================
--- head/comms/lirc/Makefile	(revision 461926)
+++ head/comms/lirc/Makefile	(revision 461927)
@@ -1,72 +1,73 @@
 # Created by: Mike Heffner <mikeh@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	lirc
 PORTVERSION=	0.9.0
 PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	comms
 MASTER_SITES=	SF/${PORTNAME}/LIRC/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Linux Infrared Remote Control
 
 BUILD_DEPENDS=	v4l_compat>=1.0.20110603:multimedia/v4l_compat
 
 USES=		alias autoreconf gmake libtool localbase python tar:bzip2
 USE_XORG=	sm x11 ice
 USE_CSTD=	gnu89
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-sandboxed --with-devdir=/var/run/lirc \
 		--sysconfdir=${PREFIX}/etc
 
 USE_RC_SUBR=	lircd
 PORTDOCS=	html images irxevent.keys lirc.css lirc.hwdb
 PORTEXAMPLES=	remotes
 SUB_FILES=	pkg-message lircd.conf
 
 OPTIONS_DEFINE=	MINIMAL DEBUG UARTLIRC DOCS EXAMPLES
 OPTIONS_DEFINE_i386=	SMODE2 # requires svgalib which is...
 OPTIONS_DEFINE_amd64=	SMODE2 # ...only available on x86
 OPTIONS_SUB=	yes
 
 MINIMAL_DESC=	Build with minimal dependencies
 UARTLIRC_DESC=	Install serial LIRC driver
 SMODE2_DESC=	Build smode2 (shows signal waveform), requires svgalib
 
 MINIMAL_LIB_DEPENDS_OFF=libftdi.so:devel/libftdi \
 			libirman.so:comms/libirman
 MINIMAL_CONFIGURE_OFF=	--with-driver=userspace
 MINIMAL_CONFIGURE_ON=	--with-driver=dvico
 
 DEBUG_CONFIGURE_ENABLE=	debug
 
 SMODE2_LIB_DEPENDS=	libvga.so:graphics/svgalib
+SMODE2_PLIST_FILES=	bin/smode2
 
 UARTLIRC_RUN_DEPENDS=	uartlirc>=0.3:comms/uartlirc
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's/`$${LIBUSB_CONFIG} --libs`/-lusb/' \
 		-e 's/`$${LIBUSB_CONFIG} --cflags`//' \
 		${WRKSRC}/configure.ac
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/lircd.conf ${STAGEDIR}${PREFIX}/etc/lircd.conf.sample
 	@${MKDIR} ${STAGEDIR}/var/run/lirc
 
 post-install-MINIMAL-on:
 	# bacause --with-driver is specified, it installs remotes/dvico/lircd.conf.fusionHDTV to etc/lircd/
 	# remove to not break the plist, but remote configs handling should probably be fixed...
 	@${RM} -r ${STAGEDIR}${PREFIX}/etc/lirc
 
 post-install-DOCS-on:
 	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "html images irxevent.keys lirc.css lirc.hwdb" ${STAGEDIR}${DOCSDIR}/)
 
 post-install-EXAMPLES-on:
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} remotes ${STAGEDIR}${EXAMPLESDIR}/)
 
 .include <bsd.port.mk>
Index: head/comms/lirc/pkg-plist
===================================================================
--- head/comms/lirc/pkg-plist	(revision 461926)
+++ head/comms/lirc/pkg-plist	(revision 461927)
@@ -1,34 +1,33 @@
 bin/ircat
 bin/irexec
 bin/irpty
 bin/irrecord
 bin/irsend
 bin/irw
 bin/irxevent
 bin/lircrcd
 bin/mode2
-%%SMODE2%%bin/smode2
 bin/pronto2lirc
 bin/xmode2
 include/lirc/lirc_client.h
 lib/liblirc_client.a
 lib/liblirc_client.so
 lib/liblirc_client.so.0
 lib/liblirc_client.so.0.2.1
 man/man1/ircat.1.gz
 man/man1/irexec.1.gz
 man/man1/irpty.1.gz
 man/man1/irrecord.1.gz
 man/man1/irsend.1.gz
 man/man1/irw.1.gz
 man/man1/irxevent.1.gz
 man/man1/lircrcd.1.gz
 man/man1/mode2.1.gz
 man/man1/smode2.1.gz
 man/man1/xmode2.1.gz
 man/man8/lircd.8.gz
 man/man8/lircmd.8.gz
 sbin/lircd
 sbin/lircmd
 @sample etc/lircd.conf.sample
 @dir /var/run/lirc