Mon Apr 13 12:40:41 2009 UTC ()
Update Pantomime to 1.2.0pre3.  Changes include some structural overhaul,
including a brand new mailbox caching code and other performance
improvements.  This also makes Pantomime use the fhs filesystem layout
to make it more hier(7) compliant.


(rh)
diff -r1.21 -r1.22 pkgsrc/mail/Pantomime/Makefile
diff -r1.2 -r1.3 pkgsrc/mail/Pantomime/PLIST
diff -r1.10 -r1.11 pkgsrc/mail/Pantomime/buildlink3.mk
diff -r1.6 -r1.7 pkgsrc/mail/Pantomime/distinfo
diff -r1.1 -r0 pkgsrc/mail/Pantomime/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/mail/Pantomime/patches/patch-ab
cvs diff -r1.21 -r1.22 pkgsrc/mail/Pantomime/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/Pantomime/Makefile 2008/01/18 05:08:19 1.21
+++ pkgsrc/mail/Pantomime/Makefile 2009/04/13 12:40:40 1.22
@@ -1,22 +1,26 @@ @@ -1,22 +1,26 @@
1# $NetBSD: Makefile,v 1.21 2008/01/18 05:08:19 tnn Exp $ 1# $NetBSD: Makefile,v 1.22 2009/04/13 12:40:40 rh Exp $
2# 2#
3 3
4DISTNAME= Pantomime-1.1.2 4DISTNAME= Pantomime-1.2.0pre3
5PKGREVISION= 5 
6CATEGORIES= mail gnustep 5CATEGORIES= mail gnustep
7MASTER_SITES= http://debian.uni-essen.de/misc/GNUstep/Apps/GNUMail/ 6MASTER_SITES= http://debian.uni-essen.de/misc/GNUstep/Apps/GNUMail/
8 7
9MAINTAINER= rh@NetBSD.org 8MAINTAINER= rh@NetBSD.org
10HOMEPAGE= http://www.collaboration-world.com/pantomime/ 9HOMEPAGE= http://www.collaboration-world.com/pantomime/
11COMMENT= Objective-C mail system class library 10COMMENT= Objective-C mail system class library
12 11
 12LICENSE= gnu-lgpl-v2
 13
 14PKG_DESTDIR_SUPPORT= destdir
 15
13USE_LANGUAGES= objc 16USE_LANGUAGES= objc
14 17
15WRKSRC= ${WRKDIR}/Pantomime 18WRKSRC= ${WRKDIR}/Pantomime
16NO_CONFIGURE= yes 19NO_CONFIGURE= yes
 20MAKE_JOBS_SAFE= no
