Index: head/editors/lfhex/Makefile
===================================================================
--- head/editors/lfhex/Makefile	(revision 412085)
+++ head/editors/lfhex/Makefile	(revision 412086)
@@ -1,37 +1,37 @@
 # Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	lfhex
 PORTVERSION=	0.42
 PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://stoopidsimple.com/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Large file hex editor
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # only
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
 USES=		bison qmake
 USE_QT4=	corelib gui moc_build rcc_build
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
+WRKSRC_SUBDIR=	src
 
 PORTDOCS=	README
 PLIST_FILES=	bin/lfhex
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|^DEFINES|# DEFINES|g' ${WRKSRC}/lfhex.pro
 	@${REINPLACE_CMD} -e 's| abs| llabs|g' ${WRKSRC}/reader.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lfhex ${STAGEDIR}${PREFIX}/bin
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/../README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/editors/lfhex/files/patch-expr.h
===================================================================
--- head/editors/lfhex/files/patch-expr.h	(revision 412085)
+++ head/editors/lfhex/files/patch-expr.h	(revision 412086)
@@ -1,10 +1,10 @@
---- expr.h.orig	Sun Nov  5 13:26:04 2006
-+++ expr.h	Wed Dec 26 02:53:48 2007
+--- expr.h.orig	2008-09-19 00:36:49 UTC
++++ expr.h
 @@ -19,6 +19,7 @@
   */
  
  #include <string>
 +#include <sys/types.h>
  
  bool expr_eval( const std::string &str, off_t &value );
  
Index: head/editors/lfhex/files/patch-mappings.h
===================================================================
--- head/editors/lfhex/files/patch-mappings.h	(revision 412085)
+++ head/editors/lfhex/files/patch-mappings.h	(revision 412086)
@@ -1,29 +1,29 @@
---- mappings.h.orig	Sun Nov  5 13:26:04 2006
-+++ mappings.h	Wed Dec 26 02:53:48 2007
+--- mappings.h.orig	2008-09-19 00:36:49 UTC
++++ mappings.h
 @@ -19,7 +19,7 @@
  /* automatically generated mappings from gen*To*Map.pl scripts          */
  
  namespace TranslationTables {
 -  char * byteToBinaryMap[256] = {
 +  const char * byteToBinaryMap[256] = {
      "00000000", "00000001", "00000010", "00000011", "00000100", "00000101", 
      "00000110", "00000111", "00001000", "00001001", "00001010", "00001011", 
      "00001100", "00001101", "00001110", "00001111", "00010000", "00010001", 
-@@ -92,7 +92,7 @@
+@@ -92,7 +92,7 @@ namespace TranslationTables {
      '.','.','.','.','.','.','.','.','.','.',
      '.','.','.','.','.','.',
    };
 -  char * byteToHexMap[256] = {
 +  const char * byteToHexMap[256] = {
      "00", "01", "02", "03", "04", "05", "06", "07", "08", "09", 
      "0a", "0b", "0c", "0d", "0e", "0f", "10", "11", "12", "13", 
      "14", "15", "16", "17", "18", "19", "1a", "1b", "1c", "1d", 
-@@ -120,7 +120,7 @@
+@@ -120,7 +120,7 @@ namespace TranslationTables {
      "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", 
      "fa", "fb", "fc", "fd", "fe", "ff", 
    };
 -  char * byteToOctalMap[256] = {
 +  const char * byteToOctalMap[256] = {
      "000", "001", "002", "003", "004", "005", "006", "007", "010", "011", 
      "012", "013", "014", "015", "016", "017", "020", "021", "022", "023", 
      "024", "025", "026", "027", "030", "031", "032", "033", "034", "035",