Date: Wed, 11 Aug 2004 03:00:07 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/70261: Update port: editors/hte to 0.8.0 Message-ID: <20040811030007.0768e033.tkato432@yahoo.com> Resent-Message-ID: <200408101800.i7AI0kAH044688@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70261
>Category: ports
>Synopsis: Update port: editors/hte to 0.8.0
>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: Tue Aug 10 18:00:46 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.10-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 0.8.0
Remove file:
files/patch-cstream.cc
files/patch-htle.cc
files/patch-src::srt_x86.cc
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/editors/hte/Makefile editors/hte/Makefile
--- /usr/ports/editors/hte/Makefile Sun Mar 21 10:13:20 2004
+++ editors/hte/Makefile Mon Aug 9 14:41:59 2004
@@ -7,7 +7,7 @@
#
PORTNAME= hte
-PORTVERSION= 0.7.5
+PORTVERSION= 0.8.0
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -42,9 +42,16 @@
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|$$FLAGS_PIPE $$FLAGS_ALL|$$CFLAGS|g ; \
+ @${REINPLACE_CMD} -e 's|^CXXFLAGS=.*$$|CXXFLAGS="$$CXXFLAGS"|g ; \
+ s|^CFLAGS=.*$$|CFLAGS="$$CFLAGS"|g ; \
s|-L/usr/X11/lib -L/usr/X11R6/lib|$$LDFLAGS|g' \
${WRKSRC}/configure
+ @${REINPLACE_CMD} -e \
+ 's|typedef unsigned int uint;||g' ${WRKSRC}/global.h
+ @${REINPLACE_CMD} -e \
+ 's|uint |UINT |g' ${WRKSRC}/htdata.h
+ @${REINPLACE_CMD} -e \
+ 's|#include <malloc.h>||g' ${WRKSRC}/cp-demangle.c
post-install:
.if !defined(NOPORTDOCS)
diff -urN /usr/ports/editors/hte/distinfo editors/hte/distinfo
--- /usr/ports/editors/hte/distinfo Sun Mar 21 10:13:20 2004
+++ editors/hte/distinfo Mon Aug 9 14:03:57 2004
@@ -1,2 +1,2 @@
-MD5 (ht-0.7.5.tar.bz2) = 9c0a9f043d6b4f366a9c60bf594c382d
-SIZE (ht-0.7.5.tar.bz2) = 649346
+MD5 (ht-0.8.0.tar.bz2) = ee309bdd16b3e1ec78b2efb6427dd5a5
+SIZE (ht-0.8.0.tar.bz2) = 731401
diff -urN /usr/ports/editors/hte/files/patch-cstream.cc editors/hte/files/patch-cstream.cc
--- /usr/ports/editors/hte/files/patch-cstream.cc Sun Aug 8 04:11:52 2004
+++ editors/hte/files/patch-cstream.cc Thu Jan 1 09:00:00 1970
@@ -1,35 +0,0 @@
---- cstream.cc.orig Mon Jul 1 02:08:48 2002
-+++ cstream.cc Wed Aug 4 18:09:28 2004
-@@ -115,12 +115,13 @@
- return true;
- }
-
--UINT ht_compressed_stream::read(void *buf, UINT size)
-+UINT ht_compressed_stream::read(void *aBuf, UINT size)
- {
- UINT ssize = size;
-+ byte *buf = (byte *)aBuf;
- while (size >= bufferpos) {
- memcpy(buf, buffer+buffersize-bufferpos, bufferpos);
-- ((byte *)buf) += bufferpos;
-+ buf += bufferpos;
- size -= bufferpos;
- bufferpos = 0;
- if (size) {
-@@ -134,13 +135,14 @@
- return ssize;
- }
-
--UINT ht_compressed_stream::write(const void *buf, UINT size)
-+UINT ht_compressed_stream::write(const void *aBuf, UINT size)
- {
- UINT ssize = size;
-+ const byte *buf = (const byte *)aBuf;
- while (bufferpos+size >= buffersize) {
- memcpy(buffer+bufferpos, buf, buffersize-bufferpos);
- size -= buffersize-bufferpos;
-- ((byte *)buf) += buffersize-bufferpos;
-+ buf += buffersize-bufferpos;
- bufferpos = buffersize;
- if (size) {
- if (!flush_compressed()) return ssize - size;
diff -urN /usr/ports/editors/hte/files/patch-htle.cc editors/hte/files/patch-htle.cc
--- /usr/ports/editors/hte/files/patch-htle.cc Sun Aug 8 04:11:52 2004
+++ editors/hte/files/patch-htle.cc Thu Jan 1 09:00:00 1970
@@ -1,46 +0,0 @@
---- htle.cc.orig Thu Oct 10 03:32:50 2002
-+++ htle.cc Wed Aug 4 18:14:34 2004
-@@ -475,19 +475,20 @@
- return false;
- }
-
--UINT ht_le_page_file::read(void *buf, UINT size)
-+UINT ht_le_page_file::read(void *aBuf, UINT size)
- {
- FILEOFS mofs;
- UINT msize;
- int c = 0;
- while (size) {
- UINT s = size;
-+ byte *buf = (byte *)aBuf;
- if (!map_ofs(ofs, &mofs, &msize)) break;
- if (s>msize) s = msize;
- streamfile->seek(mofs);
- s = streamfile->read(buf, s);
- if (!s) break;
-- ((byte*)buf) += s;
-+ buf += s;
- size -= s;
- c += s;
- ofs += s;
-@@ -546,17 +547,18 @@
- return ht_layer_streamfile::vcntl(cmd, vargs);
- }
-
--UINT ht_le_page_file::write(const void *buf, UINT size)
-+UINT ht_le_page_file::write(const void *aBuf, UINT size)
- {
- FILEOFS mofs;
- UINT msize;
- int c = 0;
- while (size) {
- UINT s = size;
-+ const byte *buf = (const byte *)aBuf;
- if (!map_ofs(ofs, &mofs, &msize)) break;
- if (s>msize) s = msize;
- streamfile->seek(mofs);
-- ((byte*)buf) += streamfile->write(buf, s);
-+ buf += streamfile->write(buf, s);
- size -= s;
- c += s;
- ofs += s;
diff -urN /usr/ports/editors/hte/files/patch-src::srt_x86.cc editors/hte/files/patch-src::srt_x86.cc
--- /usr/ports/editors/hte/files/patch-src::srt_x86.cc Sun Aug 8 04:11:52 2004
+++ editors/hte/files/patch-src::srt_x86.cc Thu Jan 1 09:00:00 1970
@@ -1,18 +0,0 @@
---- srt/srt_x86.cc.orig Mon Sep 2 02:05:13 2002
-+++ srt/srt_x86.cc Wed Aug 4 17:53:58 2004
-@@ -60,13 +60,13 @@
- k = &cpu->flags[(idx-8) % X86_FLAGS];
- (*k)->done();
- delete *k;
-- ((Object*)*k) = o;
-+ k = (sym_bool **)o;
- } else {
- sym_int **k;
- k = &cpu->regs[idx & 7];
- (*k)->done();
- delete *k;
-- ((Object*)*k) = o;
-+ k = (sym_int **)o;
- }
- }
-
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040811030007.0768e033.tkato432>