cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update sope to 1.3.9

Browse Source 
OK jasper@
This commit is contained in:
sebastia 2011-11-18 11:12:44 +00:00
parent ed94ccf08f
commit a056cee286
7 changed files with 67 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
www/sope/Makefile
View File

@ -1,23 +1,23 @@
# $OpenBSD: Makefile,v 1.18 2011/09/16 12:00:09 espie Exp $
# $OpenBSD: Makefile,v 1.19 2011/11/18 11:12:44 sebastia Exp $
COMMENT-main= Skyrix Object Publishing Environment
COMMENT-mysql= SOPE MySQL adaptor
COMMENT-postgres= SOPE PostgreSQL adaptor
VERSION = 1.3.8
DISTNAME = SOPE-${VERSION}b
PKGNAME-main = sope-${VERSION}.1
PKGNAME-mysql = sope-mysql-${VERSION}.1
PKGNAME-postgres = sope-postgres-${VERSION}.1
REVISION = 0
VERSION = 1.3.9
DISTNAME = SOPE-${VERSION}
PKGNAME-main = sope-${VERSION}
PKGNAME-mysql = sope-mysql-${VERSION}
PKGNAME-postgres = sope-postgres-${VERSION}
SO_MAJOR= 0
SO_MINOR= 1
SO_MAJOR= 1
SO_MINOR= 0
.for _lib in DOM EOControl GDLAccess NGExtensions NGLdap NGMime \
NGObjWeb NGStreams NGXmlRpc SaxObjC SoOFS WEExtensions \
WEPrototype WOExtensions WOXML XmlRpc SBJson
NGObjWeb NGStreams SaxObjC WEExtensions \
WOExtensions XmlRpc
SHARED_LIBS+= ${_lib} ${SO_MAJOR}.${SO_MINOR}
.endfor
SHARED_LIBS += SBJson 0.1
CATEGORIES= www
HOMEPAGE= http://www.sogo.nu
@ -45,12 +45,11 @@ WANTLIB-postgres = gnustep-base m objc GDLAccess EOControl pq
LIB_DEPENDS-main= x11/gnustep/base \
databases/openldap \
${MODLIBICONV_LIB_DEPENDS}
LIB_DEPENDS-mysql = ${BASE_PKGPATH}=${VERSION}.1 \
LIB_DEPENDS-mysql = ${BASE_PKGPATH}=${VERSION} \
databases/mysql
LIB_DEPENDS-postgres = ${BASE_PKGPATH}=${VERSION}.1 \
LIB_DEPENDS-postgres = ${BASE_PKGPATH}=${VERSION} \
databases/postgresql
WRKDIST= ${WRKDIR}/${DISTNAME}
CONFIGURE_STYLE=simple dest
CONFIGURE_ARGS+=--prefix=${PREFIX} \
--gsmake=`gnustep-config --variable=GNUSTEP_MAKEFILES`

10
www/sope/distinfo
View File

@ -1,5 +1,5 @@
MD5 (SOPE-1.3.8b.tar.gz) = IeMh9JTc5ZQIC3NAmSwa2A==
RMD160 (SOPE-1.3.8b.tar.gz) = iVpIA6azwODGL99EsE0Yyqq7sUA=
SHA1 (SOPE-1.3.8b.tar.gz) = ImdozQmOHsiIheeIR5NpizDS4tE=
SHA256 (SOPE-1.3.8b.tar.gz) = xxLBuip8O9xDz/8lAqDTgjn5ALDtpsbnwyKrMM04fjg=
SIZE (SOPE-1.3.8b.tar.gz) = 2291869
MD5 (SOPE-1.3.9.tar.gz) = lypAxpyvC6/6aFNhQtAm3g==
RMD160 (SOPE-1.3.9.tar.gz) = RptHBeoD5k3azDKu2FeFq6Zudyg=
SHA1 (SOPE-1.3.9.tar.gz) = WmjnldTpZHmTk0Eiz2JFO7o/9dM=
SHA256 (SOPE-1.3.9.tar.gz) = Xaq1MGAono7dmk7vAGME1DFpD15tX7xrSVlI69cviIM=
SIZE (SOPE-1.3.9.tar.gz) = 2163269

