Index: head/misc/hotkeys/Makefile
===================================================================
--- head/misc/hotkeys/Makefile	(revision 395609)
+++ head/misc/hotkeys/Makefile	(revision 395610)
@@ -1,48 +1,49 @@
 # Created by: Andy Pavlo <amp0928@rit.edu>
 # $FreeBSD$
 
 PORTNAME=	hotkeys
 PORTVERSION=	0.5.7.1
 PORTREVISION=	16
 CATEGORIES=	misc
 MASTER_SITES=	http://ypwong.org/hotkeys/${PORTVERSION}/
 DISTNAME=	hotkeys_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Allows usage of special keys on internet/multimedia keyboards
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 CONFIGURE_ARGS=	--with-db3-inc=${BDB_INCLUDE_DIR} \
 		--with-db3-lib=${BDB_LIB_DIR} \
 		--with-db-name=${BDB_LIB_NAME}
 
-USE_XORG=	x11 xkbfile xmu xft
+USE_XORG=	x11 xft xkbfile xmu
 GNU_CONFIGURE=	yes
 USE_BDB=	yes
 USES=		gmake
 
 OPTIONS_DEFINE=	OSD
 OPTIONS_DEFAULT=	OSD
 
 OSD_LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
 OSD_CONFIGURE_WITH=	xosd
 
 post-extract:
 	@${CP} ${PATCHDIR}/error.h ${WRKSRC}/src
 	@${CP} ${PATCHDIR}/eliteduo.def ${WRKSRC}/def
 	@${CP} ${PATCHDIR}/logitech-ultrax.def ${WRKSRC}/def
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^install-exec-am/s/install-sysconfDATA//' \
 		${WRKSRC}/src/Makefile.in
 post-configure:
 	${REINPLACE_CMD} -e 's,-lXinerama,-lXinerama `pkgconf --libs pangoxft`,g' ${WRKSRC}/src/Makefile
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/src/hotkeys.conf ${STAGEDIR}${PREFIX}/etc/hotkeys.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/src/hotkeys.conf ${STAGEDIR}${PREFIX}/etc/hotkeys.conf.sample
 
 .include <bsd.port.mk>
Index: head/misc/hotkeys/pkg-plist
===================================================================
--- head/misc/hotkeys/pkg-plist	(revision 395609)
+++ head/misc/hotkeys/pkg-plist	(revision 395610)
@@ -1,33 +1,31 @@
 bin/hotkeys
-@unexec if cmp -s %D/etc/hotkeys.conf.sample %D/etc/hotkeys.conf; then rm -f %D/etc/hotkeys.conf; fi
-etc/hotkeys.conf.sample
-@exec if [ ! -f %D/etc/hotkeys.conf ] ; then cp -p %D/%F %B/hotkeys.conf; fi
+@sample etc/hotkeys.conf.sample
 man/man1/hotkeys.1.gz
 %%DATADIR%%/splash.png
 %%DATADIR%%/acerwl.def
 %%DATADIR%%/btc9000.def
 %%DATADIR%%/eliteduo.def
 %%DATADIR%%/hp5181.def
 %%DATADIR%%/ibook.def
 %%DATADIR%%/itouch.def
 %%DATADIR%%/kb9930.def
 %%DATADIR%%/kb9963.def
 %%DATADIR%%/kbp8993.def
 %%DATADIR%%/logitech-cfo.def
 %%DATADIR%%/logitech-ultrax.def
 %%DATADIR%%/mck800.def
 %%DATADIR%%/msnatpro.def
 %%DATADIR%%/msnet.def
 %%DATADIR%%/msnetpro.def
 %%DATADIR%%/mx1998.def
 %%DATADIR%%/mx2500.def
 %%DATADIR%%/mx3000.def
 %%DATADIR%%/orktekusb.def
 %%DATADIR%%/pb5140w.def
 %%DATADIR%%/polypix.def
 %%DATADIR%%/sk2500.def
 %%DATADIR%%/sk2501a.def
 %%DATADIR%%/sk2505.def
 %%DATADIR%%/sk2800c.def
 %%DATADIR%%/sk7100.def
 %%DATADIR%%/sk9925.def