Attachment #89494 for bug #126441

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




# New ports collection makefile for:   isearch
# Date created:			21 Sept 1996
# Whom:				Pedro Giffuni
#
# $FreeBSD: ports/textproc/isearch/Makefile,v 1.21 2007/09/30 09:49:40 linimon Exp $
#

MAINTAINER=	pmarquis@pobox.com
COMMENT=	Text Search Engine by CNIDR

GNU_CONFIGURE=	yes
MAKE_ARGS=	INSTALL=${PREFIX}/bin

post-install:

	${INSTALL_MAN} ${WRKSRC}/html/*.html ${DOCSDIR}
.endif

.include <bsd.port.mk>

.if ${OSVERSION} >= 700042
BROKEN=		Does not compile with GCC 4.2
.endif

.include <bsd.port.post.mk>




--- Makefile.orig	2000-10-12 15:55:56.000000000 -0500
+++ Makefile	2008-08-10 22:44:02.000000000 -0500
@@ -23,9 +23,9 @@
 #
 # Compiler
 #
-CC=g++
+CC=${CXX}
 
-DTCC=g++
+DTCC=${CXX}
 #CC=/sw/CenterLine/bin/CC
 
 #
@@ -45,7 +45,7 @@
 #
 # for Linux
 #
-CFLAGS=-O2 -DUNIX -fwritable-strings
+CFLAGS+=-O2 -DUNIX ${CXXFLAGS}
 #CFLAGS=-g -fwritable-strings -Wall -Wno-unused -DUNIX # -DVERBOSE -DDEBUG
 
 #
@@ -76,8 +76,8 @@
 #
 # Where should I install executables (make install)?
 #
-INSTALL=/usr/local/bin
-CGI_INSTALL=/home/httpd/cgi-bin
+INSTALL=${PREFIX}/bin
+CGI_INSTALL=${PREFIX}/www/cgi-bin
 
 #
 # Executables Directory
@@ -189,12 +189,12 @@
 
 install:
 	@echo "*** Copying Isearch executables to $(INSTALL) ***"
-	cp $(BIN_DIR)/Iindex $(INSTALL)
-	cp $(BIN_DIR)/Isearch $(INSTALL)
-	cp $(BIN_DIR)/Iutil $(INSTALL)
-	cp $(BIN_DIR)/Iget $(INSTALL)
-	cp $(BIN_DIR)/zsearch $(INSTALL)
-	cp $(BIN_DIR)/zpresent $(INSTALL)
+	install -s $(BIN_DIR)/Iindex $(INSTALL)
+	install -s $(BIN_DIR)/Isearch $(INSTALL)
+	install -s $(BIN_DIR)/Iutil $(INSTALL)
+	install -s $(BIN_DIR)/Iget $(INSTALL)
+	install -s $(BIN_DIR)/zsearch $(INSTALL)
+	install -s $(BIN_DIR)/zpresent $(INSTALL)
 	@echo ""
 	@echo "To install Isearch-cgi, cd into the Isearch-cgi directory"
 	@echo "Then run the configure script"




--- doctype/Makefile.orig	2008-08-10 20:21:14.000000000 -0500
+++ doctype/Makefile	2008-08-10 20:22:13.000000000 -0500
@@ -2,7 +2,7 @@
 #
 # Compiler
 #
-CC=g++
+CC=${CXX}
 
 #
 # Compiler Flags
@@ -13,7 +13,7 @@
 
 #CFLAGS=-DUNIX -O2
 #CFLAGS=-g -DUNIX -Wall -O2
-CFLAGS=-g -DUNIX -Wall -D__CSTRING__
+CFLAGS= -DUNIX -D__CSTRING__
 
 #
 # Source Files Directory




--- src/string.hxx.orig	2008-08-10 20:45:33.000000000 -0500
+++ src/string.hxx	2008-08-10 20:46:39.000000000 -0500
@@ -44,7 +44,8 @@
 #define STRING_HXX
 
 #include <string.h>
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 #include "gdt.h"
 #include "defs.hxx"
 

Line 0 Link Here

(-)isearch/files/patch-src::Iindex.cxx (+11 lines)
	1	--- src/Iindex.cxx.orig 2008-08-10 22:50:36.000000000 -0500
	2	+++ src/Iindex.cxx 2008-08-10 22:52:14.000000000 -0500
	3	@@ -170,7 +170,7 @@
	4	}
	5	}
	6	if (Found) {
	7	- Offset = (GPTYPE)((UINT4)Found - (UINT4)Buffer);
	8	+ Offset = (GPTYPE)((UINT8)Found - (UINT8)Buffer);
	9	/* the separator marks the beginning of the next
	10	record. (offset - 1), then marks the end of
	11	the current record. we must make sure that the

Line 0 Link Here

(-)isearch/files/patch-src::fc.hxx (+12 lines)
	1	--- src/fc.hxx.orig 2008-08-10 20:45:08.000000000 -0500
	2	+++ src/fc.hxx 2008-08-10 20:47:33.000000000 -0500
	3	@@ -8,7 +8,8 @@
	4	#ifndef FC_HXX
	5	#define FC_HXX
	6
	7	-#include <iostream.h>
	8	+#include <iostream>
	9	+using namespace std;
	10	/*
	11	#include "defs.hxx"
	12	*/

