Date: Thu, 31 Mar 2011 18:01:37 -0500 From: Zhihao Yuan <lichray@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/156099: port lang/pure updates to 0.47 Message-ID: <4d9507d4.c9e82a0a.5ccf.4102@mx.google.com> Resent-Message-ID: <201103312310.p2VNA8Zc020469@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 156099 >Category: ports >Synopsis: port lang/pure updates to 0.47 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Mar 31 23:10:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Zhihao Yuan >Release: FreeBSD 8.2-STABLE amd64 >Organization: Northern Illinois University >Environment: System: FreeBSD compaq.yuetime 8.2-STABLE FreeBSD 8.2-STABLE #0: Mon Mar 14 02:51:28 CDT 2011 root@compaq.yuetime:/usr/obj/usr/src/sys/HOUKAGO amd64 >Description: The Pure language has been updated to 0.47. In this version, 1. libpure was updated to version 7; 2. The CC/CXX patch was merged into upstream; 3. pkg-config supported was added. >How-To-Repeat: >Fix: --- patch-pure-0.47 begins here --- diff -rupN pure.orig/Makefile pure/Makefile --- pure.orig/Makefile 2011-03-21 01:14:38.000000000 -0500 +++ pure/Makefile 2011-03-31 17:07:46.023107830 -0500 @@ -6,7 +6,7 @@ # PORTNAME= pure -PORTVERSION= 0.46 +PORTVERSION= 0.47 CATEGORIES= lang MASTER_SITES= http://pure-lang.googlecode.com/files/ DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz ${PORTNAME}-docs-${PORTVERSION}.tar.gz @@ -26,6 +26,7 @@ USE_GCC= 4.2+ USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes USE_GMAKE= yes +USE_GNOME= gnomehack MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --with-libgmp-prefix=${LOCALBASE} --enable-release diff -rupN pure.orig/distinfo pure/distinfo --- pure.orig/distinfo 2011-03-21 01:14:38.000000000 -0500 +++ pure/distinfo 2011-03-31 16:42:59.636537042 -0500 @@ -1,4 +1,4 @@ -SHA256 (pure-0.46.tar.gz) = 172cd3196d5c44341ec4cfaff801b0350d36bb7f92b7fa93d361bedd34f83896 -SIZE (pure-0.46.tar.gz) = 900928 -SHA256 (pure-docs-0.46.tar.gz) = 3429e14445bfb05a3618c2bb7800a695d08aea347d9e6c3b908fe702b5ef0803 -SIZE (pure-docs-0.46.tar.gz) = 2560377 +SHA256 (pure-0.47.tar.gz) = 36c4f890f875a25c0647ad97fff59ab8a959d770909fe2634f0992fc5d4d3d04 +SIZE (pure-0.47.tar.gz) = 1028125 +SHA256 (pure-docs-0.47.tar.gz) = 5d26edc1dce5151a616ad11378657fbf792edf2ddefa31c70934e6d3c011258c +SIZE (pure-docs-0.47.tar.gz) = 2817481 diff -rupN pure.orig/files/patch-interpreter.cc pure/files/patch-interpreter.cc --- pure.orig/files/patch-interpreter.cc 2011-03-21 01:14:38.000000000 -0500 +++ pure/files/patch-interpreter.cc 1969-12-31 18:00:00.000000000 -0600 @@ -1,32 +0,0 @@ ---- interpreter.cc.orig 2010-11-08 02:57:58.000000000 -0600 -+++ interpreter.cc 2011-03-19 02:01:57.145664585 -0500 -@@ -6709,6 +6709,11 @@ int interpreter::compiler(string out, li - // Compile and link, if requested. - if (target != out) { - assert(bc_target); -+ string cc = "gcc"; -+ string cxx = "g++"; -+ const char *env; -+ if (env = getenv("CC")) cc = env; -+ if (env = getenv("CXX")) cxx = env; - bool vflag = (verbose&verbosity::compiler) != 0; - string libs; - set<string> libset; -@@ -6735,7 +6740,7 @@ int interpreter::compiler(string out, li - if (WIFEXITED(status) && WEXITSTATUS(status) == 0 && ext!=".s") { - // Assemble. - string obj = (ext==".o")?out:out+".o"; -- cmd = "gcc -c "+quote(asmfile)+" -o "+quote(obj); -+ cmd = cc+" -c "+quote(asmfile)+" -o "+quote(obj); - if (vflag) std::cerr << cmd << '\n'; - status = system(cmd.c_str()); - unlink(asmfile.c_str()); -@@ -6755,7 +6760,7 @@ int interpreter::compiler(string out, li - " -lpure"; - if (ext != ".o") { - // Link. -- cmd = "g++ -o "+quote(out)+" "+quote(libdir)+"pure_main.o "+linkopts; -+ cmd = cxx+" -o "+quote(out)+" "+quote(libdir)+"pure_main.o "+linkopts; - if (vflag) std::cerr << cmd << '\n'; - status = system(cmd.c_str()); - unlink(obj.c_str()); diff -rupN pure.orig/pkg-plist pure/pkg-plist --- pure.orig/pkg-plist 2011-03-21 01:14:38.000000000 -0500 +++ pure/pkg-plist 2011-03-31 17:45:48.306181891 -0500 @@ -1,8 +1,8 @@ bin/pure include/pure/runtime.h lib/libpure.so -lib/libpure.so.6 -lib/libpure.so.6.0 +lib/libpure.so.7 +lib/libpure.so.7.0 lib/pure/array.pure lib/pure/avltrees.pure lib/pure/dict.pure @@ -17,11 +17,12 @@ lib/pure/primitives.pure lib/pure/pure_main.c lib/pure/pure_main.o lib/pure/quasiquote.pure -lib/pure/quasiquote2.pure +lib/pure/quasiquote1.pure lib/pure/records.pure lib/pure/set.pure lib/pure/strings.pure lib/pure/system.pure +libdata/pkgconfig/pure.pc %%DOCS%%lib/pure/docs @dirrm lib/pure @dirrm include/pure --- patch-pure-0.47 ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4d9507d4.c9e82a0a.5ccf.4102>