Attachment #28573 for bug #47985

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




USE_SUBMAKE=	yes
INSTALLS_SHLIB=	yes

.include <bsd.port.pre.mk>

.if ${OSVERSION} >= 500035
BROKEN=		"Does not compile on 5.0"
.endif

post-install:
	$(MKDIR) $(PREFIX)/include/sp
	$(MKDIR) $(PREFIX)/share/doc/sp

	for file in $(WRKSRC)/include/*;do $(INSTALL_DATA) $$file $(PREFIX)/include/sp;done
	for file in $(WRKSRC)/doc/*;do $(INSTALL_DATA) $$file $(PREFIX)/share/doc/sp;done

.include <bsd.port.mk>




--- include/config.h.orig	Wed Oct 13 07:02:46 1999
+++ include/config.h	Wed Feb  5 23:27:11 2003
@@ -29,6 +29,9 @@
 #define SP_NO_STD_NAMESPACE
 #undef SP_NEW_H_MISSING
 #endif
+#if __GNUC__ > 2
+#undef SP_NO_STD_NAMESPACE
+#endif
 
 #endif /* __GNUG__ */
 
+ #endif
+ 
  #ifdef __GNUG__
  // It's not missing, but it pulls in libg++
  #define SP_NEW_H_MISSING




--- Makefile.orig	Sat Oct 10 06:15:02 1998
+++ Makefile	Wed Feb  5 23:25:16 2003
@@ -1,11 +1,12 @@
 # Copyright (c) 1994, 1995 James Clark
 # See the file COPYING for copying permission.

 #  which doesn't appropriately define sig_atomic_t).
 # Add -DJADE_MIF to include the Jade MIF backend
-XDEFINES=
-DEFINES=-DSP_HAVE_BOOL -DSP_ANSI_CLASS_INST -DSP_MULTI_BYTE $(XDEFINES)
 DEFINES=-DSP_HAVE_BOOL -DSP_ANSI_CLASS_INST -DSP_MULTI_BYTE $(XDEFINES)
-CXXFLAGS=-ansi $(DEBUG) $(WARN)
+XDEFINES=-DSGML_CATALOG_FILES_DEFAULT=\"/usr/local/share/sgml/catalog\"
+DEFINES=-DSP_HAVE_BOOL -DSP_ANSI_CLASS_INST -DSP_MULTI_BYTE -DSP_HAVE_LOCALE -DSP_HAVE_SOCKET $(XDEFINES)
+CXXFLAGS+=-ansi $(DEBUG) $(WARN)
 # Flag to pass to CXX to make it output list of dependencies as a Makefile.
 CXXDEPGENFLAGS=-MM

Added Link Here

