Attachment #36197 for bug #58126

View | Details | Raw Unified | Return to bug 58126
Collapse All | Expand All




#

PORTNAME=	lfhex
PORTVERSION=	0.3.4
PORTREVISION=	2
CATEGORIES=	editors
MASTER_SITES=	http://home.earthlink.net/~eyekode/data/
MASTER_SITE_SUBDIR=	arved

MAINTAINER=	ports@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

MAKE_ARGS=	EXEC_PREFIX="${PREFIX}/bin" \
		IFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \
		LFLAGS="${QTCFGLIBS} -lqt-mt ${PTHREAD_LIBS}"

.include <bsd.port.mk>

Line 1 Link Here

(-)editors/lfhex/distinfo (-1 / +1 lines)
1	MD5 (lfhex-0.3.2.tar.gz) = 28bcccd6bc77b8de92d31e9361b26531	1	MD5 (lfhex-0.3.4.tar.gz) = 59aaa0ed92155106509a2cc9cb36bf1d

Lines 1-11 Link Here

(-)editors/lfhex/files/patch-hexEditor.cpp (-11 lines)
1	--- src/hexEditor.cpp.orig Sun Feb 23 00:37:11 2003
2	+++ src/hexEditor.cpp Sun Feb 23 00:38:31 2003
3	@@ -22,6 +22,8 @@
4	#include <qfiledialog.h>
5	#include <qapplication.h>
6	#include <qprogressdialog.h>
7	+#include <qpainter.h>
8	+#include <qpixmap.h>
9
10	#include "config.h"
11	#include "hexEditor.hpp"

Lines 1-10 Link Here

(-)editors/lfhex/files/patch-hexGui.cpp (-10 lines)
1	--- src/hexGui.cpp.orig Sat Jul 7 04:16:01 2001
2	+++ src/hexGui.cpp Sun Feb 23 00:40:32 2003
3	@@ -24,6 +24,7 @@
4	#include <qscrollbar.h>
5	#include <qstring.h>
6	#include <qmessagebox.h>
7	+#include <qlineedit.h>
8	//#include <qprogressbar.h>
9	//#include <qtoolbar.h>
10	//#include <qtoolbutton.h>




--- 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)




--- 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!

       while(!freePage(_firstPage++));
     else
       while(!freePage(_lastPage--));
@@ -285,7 +286,7 @@
 #ifdef LFHEX_IOS_BASE_FMTFLAGS
 ostream& operator<< (ostream&out, const ReadBuffer& buff)
 {

Return to bug 58126

Lines 7-40 Link Here

(-)editors/lfhex/Makefile (-23 / +10 lines)
7	#	7	#
8		8
9	PORTNAME= lfhex	9	PORTNAME= lfhex
10	PORTVERSION= 0.3.2	10	PORTVERSION= 0.3.4
11	PORTREVISION= 2
12	CATEGORIES= editors	11	CATEGORIES= editors
13	MASTER_SITES= ${MASTER_SITE_LOCAL}	12	MASTER_SITES= http://home.earthlink.net/~eyekode/data/
14	MASTER_SITE_SUBDIR= arved
15		13
16	MAINTAINER= ports@freebsd.org	14	MAINTAINER= ports@FreeBSD.org
17	COMMENT= "Large file hex editor"	15	COMMENT= Large file hex editor
18		16
19	USE_GETOPT_LONG=yes
20	USE_REINPLACE= yes
21	USE_QT_VER= 3	17	USE_QT_VER= 3
		18	USE_GMAKE= yes
22	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
		20	CONFIGURE_ENV= QTDIR="${QT_PREFIX}"
23	CONFIGURE_ARGS= --with-qt-moc=${MOC}	21	CONFIGURE_ARGS= --with-qt-moc=${MOC}
24	USE_GMAKE= yes
25	CONFIGURE_ENV= CXXFLAGS="${PTHREAD_CFLAGS}"
26
27	.include <bsd.port.pre.mk>
28
29	.if ${OSVERSION} >= 501000
30	BROKEN= "Does not compile"
31	.endif
32
33	post-patch:
34	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g ; \
35	s,%%X11BASE%%,${X11BASE},g" ${WRKSRC}/src/Makefile.in
36		22
37	post-configure:	23	MAKE_ARGS= EXEC_PREFIX="${PREFIX}/bin" \
38	${REINPLACE_CMD} -e "s,LFLAGS =,LFLAGS = ${PTHREAD_LIBS} ${LDFLAGS}," ${WRKSRC}/src/Makefile	24	IFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \
		25	LFLAGS="${QTCFGLIBS} -lqt-mt ${PTHREAD_LIBS}"
39		26
40	.include <bsd.port.post.mk>	27	.include <bsd.port.mk>

Lines 1-16 Link Here

(-)editors/lfhex/files/patch-src::Makefile.in (-16 lines)
1	--- src/Makefile.in.orig Wed Jul 4 10:27:43 2001
2	+++ src/Makefile.in Fri Jul 6 10:34:56 2001
3	@@ -16,10 +16,10 @@
4	endif
5
6	CXXFLAGS = @CXXFLAGS@
7	-INCLUDE_DIRS = $(QTDIR)/include
8	+INCLUDE_DIRS = %%X11BASE%%/include
9	IFLAGS = $(addprefix -I,$(INCLUDE_DIRS))
10	-LIBRARIES = qt Xext X11 m
11	-LIB_DIRS = $(QTDIR)/lib /usr/X11R6/lib
12	+LIBRARIES = qt-mt Xext X11 m
13	+LIB_DIRS = $(QTDIR)/lib /usr/X11R6/lib
14	LFLAGS = $(addprefix -L,$(LIB_DIRS)) $(addprefix -l,$(LIBRARIES))
15
16	CXX_SRC = $(wildcard *.cpp)

Lines 1-6 Link Here

(-)editors/lfhex/files/patch-src::reader.cpp (-4 / +12 lines)
1	--- src/reader.cpp.orig Sat Jul 7 04:16:01 2001	1	--- src/reader.cpp.orig Sat Jul 7 11:16:01 2001
2	+++ src/reader.cpp Sun Feb 23 00:46:53 2003	2	+++ src/reader.cpp Thu Oct 16 20:54:13 2003
3	@@ -227,7 +227,7 @@	3	@@ -13,6 +13,7 @@
		4	#include <stdexcept>
		5	#include <algorithm>
		6	#include <new>
		7	+#include <cassert>
		8
		9	// for stat:
		10	#include <sys/types.h>
		11	@@ -227,7 +228,7 @@
4	// free the page which is the furthest away from the page we are loading	12	// free the page which is the furthest away from the page we are loading
5		13
6	// this could be trouble if off_t is unsigned!	14	// this could be trouble if off_t is unsigned!
Lines 9-15 Link Here
9	while(!freePage(_firstPage++));	17	while(!freePage(_firstPage++));
10	else	18	else
11	while(!freePage(_lastPage--));	19	while(!freePage(_lastPage--));
12	@@ -285,7 +285,7 @@	20	@@ -285,7 +286,7 @@
13	#ifdef LFHEX_IOS_BASE_FMTFLAGS	21	#ifdef LFHEX_IOS_BASE_FMTFLAGS
14	ostream& operator<< (ostream&out, const ReadBuffer& buff)	22	ostream& operator<< (ostream&out, const ReadBuffer& buff)
15	{	23	{