Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 Feb 2008 02:00:13 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/121085: Update port: editors/lfhex to 0.4
Message-ID:  <20080226020013.9f706622.tkato432@yahoo.com>
Resent-Message-ID: <200802251710.m1PHA252067880@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         121085
>Category:       ports
>Synopsis:       Update port: editors/lfhex to 0.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:   Mon Feb 25 17:10:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 6.3-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Update to version 0.4

New file:
files/patch-expr.h
files/patch-mappings.h

Remove file:
files/patch-src-mappings.h
files/patch-src::expr.h

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/editors/lfhex/Makefile editors/lfhex/Makefile
--- /usr/ports/editors/lfhex/Makefile	2007-11-05 22:04:49.000000000 +0900
+++ editors/lfhex/Makefile	2007-12-26 03:20:35.000000000 +0900
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	lfhex
-PORTVERSION=	0.3.7.2
-PORTREVISION=	2
+PORTVERSION=	0.4
 CATEGORIES=	editors
 MASTER_SITES=	http://stoopidsimple.com/files/ \
 		http://home.earthlink.net/~eyekode/data/
@@ -16,28 +15,29 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Large file hex editor
 
-USE_QT_VER=	3
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib gui moc_build qmake_build
 USE_BISON=	build
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--with-qt-moc=${MOC}
-
-MAKE_ARGS=	CXXFLAGS="${CXXFLAGS}" \
-		EXEC_PREFIX="${PREFIX}/bin" \
-		IFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \
-		LFLAGS="${QTCFGLIBS} -lqt-mt ${PTHREAD_LIBS}" \
-		INSTALL="${INSTALL_PROGRAM}" \
-		VERBOSE=1
 
+PORTDOCS=	README
 PLIST_FILES=	bin/lfhex
 
 .include <bsd.port.pre.mk>
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|^DEFINES|# DEFINES|g' ${WRKSRC}/lfhex.pro
 .if ${OSVERSION} >= 700042
-	${REINPLACE_CMD} -e 's|abs|llabs|g' \
-		${WRKSRC}/src/reader.cpp
+	@${REINPLACE_CMD} -e 's| abs| llabs|g' ${WRKSRC}/reader.cpp
+.endif
+
+pre-build:
+	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE} -unix lfhex.pro
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/lfhex ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/editors/lfhex/distinfo editors/lfhex/distinfo
--- /usr/ports/editors/lfhex/distinfo	2005-11-24 16:04:48.000000000 +0900
+++ editors/lfhex/distinfo	2007-12-26 02:44:51.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (lfhex-0.3.7.2.tar.gz) = 480ec675ce163d6a5e9691d7e625484b
-SHA256 (lfhex-0.3.7.2.tar.gz) = 65c83e85012697099b09dc18db4860c03f5a0ec28e4405e85f085de1ddf46c0a
-SIZE (lfhex-0.3.7.2.tar.gz) = 70871
+MD5 (lfhex-0.4.tar.gz) = 7c664502819cfe8bd984f3f2a683df66
+SHA256 (lfhex-0.4.tar.gz) = 97e3f481a275671395d2b500d904474dfaaf5055b42b0f230e3ac6a2478897b0
+SIZE (lfhex-0.4.tar.gz) = 39180
diff -urN /usr/ports/editors/lfhex/files/patch-expr.h editors/lfhex/files/patch-expr.h
--- /usr/ports/editors/lfhex/files/patch-expr.h	1970-01-01 09:00:00.000000000 +0900
+++ editors/lfhex/files/patch-expr.h	2007-12-26 03:05:00.000000000 +0900
@@ -0,0 +1,10 @@
+--- expr.h.orig	Sun Nov  5 13:26:04 2006
++++ expr.h	Wed Dec 26 02:53:48 2007
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include <string>
++#include <sys/types.h>
+ 
+ bool expr_eval( const std::string &str, off_t &value );
+ 
diff -urN /usr/ports/editors/lfhex/files/patch-mappings.h editors/lfhex/files/patch-mappings.h
--- /usr/ports/editors/lfhex/files/patch-mappings.h	1970-01-01 09:00:00.000000000 +0900
+++ editors/lfhex/files/patch-mappings.h	2007-12-26 03:04:41.000000000 +0900
@@ -0,0 +1,29 @@
+--- mappings.h.orig	Sun Nov  5 13:26:04 2006
++++ mappings.h	Wed Dec 26 02:53:48 2007
+@@ -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 @@
+     '.','.','.','.','.','.','.','.','.','.',
+     '.','.','.','.','.','.',
+   };
+-  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 @@
+     "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", 
diff -urN /usr/ports/editors/lfhex/files/patch-src-mappings.h editors/lfhex/files/patch-src-mappings.h
--- /usr/ports/editors/lfhex/files/patch-src-mappings.h	2007-11-05 19:15:49.000000000 +0900
+++ editors/lfhex/files/patch-src-mappings.h	1970-01-01 09:00:00.000000000 +0900
@@ -1,29 +0,0 @@
---- src/mappings.h.orig	2005-09-24 22:44:32.000000000 +0200
-+++ src/mappings.h	2007-11-04 20:34:59.000000000 +0100
-@@ -12,7 +12,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", 
-@@ -85,7 +85,7 @@
-     '.','.','.','.','.','.','.','.','.','.',
-     '.','.','.','.','.','.',
-   };
--  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", 
-@@ -113,7 +113,7 @@
-     "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", 
diff -urN /usr/ports/editors/lfhex/files/patch-src::expr.h editors/lfhex/files/patch-src::expr.h
--- /usr/ports/editors/lfhex/files/patch-src::expr.h	2004-05-11 00:31:33.000000000 +0900
+++ editors/lfhex/files/patch-src::expr.h	1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@
---- src/expr.h.orig	Fri Feb 13 13:28:39 2004
-+++ src/expr.h	Mon Apr 26 20:56:45 2004
-@@ -11,6 +11,7 @@
-  *                                                                      
-  *----------------------------------------------------------------------*/
- #include <string>
-+#include <sys/types.h>
- 
- bool expr_eval( const std::string &str, off_t &value );
- 
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080226020013.9f706622.tkato432>