Date: Thu, 6 Feb 2003 02:39:54 +0100 (CET) From: Christian Weisgerber <naddy@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/47985: textproc/sp: build fix for -CURRENT, 64-bit Message-ID: <200302060139.h161dsuu041465@kemoauc.mips.inka.de>
next in thread | raw e-mail | index | archive | help
>Number: 47985
>Category: ports
>Synopsis: textproc/sp: build fix for -CURRENT, 64-bit
>Confidential: no
>Severity: critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 05 18:00:28 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Christian Weisgerber
>Release: FreeBSD 5.0-CURRENT alpha
>Organization:
>Environment:
System: FreeBSD kemoauc.mips.inka.de 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Wed Feb 5 13:01:08 CET 2003 naddy@kemoauc.mips.inka.de:/usr/obj/usr/src/sys/KEMOAUC alpha
>Description:
textproc/sp doesn't build on -CURRENT (with GCC 3.2) or on 64-bit
platforms. The patchset below fixes these issues.
(I have also moved some feature defines from config.h to Makefile.
Either way, SP_MULTI_BYTE should only be defined once.)
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/sp/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile 5 Nov 2002 16:16:20 -0000 1.22
+++ Makefile 6 Feb 2003 01:29:46 -0000
@@ -15,12 +15,6 @@
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
@@ -28,4 +22,4 @@
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.post.mk>
+.include <bsd.port.mk>
Index: files/patch-aa
===================================================================
RCS file: /home/ncvs/ports/textproc/sp/files/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
--- files/patch-aa 7 Sep 1997 00:20:37 -0000 1.3
+++ files/patch-aa 6 Feb 2003 01:29:46 -0000
@@ -1,17 +1,12 @@
-*** include/config.h.orig Wed Jun 12 11:56:06 1996
---- include/config.h Tue Oct 15 17:08:09 1996
-***************
-*** 7,12 ****
---- 7,18 ----
- #define SP_INCLUDE_UNISTD_H
- #define SP_POSIX_FILENAMES
-
-+ #if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
-+ #define SP_HAVE_LOCALE
-+ #define SP_HAVE_SOCKET
-+ #define SP_MULTI_BYTE
-+ #endif
-+
- #ifdef __GNUG__
- // It's not missing, but it pulls in libg++
- #define SP_NEW_H_MISSING
+--- 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__ */
+
Index: files/patch-ab
===================================================================
RCS file: /home/ncvs/ports/textproc/sp/files/patch-ab,v
retrieving revision 1.5
diff -u -r1.5 patch-ab
--- files/patch-ab 5 Nov 2002 16:16:20 -0000 1.5
+++ files/patch-ab 6 Feb 2003 01:29:46 -0000
@@ -1,5 +1,5 @@
---- Makefile.orig Sat Oct 10 00:15:02 1998
-+++ Makefile Sun Oct 27 01:05:00 2002
+--- 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.
@@ -29,9 +29,10 @@
# which doesn't appropriately define sig_atomic_t).
# Add -DJADE_MIF to include the Jade MIF backend
-XDEFINES=
-+XDEFINES=-DSGML_CATALOG_FILES_DEFAULT=\"/usr/local/share/sgml/catalog\"
- 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
Index: files/patch-ah
===================================================================
RCS file: files/patch-ah
diff -N files/patch-ah
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-ah 6 Feb 2003 01:29:46 -0000
@@ -0,0 +1,11 @@
+--- nsgmls/RastEventHandler.h.orig Thu Feb 6 00:13:48 2003
++++ nsgmls/RastEventHandler.h Thu Feb 6 00:14:04 2003
+@@ -102,7 +102,7 @@
+
+ class RastEventHandler : public ErrorCountEventHandler,
+ private RastSubdocState,
+- private Messenger {
++ protected Messenger {
+ public:
+ RastEventHandler(SgmlParser *, Messenger *);
+ void data(DataEvent *);
Index: files/patch-ai
===================================================================
RCS file: files/patch-ai
diff -N files/patch-ai
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-ai 6 Feb 2003 01:29:46 -0000
@@ -0,0 +1,11 @@
+--- lib/parser_inst.m4.orig Thu Feb 6 01:03:36 2003
++++ lib/parser_inst.m4 Thu Feb 6 01:04:17 2003
+@@ -164,7 +164,7 @@
+ __instantiate(Vector<ContentModelAmbiguity>)
+ __instantiate(Vector<Transition>)
+ __instantiate(Vector<LeafContentToken*>)
+-#if 0
++#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__)
+ __instantiate(Vector<size_t>)
+ #endif
+ __instantiate(Vector<unsigned int>)
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302060139.h161dsuu041465>