(-)files/patch-ah (+11 lines)
1	--- nsgmls/RastEventHandler.h.orig Thu Feb 6 00:13:48 2003
2	+++ nsgmls/RastEventHandler.h Thu Feb 6 00:14:04 2003
3	@@ -102,7 +102,7 @@
4
5	class RastEventHandler : public ErrorCountEventHandler,
6	private RastSubdocState,
7	- private Messenger {
8	+ protected Messenger {
9	public:
10	RastEventHandler(SgmlParser , Messenger );
11	void data(DataEvent *);

Added Link Here

(-)files/patch-ai (+11 lines)
1	--- lib/parser_inst.m4.orig Thu Feb 6 01:03:36 2003
2	+++ lib/parser_inst.m4 Thu Feb 6 01:04:17 2003
3	@@ -164,7 +164,7 @@
4	__instantiate(Vector<ContentModelAmbiguity>)
5	__instantiate(Vector<Transition>)
6	__instantiate(Vector<LeafContentToken*>)
7	-#if 0
8	+#if defined(__alpha__) \|\| defined(__ia64__) \|\| defined(__sparc64__)
9	__instantiate(Vector<size_t>)
10	#endif
11	__instantiate(Vector<unsigned int>)

Return to bug 47985

Lines 15-26 Link Here

(-)Makefile (-7 / +1 lines)
15	USE_SUBMAKE= yes	15	USE_SUBMAKE= yes
16	INSTALLS_SHLIB= yes	16	INSTALLS_SHLIB= yes
17		17
18	.include <bsd.port.pre.mk>
19
20	.if ${OSVERSION} >= 500035
21	BROKEN= "Does not compile on 5.0"
22	.endif
23
24	post-install:	18	post-install:
25	$(MKDIR) $(PREFIX)/include/sp	19	$(MKDIR) $(PREFIX)/include/sp
26	$(MKDIR) $(PREFIX)/share/doc/sp	20	$(MKDIR) $(PREFIX)/share/doc/sp
Lines 28-31 Link Here
28	for file in $(WRKSRC)/include/*;do $(INSTALL_DATA) $$file $(PREFIX)/include/sp;done	22	for file in $(WRKSRC)/include/*;do $(INSTALL_DATA) $$file $(PREFIX)/include/sp;done
29	for file in $(WRKSRC)/doc/*;do $(INSTALL_DATA) $$file $(PREFIX)/share/doc/sp;done	23	for file in $(WRKSRC)/doc/*;do $(INSTALL_DATA) $$file $(PREFIX)/share/doc/sp;done
30		24
31	.include <bsd.port.post.mk>	25	.include <bsd.port.mk>

Lines 1-17 Link Here

(-)files/patch-aa (-17 / +12 lines)
1	*** include/config.h.orig Wed Jun 12 11:56:06 1996	1	--- include/config.h.orig Wed Oct 13 07:02:46 1999
2	--- include/config.h Tue Oct 15 17:08:09 1996	2	+++ include/config.h Wed Feb 5 23:27:11 2003
3	***************	3	@@ -29,6 +29,9 @@
4	* 7,12 **	4	#define SP_NO_STD_NAMESPACE
5	--- 7,18 ----	5	#undef SP_NEW_H_MISSING
6	#define SP_INCLUDE_UNISTD_H	6	#endif
7	#define SP_POSIX_FILENAMES	7	+#if __GNUC__ > 2
8		8	+#undef SP_NO_STD_NAMESPACE
9	+ #if (defined(__FreeBSD__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__))	9	+#endif
10	+ #define SP_HAVE_LOCALE	10
11	+ #define SP_HAVE_SOCKET	11	#endif /* __GNUG__ */
12	+ #define SP_MULTI_BYTE	12
13	+ #endif
14	+
15	#ifdef __GNUG__
16	// It's not missing, but it pulls in libg++
17	#define SP_NEW_H_MISSING

Lines 1-5 Link Here

(-)files/patch-ab (-4 / +5 lines)
1	--- Makefile.orig Sat Oct 10 00:15:02 1998	1	--- Makefile.orig Sat Oct 10 06:15:02 1998
2	+++ Makefile Sun Oct 27 01:05:00 2002	2	+++ Makefile Wed Feb 5 23:25:16 2003
3	@@ -1,11 +1,12 @@	3	@@ -1,11 +1,12 @@
4	# Copyright (c) 1994, 1995 James Clark	4	# Copyright (c) 1994, 1995 James Clark
5	# See the file COPYING for copying permission.	5	# See the file COPYING for copying permission.
Lines 29-37 Link Here
29	# which doesn't appropriately define sig_atomic_t).	29	# which doesn't appropriately define sig_atomic_t).
30	# Add -DJADE_MIF to include the Jade MIF backend	30	# Add -DJADE_MIF to include the Jade MIF backend
31	-XDEFINES=	31	-XDEFINES=
32	+XDEFINES=-DSGML_CATALOG_FILES_DEFAULT=\"/usr/local/share/sgml/catalog\"	32	-DEFINES=-DSP_HAVE_BOOL -DSP_ANSI_CLASS_INST -DSP_MULTI_BYTE $(XDEFINES)
33	DEFINES=-DSP_HAVE_BOOL -DSP_ANSI_CLASS_INST -DSP_MULTI_BYTE $(XDEFINES)
34	-CXXFLAGS=-ansi $(DEBUG) $(WARN)	33	-CXXFLAGS=-ansi $(DEBUG) $(WARN)
		34	+XDEFINES=-DSGML_CATALOG_FILES_DEFAULT=\"/usr/local/share/sgml/catalog\"
		35	+DEFINES=-DSP_HAVE_BOOL -DSP_ANSI_CLASS_INST -DSP_MULTI_BYTE -DSP_HAVE_LOCALE -DSP_HAVE_SOCKET $(XDEFINES)
35	+CXXFLAGS+=-ansi $(DEBUG) $(WARN)	36	+CXXFLAGS+=-ansi $(DEBUG) $(WARN)
36	# Flag to pass to CXX to make it output list of dependencies as a Makefile.	37	# Flag to pass to CXX to make it output list of dependencies as a Makefile.
37	CXXDEPGENFLAGS=-MM	38	CXXDEPGENFLAGS=-MM