From c9361f6c9df58e91fde8a5f2ea1fd65487461e53 Mon Sep 17 00:00:00 2001
From: sebastia <sebastia@openbsd.org>
Date: Fri, 22 Apr 2011 05:34:13 +0000
Subject: [PATCH] Update sope to 1.3.6

OK jasper@, stuart@
---
 www/sope/Makefile                |  7 +++---
 www/sope/distinfo                | 10 ++++-----
 www/sope/patches/patch-configure | 37 +++++++++++---------------------
 3 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/www/sope/Makefile b/www/sope/Makefile
index f3e907ad04e..e344f8cb806 100644
--- a/www/sope/Makefile
+++ b/www/sope/Makefile
@@ -1,18 +1,17 @@
-# $OpenBSD: Makefile,v 1.11 2011/04/18 12:47:37 sebastia Exp $
+# $OpenBSD: Makefile,v 1.12 2011/04/22 05:34:13 sebastia Exp $
 
 COMMENT-main=		Skyrix Object Publishing Environment
 COMMENT-mysql=		SOPE MySQL adaptor
 COMMENT-postgres=	SOPE PostgreSQL adaptor
 
-VERSION=		1.3.4
-REVISION =		3
+VERSION=		1.3.6
 DISTNAME=		SOPE-${VERSION}
 PKGNAME-main=		sope-${VERSION}
 PKGNAME-mysql=		sope-mysql-${VERSION}
 PKGNAME-postgres=	sope-postgres-${VERSION}
 
 SO_MAJOR=	0
-SO_MINOR=	0
+SO_MINOR=	1
 .for _lib in DOM EOControl GDLAccess NGExtensions NGLdap NGMime \
 		NGObjWeb NGStreams NGXmlRpc SaxObjC SoOFS WEExtensions \
 		WEPrototype WOExtensions WOXML XmlRpc SBJson
diff --git a/www/sope/distinfo b/www/sope/distinfo
index 40f1eb7ff33..07bfcfff559 100644
--- a/www/sope/distinfo
+++ b/www/sope/distinfo
@@ -1,5 +1,5 @@
-MD5 (SOPE-1.3.4.tar.gz) = UKF2agROT06Melp9e+uBMA==
-RMD160 (SOPE-1.3.4.tar.gz) = kKjikbggPp28WyraLVcsui9vcWQ=
-SHA1 (SOPE-1.3.4.tar.gz) = ORzzQOnvO4uBinjr82wC07LUoRA=
-SHA256 (SOPE-1.3.4.tar.gz) = YyP/EK8apUAHZtvrSoOUxx5X/3kv53VBleuZzFg7rKA=
-SIZE (SOPE-1.3.4.tar.gz) = 2474553
+MD5 (SOPE-1.3.6.tar.gz) = p843xUTRu9xeub4X1COOzg==
+RMD160 (SOPE-1.3.6.tar.gz) = U1bzfsv4m7VDbZ6ZprYWaIdb80c=
+SHA1 (SOPE-1.3.6.tar.gz) = nGTWAXoHlWFpyj9U85pIjYmMjVk=
+SHA256 (SOPE-1.3.6.tar.gz) = vy3mWLP4hgiqlldbsuIFOSOakl/yzOIafQQTGi+kFes=
+SIZE (SOPE-1.3.6.tar.gz) = 2290059
diff --git a/www/sope/patches/patch-configure b/www/sope/patches/patch-configure
index f0c84771732..75a13f051e7 100644
--- a/www/sope/patches/patch-configure
+++ b/www/sope/patches/patch-configure
@@ -1,27 +1,19 @@
-$OpenBSD: patch-configure,v 1.2 2010/10/25 09:59:02 sebastia Exp $
+$OpenBSD: patch-configure,v 1.3 2011/04/22 05:34:13 sebastia Exp $
 
 do not link against gnustep-gui in case its installed
 decouple version of sope from the shared library interface versions
 remove unused ssl check that generates a make variable with whitespace in
 its name
 
---- configure.orig	Thu Aug 19 17:13:13 2010
-+++ configure	Sun Oct 24 19:22:44 2010
+--- configure.orig	Wed Apr  6 23:45:23 2011
++++ configure	Wed Apr  6 23:50:53 2011
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  
  #
  # Note: When adding make options to this script, ensure that the source still
-@@ -318,6 +318,7 @@ genConfigMake() {
-   cfgwrite "# Note: you can override any option as a 'make' parameter, eg:"
-   cfgwrite "#         make debug=yes"
-   cfgwrite ""
-+  cfgwrite "NEEDS_GUI=no"
-   
-   #cfgwrite "# print on the cmdline that this file is being used"
-   #cfgwrite "all :: "
-@@ -357,9 +358,9 @@ genConfigMake() {
+@@ -358,9 +358,9 @@ genConfigMake() {
      cfgwrite "FHS_INSTALL_ROOT:=$ARG_PREFIX"
      cfgwrite ""
      cfgwrite "SOPE_SYSLIBDIR=\${DESTDIR}\${FHS_INSTALL_ROOT}/\$(CGS_LIBDIR_NAME)"
@@ -33,16 +25,11 @@ its name
      cfgwrite "SOPE_DBADAPTORS=\${SOPE_LIBDIR}/dbadaptors"
      cfgwrite "SOPE_PRODUCTS=\${SOPE_LIBDIR}/products"
      cfgwrite "SOPE_SAXDRIVERS=\${SOPE_LIBDIR}/saxdrivers"
-@@ -469,11 +470,7 @@ checkDependencies() {
-   cfgwrite "# library dependencies"
-   checkLinking "xml2"        optional;
-   checkLinking "ldap"        optional;
--  if [ `uname` = "OpenBSD" ];then
--    checkLinking "ssl crypto"  required; # TODO: make optional
--  else
--    checkLinking "ssl"         required; # TODO: make optional
--  fi
-+  checkLinking "ssl"         required; # TODO: make optional
-   checkLinking "pq"          optional;
- #  checkLinking "sqlite3"     optional;
-   cfgwrite "HAS_LIBRARY_sqlite3=no"
+@@ -394,6 +394,7 @@ genConfigMake() {
+     cfgwrite "debug:=no"
+   fi
+   cfgwrite ""
++  cfgwrite "NEEDS_GUI=no"
+   
+   if test $ARG_WITH_STRIP = 1; then
+     cfgwrite "# configured to produce stripped code";