15
www/sope/patches/patch-sope-appserver_SoOFS_GNUmakefile
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-sope-appserver_SoOFS_GNUmakefile,v 1.1.1.1 2010/10/06 11:05:41 sebastia Exp $
Decouple SOPE Version from library interface version
--- sope-appserver/SoOFS/GNUmakefile.orig Fri Sep 24 09:49:13 2010
+++ sope-appserver/SoOFS/GNUmakefile Fri Sep 24 09:49:28 2010
@@ -87,7 +87,7 @@ endif
# ----- NGObjWeb tools
-SOPED_NAME=sope-$(MAJOR_VERSION).$(MINOR_VERSION)
+SOPED_NAME=sope-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)
TOOL_NAME = $(SOPED_NAME)

17
www/sope/patches/patch-sope-appserver_WEPrototype_GNUmakefile_preamble
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-sope-appserver_WEPrototype_GNUmakefile_preamble,v 1.1.1.1 2010/10/06 11:05:41 sebastia Exp $
decouple sope version from library interface version.
--- sope-appserver/WEPrototype/GNUmakefile.preamble.orig Sun Sep 26 13:50:44 2010
+++ sope-appserver/WEPrototype/GNUmakefile.preamble Sun Sep 26 13:51:05 2010
@@ -8,8 +8,8 @@ ADDITIONAL_CPPFLAGS += \
ADDITIONAL_CPPFLAGS += \
-Wall \
- -DSOPE_MAJOR_VERSION=$(MAJOR_VERSION) \
- -DSOPE_MINOR_VERSION=$(MINOR_VERSION) \
+ -DSOPE_MAJOR_VERSION=$(SOPE_MAJOR_VERSION) \
+ -DSOPE_MINOR_VERSION=$(SOPE_MINOR_VERSION) \
-DWEP_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
ADDITIONAL_CPPFLAGS += -Wall

17
www/sope/patches/patch-sope-core_NGStreams_NGActiveSocket_m Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-sope-core_NGStreams_NGActiveSocket_m,v 1.1 2011/11/18 11:12:44 sebastia Exp $
MSG_NOSIGNAL is not POSIX, OpenBSD doesn't have it, so ignore it
--- sope-core/NGStreams/NGActiveSocket.m.orig Thu Oct 6 09:15:44 2011
+++ sope-core/NGStreams/NGActiveSocket.m Thu Oct 6 10:04:09 2011
@@ -73,6 +73,10 @@
# define POLLRDNORM POLLIN
#endif
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+
@interface NGActiveSocket(PrivateMethods)
- (id)_initWithDescriptor:(int)_fd

31
www/sope/patches/patch-sope-gdl1_MySQL_NSNumber+MySQL4Val_m Normal file
View File

