Index: lang/ponyc/Makefile =================================================================== --- lang/ponyc/Makefile +++ lang/ponyc/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ponyc -PORTVERSION= 0.21.0 +DISTVERSION= 0.22.2 CATEGORIES= lang MAINTAINER= greg@unrelenting.technology @@ -25,17 +25,17 @@ LLVM_VERSION= 50 -PLIST_SUB= VERSION="${PORTVERSION}" +PLIST_SUB= VERSION="${DISTVERSION}" USE_GITHUB= yes GH_ACCOUNT= ponylang PORTDOCS= *.md -MAKE_ENV= destdir=${STAGEDIR} prefix=${PREFIX} verbose=true +MAKE_ENV= prefix=${PREFIX} verbose=true post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pony/${PORTVERSION}/bin/ponyc + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pony/${DISTVERSION}/bin/ponyc post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} Index: lang/ponyc/distinfo =================================================================== --- lang/ponyc/distinfo +++ lang/ponyc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513691860 -SHA256 (ponylang-ponyc-0.21.0_GH0.tar.gz) = 3a94719e8e7835a97b6d4b67945373346f723c1f85f756a80822f78d9705fd9b -SIZE (ponylang-ponyc-0.21.0_GH0.tar.gz) = 1371014 +TIMESTAMP = 1527444982 +SHA256 (ponylang-ponyc-0.22.2_GH0.tar.gz) = 7bf1290a4a3f6f74a12482ed1698b45d7766495958f1181e92564991ff7a09b6 +SIZE (ponylang-ponyc-0.22.2_GH0.tar.gz) = 1490218 Index: lang/ponyc/files/patch-Makefile =================================================================== --- lang/ponyc/files/patch-Makefile +++ lang/ponyc/files/patch-Makefile @@ -1,97 +1,13 @@ ---- Makefile.orig 2017-12-17 14:07:55 UTC +--- Makefile.orig 2018-05-27 18:29:53 UTC +++ Makefile -@@ -87,7 +87,8 @@ else - endif - - prefix ?= /usr/local --destdir ?= $(prefix)/lib/pony/$(tag) -+destdir ?= -+libdir ?= lib/pony/$(tag) - - LIB_EXT ?= a - BUILD_FLAGS = -march=$(arch) -mtune=$(tune) -Werror -Wconversion \ -@@ -244,10 +245,10 @@ ifndef LLVM_CONFIG - LLVM_CONFIG = llvm-config - LLVM_LINK = llvm-link - LLVM_OPT = opt -- else ifneq (,$(shell which llvm-config-5.0 2> /dev/null)) -- LLVM_CONFIG = llvm-config-5.0 -- LLVM_LINK = llvm-link-5.0 -- LLVM_OPT = opt-5.0 +@@ -221,6 +221,10 @@ ifndef LLVM_CONFIG + LLVM_CONFIG = llvm-config-3.9 + else ifneq (,$(shell which /usr/local/opt/llvm@3.9/bin/llvm-config 2> /dev/null)) + LLVM_CONFIG = /usr/local/opt/llvm@3.9/bin/llvm-config + else ifneq (,$(shell which llvm-config50 2> /dev/null)) + LLVM_CONFIG = llvm-config50 -+ LLVM_LINK = llvm-link50 -+ LLVM_OPT = opt50 - else ifneq (,$(shell which llvm-config-4.0 2> /dev/null)) - LLVM_CONFIG = llvm-config-4.0 - LLVM_LINK = llvm-link-4.0 -@@ -775,44 +776,44 @@ install: libponyc libponyrt libponyrt-pi - else - install: libponyc libponyrt ponyc - endif -- @mkdir -p $(destdir)/bin -- @mkdir -p $(destdir)/docs-support -- @mkdir -p $(destdir)/lib -- @mkdir -p $(destdir)/include/pony/detail -- $(SILENT)cp $(PONY_BUILD_DIR)/libponyrt.a $(destdir)/lib -+ @mkdir -p $(destdir)/$(prefix)/$(libdir)/bin -+ @mkdir -p $(destdir)/$(prefix)/$(libdir)/docs-support -+ @mkdir -p $(destdir)/$(prefix)/$(libdir)/lib -+ @mkdir -p $(destdir)/$(prefix)/$(libdir)/include/pony/detail -+ $(SILENT)cp $(PONY_BUILD_DIR)/libponyrt.a $(destdir)/$(prefix)/$(libdir)/lib - ifeq ($(OSTYPE),linux) -- $(SILENT)cp $(PONY_BUILD_DIR)/libponyrt-pic.a $(destdir)/lib -+ $(SILENT)cp $(PONY_BUILD_DIR)/libponyrt-pic.a $(destdir)/$(prefix)/$(libdir)/lib - endif - ifneq ($(wildcard $(PONY_BUILD_DIR)/libponyrt.bc),) -- $(SILENT)cp $(PONY_BUILD_DIR)/libponyrt.bc $(destdir)/lib -+ $(SILENT)cp $(PONY_BUILD_DIR)/libponyrt.bc $(destdir)/$(prefix)/$(libdir)/lib - endif - ifneq ($(wildcard $(PONY_BUILD_DIR)/libdtrace_probes.a),) -- $(SILENT)cp $(PONY_BUILD_DIR)/libdtrace_probes.a $(destdir)/lib -+ $(SILENT)cp $(PONY_BUILD_DIR)/libdtrace_probes.a $(destdir)/$(prefix)/$(libdir)/lib - endif -- $(SILENT)cp $(PONY_BUILD_DIR)/libponyc.a $(destdir)/lib -- $(SILENT)cp $(PONY_BUILD_DIR)/ponyc $(destdir)/bin -- $(SILENT)cp src/libponyrt/pony.h $(destdir)/include -- $(SILENT)cp src/common/pony/detail/atomics.h $(destdir)/include/pony/detail -- $(SILENT)cp -r packages $(destdir)/ -- $(SILENT)cp -r .docs/* $(destdir)/docs-support/ -+ $(SILENT)cp $(PONY_BUILD_DIR)/libponyc.a $(destdir)/$(prefix)/$(libdir)/lib -+ $(SILENT)cp $(PONY_BUILD_DIR)/ponyc $(destdir)/$(prefix)/$(libdir)/bin -+ $(SILENT)cp src/libponyrt/pony.h $(destdir)/$(prefix)/$(libdir)/include -+ $(SILENT)cp src/common/pony/detail/atomics.h $(destdir)/$(prefix)/$(libdir)/include/pony/detail -+ $(SILENT)cp -r packages $(destdir)/$(prefix)/$(libdir)/ -+ $(SILENT)cp -r .docs/* $(destdir)/$(prefix)/$(libdir)/docs-support/ - ifeq ($$(symlink),yes) -- @mkdir -p $(prefix)/bin -- @mkdir -p $(prefix)/lib -- @mkdir -p $(prefix)/include/pony/detail -- $(SILENT)ln $(symlink.flags) $(destdir)/bin/ponyc $(prefix)/bin/ponyc -- $(SILENT)ln $(symlink.flags) $(destdir)/lib/libponyrt.a $(prefix)/lib/libponyrt.a -+ @mkdir -p $(destdir)/$(prefix)/bin -+ @mkdir -p $(destdir)/$(prefix)/lib -+ @mkdir -p $(destdir)/$(prefix)/include/pony/detail -+ $(SILENT)ln $(symlink.flags) ../$(libdir)/bin/ponyc $(destdir)/$(prefix)/bin/ponyc -+ $(SILENT)ln $(symlink.flags) ../$(libdir)/lib/libponyrt.a $(destdir)/$(prefix)/lib/libponyrt.a - ifeq ($(OSTYPE),linux) -- $(SILENT)ln $(symlink.flags) $(destdir)/lib/libponyrt-pic.a $(prefix)/lib/libponyrt-pic.a -+ $(SILENT)ln $(symlink.flags) ../$(libdir)/lib/libponyrt-pic.a $(destdir)/$(prefix)/lib/libponyrt-pic.a - endif - ifneq ($(wildcard $(destdir)/lib/libponyrt.bc),) -- $(SILENT)ln $(symlink.flags) $(destdir)/lib/libponyrt.bc $(prefix)/lib/libponyrt.bc -+ $(SILENT)ln $(symlink.flags) ../$(libdir)/lib/libponyrt.bc $(destdir)/$(prefix)/lib/libponyrt.bc - endif - ifneq ($(wildcard $(PONY_BUILD_DIR)/libdtrace_probes.a),) -- $(SILENT)ln $(symlink.flags) $(destdir)/lib/libdtrace_probes.a $(prefix)/lib/libdtrace_probes.a -+ $(SILENT)ln $(symlink.flags) ../$(libdir)/lib/libdtrace_probes.a $(destdir)/$(prefix)/lib/libdtrace_probes.a - endif -- $(SILENT)ln $(symlink.flags) $(destdir)/lib/libponyc.a $(prefix)/lib/libponyc.a -- $(SILENT)ln $(symlink.flags) $(destdir)/include/pony.h $(prefix)/include/pony.h -- $(SILENT)ln $(symlink.flags) $(destdir)/include/pony/detail/atomics.h $(prefix)/include/pony/detail/atomics.h -+ $(SILENT)ln $(symlink.flags) ../$(libdir)/lib/libponyc.a $(destdir)/$(prefix)/lib/libponyc.a -+ $(SILENT)ln $(symlink.flags) ../$(libdir)/include/pony.h $(destdir)/$(prefix)/include/pony.h -+ $(SILENT)ln $(symlink.flags) ../$(libdir)/include/pony/detail/atomics.h $(destdir)/$(prefix)/include/pony/detail/atomics.h - endif - endef - ++ else ifneq (,$(shell which llvm-config40 2> /dev/null)) ++ LLVM_CONFIG = llvm-config40 + else ifneq (,$(shell which llvm-config39 2> /dev/null)) + LLVM_CONFIG = llvm-config39 + else ifneq (,$(shell which /usr/local/opt/llvm/bin/llvm-config 2> /dev/null)) Index: lang/ponyc/pkg-plist =================================================================== --- lang/ponyc/pkg-plist +++ lang/ponyc/pkg-plist @@ -4,7 +4,6 @@ lib/libponyc.a lib/libponyrt.a lib/pony/%%VERSION%%/bin/ponyc -lib/pony/%%VERSION%%/docs-support/extra.js lib/pony/%%VERSION%%/include/pony.h lib/pony/%%VERSION%%/include/pony/detail/atomics.h lib/pony/%%VERSION%%/lib/libponyc.a @@ -144,10 +143,14 @@ lib/pony/%%VERSION%%/packages/net/http/url_encode.pony lib/pony/%%VERSION%%/packages/net/net.pony lib/pony/%%VERSION%%/packages/net/net_address.pony +lib/pony/%%VERSION%%/packages/net/ossocket.pony +lib/pony/%%VERSION%%/packages/net/ossockopt.pony lib/pony/%%VERSION%%/packages/net/ssl/_ssl_init.pony +lib/pony/%%VERSION%%/packages/net/ssl/_ssl_versions.pony lib/pony/%%VERSION%%/packages/net/ssl/ssl.pony lib/pony/%%VERSION%%/packages/net/ssl/ssl_connection.pony lib/pony/%%VERSION%%/packages/net/ssl/ssl_context.pony +lib/pony/%%VERSION%%/packages/net/ssl/ssl_versions.pony lib/pony/%%VERSION%%/packages/net/ssl/x509.pony lib/pony/%%VERSION%%/packages/net/tcp_connection.pony lib/pony/%%VERSION%%/packages/net/tcp_connection_notify.pony @@ -158,10 +161,11 @@ lib/pony/%%VERSION%%/packages/options/_test.pony lib/pony/%%VERSION%%/packages/options/env_vars.pony lib/pony/%%VERSION%%/packages/options/options.pony -lib/pony/%%VERSION%%/packages/ponybench/_auto_bench.pony -lib/pony/%%VERSION%%/packages/ponybench/_bench.pony -lib/pony/%%VERSION%%/packages/ponybench/_bench_async.pony -lib/pony/%%VERSION%%/packages/ponybench/_test.pony +lib/pony/%%VERSION%%/packages/ponybench/_aggregator.pony +lib/pony/%%VERSION%%/packages/ponybench/_output_manager.pony +lib/pony/%%VERSION%%/packages/ponybench/_results.pony +lib/pony/%%VERSION%%/packages/ponybench/_runner.pony +lib/pony/%%VERSION%%/packages/ponybench/benchmark.pony lib/pony/%%VERSION%%/packages/ponybench/pony_bench.pony lib/pony/%%VERSION%%/packages/ponytest/_color.pony lib/pony/%%VERSION%%/packages/ponytest/_group.pony @@ -211,6 +215,7 @@ lib/pony/%%VERSION%%/packages/time/timer.pony lib/pony/%%VERSION%%/packages/time/timer_notify.pony lib/pony/%%VERSION%%/packages/time/timers.pony +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.md %%PORTEXAMPLES%%%%EXAMPLESDIR%%/circle/main.pony %%PORTEXAMPLES%%%%EXAMPLESDIR%%/commandline/main.pony %%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/main.pony @@ -252,6 +257,7 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/net/pong.pony %%PORTEXAMPLES%%%%EXAMPLESDIR%%/net/server.pony %%PORTEXAMPLES%%%%EXAMPLESDIR%%/overload/main.pony +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ponybench/main.pony %%PORTEXAMPLES%%%%EXAMPLESDIR%%/printargs/printargs.pony %%PORTEXAMPLES%%%%EXAMPLESDIR%%/producer-consumer/buffer.pony %%PORTEXAMPLES%%%%EXAMPLESDIR%%/producer-consumer/consumer.pony