Line 0 Link Here

(-)isearch/files/patch-src::fct.cxx (+12 lines)
	1	--- src/fct.cxx.orig 2008-08-10 21:01:26.000000000 -0500
	2	+++ src/fct.cxx 2008-08-10 21:05:15.000000000 -0500
	3	@@ -6,7 +6,8 @@
	4	@@@*/
	5
	6	#include <stdlib.h>
	7	-#include <iostream.h>
	8	+#include <iostream>
	9	+using namespace std;
	10
	11	#include "defs.hxx"
	12	#include "string.hxx"




--- src/intlist.cxx.orig	2008-08-10 21:01:51.000000000 -0500
+++ src/intlist.cxx	2008-08-10 21:03:34.000000000 -0500
@@ -47,7 +47,8 @@
 
 #include <stdlib.h>
 #include <time.h>
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 #include "intlist.hxx"
 




--- src/intlist.hxx.orig	2008-08-10 20:45:21.000000000 -0500
+++ src/intlist.hxx	2008-08-10 20:47:28.000000000 -0500
@@ -50,7 +50,8 @@
 
 #include <stdlib.h>
 #include <time.h>
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 #include "gdt.h"
 #include "defs.hxx"

Line 0 Link Here

(-)isearch/files/patch-src::mergeunit.hxx (+10 lines)
	1	--- src/mergeunit.hxx.orig 1998-05-12 16:49:13.000000000 +0000
	2	+++ src/mergeunit.hxx 2007-12-01 16:40:09.000000000 +0000
	3	@@ -49,6 +49,7 @@ Author: Jim Fullton, MCNC/CNIDR
	4
	5	#include "defs.hxx"
	6	#include "idbobj.hxx"
	7	+#include "filemap.hxx"
	8
	9	#define LIM 10000
	10

Line 0 Link Here

(-)isearch/files/patch-src::nlist.cxx (+12 lines)
	1	--- src/nlist.cxx.orig 2008-08-10 21:02:00.000000000 -0500
	2	+++ src/nlist.cxx 2008-08-10 21:03:22.000000000 -0500
	3	@@ -45,7 +45,8 @@
	4	@@@*/
	5
	6	#include <stdlib.h>
	7	-#include <iostream.h>
	8	+#include <iostream>
	9	+using namespace std;
	10
	11	#include "nlist.hxx"
	12

Line 0 Link Here

(-)isearch/files/patch-src::opstack.hxx (+11 lines)
	1	--- src/opstack.hxx.orig 1996-12-21 00:41:10.000000000 +0000
	2	+++ src/opstack.hxx 2007-12-01 16:38:59.000000000 +0000
	3	@@ -57,7 +57,7 @@ public:
	4	OPSTACK& operator<<(OPOBJ* Op);
	5	POPOBJ operator>>(POPOBJ& OpPtr);
	6	PIRSET operator>>(PIRSET& OpPtr);
	7	- void OPSTACK::Reverse();
	8	+ void Reverse();
	9	~OPSTACK();
	10	private:
	11	void Push(OPOBJ& Op);




--- src/registry.cxx.orig	2008-08-10 20:54:13.000000000 -0500
+++ src/registry.cxx	2008-08-10 20:58:13.000000000 -0500
@@ -40,8 +40,9 @@
 Author:		Nassib Nassar, nrn@cnidr.org
 @@@*/
 
-#include <fstream.h>
 #include <stdlib.h>
+#include <fstream>
+using namespace std;
 
 #include "registry.hxx"
 




--- src/string.cxx.orig	2000-10-31 01:22:09.000000000 -0500
+++ src/string.cxx	2008-08-10 20:55:59.000000000 -0500
@@ -45,9 +45,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <fstream.h>
 #include <ctype.h>
 #include <sys/stat.h>
