fix stupid conflict marker introduced ages ago that my friends forgot to fix...

lang/swi-prolog/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2008/07/30 19:47:09 martynas Exp $
+# $OpenBSD: Makefile,v 1.14 2008/08/29 11:52:20 espie Exp $
 
 CATEGORIES=		lang
 V=			5.6.27
@@ -6,7 +6,7 @@ XV=			6.6.27
 FULLARCH=		${MACHINE_ARCH:S/amd64/x86_64/}-openbsd${OSREV}
 SUBST_VARS=		V XV FULLARCH
 DISTNAME=		pl-$V
-PKGNAME=		swi-prolog-$Vp6
+PKGNAME=		swi-prolog-$Vp7
 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/
@@ -46,6 +46,9 @@ WANTLIB=		ICE Xrender readline SM freetype Xt pthread \
 LIB_DEPENDS=		jpeg::graphics/jpeg
 SUBST_VARS+=		BOOT
 
+post-install:
+	cd ${PREFIX}/lib && ln -s swipl-$V/lib/${FULLARCH}/libpl.so.${LIBpl_VERSION}
+
 .include <bsd.port.mk>
 
 .for _m in ${MACHINE_ARCH}

lang/swi-prolog/patches/patch-src_configure_in

@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_configure_in,v 1.2 2007/01/27 17:35:46 espie Exp $
+$OpenBSD: patch-src_configure_in,v 1.3 2008/08/29 11:52:20 espie Exp $
 --- src/configure.in.orig	Wed Jan 24 10:30:36 2007
-+++ src/configure.in	Sat Jan 27 18:35:39 2007
++++ src/configure.in	Fri Aug 29 13:32:36 2008
 @@ -350,7 +350,7 @@ AC_TRY_LINK([
  	    [ static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
  	      pthread_mutex_lock(&m);
@@ -10,3 +10,14 @@ $OpenBSD: patch-src_configure_in,v 1.2 2007/01/27 17:35:46 espie Exp $
    this should not be compiled
  #endif
  	    ],
+@@ -1438,6 +1438,10 @@ dnl	AC_DEFINE(SO_FORMAT_LDFLAGS,
+ dnl		  ["-bundle -dynamic -o \"%s\"", soout],
+ dnl		  [Arguments to pass to sprintf() to create SO_LDFLAGS])
+ 	CMFLAGS="-no-cpp-precomp"
++	;;
++  *openbsd*)
++  	# avoid conflict with gnustep
++  	PL=swipl
+ 	;;
+   *cygwin*)
+ 	SO_EXT="dll"

lang/swi-prolog/pkg/PFRAG.shared

@@ -1,19 +1,20 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2007/01/27 17:35:46 espie Exp $
-lib/pl-${V}/lib/${FULLARCH}/cgi.so
-lib/pl-${V}/lib/${FULLARCH}/double_metaphone.so
-lib/pl-${V}/lib/${FULLARCH}/files.so
-lib/pl-${V}/lib/${FULLARCH}/libpl.so
-@lib lib/pl-${V}/lib/${FULLARCH}/libpl.so.${LIBpl_VERSION}
-lib/pl-${V}/lib/${FULLARCH}/memfile.so
-lib/pl-${V}/lib/${FULLARCH}/mime.so
-lib/pl-${V}/lib/${FULLARCH}/porter_stem.so
-lib/pl-${V}/lib/${FULLARCH}/random.so
-lib/pl-${V}/lib/${FULLARCH}/rdf_db.so
-lib/pl-${V}/lib/${FULLARCH}/readutil.so
-lib/pl-${V}/lib/${FULLARCH}/rlimit.so
-lib/pl-${V}/lib/${FULLARCH}/socket.so
-lib/pl-${V}/lib/${FULLARCH}/table.so
-lib/pl-${V}/lib/${FULLARCH}/time.so
-lib/pl-${V}/lib/${FULLARCH}/unix.so
-lib/pl-${V}/lib/${FULLARCH}/zlib4pl.so
-lib/pl-${V}/xpce-${XV}/lib/${FULLARCH}/pl2xpce.so
+@comment $OpenBSD: PFRAG.shared,v 1.3 2008/08/29 11:52:20 espie Exp $
+@lib lib/libpl.so.${LIBpl_VERSION}
+lib/swipl-${V}/lib/${FULLARCH}/cgi.so
+lib/swipl-${V}/lib/${FULLARCH}/double_metaphone.so
+lib/swipl-${V}/lib/${FULLARCH}/files.so
+lib/swipl-${V}/lib/${FULLARCH}/libpl.so
+@lib lib/swipl-${V}/lib/${FULLARCH}/libpl.so.${LIBpl_VERSION}
+lib/swipl-${V}/lib/${FULLARCH}/memfile.so
+lib/swipl-${V}/lib/${FULLARCH}/mime.so
+lib/swipl-${V}/lib/${FULLARCH}/porter_stem.so
+lib/swipl-${V}/lib/${FULLARCH}/random.so
+lib/swipl-${V}/lib/${FULLARCH}/rdf_db.so
+lib/swipl-${V}/lib/${FULLARCH}/readutil.so
+lib/swipl-${V}/lib/${FULLARCH}/rlimit.so
+lib/swipl-${V}/lib/${FULLARCH}/socket.so
+lib/swipl-${V}/lib/${FULLARCH}/table.so
+lib/swipl-${V}/lib/${FULLARCH}/time.so
+lib/swipl-${V}/lib/${FULLARCH}/unix.so
+lib/swipl-${V}/lib/${FULLARCH}/zlib4pl.so
+lib/swipl-${V}/xpce-${XV}/lib/${FULLARCH}/pl2xpce.so

x11/gnustep/base/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2008/07/28 23:55:28 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2008/08/29 11:52:20 espie Exp $
 
 COMMENT=	GNUstep base library
 
 DISTNAME=	gnustep-base-1.16.1
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 SHARED_LIBS=	gnustep-base 2.0	# .1.16.1
 CATEGORIES=	devel
 

x11/gnustep/base/pkg/PLIST

@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.4 2008/07/28 23:55:28 sthen Exp $
-@conflict swi-prolog-*
+@comment $OpenBSD: PLIST,v 1.5 2008/08/29 11:52:20 espie Exp $
+@conflict swi-prolog-<=5.6.27p5
 @bin bin/HTMLLinker
 @bin bin/autogsdoc
 @bin bin/cvtenc