Date: Sun, 15 Dec 2002 09:35:26 +0800 (CST) From: Kuang-che Wu <kcwu@kcwu.dyndns.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46264: Fix build on -current for textproc/isearch Message-ID: <200212150135.gBF1ZQY6076291@kcwu.dyndns.org>
next in thread | raw e-mail | index | archive | help
>Number: 46264
>Category: ports
>Synopsis: Fix build on -current for textproc/isearch
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Dec 14 17:40:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Kuang-che Wu
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD m722 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Tue Nov 26 18:00:18 CST 2002 root@m722:/usr/obj/usr/src/sys/M722 i386
>Description:
Fix build on -current for textproc/isearch
>How-To-Repeat:
>Fix:
diff -urN isearch/Makefile isearch.new/Makefile
--- isearch/Makefile Sun Dec 15 09:08:36 2002
+++ isearch.new/Makefile Sun Dec 15 09:32:42 2002
@@ -16,16 +16,10 @@
GNU_CONFIGURE= yes
MAKE_ARGS= INSTALL=${PREFIX}/bin
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500035
-#BROKEN= "Does not compile on 5.0"
-.endif
-
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/html/*.html ${DOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN isearch/files/patch-src::registry.hxx isearch.new/files/patch-src::registry.hxx
--- isearch/files/patch-src::registry.hxx Thu Jan 1 08:00:00 1970
+++ isearch.new/files/patch-src::registry.hxx Sun Dec 15 09:32:25 2002
@@ -0,0 +1,11 @@
+--- src/registry.hxx.orig Sun Dec 15 09:13:27 2002
++++ src/registry.hxx Sun Dec 15 09:12:51 2002
+@@ -89,7 +89,7 @@
+ void LoadFromFile(const STRING& FileName);
+ void AddFromFile(const STRING& FileName);
+ // void Print(ostream& os, const INT Level) const;
+- void fprint(FILE* fp, const INT level = 0) const;
++ void fprint(FILE* fp, const INT level) const;
+ void ProfilePrint(ostream& os, const INT Level) const;
+ void GetData(STRLIST *StrlistBuffer);
+ void DeleteChildren();
diff -urN isearch/files/patch-src::string.cxx isearch.new/files/patch-src::string.cxx
--- isearch/files/patch-src::string.cxx Thu Jan 1 08:00:00 1970
+++ isearch.new/files/patch-src::string.cxx Sun Dec 15 09:32:25 2002
@@ -0,0 +1,11 @@
+--- src/string.cxx.orig Sun Dec 15 09:27:00 2002
++++ src/string.cxx Sun Dec 15 09:27:20 2002
+@@ -574,7 +574,7 @@
+
+ // can this be const STRING& ?
+ ostream& operator<<(ostream& os, const STRING& str) {
+- os.write(str.Buffer, str.Length);
++ os.write((char*)str.Buffer, str.Length);
+ return os;
+ }
+
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212150135.gBF1ZQY6076291>