Unbreaking it for powerpc did break it for amd64 :-(
Since i'm a little bit uncertain, and not even use swi-prolog, i
post this here to get some more people testing/commenting on it:
1. Unbreak for amd64. Noticed, suggested and already ok, steven@
If someone knows a better way than substituting
${MACHINE_ARCH:S/amd64/x86_64/}, let me know.
2. Zap a -O3 from packages/semweb and honor our CFLAGS instead.
Also noticed by steven@, but no ok yet -- I'd prefer someone actually
using swi-prolog to test this. Note that the thread regression test
hangs (independently of this diff), so there may be more work
necessary. Note that a sheer update to the latest version of
swi-prolog does *not* fix the thread test.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/swi-prolog/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 10 Jun 2007 23:32:27 -0000 1.6
+++ Makefile 26 Jun 2007 11:52:14 -0000
@@ -3,10 +3,10 @@
CATEGORIES= lang
V= 5.6.27
XV= 6.6.27
-FULLARCH= ${MACHINE_ARCH}-openbsd${OSREV}
+FULLARCH= ${MACHINE_ARCH:S/amd64/x86_64/}-openbsd${OSREV}
SUBST_VARS= V XV FULLARCH
DISTNAME= pl-$V
-PKGNAME= swi-prolog-$Vp0
+PKGNAME= swi-prolog-$Vp1
MASTER_SITES=
http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/
COMMENT= 'prolog for the real world'
HOMEPAGE= http://www.swi-prolog.org/
@@ -21,7 +21,7 @@ PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.59
-AUTOCONF_DIR= ${WRKSRC}/src
+AUTOCONF_DIR= ${WRKSRC}/src ${WRKSRC}/packages/semweb
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/src \
${WRKSRC}/packages/jpl \
${WRKSRC}/packages/xpce/src
Index: patches/patch-packages_semweb_Makefile_in
===================================================================
RCS file: patches/patch-packages_semweb_Makefile_in
diff -N patches/patch-packages_semweb_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-packages_semweb_Makefile_in 26 Jun 2007 11:52:14 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Honor CFLAGS.
+
+--- packages/semweb/Makefile.in.orig Tue Jun 26 13:02:46 2007
++++ packages/semweb/Makefile.in Tue Jun 26 13:17:25 2007
+@@ -29,7 +29,7 @@ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+ CIFLAGS=-I.
+-CFLAGS=$(COFLAGS) $(CWFLAGS) $(CMFLAGS) $(CIFLAGS) @DEFS@
[EMAIL PROTECTED]@ $(COFLAGS) $(CWFLAGS) $(CMFLAGS) $(CIFLAGS) @DEFS@
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+
Index: patches/patch-packages_semweb_configure_in
===================================================================
RCS file: patches/patch-packages_semweb_configure_in
diff -N patches/patch-packages_semweb_configure_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-packages_semweb_configure_in 26 Jun 2007 11:52:14 -0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+Don't override CFLAGS, don't force -O3 (but keep -fno-strict-aliasing).
+
+--- packages/semweb/configure.in.orig Tue Jan 23 20:25:14 2007
++++ packages/semweb/configure.in Tue Jun 26 13:28:57 2007
+@@ -65,14 +65,13 @@ AC_CHECK_PROGS(ETAGS, etags ctags, ":")
+ AC_PROG_INSTALL
+ AC_ISC_POSIX
+ AC_HEADER_STDC
+-CFLAGS="$CMFLAGS"
+ AC_FUNC_ALLOCA
+ AC_C_BIGENDIAN
+ AC_C_INLINE
+ AC_CHECK_SIZEOF(long)
+
+ if test ! -z "$GCC"; then
+- COFLAGS="-O3 -fno-strict-aliasing"
++ COFLAGS=-fno-strict-aliasing
+ CWFLAGS=${CWFLAGS--Wall}
+ else
+ COFLAGS=-O
