update to 5.6.27. We lose the sgml package temporarily (wide-chars),

but we gain sparc64 support ! seems the fixes for win64 also fixed
our problems.

Add a few SUBST variables to simplify packing-list comparisons.

lang/swi-prolog/Makefile

@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2006/11/13 11:20:25 steven Exp $
+# $OpenBSD: Makefile,v 1.4 2007/01/27 17:35:46 espie Exp $
 
 CATEGORIES=		lang
-V=			5.6.18
+V=			5.6.27
-SUBST_VARS=		V
+XV=			6.6.27
+FULLARCH=		${MACHINE_ARCH}-openbsd${OSREV}
+SUBST_VARS=		V XV FULLARCH
 DISTNAME=		pl-$V
 PKGNAME=		swi-prolog-$V
 MASTER_SITES=		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/
@@ -25,19 +27,19 @@ CONFIGURE_ARGS=		--enable-mt \
 			--with-world \
 			--disable-gmp \
 			--with-jpeg=${LOCALBASE} \
+			--without-sgml \
 			${CONFIGURE_SHARED}
 
 USE_X11=		Yes
 USE_GMAKE=		Yes
 
 MAKE_FLAGS=		SONAMEOPT= \
-			SHAREDV=libpl.so.${LIBpl_VERSION} \
+			SHAREDV=libpl.so.${LIBpl_VERSION}
-			CONFIGURE_ARGS='$(CONFIGURE_ARGS)'
 FAKE_FLAGS=		${MAKE_FLAGS} \
 			DESTDIR=${WRKINST}
 
 WANTLIB=		ICE Xrender readline SM freetype Xt pthread \
-			c Xinerama Xft Xpm m fontconfig X11 ncurses
+			c Xinerama Xft Xpm m fontconfig X11 ncurses z
 
 LIB_DEPENDS=		jpeg::graphics/jpeg
 SUBST_VARS+=		BOOT

lang/swi-prolog/distinfo

@@ -1,4 +1,4 @@
-MD5 (pl-5.6.18.tar.gz) = 32fc7336c9eed667e04d6cd2b7efb3bd
+MD5 (pl-5.6.27.tar.gz) = af5e4797d3e3b8b1c086793d07b284fc
-RMD160 (pl-5.6.18.tar.gz) = 238554526c0e0367c770d6aabb9a55900ca358b7
+RMD160 (pl-5.6.27.tar.gz) = e180ad228946b36b2aaba561be25ba294da473af
-SHA1 (pl-5.6.18.tar.gz) = 4ded148ea657f43c78c951212f19f60e62db27b2
+SHA1 (pl-5.6.27.tar.gz) = 7195af43f02f6569f7611cc5a6543fa00ae49c01
-SIZE (pl-5.6.18.tar.gz) = 11517892
+SIZE (pl-5.6.27.tar.gz) = 11661684

lang/swi-prolog/patches/patch-Makefile_in

@@ -1,39 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/10/09 10:20:24 espie Exp $
---- Makefile.in.orig	Wed May 11 10:45:37 2005
-+++ Makefile.in	Thu Sep  7 19:01:23 2006
-@@ -32,13 +32,13 @@ check::
- clean::
- 	@cd $(BUILDARCH) && $(MAKE) $@
- 	@if [ -f packages/Makefile ]; then \
--	   cd packages && make clean; \
-+	   cd packages && ${MAKE} clean; \
- 	fi
- 
- distclean::
- 	rm -f .pkg-config
- 	@if [ -f packages/Makefile ]; then \
--	   cd packages && make distclean; \
-+	   cd packages && ${MAKE} distclean; \
- 	fi
- 	@cd $(BUILDARCH) && $(MAKE) $@
- 	rm -f Makefile
-@@ -50,14 +50,14 @@ distclean::
- world:	lite .pkg-config packages
- 
- .pkg-config:
--	cd packages && ./configure
-+	cd packages && ./configure $(CONFIGURE_ARGS)
- 	touch $@
- 
- packages::
--	cd packages && make
-+	cd packages && ${MAKE}
- 
- install-world::
--	cd $(BUILDARCH) && make install
--	cd packages && make install
--	cd packages && make html-install
-+	cd $(BUILDARCH) && ${MAKE} install
-+	cd packages && ${MAKE} install
-+	cd packages && ${MAKE} html-install
- 