17MAKE_ENV+= ADDITIONAL_CPPFLAGS=-DMKDIR 21MAKE_ENV+= ADDITIONAL_CPPFLAGS=-DMKDIR
18MAKE_FILE= GNUmakefile 22MAKE_FILE= GNUmakefile
19 23
20.include "../../devel/gnustep-base/buildlink3.mk" 24.include "../../devel/gnustep-base/buildlink3.mk"
21.include "../../mk/pthread.buildlink3.mk" 25.include "../../mk/pthread.buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/mail/Pantomime/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/Pantomime/PLIST 2003/12/05 11:25:58 1.2
+++ pkgsrc/mail/Pantomime/PLIST 2009/04/13 12:40:40 1.3
@@ -1,68 +1,99 @@ @@ -1,68 +1,99 @@
1@comment $NetBSD: PLIST,v 1.2 2003/12/05 11:25:58 adam Exp $ 1@comment $NetBSD: PLIST,v 1.3 2009/04/13 12:40:40 rh Exp $
2share/GNUstep/Local/Library/Headers/Pantomime/Charset.h 2include/Pantomime
3share/GNUstep/Local/Library/Headers/Pantomime/Connection.h 3lib/GNUstep/Frameworks/Pantomime.framework/Headers
4share/GNUstep/Local/Library/Headers/Pantomime/Constants.h 4lib/GNUstep/Frameworks/Pantomime.framework/Pantomime
5share/GNUstep/Local/Library/Headers/Pantomime/Container.h 5lib/GNUstep/Frameworks/Pantomime.framework/Resources
6share/GNUstep/Local/Library/Headers/Pantomime/Flags.h 6lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWCacheManager.h
7share/GNUstep/Local/Library/Headers/Pantomime/Folder.h 7lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWCharset.h
8share/GNUstep/Local/Library/Headers/Pantomime/FolderInformation.h 8lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWConnection.h
9share/GNUstep/Local/Library/Headers/Pantomime/IMAPCacheManager.h 9lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWConstants.h
10share/GNUstep/Local/Library/Headers/Pantomime/IMAPFolder.h 10lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWContainer.h
11share/GNUstep/Local/Library/Headers/Pantomime/IMAPMessage.h 11lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWDNSManager.h
12share/GNUstep/Local/Library/Headers/Pantomime/IMAPStore.h 12lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWFlags.h
13share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_1.h 13lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWFolder.h
14share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_10.h 14lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWFolderInformation.h
15share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_11.h 15lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWIMAPCacheManager.h
16share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_13.h 16lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWIMAPFolder.h
17share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_14.h 17lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWIMAPMessage.h
18share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_15.h 18lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWIMAPStore.h
19share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_2.h 19lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_1.h
20share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_3.h 20lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_10.h
21share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_4.h 21lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_11.h
22share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_5.h 22lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_13.h
23share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_6.h 23lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_14.h
24share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_7.h 24lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_15.h
25share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_8.h 25lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_2.h
26share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_9.h 26lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_3.h
27share/GNUstep/Local/Library/Headers/Pantomime/InternetAddress.h 27lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_4.h
28share/GNUstep/Local/Library/Headers/Pantomime/KOI8_R.h 28lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_5.h
29share/GNUstep/Local/Library/Headers/Pantomime/KOI8_U.h 29lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_6.h
30share/GNUstep/Local/Library/Headers/Pantomime/LocalFolder.h 30lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_7.h
31share/GNUstep/Local/Library/Headers/Pantomime/LocalFolderCacheManager.h 31lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_8.h
32share/GNUstep/Local/Library/Headers/Pantomime/LocalMessage.h 32lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_9.h
33share/GNUstep/Local/Library/Headers/Pantomime/LocalStore.h 33lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWInternetAddress.h
34share/GNUstep/Local/Library/Headers/Pantomime/MD5.h 34lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWKOI8_R.h
35share/GNUstep/Local/Library/Headers/Pantomime/Message.h 35lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWKOI8_U.h
36share/GNUstep/Local/Library/Headers/Pantomime/MimeMultipart.h 36lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWLocalCacheManager.h
37share/GNUstep/Local/Library/Headers/Pantomime/MimeUtility.h 37lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWLocalFolder+maildir.h
38share/GNUstep/Local/Library/Headers/Pantomime/NSData+Extensions.h 38lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWLocalFolder+mbox.h
39share/GNUstep/Local/Library/Headers/Pantomime/NSRegEx.h 39lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWLocalFolder.h
40share/GNUstep/Local/Library/Headers/Pantomime/NSString+Extensions.h 40lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWLocalMessage.h
41share/GNUstep/Local/Library/Headers/Pantomime/POP3CacheManager.h 41lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWLocalStore.h
42share/GNUstep/Local/Library/Headers/Pantomime/POP3CacheObject.h 42lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWMD5.h
43share/GNUstep/Local/Library/Headers/Pantomime/POP3Folder.h 43lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWMIMEMultipart.h
44share/GNUstep/Local/Library/Headers/Pantomime/POP3Message.h 44lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWMIMEUtility.h
45share/GNUstep/Local/Library/Headers/Pantomime/POP3Store.h 45lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWMessage.h
46share/GNUstep/Local/Library/Headers/Pantomime/Pantomime.h 46lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWPOP3CacheManager.h
47share/GNUstep/Local/Library/Headers/Pantomime/Parser.h 47lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWPOP3CacheObject.h
48share/GNUstep/Local/Library/Headers/Pantomime/Part.h 48lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWPOP3Folder.h
49share/GNUstep/Local/Library/Headers/Pantomime/SMTP.h 49lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWPOP3Message.h
50share/GNUstep/Local/Library/Headers/Pantomime/Sendmail.h 50lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWPOP3Store.h
51share/GNUstep/Local/Library/Headers/Pantomime/Service.h 51lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWParser.h
52share/GNUstep/Local/Library/Headers/Pantomime/Store.h 52lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWPart.h
53share/GNUstep/Local/Library/Headers/Pantomime/TCPConnection.h 53lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWRegEx.h
54share/GNUstep/Local/Library/Headers/Pantomime/Transport.h 54lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWSMTP.h
55share/GNUstep/Local/Library/Headers/Pantomime/URLName.h 55lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWSendmail.h
56share/GNUstep/Local/Library/Headers/Pantomime/UTF8.h 56lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWService.h
57share/GNUstep/Local/Library/Headers/Pantomime/UUFile.h 57lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWStore.h
58share/GNUstep/Local/Library/Headers/Pantomime/WINDOWS_1250.h 58lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWTCPConnection.h
59share/GNUstep/Local/Library/Headers/Pantomime/WINDOWS_1251.h 59lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWTransport.h
60share/GNUstep/Local/Library/Headers/Pantomime/WINDOWS_1252.h 60lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWURLName.h
61share/GNUstep/Local/Library/Headers/Pantomime/WINDOWS_1253.h 61lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWUUFile.h
62share/GNUstep/Local/Library/Headers/Pantomime/WINDOWS_1254.h 62lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWVirtualFolder.h
63share/GNUstep/Local/Library/Headers/Pantomime/elm_defs.h 63lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWWINDOWS_1250.h
64share/GNUstep/Local/Library/Headers/Pantomime/elm_lib.h 64lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWWINDOWS_1251.h
65share/GNUstep/Local/Library/Headers/Pantomime/parseaddrs.h 65lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWWINDOWS_1252.h
66share/GNUstep/Local/Library/Libraries/libPantomime.so 66lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWWINDOWS_1253.h
67share/GNUstep/Local/Library/Libraries/libPantomime.so.1.1.0 67lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWWINDOWS_1254.h
68@dirrm share/GNUstep/Local/Library/Headers/Pantomime 68lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/NSData+Extensions.h
 69lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/NSFileManager+Extensions.h
 70lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/NSScanner+Extensions.h
 71lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/NSString+Extensions.h
 72lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/Pantomime.h
 73lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/io.h
 74lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Pantomime
 75lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/English.lproj/InfoPlist.strings
 76lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/English.lproj/Localizable.strings
 77lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/German.lproj/InfoPlist.strings
 78lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/German.lproj/Localizable.strings
 79lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/Info-gnustep.plist
 80lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/libPantomime.so
 81lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/libPantomime.so.1.2.0
 82lib/GNUstep/Frameworks/Pantomime.framework/Versions/Current
 83lib/GNUstep/Frameworks/Pantomime.framework/Versions/Resources/English.lproj/Localizable.strings
 84lib/GNUstep/Frameworks/Pantomime.framework/Versions/Resources/German.lproj/Localizable.strings
 85lib/GNUstep/Frameworks/Pantomime.framework/libPantomime.so
 86lib/libPantomime.so
 87lib/libPantomime.so.1.2.0
 88@dirrm lib/GNUstep/Frameworks/Pantomime.framework/Versions/Resources/German.lproj
 89@dirrm lib/GNUstep/Frameworks/Pantomime.framework/Versions/Resources/English.lproj
 90@dirrm lib/GNUstep/Frameworks/Pantomime.framework/Versions/Resources
 91@dirrm lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/German.lproj
 92@dirrm lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/English.lproj
 93@dirrm lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources
 94@dirrm lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers
 95@dirrm lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2
 96@dirrm lib/GNUstep/Frameworks/Pantomime.framework/Versions
 97@dirrm lib/GNUstep/Frameworks/Pantomime.framework
 98@comment in devel/gnustep-base: @dirrm lib/GNUstep/Frameworks
 99@comment in devel/gnustep-base: @dirrm lib/GNUstep
