Update sope to 1.3.3, and add patch from naddy to fix build with new gmake

OK landry@
This commit is contained in:
sebastia 2010-10-25 09:59:02 +00:00
parent 6cad7a9541
commit 5095bfaab0
3 changed files with 25 additions and 10 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2010/10/06 13:53:07 sebastia Exp $
# $OpenBSD: Makefile,v 1.3 2010/10/25 09:59:02 sebastia Exp $
COMMENT-main= Skyrix Object Publishing Environment
COMMENT-mysql= SOPE MySQL adaptor
COMMENT-postgres= SOPE PostgreSQL adaptor
VERSION= 1.3.2
REVISION= 0
VERSION= 1.3.3
DISTNAME= SOPE-${VERSION}
PKGNAME-main= sope-${VERSION}
PKGNAME-mysql= sope-mysql-${VERSION}
@ -59,6 +58,7 @@ MAKE_ENV+= OBJC_INCLUDE_PATH="${LOCALBASE}/include/postgresql;${LOCALBASE}/inclu
MAKE_FLAGS+= MAJOR_VERSION=${SO_MAJOR} MINOR_VERSION=${SO_MINOR}
MAKE_FLAGS+= SOPE_MAJOR_VERSION=4 SOPE_MINOR_VERSION=9
CONFIGURE_ENV+= ${MAKE_ENV}
NO_REGRESS= Yes
post-extract:
# those fhs.make files are not needed and may cause harm if they exist

View File

@ -1,5 +1,5 @@
MD5 (SOPE-1.3.2.tar.gz) = 6i/osc9duqzpdeTi7Mb8xA==
RMD160 (SOPE-1.3.2.tar.gz) = pEfOwZn7M5EAAUuN263G+XpT+7g=
SHA1 (SOPE-1.3.2.tar.gz) = Y6teu/0svOpfyWUZLduwmSv1wzA=
SHA256 (SOPE-1.3.2.tar.gz) = gBMPYJrlZlFaQCQ3RL+OYv1ULlFXUiHZVHy8lQeKeKY=
SIZE (SOPE-1.3.2.tar.gz) = 2428692
MD5 (SOPE-1.3.3.tar.gz) = M81mz5xCWWHLyAhbE7kyfw==
RMD160 (SOPE-1.3.3.tar.gz) = d40OcdMWl1Lvazcx+p4qGR6X0Ck=
SHA1 (SOPE-1.3.3.tar.gz) = 8mNTqWYcuiJUyC6pcC2ZzKAfzvc=
SHA256 (SOPE-1.3.3.tar.gz) = V6/vkTIistY3lEeYTN090+Ueezhrvm1lpY7r7GldEjg=
SIZE (SOPE-1.3.3.tar.gz) = 2430299

View File

@ -1,10 +1,12 @@
$OpenBSD: patch-configure,v 1.1.1.1 2010/10/06 11:05:41 sebastia Exp $
$OpenBSD: patch-configure,v 1.2 2010/10/25 09:59:02 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 Thu Sep 23 15:54:32 2010
+++ configure Sun Oct 24 19:22:44 2010
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
@ -31,3 +33,16 @@ decouple version of sope from the shared library interface versions
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"