Index: head/graphics/xface.el/Makefile
===================================================================
--- head/graphics/xface.el/Makefile	(revision 444174)
+++ head/graphics/xface.el/Makefile	(revision 444175)
@@ -1,51 +1,41 @@
 # Created by: Yoichi NAKAYAMA <yoichi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xface.el
 PORTVERSION=	1.3.6.24
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	graphics elisp
 MASTER_SITES=	http://www.jpl.org/ftp/pub/elisp/ \
 		ftp://ftp.jpl.org/pub/elisp/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	x-face-${PORTVERSION}
-DISTFILES=	${DISTNAME}.tar.gz \
-		x-face-e21.el.gz
-EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X-Face encoder/decoder/viewer for Emacsen
 
-EMACS_PORT_NAME?=	emacs25
+LICENSE=	GPLv2+
 
 RUN_DEPENDS=	compface:mail/faces
 
 USE_EMACS=	yes
 
 LISP_FILES=	x-face
-.if (${EMACS_PORT_NAME} == xemacs21 || ${EMACS_PORT_NAME} == xemacs21-mule)
-LISPDIR=	${EMACS_SITE_LISPDIR}/x-face
-LISP_FILES+=	x-face-xmas
-PLIST_SUB+=	E21_ONLY="@comment " \
-		XEMACS_ONLY=""
-.else
 LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/x-face
-PLIST_SUB+=	E21_ONLY="@comment " \
-		XEMACS_ONLY="@comment "
-.endif
 PLIST_SUB+=	LISPDIR=${LISPDIR} \
 		DOCSDIR=share/doc/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${LISPDIR}
 .for i in ${LISP_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${i}.el ${WRKSRC}/${i}.elc \
 		${STAGEDIR}${PREFIX}/${LISPDIR}
 .endfor
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} METHOD.ja README.ja README-Anim.ja \
 		TODO.ja ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/graphics/xface.el/distinfo
===================================================================
--- head/graphics/xface.el/distinfo	(revision 444174)
+++ head/graphics/xface.el/distinfo	(revision 444175)
@@ -1,4 +1,3 @@
+TIMESTAMP = 1475572879
 SHA256 (x-face-1.3.6.24.tar.gz) = 9b94b09ce48a58a3241468236628c35dee1ad6697782936ac6d7fab17c7e414a
 SIZE (x-face-1.3.6.24.tar.gz) = 82489
-SHA256 (x-face-e21.el.gz) = 1e0b5f88938f1db76cfc18c2ac176125693a510e9fb20e65831a3c5bf2bfc76c
-SIZE (x-face-e21.el.gz) = 21930
Index: head/graphics/xface.el/pkg-plist
===================================================================
--- head/graphics/xface.el/pkg-plist	(revision 444174)
+++ head/graphics/xface.el/pkg-plist	(revision 444175)
@@ -1,10 +1,6 @@
 %%LISPDIR%%/x-face.el
 %%LISPDIR%%/x-face.elc
-%%XEMACS_ONLY%%%%LISPDIR%%/x-face-xmas.el
-%%XEMACS_ONLY%%%%LISPDIR%%/x-face-xmas.elc
-%%E21_ONLY%%%%LISPDIR%%/x-face-e21.el
-%%E21_ONLY%%%%LISPDIR%%/x-face-e21.elc
 %%PORTDOCS%%%%DOCSDIR%%/METHOD.ja
 %%PORTDOCS%%%%DOCSDIR%%/README.ja
 %%PORTDOCS%%%%DOCSDIR%%/README-Anim.ja
 %%PORTDOCS%%%%DOCSDIR%%/TODO.ja