ports/58126: Update port: editors/lfhex to 0.3.4

[KATO Tsuguru]

>Number:         58126
>Category:       ports
>Synopsis:       Update port: editors/lfhex to 0.3.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 16 07:50:23 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.8-RELEASE-p13 i386
>Organization:
>Environment:
>Description:
- Update to version 0.3.4

Remove file:
files/patch-hexEditor.cpp
files/patch-hexGui.cpp
files/patch-src::Makefile.in

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/editors/lfhex/Makefile editors/lfhex/Makefile
--- /usr/ports/editors/lfhex/Makefile	Thu Oct 16 19:36:46 2003
+++ editors/lfhex/Makefile	Thu Oct 16 21:44:31 2003
@@ -7,34 +7,21 @@
 #
 
 PORTNAME=	lfhex
-PORTVERSION=	0.3.2
-PORTREVISION=	2
+PORTVERSION=	0.3.4
 CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	arved
+MASTER_SITES=	http://home.earthlink.net/~eyekode/data/
 
-MAINTAINER=	ports at freebsd.org
-COMMENT=	"Large file hex editor"
+MAINTAINER=	ports at FreeBSD.org
+COMMENT=	Large file hex editor
 
-USE_GETOPT_LONG=yes
-USE_REINPLACE=	yes
 USE_QT_VER=	3
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
 CONFIGURE_ARGS=	--with-qt-moc=${MOC}
-USE_GMAKE=	yes
-CONFIGURE_ENV=	CXXFLAGS="${PTHREAD_CFLAGS}"
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g ; \
-		s,%%X11BASE%%,${X11BASE},g" ${WRKSRC}/src/Makefile.in
 
-post-configure:
-	${REINPLACE_CMD} -e "s,LFLAGS =,LFLAGS = ${PTHREAD_LIBS} ${LDFLAGS}," ${WRKSRC}/src/Makefile
+MAKE_ARGS=	EXEC_PREFIX="${PREFIX}/bin" \
+		IFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \
+		LFLAGS="${QTCFGLIBS} -lqt-mt ${PTHREAD_LIBS}"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/editors/lfhex/distinfo editors/lfhex/distinfo
--- /usr/ports/editors/lfhex/distinfo	Sun Jul  8 23:51:01 2001
+++ editors/lfhex/distinfo	Thu Oct 16 20:57:52 2003
@@ -1 +1 @@
-MD5 (lfhex-0.3.2.tar.gz) = 28bcccd6bc77b8de92d31e9361b26531
+MD5 (lfhex-0.3.4.tar.gz) = 59aaa0ed92155106509a2cc9cb36bf1d
diff -urN /usr/ports/editors/lfhex/files/patch-hexEditor.cpp editors/lfhex/files/patch-hexEditor.cpp
--- /usr/ports/editors/lfhex/files/patch-hexEditor.cpp	Sun Feb 23 09:06:05 2003
+++ editors/lfhex/files/patch-hexEditor.cpp	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
---- src/hexEditor.cpp.orig	Sun Feb 23 00:37:11 2003
-+++ src/hexEditor.cpp	Sun Feb 23 00:38:31 2003
-@@ -22,6 +22,8 @@
- #include <qfiledialog.h>
- #include <qapplication.h>
- #include <qprogressdialog.h>
-+#include <qpainter.h>
-+#include <qpixmap.h>
- 
- #include "config.h"
- #include "hexEditor.hpp"
diff -urN /usr/ports/editors/lfhex/files/patch-hexGui.cpp editors/lfhex/files/patch-hexGui.cpp
--- /usr/ports/editors/lfhex/files/patch-hexGui.cpp	Sun Feb 23 09:06:05 2003
+++ editors/lfhex/files/patch-hexGui.cpp	Thu Jan  1 09:00:00 1970
@@ -1,10 +0,0 @@
---- src/hexGui.cpp.orig	Sat Jul  7 04:16:01 2001
-+++ src/hexGui.cpp	Sun Feb 23 00:40:32 2003
-@@ -24,6 +24,7 @@
- #include <qscrollbar.h>
- #include <qstring.h>
- #include <qmessagebox.h>
-+#include <qlineedit.h>
- //#include <qprogressbar.h>
- //#include <qtoolbar.h>
- //#include <qtoolbutton.h>
diff -urN /usr/ports/editors/lfhex/files/patch-src::Makefile.in editors/lfhex/files/patch-src::Makefile.in
--- /usr/ports/editors/lfhex/files/patch-src::Makefile.in	Tue Jul 15 00:12:58 2003
+++ editors/lfhex/files/patch-src::Makefile.in	Thu Jan  1 09:00:00 1970
@@ -1,16 +0,0 @@
---- src/Makefile.in.orig	Wed Jul  4 10:27:43 2001
-+++ src/Makefile.in	Fri Jul  6 10:34:56 2001
-@@ -16,10 +16,10 @@
- endif
- 
- CXXFLAGS = @CXXFLAGS@
--INCLUDE_DIRS = $(QTDIR)/include 
-+INCLUDE_DIRS = %%X11BASE%%/include
- IFLAGS = $(addprefix -I,$(INCLUDE_DIRS))
--LIBRARIES = qt Xext X11 m
--LIB_DIRS  = $(QTDIR)/lib /usr/X11R6/lib
-+LIBRARIES = qt-mt Xext X11 m
-+LIB_DIRS  = $(QTDIR)/lib /usr/X11R6/lib
- LFLAGS = $(addprefix -L,$(LIB_DIRS)) $(addprefix -l,$(LIBRARIES))
- 
- CXX_SRC = $(wildcard *.cpp)
diff -urN /usr/ports/editors/lfhex/files/patch-src::reader.cpp editors/lfhex/files/patch-src::reader.cpp
--- /usr/ports/editors/lfhex/files/patch-src::reader.cpp	Sat Apr 12 22:44:38 2003
+++ editors/lfhex/files/patch-src::reader.cpp	Thu Oct 16 20:55:00 2003
@@ -1,6 +1,14 @@
---- src/reader.cpp.orig	Sat Jul  7 04:16:01 2001
-+++ src/reader.cpp	Sun Feb 23 00:46:53 2003
-@@ -227,7 +227,7 @@
+--- src/reader.cpp.orig	Sat Jul  7 11:16:01 2001
++++ src/reader.cpp	Thu Oct 16 20:54:13 2003
+@@ -13,6 +13,7 @@
+ #include <stdexcept>
+ #include <algorithm>
+ #include <new>
++#include <cassert>
+ 
+ // for stat:
+ #include <sys/types.h>
+@@ -227,7 +228,7 @@
      // free the page which is the furthest away from the page we are loading
  
      // this could be trouble if off_t is unsigned!
@@ -9,7 +17,7 @@
        while(!freePage(_firstPage++));
      else
        while(!freePage(_lastPage--));
-@@ -285,7 +285,7 @@
+@@ -285,7 +286,7 @@
  #ifdef LFHEX_IOS_BASE_FMTFLAGS
  ostream& operator<< (ostream&out, const ReadBuffer& buff)
  {
>Release-Note:
>Audit-Trail:
>Unformatted: