<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/65062b9b7ed4f19c359295abe1c1d274aa834e32">https://github.com/macports/macports-ports/commit/65062b9b7ed4f19c359295abe1c1d274aa834e32</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 65062b9 astyle: update to 3.1
</span>65062b9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 65062b9b7ed4f19c359295abe1c1d274aa834e32
</span>Author: reneeotten <reneeotten@users.noreply.github.com>
AuthorDate: Sun Oct 21 20:35:33 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> astyle: update to 3.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - update license to MIT
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/53291
</span>---
devel/astyle/Portfile | 35 +++++----------
devel/astyle/files/patch-Makefile.diff | 82 +++++++++++++++++++---------------
2 files changed, 57 insertions(+), 60 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/astyle/Portfile b/devel/astyle/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bafb978..fb5407e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/astyle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/astyle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,12 +2,13 @@
</span>
PortSystem 1.0
PortGroup java 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compilers 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span>
name astyle
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.05.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.1
</span> categories devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license LGPL-3+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license MIT
</span> platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +19,10 @@ long_description Artistic Style is a source code indenter, source code format
</span>
homepage http://astyle.sourceforge.net
master_sites sourceforge:project/astyle/astyle/astyle%20${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}_${version}_macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d153c0004c7a5d44dc68f235b5baa36e988afab3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 de66da286dee2b9de1dc1c05092cbf5368c0889f25d1e2ee8b51766aff8e4baf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}_${version}_macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5aed3c48b59aedf02e247652db6fad597ef9bd63 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c4eebbe082eb2cb98f90aafcce3da2daeb774dd092e4cf8b728102fded8d1dcf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 187918
</span>
worksrcdir ${name}/build/mac
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,28 +32,15 @@ use_configure no
</span>
build.args-append prefix=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install-lib
</span> destroot.args-append \
prefix=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_args(${arch}) CXX='${configure.cxx} -arch ${arch}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_destroot_args(${arch}) CXX='${configure.cxx} -arch ${arch}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists merger_build_args(${configure.build_arch})]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append $merger_build_args(${configure.build_arch})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists merger_destroot_args(${configure.build_arch})]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append $merger_destroot_args(${configure.build_arch})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.target-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install-lib
</span>
variant java description {Build and install the JNI library} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target-append java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.target-append install-jnilib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target-append java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.target-append install-jnilib
</span> }
livecheck.regex "[quotemeta $name] (\\d+(\\.\\d+)*)"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/astyle/files/patch-Makefile.diff b/devel/astyle/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f5c8b17..3b0a67f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/astyle/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/astyle/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,58 +1,72 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2014-12-11 08:42:25.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2015-09-18 07:13:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,14 +33,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2018-10-21 15:13:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2018-10-22 13:36:03.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,23 +36,23 @@
</span> # define macros
dylib = dylib
dynamiclib = -dynamiclib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+installname = -install_name ${prefix}/lib/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++installname = -install_name $(prefix)/lib/
</span> bindir = bin
objdir = obj
ipath=$(prefix)/bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CBASEFLAGS = -W -Wall -fno-rtti -fno-exceptions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--UNIVFLAGS = -arch i386 -arch x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JAVAINCS = -I/System/Library/Frameworks/JavaVM.framework/Headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CBASEFLAGS = -W -Wall -std=c++11 -stdlib=libc++ -fno-rtti -fno-exceptions \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -mmacosx-version-min=10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LDBASEFLAGS =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-JAVAINCS = -I/Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk/Contents/Home/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--I/Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk/Contents/Home/include/darwin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--I/System/Library/Frameworks/JavaVM.framework/Headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDBASEFLAGS =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++JAVAINCS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin
</span> CXX = clang++
-INSTALL=install -o $(USER) -g wheel
+INSTALL=install
# INSTALL=install -o 0 -g 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # set debug directories for DEBUG=1 on the command line
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,6 +53,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for testing on linux
</span> ifdef linux
dylib = so
dynamiclib = -shared
+ installname = -Wl,-soname,
<span style='display:block; white-space:pre;background:#ffe0e0;'>- JAVAINCS = -I$(JAVA_HOME)/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX = g++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JAVAINCS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
</span> endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -152,10 +152,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) $(LDFLAGSd) -o $(bindir)/AStyled $^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @ echo
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -125,7 +126,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shared: libastyle-2.05.1.$(dylib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libastyle-2.05.1.$(dylib): $(OBJs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-shared: libastyle.$(dylib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-libastyle.$(dylib): $(OBJs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++shared: libastyle31.$(dylib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++libastyle31.$(dylib): $(OBJs)
</span> @ mkdir -p $(bindir)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CXX) $(dynamiclib) $(LDFLAGSr) $(UNIVFLAGS) -o $(bindir)/$@ $^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CXX) $(dynamiclib) $(installname)libastyle-2.05.1.$(dylib) $(LDFLAGSr) $(UNIVFLAGS) -o $(bindir)/$@ $^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CXX) $(dynamiclib) $(LDFLAGSr) -o $(bindir)/libastyle31.$(dylib) $^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) $(dynamiclib) $(installname)libastyle31.$(dylib) $(LDFLAGSr) -o $(bindir)/$@ $^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @ echo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shareddebug: libastyled.$(dylib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,10 +176,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ar crs $(bindir)/$@ $^
</span> @ echo
<span style='display:block; white-space:pre;background:#ffe0e0;'>- static: libastyle.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,7 +138,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- java: libastyle-2.05.1j.$(dylib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libastyle-2.05.1j.$(dylib): $(OBJsj)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-java: libastylej.$(dylib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-libastylej.$(dylib): $(OBJsj)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++java: libastyle31j.$(dylib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++libastyle31j.$(dylib): $(OBJsj)
</span> @ mkdir -p $(bindir)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CXX) $(dynamiclib) $(LDFLAGSr) $(UNIVFLAGS) -o $(bindir)/$@ $^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CXX) $(dynamiclib) $(installname)libastyle-2.05.1j.$(dylib) $(LDFLAGSr) $(UNIVFLAGS) -o $(bindir)/$@ $^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CXX) $(dynamiclib) $(LDFLAGSr) -o $(bindir)/libastyle31j.$(dylib) $^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) $(dynamiclib) $(installname)libastyle31j.$(dylib) $(LDFLAGSr) -o $(bindir)/$@ $^
</span> @ echo
<span style='display:block; white-space:pre;background:#ffe0e0;'>- all: release static shared
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -148,25 +149,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ javadebug: libastylejd.$(dylib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -198,21 +198,31 @@
</span> cleanobj:
rm -f $(objdir)/*.o
-install:
- $(INSTALL) -m 755 -d $(ipath)
- @$(INSTALL) -m 755 $(bindir)/astyle $(ipath)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+install: release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install: release
</span> + $(INSTALL) -m 755 -d $(DESTDIR)$(ipath)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL) -m 755 $(bindir)/astyle $(DESTDIR)$(ipath)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @$(INSTALL) -m 755 $(bindir)/astyle $(DESTDIR)$(ipath)
</span>
- @if [ -d $(SYSCONF_PATH)/html ]; then \
- rm -rf $(SYSCONF_PATH)/html; \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,25 +80,19 @@
</span> + @mkdir -p $(DESTDIR)$(SYSCONF_PATH)/html;
@for files in ../../doc/*.html ../../doc/*.css; \
do \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(INSTALL) -m 644 $$files $(SYSCONF_PATH)/html; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL) -m 644 $$files $(DESTDIR)$(SYSCONF_PATH)/html; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL) -m 644 "$$files" $(SYSCONF_PATH)/html; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL) -m 644 "$$files" $(DESTDIR)$(SYSCONF_PATH)/html; \
</span> done
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- @if [ -d $(SYSCONF_PATH_OLD) ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rm -rf $(SYSCONF_PATH_OLD); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @if [ -d $(DESTDIR)$(SYSCONF_PATH_OLD) ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rm -rf $(DESTDIR)$(SYSCONF_PATH_OLD); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> +install-lib: static shared
+ $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL) $(bindir)/libastyle.a $(bindir)/libastyle-2.05.1.$(dylib) $(DESTDIR)$(prefix)/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ln -s libastyle-2.05.1.$(dylib) $(DESTDIR)$(prefix)/lib/libastyle.$(dylib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL) $(bindir)/libastyle.a $(bindir)/libastyle31.$(dylib) $(DESTDIR)$(prefix)/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ln -s libastyle31$(dylib) $(DESTDIR)$(prefix)/lib/libastyle.$(dylib)
</span> +
+install-jnilib: java
+ $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL) $(bindir)/libastyle-2.05.1j.$(dylib) $(DESTDIR)$(prefix)/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ln -s libastyle-2.05.1j.$(dylib) $(DESTDIR)$(prefix)/lib/libastylej.$(dylib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL) $(bindir)/libastyle31j.$(dylib) $(DESTDIR)$(prefix)/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ln -s libastyle31j.$(dylib) $(DESTDIR)$(prefix)/lib/libastylej.$(dylib)
</span> +
uninstall:
rm -f $(ipath)/astyle
</pre><pre style='margin:0'>
</pre>