[47069] trunk/dports/aqua/macsword
jmr at macports.org
jmr at macports.org
Sat Feb 21 03:05:39 PST 2009
Revision: 47069
http://trac.macports.org/changeset/47069
Author: jmr at macports.org
Date: 2009-02-21 03:05:39 -0800 (Sat, 21 Feb 2009)
Log Message:
-----------
macsword: update to 1.4.3, use xcode portgroup. Fixes #18568.
Modified Paths:
--------------
trunk/dports/aqua/macsword/Portfile
trunk/dports/aqua/macsword/files/patch-project.pbxproj
Removed Paths:
-------------
trunk/dports/aqua/macsword/files/patch-PrefHandler.m
trunk/dports/aqua/macsword/files/patch-SwordManager.mm
Modified: trunk/dports/aqua/macsword/Portfile
===================================================================
--- trunk/dports/aqua/macsword/Portfile 2009-02-21 11:02:55 UTC (rev 47068)
+++ trunk/dports/aqua/macsword/Portfile 2009-02-21 11:05:39 UTC (rev 47069)
@@ -1,9 +1,11 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
# $Id$
+
PortSystem 1.0
+PortGroup xcode 1.0
name macsword
-version 1.1.3
-revision 1
+version 1.4.3
categories aqua textproc
maintainers nomaintainer
description Aqua application based on the Sword project for Bible reading
@@ -22,33 +24,26 @@
it is compatible with a growing collection of over \
200 texts available in over 50 languages.
homepage http://www.macsword.com/
-master_sites sourceforge
-worksrcdir ${name}
-checksums md5 ba943645e41d1b1440decd028395ff48
-platforms darwin
+master_sites macports
+use_bzip2 yes
+checksums md5 2c6be1d86186a1a0fc770159f6a96066 \
+ sha1 258251d39fd18aa3a52f6c546e387873256c445e \
+ rmd160 4a24eb4e8ac3cf81fced81318f1a14dd45a3f13f
-depends_lib lib:libsword:sword \
- path:/Library/Frameworks/AGRegex.framework:agregex
+depends_lib port:sword
-patchfiles patch-project.pbxproj \
- patch-PrefHandler.m \
- patch-SwordManager.mm
+patchfiles patch-project.pbxproj
post-patch {
reinplace "s|__PREFIX|${prefix}|g" \
- ${worksrcpath}/MacSword.xcode/project.pbxproj \
- ${worksrcpath}/PrefHandler.m
+ ${worksrcpath}/MacSword.xcodeproj/project.pbxproj
+ reinplace "s|__APPS_DIR|${applications_dir}|g" \
+ ${worksrcpath}/MacSword.xcodeproj/project.pbxproj
}
-use_configure no
+xcode.target MacSword
-build.type pbx
-build.target MacSword
-build.pre_args -target ${build.target}
-build.args -configuration Deployment
-
destroot {
- xinstall -d -m 0755 ${destroot}/Applications/MacPorts
- system "cp -R ${worksrcpath}/build/Deployment/MacSword.app \
- ${destroot}/Applications/MacPorts"
+ xinstall -d -m 0755 ${destroot}${applications_dir}
+ copy ${worksrcpath}/build/Deployment/MacSword.app \
+ ${destroot}${applications_dir}
}
-
Deleted: trunk/dports/aqua/macsword/files/patch-PrefHandler.m
===================================================================
--- trunk/dports/aqua/macsword/files/patch-PrefHandler.m 2009-02-21 11:02:55 UTC (rev 47068)
+++ trunk/dports/aqua/macsword/files/patch-PrefHandler.m 2009-02-21 11:05:39 UTC (rev 47069)
@@ -1,11 +0,0 @@
---- PrefHandler.m.orig Tue May 18 17:21:22 2004
-+++ PrefHandler.m Tue May 18 17:21:40 2004
-@@ -29,7 +29,7 @@
- defaults = [NSUserDefaults standardUserDefaults];
-
- //setup some defaults
-- [appDefaults setObject:@"./Modules" forKey:@"moduleLocation"];
-+ [appDefaults setObject:@"__PREFIX/share/sword" forKey:@"moduleLocation"];
- [appDefaults setObject:@"YES" forKey:@"cache lexicons"];
- [appDefaults setObject:@"NO" forKey:@"descriptions"];
- [appDefaults setObject:@"YES" forKey:@"tool tips"];
Deleted: trunk/dports/aqua/macsword/files/patch-SwordManager.mm
===================================================================
--- trunk/dports/aqua/macsword/files/patch-SwordManager.mm 2009-02-21 11:02:55 UTC (rev 47068)
+++ trunk/dports/aqua/macsword/files/patch-SwordManager.mm 2009-02-21 11:05:39 UTC (rev 47069)
@@ -1,29 +0,0 @@
---- Backend/SwordManager.mm.orig Mon Mar 7 12:36:42 2005
-+++ Backend/SwordManager.mm Mon Mar 7 13:23:15 2005
-@@ -133,7 +133,7 @@
- sword::LocaleMgr *lManager;
- sword::SWLocale *myLocale;
-
-- lManager = sword::LocaleMgr::getSystemLocaleMgr();
-+ //lManager = sword::LocaleMgr::getSystemLocaleMgr();
-
- //get the language
- fullNames = [NSDictionary dictionaryWithObjectsAndKeys:@"en", @"English", @"de", @"German", @"fr", @"French", @"nl", @"Dutch", @"it", @"Italian", @"ja", @"Japanese", @"es", @"Spanish", NULL];
-@@ -182,7 +182,7 @@
- {
- myLocale = new sword::SWLocale(toUTF8(filePath));
-
-- lManager->addLocale(myLocale);
-+ //lManager->addLocale(myLocale);
- lManager->setDefaultLocaleName(toLatin1(language));
- break;
- }
-@@ -193,7 +193,7 @@
- {
- myLocale = new sword::SWLocale(toUTF8(filePath));
-
-- lManager->addLocale(myLocale);
-+ //lManager->addLocale(myLocale);
- lManager->setDefaultLocaleName(toLatin1(language));
- break;
- }
Modified: trunk/dports/aqua/macsword/files/patch-project.pbxproj
===================================================================
--- trunk/dports/aqua/macsword/files/patch-project.pbxproj 2009-02-21 11:02:55 UTC (rev 47068)
+++ trunk/dports/aqua/macsword/files/patch-project.pbxproj 2009-02-21 11:05:39 UTC (rev 47069)
@@ -1,133 +1,123 @@
---- MacSword.xcode/project.pbxproj.orig Mon Mar 7 12:59:41 2005
-+++ MacSword.xcode/project.pbxproj Mon Mar 7 13:11:32 2005
-@@ -5,14 +5,6 @@
- };
- objectVersion = 39;
- objects = {
-- 089C1660FE840EACC02AAC07 = {
-- fileEncoding = 10;
-- isa = PBXFileReference;
-- lastKnownFileType = text.plist.strings;
-- path = InfoPlist.strings;
-- refType = 4;
-- sourceTree = "<group>";
-- };
- //080
- //081
- //082
-@@ -83,7 +75,6 @@
- 2A37F4A9FDCFA73011CA2CEA = {
- buildSettings = {
- MACOSX_DEPLOYMENT_TARGET = 10.2;
-- SDKROOT = /Developer/SDKs/MacOSX10.2.7.sdk;
- };
- buildStyles = (
- 4A9504D0FFE6A4CB11CA0CBA,
-@@ -176,7 +167,6 @@
- 8D15AC360486D014006FF6A4,
- 3D794B2C05B83F8300E16D45,
- 3D794B2E05B83F8300E16D45,
-- 089C1660FE840EACC02AAC07,
- 3D812C33062AEFC3005FFF00,
- 3D794EA405B847EE00E16D45,
- 3D794EA505B847EE00E16D45,
-@@ -284,9 +274,9 @@
- 3D705CB20752906E00AC796D = {
- isa = PBXFileReference;
- lastKnownFileType = folder;
-- path = locales.d;
-+ path = __PREFIX/share/sword/locales.d;
- refType = 4;
-- sourceTree = "<group>";
-+ sourceTree = "<absolute>";
- };
- 3D705CB30752906E00AC796D = {
- fileRef = 3D705CB20752906E00AC796D;
-@@ -901,7 +891,7 @@
- isa = PBXFileReference;
- lastKnownFileType = wrapper.framework;
- name = AGRegex.framework;
-- path = /Users/william/Library/Frameworks/AGRegex.framework;
-+ path = /Library/Frameworks/AGRegex.framework;
- refType = 0;
- sourceTree = "<absolute>";
- };
-@@ -1067,12 +1057,6 @@
- refType = 4;
- sourceTree = "<group>";
- };
-- 3D812952062AB4E3005FFF00 = {
-- fileRef = 089C1660FE840EACC02AAC07;
-- isa = PBXBuildFile;
-- settings = {
-- };
-- };
- 3D812973062AB703005FFF00 = {
- isa = PBXFileReference;
- lastKnownFileType = folder;
-@@ -1377,9 +1361,9 @@
- 3DF211A407246621006E07A3 = {
- isa = PBXFileReference;
- lastKnownFileType = archive.ar;
-- path = libsword.a;
-+ path = __PREFIX/lib/libsword.a;
- refType = 4;
-- sourceTree = "<group>";
-+ sourceTree = "<absolute>";
- };
- 3DF211A507246621006E07A3 = {
- fileRef = 3DF211A407246621006E07A3;
-@@ -1445,7 +1429,7 @@
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_OPTIMIZATION_LEVEL = 0;
-- HEADER_SEARCH_PATHS = /Users/william/sword/include;
-+ HEADER_SEARCH_PATHS = __PREFIX/include/sword;
- OPTIMIZATION_CFLAGS = "-O0";
- OTHER_LDFLAGS = "-lz";
- ZERO_LINK = YES;
-@@ -1485,7 +1469,7 @@
- buildRules = (
+--- MacSword.xcodeproj/project.pbxproj.orig 2008-08-03 23:46:17.000000000 +1000
++++ MacSword.xcodeproj/project.pbxproj 2009-02-21 21:29:47.000000000 +1100
+@@ -458,7 +458,7 @@
+ 500C8BBE09B12C1200B25530 /* Personal */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Personal; path = Resources/Personal; sourceTree = "<group>"; };
+ 502419D509996053006816E2 /* German */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = German; path = German.lproj/MainMenu.nib; sourceTree = "<group>"; };
+ 50EAB1DB09B007AD00E61DE6 /* AGRegex.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGRegex.framework; path = AGRegex/build/Deployment/AGRegex.framework; sourceTree = SOURCE_ROOT; };
+- 50EAB1E309B007EA00E61DE6 /* locales.d */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locales.d; path = sword_mac_build/build/result_inst/locales.d; sourceTree = "<group>"; };
++ 50EAB1E309B007EA00E61DE6 /* locales.d */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locales.d; path = /opt/local/share/sword/locales.d; sourceTree = "<absolute>"; };
+ 8D15AC360486D014006FF6A4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
+ 8D15AC370486D014006FF6A4 /* MacSword.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacSword.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ A90FD2660DFE85950025F137 /* Finnish */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Finnish; path = Finnish.lproj/Localizable.strings; sourceTree = "<group>"; };
+@@ -644,7 +644,7 @@
+ A92AD37F0D4BEC6700AE84EE /* zstr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zstr.h; sourceTree = "<group>"; };
+ A92AD3800D4BEC6700AE84EE /* ztext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ztext.h; sourceTree = "<group>"; };
+ A92AD3810D4BEC6700AE84EE /* zverse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zverse.h; sourceTree = "<group>"; };
+- A92AD41B0D4BED2500AE84EE /* libsword-1.5.11-fat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsword-1.5.11-fat.a"; path = "sword_mac_build/build/result_inst/lib/libsword-1.5.11-fat.a"; sourceTree = "<group>"; };
++ A92AD41B0D4BED2500AE84EE /* libsword-1.5.11-fat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsword.a"; path = "/opt/local/lib/libsword.a"; sourceTree = "<absolute>"; };
+ A92D940F0C0F4CD000F8C7BF /* BibleIndexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BibleIndexer.h; path = src/Indexing/BibleIndexer.h; sourceTree = "<group>"; };
+ A92D94100C0F4CD000F8C7BF /* BibleIndexer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BibleIndexer.m; path = src/Indexing/BibleIndexer.m; sourceTree = "<group>"; };
+ A92D941B0C0F506400F8C7BF /* BookIndexer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BookIndexer.h; path = src/Indexing/BookIndexer.h; sourceTree = "<group>"; };
+@@ -1580,7 +1580,7 @@
+ A99C2A850B34525900805DEF /* PBXTargetDependency */,
);
+ name = MacSword;
+- productInstallPath = "$(HOME)/Applications";
++ productInstallPath = "/Applications/MacPorts";
+ productName = MacSword;
+ productReference = 8D15AC370486D014006FF6A4 /* MacSword.app */;
+ productType = "com.apple.product-type.application";
+@@ -1929,10 +1929,11 @@
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+ GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+ GCC_WARN_UNKNOWN_PRAGMAS = NO;
+- HEADER_SEARCH_PATHS = "$(SRCROOT)/sword-mac-build/build/result_inst/include/sword/**";
++ HEADER_SEARCH_PATHS = ("/opt/local/include/sword", "$(SRCROOT)/sword-mac-build/build/result_inst/include/sword/**",);
+ INFOPLIST_FILE = Info.plist;
+- INSTALL_PATH = "$(HOME)/Applications";
++ INSTALL_PATH = "/Applications/MacPorts";
+ LIBRARY_SEARCH_PATHS = (
++ "/opt/local/lib",
+ "$(inherited)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
+@@ -1948,7 +1949,6 @@
+ "-lcurl",
+ );
+ PRODUCT_NAME = MacSword;
+- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ SECTORDER_FLAGS = "";
+ USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/sword-mac-build/build/result_inst/include/sword/**";
+ WARNING_CFLAGS = "-Wall";
+@@ -1960,10 +1960,7 @@
+ 3DEB87B108C794D100C58D39 /* Deployment */ = {
+ isa = XCBuildConfiguration;
buildSettings = {
-- FRAMEWORK_SEARCH_PATHS = /Users/william/Library/Frameworks;
-+ FRAMEWORK_SEARCH_PATHS = "/Library/Frameworks /System/Library/Frameworks";
- GCC_ENABLE_TRIGRAPHS = NO;
- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
-@@ -1493,22 +1477,22 @@
+- ARCHS = (
+- ppc,
+- i386,
+- );
++ ARCHS = "$(NATIVE_ARCH)";
+ COPY_PHASE_STRIP = NO;
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(SRCROOT)/AGRegex/build/Deployment",
+@@ -1988,10 +1985,11 @@
GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
GCC_WARN_UNKNOWN_PRAGMAS = NO;
-- HEADER_SEARCH_PATHS = /Users/william/sword/include;
-+ HEADER_SEARCH_PATHS = __PREFIX/include/sword;
+- HEADER_SEARCH_PATHS = "$(SRCROOT)/sword-mac-build/build/result_inst/include/sword/**";
++ HEADER_SEARCH_PATHS = ("/opt/local/include/sword", "$(SRCROOT)/sword-mac-build/build/result_inst/include/sword/**",);
INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "$(HOME)/Applications";
-- LIBRARY_SEARCH_PATHS = .;
+ INSTALL_PATH = "/Applications/MacPorts";
-+ LIBRARY_SEARCH_PATHS = __PREFIX/lib;
- OTHER_CFLAGS = "";
- OTHER_LDFLAGS = "-lc";
+ LIBRARY_SEARCH_PATHS = (
++ "/opt/local/lib",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+@@ -2006,7 +2004,6 @@
+ "-lcurl",
+ );
PRODUCT_NAME = MacSword;
+- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
SECTORDER_FLAGS = "";
-- WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
-+ WARNING_CFLAGS = "-w";
- WRAPPER_EXTENSION = app;
+ STRIP_INSTALLED_PRODUCT = YES;
+ WARNING_CFLAGS = "-Wall";
+@@ -2034,10 +2031,11 @@
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+ GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+ GCC_WARN_UNKNOWN_PRAGMAS = NO;
+- HEADER_SEARCH_PATHS = /Users/william/sword/include;
++ HEADER_SEARCH_PATHS = /opt/local/include/sword;
+ INFOPLIST_FILE = Info.plist;
+- INSTALL_PATH = "$(HOME)/Applications";
++ INSTALL_PATH = "/Applications/MacPorts";
+ LIBRARY_SEARCH_PATHS = (
++ "/opt/local/lib",
+ /Users/william/Documents/cvs/macsword,
+ "$(SRCROOT)/sword-mac-build/fat_inst/lib",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+@@ -2072,7 +2070,6 @@
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ MACOSX_DEPLOYMENT_TARGET = 10.4;
+- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
- dependencies = (
- );
- isa = PBXNativeTarget;
- name = MacSword;
-- productInstallPath = "$(HOME)/Applications";
-+ productInstallPath = "/Applications/MacPorts";
- productName = MacSword;
- productReference = 8D15AC370486D014006FF6A4;
- productType = "com.apple.product-type.application";
-@@ -1535,7 +1519,6 @@
- 8D15AC2B0486D014006FF6A4 = {
- buildActionMask = 2147483647;
- files = (
-- 3D812952062AB4E3005FFF00,
- 3D70D03205B776B400A0A8AE,
- 3D70D23E05B7F06600A0A8AE,
- 3D70D24005B7F06600A0A8AE,
+ name = Development;
+ };
+@@ -2080,7 +2077,6 @@
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ MACOSX_DEPLOYMENT_TARGET = 10.4;
+- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ };
+ name = Deployment;
+ };
+@@ -2088,7 +2084,6 @@
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ MACOSX_DEPLOYMENT_TARGET = 10.2;
+- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ };
+ name = Default;
+ };
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090221/d4e1af9c/attachment.html>
More information about the macports-changes
mailing list