[30986] trunk/dports/devel/nu
source_changes at macosforge.org
source_changes at macosforge.org
Tue Nov 13 00:29:10 PST 2007
Revision: 30986
http://trac.macosforge.org/projects/macports/changeset/30986
Author: eridius at macports.org
Date: 2007-11-13 00:29:09 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
Update to Nu 0.2.1
Modified Paths:
--------------
trunk/dports/devel/nu/Portfile
trunk/dports/devel/nu/files/patch-libffi-single-arch
Removed Paths:
-------------
trunk/dports/devel/nu/files/patch-Nukefile
trunk/dports/devel/nu/files/patch-Nukefile-single-arch
trunk/dports/devel/nu/files/patch-Rakefile
Modified: trunk/dports/devel/nu/Portfile
===================================================================
--- trunk/dports/devel/nu/Portfile 2007-11-13 08:14:34 UTC (rev 30985)
+++ trunk/dports/devel/nu/Portfile 2007-11-13 08:29:09 UTC (rev 30986)
@@ -3,8 +3,7 @@
PortSystem 1.0
name nu
-version 0.2.0
-revision 1
+version 0.2.1
categories devel
maintainers eridius
description Nu is an interpreted object-oriented lisp-like language written in Objective-C.
@@ -21,10 +20,10 @@
master_sites http://programming.nu/releases/
extract.suffix .tgz
-checksums md5 2d99de5b3ec7a019e505e854b7e10338 \
- sha1 e88c071cc8e0df7dd9f97a01d012e6d4e06e97cb
+checksums md5 a97e6807b8e9b26a60d683a52974693d \
+ sha1 6b9a3d087275aee5256362e83e9c1af8ee711780
-patchfiles patch-Rakefile patch-Nukefile patch-Nukefile-single-arch patch-libffi-single-arch
+patchfiles patch-libffi-single-arch
depends_build port:pcre bin:rake:rb-rake
@@ -41,16 +40,16 @@
}
variant universal {
- patchfiles-delete patch-Nukefile-single-arch patch-libffi-single-arch
+ patchfiles-delete patch-libffi-single-arch
}
post-patch {
- reinplace s|@@PREFIX@@|$prefix|g ${worksrcpath}/Rakefile
+ if {![variant_isset universal]} {
+ reinplace "s|;(set @arch nil)|(set @arch nil)|" ${worksrcpath}/Nukefile
+ }
# fix the tools
- foreach tool [list enu nubile nudoc nuke nutest] {
- reinplace s|/usr/local|$prefix| ${worksrcpath}/tools/$tool
- }
+ reinplace s|/usr/local|$prefix| ${worksrcpath}/tools/nubile
# fix the examples
reinplace s|/usr/local|$prefix| ${worksrcpath}/examples/NuAnywhere/nu-anywhere
@@ -64,7 +63,7 @@
}
build {
- system "cd ${worksrcpath} && rake"
+ system "cd ${worksrcpath} && PREFIX=${prefix} rake"
system "cd ${worksrcpath} && PREFIX=${prefix} ./mininush tools/nuke"
}
Deleted: trunk/dports/devel/nu/files/patch-Nukefile
===================================================================
--- trunk/dports/devel/nu/files/patch-Nukefile 2007-11-13 08:14:34 UTC (rev 30985)
+++ trunk/dports/devel/nu/files/patch-Nukefile 2007-11-13 08:29:09 UTC (rev 30986)
@@ -1,76 +0,0 @@
---- ../Nu-0.1.3.old/Nukefile 2007-10-05 23:31:40.000000000 -0400
-+++ Nukefile 2007-10-09 06:44:01.000000000 -0400
-@@ -16,6 +16,15 @@
- END)
- (version writeToFile:"objc/version.h" atomically:NO encoding:NSUTF8StringEncoding error:(set error (NuReference new))))
-
-+;; read environment for prefix and destroot
-+(let ((env ((NSProcessInfo processInfo) environment)))
-+ (if (env objectForKey:"PREFIX")
-+ (then (set @prefix (env objectForKey:"PREFIX")))
-+ (else (set @prefix "/usr/local")))
-+ (if (env objectForKey:"DESTDIR")
-+ (then (set @destdir (env objectForKey:"DESTDIR")))
-+ (else (set @destdir ""))))
-+
- ;; source files
- (set @c_files (filelist "^objc/.*\.c$"))
- (set @m_files (filelist "^objc/.*\.m$"))
-@@ -28,13 +37,11 @@
- (set @libs '("edit" "ffi" ))
-
- (set @lib_dirs (NSMutableArray arrayWithObject:"/usr/lib"))
--(if (NSFileManager directoryExistsNamed:"/usr/local/lib") (@lib_dirs addObject:"/usr/local/lib"))
--(if (NSFileManager directoryExistsNamed:"/opt/local/lib") (@lib_dirs addObject:"/opt/local/lib"))
-+(if (NSFileManager directoryExistsNamed:"#{@prefix}/lib") (@lib_dirs addObject:"#{@prefix}/lib"))
-
- ;; includes
- (set @includes "")
--(if (NSFileManager directoryExistsNamed:"/usr/local/include") (@includes appendString:" -I /usr/local/include"))
--(if (NSFileManager directoryExistsNamed:"/opt/local/include") (@includes appendString:" -I /opt/local/include"))
-+(if (NSFileManager directoryExistsNamed:"#{@prefix}/include") (@includes appendString:" -I #{@prefix}/include"))
-
- (if (NSFileManager fileExistsNamed:"/usr/lib/libffi.dylib")
- (then ;; Use the libffi that ships with OS X.
-@@ -67,8 +74,7 @@
- (set @ldflags
- ((list
- (cond ;; statically link in pcre since most people won't have it..
-- ((NSFileManager fileExistsNamed:"/usr/local/lib/libpcre.a") ("/usr/local/lib/libpcre.a"))
-- ((NSFileManager fileExistsNamed:"/opt/local/lib/libpcre.a") ("/opt/local/lib/libpcre.a"))
-+ ((NSFileManager fileExistsNamed:"#{@prefix}/lib/libpcre.a") ("#{@prefix}/lib/libpcre.a"))
- (else (NSException raise:"NukeBuildError" format:"Can't find static pcre library (libpcre.a).")))
- ((@frameworks map: (do (framework) " -framework #{framework}")) join)
- ((@libs map: (do (lib) " -l#{lib}")) join)
-@@ -115,20 +121,21 @@
- (task "default" => "nush")
-
- ;; Except for the Nu.framework (installed in /Library/Frameworks),
--;; all scripts and binaries are installed to /usr/local/bin
--(set @prefix "/usr/local")
-+;; all scripts and binaries are installed to #{@prefix}/bin
-+
-+(set @installprefix "#{@destdir}#{@prefix}")
-
- (task "install" => "nush" is
- ('("nuke" "nubile" "enu" "nutest" "nudoc") each:
- (do (program)
-- (SH "sudo cp tools/#{program} #{@prefix}/bin")))
-- (SH "sudo cp nush #{@prefix}/bin")
-- (SH "sudo rm -rf /Library/Frameworks/#{@framework}.framework")
-- (SH "cp -pRfv #{@framework}.framework /Library/Frameworks/#{@framework}.framework")
-- (SH "sudo mkdir -p #{@prefix}/share")
-- (SH "sudo rm -rf #{@prefix}/share/nu")
-- (SH "sudo cp -pRfv share/nu #{@prefix}/share/nu")
-- (SH "sudo cp -pRfv examples #{@prefix}/share/nu/examples"))
-+ (SH "sudo ditto tools/#{program} #{@installprefix}/bin")))
-+ (SH "sudo ditto nush #{@installprefix}/bin")
-+ (SH "sudo rm -rf #{@destdir}/Library/Frameworks/#{@framework}.framework")
-+ (SH "ditto #{@framework}.framework #{@destdir}/Library/Frameworks/#{@framework}.framework")
-+ (SH "sudo mkdir -p #{@installprefix}/share")
-+ (SH "sudo rm -rf #{@installprefix}/share/nu")
-+ (SH "sudo ditto share/nu #{@installprefix}/share/nu")
-+ (SH "sudo ditto examples #{@installprefix}/share/nu/examples"))
-
- ;; Build a disk image for distributing the framework.
- (task "framework_image" => "framework" is
Deleted: trunk/dports/devel/nu/files/patch-Nukefile-single-arch
===================================================================
--- trunk/dports/devel/nu/files/patch-Nukefile-single-arch 2007-11-13 08:14:34 UTC (rev 30985)
+++ trunk/dports/devel/nu/files/patch-Nukefile-single-arch 2007-11-13 08:29:09 UTC (rev 30986)
@@ -1,11 +0,0 @@
---- Nukefile.old 2007-10-09 06:50:38.000000000 -0400
-+++ Nukefile 2007-10-09 06:50:48.000000000 -0400
-@@ -69,7 +69,7 @@
- ;; use this to build a universal binary
- (set @arch '("ppc" "i386"))
- ;; or this to just build for your current platform
--;(set @arch nil)
-+(set @arch nil)
-
- (set @ldflags
- ((list
Deleted: trunk/dports/devel/nu/files/patch-Rakefile
===================================================================
--- trunk/dports/devel/nu/files/patch-Rakefile 2007-11-13 08:14:34 UTC (rev 30985)
+++ trunk/dports/devel/nu/files/patch-Rakefile 2007-11-13 08:29:09 UTC (rev 30986)
@@ -1,19 +0,0 @@
---- ../Nu-0.1.3.old/Rakefile 2007-10-05 23:31:40.000000000 -0400
-+++ Rakefile 2007-10-09 06:48:40.000000000 -0400
-@@ -17,14 +17,12 @@
- end
-
- @includes = FFI_INCLUDE
-- at includes += " -I /usr/local/include" if File.exist? "/usr/local/include"
-- at includes += " -I /opt/local/include" if File.exist? "/opt/local/include"
-+ at includes += " -I @@PREFIX@@/include" if File.exist? "@@PREFIX@@/include"
-
- @frameworks = %w{Cocoa}
- @libs = %w{objc pcre readline}
- @lib_dirs = []
-- at lib_dirs << "/usr/local/lib" if File.exist? "/usr/local/lib"
-- at lib_dirs << "/opt/local/lib" if File.exist? "/opt/local/lib"
-+ at lib_dirs << "@@PREFIX@@/lib" if File.exist? "@@PREFIX@@/lib"
-
- CLEAN.include("*/*.o")
- CLOBBER.include("mininush")
Modified: trunk/dports/devel/nu/files/patch-libffi-single-arch
===================================================================
--- trunk/dports/devel/nu/files/patch-libffi-single-arch 2007-11-13 08:14:34 UTC (rev 30985)
+++ trunk/dports/devel/nu/files/patch-libffi-single-arch 2007-11-13 08:29:09 UTC (rev 30986)
@@ -1,6 +1,6 @@
--- libffi/Rakefile.old 2007-10-01 06:52:29.000000000 -0400
+++ libffi/Rakefile 2007-10-01 06:52:37.000000000 -0400
-@@ -16,7 +16,7 @@
+@@ -17,7 +17,7 @@
@cc = "gcc"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071113/3d10edfb/attachment.html
More information about the macports-changes
mailing list