Repair, fake.

This commit is contained in:
espie 2000-04-21 23:42:10 +00:00
parent 9e8b214f42
commit f1eff3ecd2
6 changed files with 60 additions and 45 deletions

View File

@ -1,23 +1,25 @@
# $OpenBSD: Makefile,v 1.9 2000/04/09 17:38:25 espie Exp $
# $OpenBSD: Makefile,v 1.10 2000/04/21 23:42:10 espie Exp $
# Original from: Ejovi Nuwere <ejovi@ejovi.net>
BROKEN= C++ syntax errors, index.cxx:533: ANSI C++ forbids declaration PhraseLength with no type
#BROKEN= C++ syntax errors, index.cxx:533: ANSI C++ forbids declaration PhraseLength with no type
DISTNAME= Isearch-1.14
PKGNAME= isearch-1.14
CATEGORIES= textproc databases
FAKE=No
MASTER_SITES= ftp://ftp.cnidr.org/pub/NIDR.tools/Isearch/
MAINTAINER= ports@OpenBSD.ORG
LICENSE_TYPE= BSD
PERMIT_PACKAGE_CDROM= YES
PERMIT_PACKAGE_FTP= YES
PERMIT_DISTFILES_CDROM= YES
PERMIT_DISTFILES_FTP= YES
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
GNU_CONFIGURE= yes
GNU_CONFIGURE= Yes
FAKE= Yes
MAKE_FLAGS= CFLAGS='${CFLAGS} -DUNIX'
FAKE_FLAGS= INSTALL=${WRKINST}${PREFIX}/bin
post-install:
strip ${PREFIX}/bin/Isearch

View File

@ -1,6 +1,6 @@
--- Makefile.orig Thu Dec 5 22:35:46 1996
+++ Makefile Mon Feb 17 10:42:51 1997
@@ -153,7 +153,7 @@
+++ Makefile Sat Apr 22 01:27:42 2000
@@ -153,7 +153,7 @@ install:
cp $(BIN_DIR)/Iindex $(INSTALL)/.
cp $(BIN_DIR)/Isearch $(INSTALL)/.
cp $(BIN_DIR)/Iutil $(INSTALL)/.

View File

@ -1,35 +0,0 @@
*** doctype/usmarc.cxx.orig Mon Apr 27 21:02:09 1998
--- doctype/usmarc.cxx Mon Apr 27 21:04:23 1998
***************
*** 453,463 ****
// "Sutrs" is the Z39.50-compliant way to say "ASCII".
! CHR *TempFile = tmpnam(NULL);
if((fp = fopen(TempFile, "w")) == NULL) {
perror(TempFile);
exit(1);
}
MARC *m;
m = new MARC(myBuff);
--- 453,471 ----
// "Sutrs" is the Z39.50-compliant way to say "ASCII".
! CHR TempFile[30];
! sprintf(TempFile, "%s/usm.XXXXXXXXXX", P_tmpdir);
!
! if ((fp = fdopen(mkstemp(TempFile), "w")) == NULL) {
! perror(TempFile);
! exit(1);
! }
! #if 0
if((fp = fopen(TempFile, "w")) == NULL) {
perror(TempFile);
exit(1);
}
+ #endif
MARC *m;
m = new MARC(myBuff);

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-doctype_sgmlnorm_cxx,v 1.1 2000/04/21 23:42:11 espie Exp $
--- doctype/sgmlnorm.cxx.orig Sat Apr 22 01:32:03 2000
+++ doctype/sgmlnorm.cxx Sat Apr 22 01:32:09 2000
@@ -528,7 +528,7 @@ PCHR *SGMLNORM::parse_tags (PCHR b, GPTY
#ifndef TAG_GROW_SIZE
#define TAG_GROW_SIZE 128
#endif
- const grow_size = TAG_GROW_SIZE;
+ const int grow_size = TAG_GROW_SIZE;
#undef TAG_GROW_SIZE
// You should allocate character pointers (to tags) as you need them.

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-doctype_usmarc_cxx,v 1.1 2000/04/21 23:42:11 espie Exp $
--- doctype/usmarc.cxx.orig Wed Dec 4 22:02:09 1996
+++ doctype/usmarc.cxx Sat Apr 22 01:27:43 2000
@@ -453,11 +453,19 @@ if (RecordSyntax == SutrsRecordSyntax) {
// "Sutrs" is the Z39.50-compliant way to say "ASCII".
- CHR *TempFile = tmpnam(NULL);
+ CHR TempFile[30];
+ sprintf(TempFile, "%s/usm.XXXXXXXXXX", P_tmpdir);
+
+ if ((fp = fdopen(mkstemp(TempFile), "w")) == NULL) {
+ perror(TempFile);
+ exit(1);
+ }
+#if 0
if((fp = fopen(TempFile, "w")) == NULL) {
perror(TempFile);
exit(1);
}
+#endif
MARC *m;
m = new MARC(myBuff);

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_index_cxx,v 1.1 2000/04/21 23:42:11 espie Exp $
--- src/index.cxx.orig Sat Apr 22 01:29:57 2000
+++ src/index.cxx Sat Apr 22 01:30:04 2000
@@ -530,7 +530,7 @@ GPTYPE INDEX::BuildGpList(
}
GDT_BOOLEAN INDEX::ValidateInField(const GPTYPE HitGp, const STRING& FieldName,
- const PhraseLength) {
+ const int PhraseLength) {
STRING Fn;
Parent->DfdtGetFileName(FieldName, &Fn);
PFILE Fp = Parent->ffopen(Fn, "rb");