lang/swi-prolog/patches/patch-packages_clib_Makefile_in

@@ -1,15 +0,0 @@
-$OpenBSD: patch-packages_clib_Makefile_in,v 1.1.1.1 2006/10/09 10:20:24 espie Exp $
---- packages/clib/Makefile.in.orig	Thu Sep  7 15:58:15 2006
-+++ packages/clib/Makefile.in	Thu Sep  7 15:58:34 2006
-@@ -83,9 +83,9 @@ readutil.@SO@:	$(READUTILOBJ)
- 		$(LD) $(LDFLAGS) -o $@ $(READUTILOBJ)
- 
- maildrop/rfc822/librfc822.a:
--		(cd maildrop/rfc822 && make)
-+		(cd maildrop/rfc822 && ${MAKE})
- maildrop/rfc2045/librfc2045.a:
--		(cd maildrop/rfc2045 && make)
-+		(cd maildrop/rfc2045 && ${MAKE})
- 
- 
- install:	$(TARGETS) $(LIBPL)

lang/swi-prolog/patches/patch-src_configure_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_configure_in,v 1.1.1.1 2006/10/09 10:20:24 espie Exp $
+$OpenBSD: patch-src_configure_in,v 1.2 2007/01/27 17:35:46 espie Exp $
---- src/configure.in.orig	Wed Sep  6 19:20:06 2006
+--- src/configure.in.orig	Wed Jan 24 10:30:36 2007
-+++ src/configure.in	Wed Sep  6 19:20:27 2006
++++ src/configure.in	Sat Jan 27 18:35:39 2007
-@@ -349,7 +349,7 @@ AC_TRY_LINK([
+@@ -350,7 +350,7 @@ AC_TRY_LINK([
  	    [ static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
  	      pthread_mutex_lock(&m);
  	      pthread_mutex_unlock(&m);

lang/swi-prolog/patches/patch-src_pl-tai_c

@@ -1,47 +0,0 @@
-$OpenBSD: patch-src_pl-tai_c,v 1.1.1.1 2006/10/09 10:20:24 espie Exp $
---- src/pl-tai.c.orig	Wed Sep  6 18:58:22 2006
-+++ src/pl-tai.c	Wed Sep  6 19:06:00 2006
-@@ -47,9 +47,11 @@ is supposed to give the POSIX standard o
- #define daylight _daylight
- #else
- extern char *tzname[2];
-+#if !defined(__OpenBSD__)
- extern long timezone;
- extern int daylight;
- #endif
-+#endif
- 
- 
- #define TAI_UTC_OFFSET LL(4611686018427387914)
-@@ -89,7 +91,11 @@ do_tzset()
- static int
- tz_offset()
- { do_tzset();
-+#if defined(__OpenBSD__)
-+  return 0;
-+#else
-   return timezone;
-+#endif
- }
- 
- 
-@@ -318,7 +324,9 @@ PRED_IMPL("stamp_date_time", 3, stamp_da
- 	  ct.hour       = tm.tm_hour;
- 	  ct.minute     = tm.tm_min;
- 	  tzatom = tz_name_as_atom(tm.tm_isdst);
-+#if !defined(__OpenBSD__)
- 	  if ( daylight )			/* from tzset() */
-+#endif
- 	  { if ( tm.tm_isdst )
- 	    { utcoffset -= 3600;
- 	      dstatom    = ATOM_true;
-@@ -728,7 +736,9 @@ PRED_IMPL("format_time", 3, format_time,
-     { tb.utcoff = tz_offset();
-       localtime_r(&unixt, &tb.tm);
-       tb.sec = (double)tb.tm.tm_sec + modf(tb.stamp, &ip);
-+#if !defined(__OpenBSD__)
-       if ( daylight )
-+#endif
-       { if ( tb.tm.tm_isdst )
- 	{ tb.utcoff -= 3600;
- 	  tb.isdst = TRUE;

lang/swi-prolog/pkg/PFRAG.shared

@@ -1,18 +1,19 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/10/09 10:20:24 espie Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2007/01/27 17:35:46 espie Exp $
-lib/pl-${V}/lib/${MACHINE_ARCH}-openbsd4.0/cgi.so
+lib/pl-${V}/lib/${FULLARCH}/cgi.so
-lib/pl-${V}/lib/${MACHINE_ARCH}-openbsd4.0/double_metaphone.so
+lib/pl-${V}/lib/${FULLARCH}/double_metaphone.so
-lib/pl-${V}/lib/${MACHINE_ARCH}-openbsd4.0/files.so
+lib/pl-${V}/lib/${FULLARCH}/files.so
-lib/pl-${V}/lib/${MACHINE_ARCH}-openbsd4.0/libpl.so
+lib/pl-${V}/lib/${FULLARCH}/libpl.so
-@lib lib/pl-${V}/lib/${MACHINE_ARCH}-openbsd4.0/libpl.so.${LIBpl_VERSION}
+@lib lib/pl-${V}/lib/${FULLARCH}/libpl.so.${LIBpl_VERSION}
-lib/pl-${V}/lib/${MACHINE_ARCH}-openbsd4.0/memfile.so
+lib/pl-${V}/lib/${FULLARCH}/memfile.so
-lib/pl-${V}/lib/${MACHINE_ARCH}-openbsd4.0/mime.so
+lib/pl-${V}/lib/${FULLARCH}/mime.so
-lib/pl-${V}/lib/${MACHINE_ARCH}-openbsd4.0/porter_stem.so
+lib/pl-${V}/lib/${FULLARCH}/porter_stem.so
-lib/pl-${V}/lib/${MACHINE_ARCH}-openbsd4.0/rdf_db.so
+lib/pl-${V}/lib/${FULLARCH}/random.so
-lib/pl-${V}/lib/${MACHINE_ARCH}-openbsd4.0/readutil.so
+lib/pl-${V}/lib/${FULLARCH}/rdf_db.so
-lib/pl-${V}/lib/${MACHINE_ARCH}-openbsd4.0/rlimit.so
+lib/pl-${V}/lib/${FULLARCH}/readutil.so
-lib/pl-${V}/lib/${MACHINE_ARCH}-openbsd4.0/sgml2pl.so
+lib/pl-${V}/lib/${FULLARCH}/rlimit.so
-lib/pl-${V}/lib/${MACHINE_ARCH}-openbsd4.0/socket.so
+lib/pl-${V}/lib/${FULLARCH}/socket.so
-lib/pl-${V}/lib/${MACHINE_ARCH}-openbsd4.0/table.so
+lib/pl-${V}/lib/${FULLARCH}/table.so
-lib/pl-${V}/lib/${MACHINE_ARCH}-openbsd4.0/time.so
+lib/pl-${V}/lib/${FULLARCH}/time.so
-lib/pl-${V}/lib/${MACHINE_ARCH}-openbsd4.0/unix.so
+lib/pl-${V}/lib/${FULLARCH}/unix.so
-lib/pl-${V}/xpce-6.6.18/lib/${MACHINE_ARCH}-openbsd4.0/pl2xpce.so
+lib/pl-${V}/lib/${FULLARCH}/zlib4pl.so
+lib/pl-${V}/xpce-${XV}/lib/${FULLARCH}/pl2xpce.so