cvs diff -r1.10 -r1.11 pkgsrc/mail/Pantomime/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mail/Pantomime/buildlink3.mk 2009/03/20 19:24:53 1.10
+++ pkgsrc/mail/Pantomime/buildlink3.mk 2009/04/13 12:40:40 1.11
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:53 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.11 2009/04/13 12:40:40 rh Exp $
2 2
3BUILDLINK_TREE+= Pantomime 3BUILDLINK_TREE+= Pantomime
4 4
5.if !defined(PANTOMIME_BUILDLINK3_MK) 5.if !defined(PANTOMIME_BUILDLINK3_MK)
6PANTOMIME_BUILDLINK3_MK:= 6PANTOMIME_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.Pantomime+= Pantomime>=1.1.2 8BUILDLINK_API_DEPENDS.Pantomime+= Pantomime>1.1.9
9BUILDLINK_ABI_DEPENDS.Pantomime+= Pantomime>=1.1.2nb5 9BUILDLINK_ABI_DEPENDS.Pantomime+= Pantomime>1.1.9
10BUILDLINK_PKGSRCDIR.Pantomime?= ../../mail/Pantomime 10BUILDLINK_PKGSRCDIR.Pantomime?= ../../mail/Pantomime
11 11
12.include "../../devel/gnustep-make/gnustep.mk" 12.include "../../devel/gnustep-make/gnustep.mk"
13 13
14BUILDLINK_INCDIRS.Pantomime+= ${GNUSTEP_LOCAL_ROOT:Q}/${GNUSTEP_IDIR:Q}/Pantomime 14BUILDLINK_INCDIRS.Pantomime+= lib/GNUstep/Frameworks/Pantomime.framework/Headers
 15BUILDLINK_FILES.Pantomime+= include/Pantomime/*.h
15 16
16.include "../../devel/gnustep-base/buildlink3.mk" 17.include "../../devel/gnustep-base/buildlink3.mk"
17.endif # PANTOMIME_BUILDLINK3_MK 18.endif # PANTOMIME_BUILDLINK3_MK
18 19
19BUILDLINK_TREE+= -Pantomime 20BUILDLINK_TREE+= -Pantomime
cvs diff -r1.6 -r1.7 pkgsrc/mail/Pantomime/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/Pantomime/distinfo 2007/05/25 23:37:11 1.6
+++ pkgsrc/mail/Pantomime/distinfo 2009/04/13 12:40:40 1.7
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.6 2007/05/25 23:37:11 rh Exp $ 1$NetBSD: distinfo,v 1.7 2009/04/13 12:40:40 rh Exp $
2 2
3SHA1 (Pantomime-1.1.2.tar.gz) = 06755835a74ff3686eca35ba5169722f17cf968e 3SHA1 (Pantomime-1.2.0pre3.tar.gz) = beddf538d239513bdd46f67db04e9b4d4bd7441c
4RMD160 (Pantomime-1.1.2.tar.gz) = 2d6a3bf2c5e1cd146ba3f72ac69970ed6b5ee999 4RMD160 (Pantomime-1.2.0pre3.tar.gz) = 25c397080f0826d7b266e018246658707e9bbd00
5Size (Pantomime-1.1.2.tar.gz) = 394509 bytes 5Size (Pantomime-1.2.0pre3.tar.gz) = 441478 bytes
6SHA1 (patch-aa) = ef93a034eb706006ae9c7f0b6f393d8117656129 6SHA1 (patch-ab) = 0691970542c20876c709a07c33842948bfd536f6
7SHA1 (patch-ab) = e93e2e507b22d9deaf91af147ec6552a707f70bb 
File Deleted: pkgsrc/mail/Pantomime/patches/Attic/patch-aa
cvs diff -r1.1 -r1.2 pkgsrc/mail/Pantomime/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/mail/Pantomime/patches/Attic/patch-ab 2007/05/25 23:37:11 1.1
+++ pkgsrc/mail/Pantomime/patches/Attic/patch-ab 2009/04/13 12:40:40 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ab,v 1.1 2007/05/25 23:37:11 rh Exp $ 1$NetBSD: patch-ab,v 1.2 2009/04/13 12:40:40 rh Exp $
2 2
3--- Source/GNUmakefile.orig 2003-08-13 00:17:39.000000000 +1000 3--- Framework/Pantomime/GNUmakefile.orig 2006-12-17 02:13:38.000000000 +1000
4+++ Source/GNUmakefile 4+++ Framework/Pantomime/GNUmakefile
5@@ -88,7 +88,7 @@ ADDITIONAL_OBJCFLAGS = -DHAVE_ICONV -Wal 5@@ -191,7 +191,7 @@ endif
6  6 # Under Solaris, we include SSL headers / libraries
7 # Under Solaris, we link to libucb 
8 ifeq ($(findstring solaris, $(GNUSTEP_TARGET_OS)), solaris) 7 ifeq ($(findstring solaris, $(GNUSTEP_TARGET_OS)), solaris)
9-ADDITIONAL_LDFLAGS = -L/usr/ucblib -lucb 8 ADDITIONAL_OBJCFLAGS += -I/usr/local/ssl/include
10+ADDITIONAL_LDFLAGS = -Wl,-L/usr/ucblib -lucb 9-ADDITIONAL_LDFLAGS += -L/usr/local/ssl/lib
 10+ADDITIONAL_LDFLAGS += -Wl,-L/usr/local/ssl/lib
11 endif 11 endif
12  12
13 include $(GNUSTEP_MAKEFILES)/library.make 13 include $(GNUSTEP_MAKEFILES)/framework.make