@ -0,0 +1,31 @@
$OpenBSD: patch-sope-gdl1_MySQL_NSNumber+MySQL4Val_m,v 1.1 2011/11/18 11:12:44 sebastia Exp $
fix bug when completing tasks with mysql backend, taken from
http://mtn.inverse.ca/revision/diff/6eaf4a45ce4e94507a541be4594b94f2adc500a6/with/251b4565fb618249a9be38b2f6e86da9f39d8945
--- sope-gdl1/MySQL/NSNumber+MySQL4Val.m.orig Tue Nov 2 15:12:14 2010
+++ sope-gdl1/MySQL/NSNumber+MySQL4Val.m Sun Nov 13 21:26:22 2011
@@ -77,7 +77,22 @@
if ((len = [_type length]) == 0)
return [self stringValue];
if (len < 4)
- return [self stringValue];
+ {
+#if GNUSTEP_BASE_LIBRARY
+ /*
+ on gstep-base -stringValue of bool's return YES or NO, which seems to
+ be different on Cocoa and liBFoundation.
+ */
+ {
+ Class BoolClass = Nil;
+
+ if (BoolClass == Nil) BoolClass = NSClassFromString(@"NSBoolNumber");
+ if ([self isKindOfClass:BoolClass])
+ return [self boolValue] ? @"1" : @"0";
+ }
+#endif
+ return [self stringValue];
+ }
c1 = [_type characterAtIndex:0];
switch (c1) {

56
www/sope/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.5 2011/04/18 12:47:37 sebastia Exp $
@comment $OpenBSD: PLIST-main,v 1.6 2011/11/18 11:12:44 sebastia Exp $
@bin bin/connect-EOAdaptor
@bin bin/load-EOAdaptor
@bin bin/wod
@ -132,7 +132,6 @@ include/NGExtensions/NGLoggerManager.h
include/NGExtensions/NGLogging.h
include/NGExtensions/NGMemoryAllocation.h
include/NGExtensions/NGMerging.h
include/NGExtensions/NGObjCRuntime.h
include/NGExtensions/NGObjectMacros.h
include/NGExtensions/NGPropertyListParser.h
include/NGExtensions/NGQuotedPrintableCoding.h
@ -369,19 +368,6 @@ include/NGStreams/NGStringTextStream.h
include/NGStreams/NGTerminalSupport.h
include/NGStreams/NGTextStream.h
include/NGStreams/NGTextStreamProtocols.h
include/NGXmlRpc/
include/NGXmlRpc/NGAsyncResultProxy.h
include/NGXmlRpc/NGXmlRpc.h
include/NGXmlRpc/NGXmlRpcAction.h
include/NGXmlRpc/NGXmlRpcClient.h
include/NGXmlRpc/NGXmlRpcInvocation.h
include/NGXmlRpc/NGXmlRpcMethodSignature.h
include/NGXmlRpc/NGXmlRpcRequestHandler.h
include/NGXmlRpc/NSObject+Reflection.h
include/NGXmlRpc/WODirectAction+XmlRpc.h
include/NGXmlRpc/WODirectAction+XmlRpcIntrospection.h
include/NGXmlRpc/XmlRpcMethodCall+WO.h
include/NGXmlRpc/XmlRpcMethodResponse+WO.h
include/SBJson/
include/SBJson/NSObject+SBJSON.h
include/SBJson/NSString+SBJSON.h
@ -412,34 +398,12 @@ include/SaxObjC/SaxXMLFilter.h
include/SaxObjC/SaxXMLReader.h
include/SaxObjC/SaxXMLReaderFactory.h
include/SaxObjC/XMLNamespaces.h
include/SoOFS/
include/SoOFS/OFSBaseObject.h
include/SoOFS/OFSChangeLog.h
include/SoOFS/OFSFactoryContext.h
include/SoOFS/OFSFactoryRegistry.h
include/SoOFS/OFSFile.h
include/SoOFS/OFSFileRenderer.h
include/SoOFS/OFSFolder.h
include/SoOFS/OFSFolderDataSource.h
include/SoOFS/OFSHttpPasswd.h
include/SoOFS/OFSImage.h
include/SoOFS/OFSPropertyListObject.h
include/SoOFS/OFSResourceManager.h
include/SoOFS/OFSWebDocument.h
include/SoOFS/OFSWebMethod.h
include/SoOFS/OFSWebMethodRenderer.h
include/SoOFS/OFSWebTemplate.h
include/SoOFS/SoOFS.h
include/WEExtensions/
include/WEExtensions/WEContextConditional.h
include/WEExtensions/WEResourceManager.h
include/WOExtensions/
include/WOExtensions/WOExtensions.h
include/WOExtensions/WORedirect.h
include/WOXML/
include/WOXML/WOXML.h
include/WOXML/WOXMLDecoder.h
include/WOXML/WOXMLMappingModel.h
include/XmlRpc/
include/XmlRpc/NSObject+XmlRpc.h
include/XmlRpc/XmlRpc.h
@ -454,14 +418,10 @@ include/XmlRpc/XmlRpcMethodResponse.h
@lib lib/libNGMime.so.${LIBNGMime_VERSION}
@lib lib/libNGObjWeb.so.${LIBNGObjWeb_VERSION}
@lib lib/libNGStreams.so.${LIBNGStreams_VERSION}
@lib lib/libNGXmlRpc.so.${LIBNGXmlRpc_VERSION}
@lib lib/libSBJson.so.${LIBSBJson_VERSION}
@lib lib/libSaxObjC.so.${LIBSaxObjC_VERSION}
@lib lib/libSoOFS.so.${LIBSoOFS_VERSION}
@lib lib/libWEExtensions.so.${LIBWEExtensions_VERSION}
@lib lib/libWEPrototype.so.${LIBWEPrototype_VERSION}
@lib lib/libWOExtensions.so.${LIBWOExtensions_VERSION}
@lib lib/libWOXML.so.${LIBWOXML_VERSION}
@lib lib/libXmlRpc.so.${LIBXmlRpc_VERSION}
lib/sope-4.9/
lib/sope-4.9/dbadaptors/
@ -473,13 +433,6 @@ lib/sope-4.9/products/SoCore.sxp/Resources/Version
lib/sope-4.9/products/SoCore.sxp/Resources/product.plist
@bin lib/sope-4.9/products/SoCore.sxp/SoCore
lib/sope-4.9/products/SoCore.sxp/stamp.make
lib/sope-4.9/products/SoOFS.sxp/
lib/sope-4.9/products/SoOFS.sxp/Resources/
lib/sope-4.9/products/SoOFS.sxp/Resources/Info-gnustep.plist
lib/sope-4.9/products/SoOFS.sxp/Resources/Version
lib/sope-4.9/products/SoOFS.sxp/Resources/product.plist
@bin lib/sope-4.9/products/SoOFS.sxp/SoOFS
lib/sope-4.9/products/SoOFS.sxp/stamp.make
lib/sope-4.9/saxdrivers/
lib/sope-4.9/saxdrivers/STXSaxDriver.sax/
lib/sope-4.9/saxdrivers/STXSaxDriver.sax/Resources/
@ -503,19 +456,12 @@ lib/sope-4.9/wox-builders/WEExtensions.wox/Resources/Info-gnustep.plist
@bin lib/sope-4.9/wox-builders/WEExtensions.wox/WEExtensions
lib/sope-4.9/wox-builders/WEExtensions.wox/bundle-info.plist
lib/sope-4.9/wox-builders/WEExtensions.wox/stamp.make
lib/sope-4.9/wox-builders/WEPrototype.wox/
lib/sope-4.9/wox-builders/WEPrototype.wox/Resources/
lib/sope-4.9/wox-builders/WEPrototype.wox/Resources/Info-gnustep.plist
@bin lib/sope-4.9/wox-builders/WEPrototype.wox/WEPrototype
lib/sope-4.9/wox-builders/WEPrototype.wox/bundle-info.plist
lib/sope-4.9/wox-builders/WEPrototype.wox/stamp.make
lib/sope-4.9/wox-builders/WOExtensions.wox/
lib/sope-4.9/wox-builders/WOExtensions.wox/Resources/
lib/sope-4.9/wox-builders/WOExtensions.wox/Resources/Info-gnustep.plist
@bin lib/sope-4.9/wox-builders/WOExtensions.wox/WOExtensions
lib/sope-4.9/wox-builders/WOExtensions.wox/bundle-info.plist
lib/sope-4.9/wox-builders/WOExtensions.wox/stamp.make
@bin sbin/sope-4.9
share/GNUstep/Makefiles/Additional/ngobjweb.make
share/GNUstep/Makefiles/woapp.make
share/GNUstep/Makefiles/wobundle.make