4 files changed, 22 insertions, 33 deletions

diff --git a/lang/ponyc/Makefile b/lang/ponyc/Makefile
index 70fd2a8acbf9..ca7ed6180d08 100644
--- a/lang/ponyc/Makefile
+++ b/lang/ponyc/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ponyc
-DISTVERSION=	0.23.0
-PORTREVISION=	1
+DISTVERSION=	0.24.4
 CATEGORIES=	lang
 
 MAINTAINER=	greg@unrelenting.technology
@@ -26,14 +25,24 @@ MAKE_ARGS=	config=release
 
 LLVM_VERSION=	50
 
-PLIST_SUB=	VERSION="${DISTVERSION}"
+PLIST_SUB=	VERSION="${DISTVERSION}" PONYARCH="${PONYARCH}"
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ponylang
 
 PORTDOCS=	*.md
 
-MAKE_ENV=	prefix=${PREFIX} verbose=true ${"${ARCH}" == aarch64:?arch=armv8-a:}
+MAKE_ENV=	prefix=${PREFIX} verbose=true arch=${PONYARCH}
+
+# Pony defaults to 'native', which
+# a) doesn't work on aarch64
+# b) is not appropriate for official OS packages
+.if "${ARCH}" == aarch64
+PONYARCH?=	armv8-a
+.elif "${ARCH}" == amd64
+# Can't use 'x86-64' because atomics are required
+PONYARCH?=	core2
+.endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pony/${DISTVERSION}/bin/ponyc
diff --git a/lang/ponyc/distinfo b/lang/ponyc/distinfo
index 7bc4a595ce24..6e3191d3013f 100644
--- a/lang/ponyc/distinfo
+++ b/lang/ponyc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1528747607
-SHA256 (ponylang-ponyc-0.23.0_GH0.tar.gz) = 13bace89b4d069c7fa01e514d38fdcf02a8d2bf011367081186c4b00decf83bd
-SIZE (ponylang-ponyc-0.23.0_GH0.tar.gz) = 1520685
+TIMESTAMP = 1533336886
+SHA256 (ponylang-ponyc-0.24.4_GH0.tar.gz) = 979e443fa27df7b65c3ac35db47fc0b130608f0745d4fa393c451734343c088d
+SIZE (ponylang-ponyc-0.24.4_GH0.tar.gz) = 1361094
diff --git a/lang/ponyc/pkg-message b/lang/ponyc/pkg-message
new file mode 100644
index 000000000000..3a2225993764
--- /dev/null
+++ b/lang/ponyc/pkg-message
@@ -0,0 +1 @@
+Install devel/pcre2 for regex/glob support in Pony programs.
diff --git a/lang/ponyc/pkg-plist b/lang/ponyc/pkg-plist
index 43d0a5496685..5e57b97b6aa0 100644
--- a/lang/ponyc/pkg-plist
+++ b/lang/ponyc/pkg-plist
@@ -6,8 +6,8 @@ lib/libponyrt.a
 lib/pony/%%VERSION%%/bin/ponyc
 lib/pony/%%VERSION%%/include/pony.h
 lib/pony/%%VERSION%%/include/pony/detail/atomics.h
-lib/pony/%%VERSION%%/lib/libponyc.a
-lib/pony/%%VERSION%%/lib/libponyrt.a
+lib/pony/%%VERSION%%/lib/%%PONYARCH%%/libponyc.a
+lib/pony/%%VERSION%%/lib/%%PONYARCH%%/libponyrt.a
 lib/pony/%%VERSION%%/packages/assert/assert.pony
 lib/pony/%%VERSION%%/packages/backpressure/auth.pony
 lib/pony/%%VERSION%%/packages/backpressure/backpressure.pony
@@ -112,6 +112,7 @@ lib/pony/%%VERSION%%/packages/itertools/iter.pony
 lib/pony/%%VERSION%%/packages/itertools/itertools.pony
 lib/pony/%%VERSION%%/packages/json/_json_print.pony
 lib/pony/%%VERSION%%/packages/json/_test.pony
+lib/pony/%%VERSION%%/packages/json/json.pony
 lib/pony/%%VERSION%%/packages/json/json_doc.pony
 lib/pony/%%VERSION%%/packages/json/json_type.pony
 lib/pony/%%VERSION%%/packages/logger/_test.pony
@@ -120,33 +121,14 @@ lib/pony/%%VERSION%%/packages/math/fibonacci.pony
 lib/pony/%%VERSION%%/packages/net/_test.pony
 lib/pony/%%VERSION%%/packages/net/auth.pony
 lib/pony/%%VERSION%%/packages/net/dns.pony
-lib/pony/%%VERSION%%/packages/net/http/_client_conn_handler.pony
-lib/pony/%%VERSION%%/packages/net/http/_client_connection.pony
-lib/pony/%%VERSION%%/packages/net/http/_host_service.pony
-lib/pony/%%VERSION%%/packages/net/http/_http_parser.pony
-lib/pony/%%VERSION%%/packages/net/http/_server_conn_handler.pony
-lib/pony/%%VERSION%%/packages/net/http/_server_connection.pony
-lib/pony/%%VERSION%%/packages/net/http/_server_listener.pony
-lib/pony/%%VERSION%%/packages/net/http/_test.pony
-lib/pony/%%VERSION%%/packages/net/http/client.pony
-lib/pony/%%VERSION%%/packages/net/http/common_log.pony
-lib/pony/%%VERSION%%/packages/net/http/contents_log.pony
-lib/pony/%%VERSION%%/packages/net/http/discard_log.pony
-lib/pony/%%VERSION%%/packages/net/http/http_handler.pony
-lib/pony/%%VERSION%%/packages/net/http/http_session.pony
-lib/pony/%%VERSION%%/packages/net/http/mimetypes.pony
-lib/pony/%%VERSION%%/packages/net/http/payload.pony
-lib/pony/%%VERSION%%/packages/net/http/server.pony
-lib/pony/%%VERSION%%/packages/net/http/server_notify.pony
-lib/pony/%%VERSION%%/packages/net/http/status.pony
-lib/pony/%%VERSION%%/packages/net/http/url.pony
-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/_test.pony
+lib/pony/%%VERSION%%/packages/net/ssl/alpn.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
@@ -236,9 +218,6 @@ lib/pony/%%VERSION%%/packages/time/timers.pony
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gups_basic/main.pony
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gups_opt/main.pony
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/helloworld/main.pony
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpget/cacert.pem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpget/httpget.pony
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpserver/httpserver.pony
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifdef/ifdef.pony
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lambda/lambda.pony
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mailbox/main.pony