Index: head/x11/x3270/Makefile
===================================================================
--- head/x11/x3270/Makefile	(revision 376981)
+++ head/x11/x3270/Makefile	(revision 376982)
@@ -1,61 +1,62 @@
 # Created by: janek
 # $FreeBSD$
 
 PORTNAME=	x3270
-PORTVERSION=	3.3.13
+PORTVERSION=	3.3.15
 CATEGORIES=	x11 net
 MASTER_SITES=	http://x3270.bgp.nu/download/current/
 EXTRACT_SUFX=	ga7-src.tgz
 
 MAINTAINER=	ecrist@secure-computing.net
 COMMENT=	3270 Terminal emulator
 
-# Conflict due to x3270if
-CONFLICTS=	c3270-*
-
 BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
+# Conflict due to x3270if
+CONFLICTS=	c3270-*
+
 USES=		iconv imake:env
 USE_XORG=	ice sm x11 xaw xext xmu xt
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-fontdir=${PREFIX}/lib/X11/fonts/local --disable-dbcs
+CONFIGURE_ARGS+=	--with-fontdir=${PREFIX}/lib/X11/fonts/${PORTNAME} \
+			--disable-dbcs
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 .if defined(WITHOUT_OPENSSL)
 CONFIGURE_ARGS+=	--disable-ssl
 .else
 USE_OPENSSL=	yes
 .endif
 MAKE_ARGS+=	COMPRESSMANCMD="${DO_NADA}" \
 		INSTALL="${INSTALL}" INSTALLFLAGS="${COPY}" \
 		INSTPGMFLAGS="${STRIP} ${_BINOWNGRP} -m ${BINMODE}" \
 		INSTBINFLAGS="${_BINOWNGRP} -m ${BINMODE}" \
 		INSTDATFLAGS="${_SHROWNGRP} -m ${SHAREMODE}" \
 		INSTMANFLAGS="${_MANOWNGRP} -m ${MANMODE}"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 PORTDOCS=	README README.dbcs
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	${REINPLACE_CMD} -e 's|\$$(INSTALL) -c|$$(INSTALL) $$(INSTALLFLAGS)|g' \
 		${WRKSRC}/Imakefile.in
 
 post-install:
 .for m in x3270-script.man x3270.man x3270if.man
 	@(cd ${WRKSRC} ; ${INSTALL_MAN} ${m} ${STAGEDIR}${MAN1PREFIX}/man/man1/)
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/ibm_hosts.man ${STAGEDIR}${MAN5PREFIX}/man/man5/
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 	@(cd ${WRKSRC}/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} html ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
Index: head/x11/x3270/distinfo
===================================================================
--- head/x11/x3270/distinfo	(revision 376981)
+++ head/x11/x3270/distinfo	(revision 376982)
@@ -1,2 +1,2 @@
-SHA256 (x3270-3.3.13ga7-src.tgz) = a8c6bc9d410e9aa837a2a427f978597fdba135abef0e300cc4531aed6ca45a94
-SIZE (x3270-3.3.13ga7-src.tgz) = 1354917
+SHA256 (x3270-3.3.15ga7-src.tgz) = 0914f5c360faf72eb5a5a764ddcbaf0ba4b195d1c166a65a057126f5f7b945c9
+SIZE (x3270-3.3.15ga7-src.tgz) = 1367615
Index: head/x11/x3270/pkg-plist
===================================================================
--- head/x11/x3270/pkg-plist	(revision 376981)
+++ head/x11/x3270/pkg-plist	(revision 376982)
@@ -1,31 +1,25 @@
 bin/x3270
 bin/x3270if
 etc/x3270/ibm_hosts
-lib/X11/fonts/local/3270-12.pcf.gz
-lib/X11/fonts/local/3270-12b.pcf.gz
-lib/X11/fonts/local/3270-20.pcf.gz
-lib/X11/fonts/local/3270-20b.pcf.gz
-lib/X11/fonts/local/3270.pcf.gz
-lib/X11/fonts/local/3270b.pcf.gz
-lib/X11/fonts/local/3270gr.pcf.gz
-lib/X11/fonts/local/3270gt12.pcf.gz
-lib/X11/fonts/local/3270gt12b.pcf.gz
-lib/X11/fonts/local/3270gt16.pcf.gz
-lib/X11/fonts/local/3270gt16b.pcf.gz
-lib/X11/fonts/local/3270gt24.pcf.gz
-lib/X11/fonts/local/3270gt24b.pcf.gz
-lib/X11/fonts/local/3270gt32.pcf.gz
-lib/X11/fonts/local/3270gt32b.pcf.gz
-lib/X11/fonts/local/3270gt8.pcf.gz
-lib/X11/fonts/local/3270h.pcf.gz
+lib/X11/fonts/x3270/3270-12.pcf.gz
+lib/X11/fonts/x3270/3270-12b.pcf.gz
+lib/X11/fonts/x3270/3270-20.pcf.gz
+lib/X11/fonts/x3270/3270-20b.pcf.gz
+lib/X11/fonts/x3270/3270.pcf.gz
+lib/X11/fonts/x3270/3270b.pcf.gz
+lib/X11/fonts/x3270/3270gr.pcf.gz
+lib/X11/fonts/x3270/3270gt12.pcf.gz
+lib/X11/fonts/x3270/3270gt12b.pcf.gz
+lib/X11/fonts/x3270/3270gt16.pcf.gz
+lib/X11/fonts/x3270/3270gt16b.pcf.gz
+lib/X11/fonts/x3270/3270gt24.pcf.gz
+lib/X11/fonts/x3270/3270gt24b.pcf.gz
+lib/X11/fonts/x3270/3270gt32.pcf.gz
+lib/X11/fonts/x3270/3270gt32b.pcf.gz
+lib/X11/fonts/x3270/3270gt8.pcf.gz
+lib/X11/fonts/x3270/3270h.pcf.gz
 man/man1/x3270-script.man.gz
 man/man1/x3270.man.gz
 man/man1/x3270if.man.gz
 man/man5/ibm_hosts.man.gz
-@exec /bin/chmod u+w %D/lib/X11/fonts/local %D/lib/X11/fonts/local/fonts.dir
-@exec %D/bin/mkfontdir %D/lib/X11/fonts/local
-@exec /bin/chmod u=rwx,go=rx %D/lib/X11/fonts/local
-@exec /bin/chmod a=r %D/lib/X11/fonts/local/fonts.dir
-@unexec %D/bin/mkfontdir %D/lib/X11/fonts/local
-@unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi
-@dirrm etc/x3270
+@fontsdir lib/X11/fonts/x3270