+#include <fstream>
+using namespace std;
 
 #ifdef UNIX
 #include <unistd.h>
@@ -574,7 +575,7 @@
 
 // can this be const STRING& ?
 ostream& operator<<(ostream& os, const STRING& str) {

Return to bug 126441

Lines 1-6 Link Here

(-)isearch/Makefile (-9 / +2 lines)
1	# New ports collection makefile for: isearch	1	# New ports collection makefile for: isearch
2	# Date created: 21 Sept 1996	2	# Date created: 21 Sept 1996
3	# Whom: Pedro	3	# Whom: Pedro Giffuni
4	#	4	#
5	# $FreeBSD: ports/textproc/isearch/Makefile,v 1.21 2007/09/30 09:49:40 linimon Exp $	5	# $FreeBSD: ports/textproc/isearch/Makefile,v 1.21 2007/09/30 09:49:40 linimon Exp $
6	#	6	#
Lines 14-20 Link Here
14	MAINTAINER= pmarquis@pobox.com	14	MAINTAINER= pmarquis@pobox.com
15	COMMENT= Text Search Engine by CNIDR	15	COMMENT= Text Search Engine by CNIDR
16		16
17	GNU_CONFIGURE= yes
18	MAKE_ARGS= INSTALL=${PREFIX}/bin	17	MAKE_ARGS= INSTALL=${PREFIX}/bin
19		18
20	post-install:	19	post-install:
Lines 23-32 Link Here
23	${INSTALL_MAN} ${WRKSRC}/html/*.html ${DOCSDIR}	22	${INSTALL_MAN} ${WRKSRC}/html/*.html ${DOCSDIR}
24	.endif	23	.endif
25		24
26	.include <bsd.port.pre.mk>	25	.include <bsd.port.mk>
27
28	.if ${OSVERSION} >= 700042
29	BROKEN= Does not compile with GCC 4.2
30	.endif
31
32	.include <bsd.port.post.mk>

Line 0 Link Here

(-)isearch/files/patch-Makefile (+53 lines)
	1	--- Makefile.orig 2000-10-12 15:55:56.000000000 -0500
	2	+++ Makefile 2008-08-10 22:44:02.000000000 -0500
	3	@@ -23,9 +23,9 @@
	4	#
	5	# Compiler
	6	#
	7	-CC=g++
	8	+CC=${CXX}
	9
	10	-DTCC=g++
	11	+DTCC=${CXX}
	12	#CC=/sw/CenterLine/bin/CC
	13
	14	#
	15	@@ -45,7 +45,7 @@
	16	#
	17	# for Linux
	18	#
	19	-CFLAGS=-O2 -DUNIX -fwritable-strings
	20	+CFLAGS+=-O2 -DUNIX ${CXXFLAGS}
	21	#CFLAGS=-g -fwritable-strings -Wall -Wno-unused -DUNIX # -DVERBOSE -DDEBUG
	22
	23	#
	24	@@ -76,8 +76,8 @@
	25	#
	26	# Where should I install executables (make install)?
	27	#
	28	-INSTALL=/usr/local/bin
	29	-CGI_INSTALL=/home/httpd/cgi-bin
	30	+INSTALL=${PREFIX}/bin
	31	+CGI_INSTALL=${PREFIX}/www/cgi-bin
	32
	33	#
	34	# Executables Directory
	35	@@ -189,12 +189,12 @@
	36
	37	install:
	38	@echo "* Copying Isearch executables to $(INSTALL) *"
	39	- cp $(BIN_DIR)/Iindex $(INSTALL)
	40	- cp $(BIN_DIR)/Isearch $(INSTALL)
	41	- cp $(BIN_DIR)/Iutil $(INSTALL)
	42	- cp $(BIN_DIR)/Iget $(INSTALL)
	43	- cp $(BIN_DIR)/zsearch $(INSTALL)
	44	- cp $(BIN_DIR)/zpresent $(INSTALL)
	45	+ install -s $(BIN_DIR)/Iindex $(INSTALL)
	46	+ install -s $(BIN_DIR)/Isearch $(INSTALL)
	47	+ install -s $(BIN_DIR)/Iutil $(INSTALL)
	48	+ install -s $(BIN_DIR)/Iget $(INSTALL)
	49	+ install -s $(BIN_DIR)/zsearch $(INSTALL)
	50	+ install -s $(BIN_DIR)/zpresent $(INSTALL)
	51	@echo ""
	52	@echo "To install Isearch-cgi, cd into the Isearch-cgi directory"
	53	@echo "Then run the configure script"

Line 0 Link Here

(-)isearch/files/patch-doctype+Makefile (+20 lines)
	1	--- doctype/Makefile.orig 2008-08-10 20:21:14.000000000 -0500
	2	+++ doctype/Makefile 2008-08-10 20:22:13.000000000 -0500
	3	@@ -2,7 +2,7 @@
	4	#
	5	# Compiler
	6	#
	7	-CC=g++
	8	+CC=${CXX}
	9
	10	#
	11	# Compiler Flags
	12	@@ -13,7 +13,7 @@
	13
	14	#CFLAGS=-DUNIX -O2
	15	#CFLAGS=-g -DUNIX -Wall -O2
	16	-CFLAGS=-g -DUNIX -Wall -D__CSTRING__
	17	+CFLAGS= -DUNIX -D__CSTRING__
	18
	19	#
	20	# Source Files Directory

Line 0 Link Here

(-)isearch/files/patch-src+string::hxx (+12 lines)
	1	--- src/string.hxx.orig 2008-08-10 20:45:33.000000000 -0500
	2	+++ src/string.hxx 2008-08-10 20:46:39.000000000 -0500
	3	@@ -44,7 +44,8 @@
	4	#define STRING_HXX
	5
	6	#include <string.h>
	7	-#include <iostream.h>
	8	+#include <iostream>
	9	+using namespace std;
	10	#include "gdt.h"
	11	#include "defs.hxx"
	12

Line 0 Link Here

(-)isearch/files/patch-src::intlist.cxx (+12 lines)
	1	--- src/intlist.cxx.orig 2008-08-10 21:01:51.000000000 -0500
	2	+++ src/intlist.cxx 2008-08-10 21:03:34.000000000 -0500
	3	@@ -47,7 +47,8 @@
	4
	5	#include <stdlib.h>
	6	#include <time.h>
	7	-#include <iostream.h>
	8	+#include <iostream>
	9	+using namespace std;
	10
	11	#include "intlist.hxx"
	12

Line 0 Link Here

(-)isearch/files/patch-src::intlist.hxx (+12 lines)
	1	--- src/intlist.hxx.orig 2008-08-10 20:45:21.000000000 -0500
	2	+++ src/intlist.hxx 2008-08-10 20:47:28.000000000 -0500
	3	@@ -50,7 +50,8 @@
	4
	5	#include <stdlib.h>
	6	#include <time.h>
	7	-#include <iostream.h>
	8	+#include <iostream>
	9	+using namespace std;
	10
	11	#include "gdt.h"
	12	#include "defs.hxx"

Line 0 Link Here

(-)isearch/files/patch-src::registry.cxx (+13 lines)
	1	--- src/registry.cxx.orig 2008-08-10 20:54:13.000000000 -0500
	2	+++ src/registry.cxx 2008-08-10 20:58:13.000000000 -0500
	3	@@ -40,8 +40,9 @@
	4	Author: Nassib Nassar, nrn@cnidr.org
	5	@@@*/
	6
	7	-#include <fstream.h>
	8	#include <stdlib.h>
	9	+#include <fstream>
	10	+using namespace std;
	11
	12	#include "registry.hxx"
	13

Lines 1-6 Link Here

(-)isearch/files/patch-src::string.cxx (-3 / +15 lines)
1	--- src/string.cxx.orig Sun Dec 15 09:27:00 2002	1	--- src/string.cxx.orig 2000-10-31 01:22:09.000000000 -0500
2	+++ src/string.cxx Sun Dec 15 09:27:20 2002	2	+++ src/string.cxx 2008-08-10 20:55:59.000000000 -0500
3	@@ -574,7 +574,7 @@	3	@@ -45,9 +45,10 @@
		4	#include <stdio.h>
		5	#include <stdlib.h>
		6	#include <string.h>
		7	-#include <fstream.h>
		8	#include <ctype.h>
		9	#include <sys/stat.h>
		10	+#include <fstream>
		11	+using namespace std;
		12
		13	#ifdef UNIX
		14	#include <unistd.h>
		15	@@ -574,7 +575,7 @@
4		16
5	// can this be const STRING& ?	17	// can this be const STRING& ?
6	ostream& operator<<(ostream& os, const STRING& str) {	18	ostream& operator<<(ostream& os, const STRING& str) {