[144506] trunk/dports/devel/astyle
khindenburg at macports.org
khindenburg at macports.org
Sun Jan 10 09:46:59 PST 2016
Revision: 144506
https://trac.macports.org/changeset/144506
Author: khindenburg at macports.org
Date: 2016-01-10 09:46:59 -0800 (Sun, 10 Jan 2016)
Log Message:
-----------
astyle: update to 2.05.1; building lib by default thus remove +lib; misc fixes #48862
Modified Paths:
--------------
trunk/dports/devel/astyle/Portfile
trunk/dports/devel/astyle/files/patch-Makefile.diff
Modified: trunk/dports/devel/astyle/Portfile
===================================================================
--- trunk/dports/devel/astyle/Portfile 2016-01-10 17:10:42 UTC (rev 144505)
+++ trunk/dports/devel/astyle/Portfile 2016-01-10 17:46:59 UTC (rev 144506)
@@ -2,9 +2,11 @@
# $Id$
PortSystem 1.0
+PortGroup java 1.0
+PortGroup muniversal 1.0
name astyle
-version 2.04
+version 2.05.1
categories devel
license LGPL-3+
platforms darwin
@@ -16,31 +18,38 @@
programming languages.
homepage http://astyle.sourceforge.net
-master_sites sourceforge::macosx
-distfiles ${name}_${version}_macosx.tar.gz:macosx
-checksums rmd160 3acff3f6d604c50a4762db9bce8c5cb18088c4a0 \
- sha256 e0ba90723463172fd8a063897092284993eeebb87c63cf26ee36f555b0d89368
+master_sites sourceforge:project/astyle/astyle/astyle%20${version}
+distname ${name}_${version}_macosx
+checksums rmd160 d153c0004c7a5d44dc68f235b5baa36e988afab3 \
+ sha256 de66da286dee2b9de1dc1c05092cbf5368c0889f25d1e2ee8b51766aff8e4baf
worksrcdir ${name}/build/mac
+
patchfiles patch-Makefile.diff
+
use_configure no
-conflicts astyle-dev
-variant universal {}
+build.args-append prefix=${prefix}
-build.target release
-build.args-append prefix=${prefix} \
- CXX="${configure.cxx} [get_canonical_archflags cxx]"
-
+destroot.target-append \
+ install-lib
destroot.args-append \
- prefix=${prefix} \
- CXX="${configure.cxx} [get_canonical_archflags cxx]"
+ prefix=${prefix}
-variant lib description {Build and install the libraries} {
- build.target-append shared static
- destroot.target-append install-lib
+foreach arch ${configure.universal_archs} {
+ lappend merger_build_args(${arch}) CXX='${configure.cxx} -arch ${arch}'
+ lappend merger_destroot_args(${arch}) CXX='${configure.cxx} -arch ${arch}'
}
+if {![variant_isset universal]} {
+ if {[info exists merger_build_args(${configure.build_arch})]} {
+ build.args-append $merger_build_args(${configure.build_arch})
+ }
+ if {[info exists merger_destroot_args(${configure.build_arch})]} {
+ destroot.args-append $merger_destroot_args(${configure.build_arch})
+ }
+}
+
variant java description {Build and install the JNI library} {
build.target-append java
destroot.target-append install-jnilib
Modified: trunk/dports/devel/astyle/files/patch-Makefile.diff
===================================================================
--- trunk/dports/devel/astyle/files/patch-Makefile.diff 2016-01-10 17:10:42 UTC (rev 144505)
+++ trunk/dports/devel/astyle/files/patch-Makefile.diff 2016-01-10 17:46:59 UTC (rev 144506)
@@ -1,27 +1,49 @@
---- Makefile.orig 2011-11-21 09:15:43.000000000 -0600
-+++ Makefile 2012-01-19 21:43:19.000000000 -0600
-@@ -18,7 +18,7 @@
- # NOTE for java compiles the environment variable $JAVA_HOME must be set
- # example: export JAVA_HOME=/usr/lib/jvm/java-6-sun-1.6.0.00
- ifndef JAVA_HOME
-- JAVA_HOME = /usr/lib/jvm/default-java
-+ JAVA_HOME = /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK
- endif
-
- # set prefix if not defined on the command line
-@@ -37,9 +37,9 @@
+--- Makefile.orig 2014-12-11 08:42:25.000000000 -0600
++++ Makefile 2015-09-18 07:13:58.000000000 -0500
+@@ -33,14 +33,14 @@
+ # define macros
+ dylib = dylib
+ dynamiclib = -dynamiclib
++installname = -install_name ${prefix}/lib/
+ bindir = bin
objdir = obj
ipath=$(prefix)/bin
CBASEFLAGS = -W -Wall -fno-rtti -fno-exceptions
--JAVAINCS = -I$(JAVA_HOME)/include
-+JAVAINCS = -I$(JAVA_HOME)/Headers
- CXX = g++
--INSTALL=install -o $(USER) -g $(USER)
+-UNIVFLAGS = -arch i386 -arch x86_64
+ JAVAINCS = -I/System/Library/Frameworks/JavaVM.framework/Headers
+ CXX = clang++
+-INSTALL=install -o $(USER) -g wheel
+INSTALL=install
# INSTALL=install -o 0 -g 0
- # for testing on linux
-@@ -186,19 +186,24 @@
+ # set debug directories for DEBUG=1 on the command line
+@@ -53,6 +53,7 @@
+ ifdef linux
+ dylib = so
+ dynamiclib = -shared
++ installname = -Wl,-soname,
+ JAVAINCS = -I$(JAVA_HOME)/include
+ endif
+
+@@ -125,7 +126,7 @@
+ shared: libastyle-2.05.1.$(dylib)
+ libastyle-2.05.1.$(dylib): $(OBJs)
+ @ mkdir -p $(bindir)
+- $(CXX) $(dynamiclib) $(LDFLAGSr) $(UNIVFLAGS) -o $(bindir)/$@ $^
++ $(CXX) $(dynamiclib) $(installname)libastyle-2.05.1.$(dylib) $(LDFLAGSr) $(UNIVFLAGS) -o $(bindir)/$@ $^
+ @ echo
+
+ static: libastyle.a
+@@ -137,7 +138,7 @@
+ java: libastyle-2.05.1j.$(dylib)
+ libastyle-2.05.1j.$(dylib): $(OBJsj)
+ @ mkdir -p $(bindir)
+- $(CXX) $(dynamiclib) $(LDFLAGSr) $(UNIVFLAGS) -o $(bindir)/$@ $^
++ $(CXX) $(dynamiclib) $(installname)libastyle-2.05.1j.$(dylib) $(LDFLAGSr) $(UNIVFLAGS) -o $(bindir)/$@ $^
+ @ echo
+
+ all: release static shared
+@@ -148,25 +149,35 @@
cleanobj:
rm -f $(objdir)/*.o
@@ -32,6 +54,12 @@
+ $(INSTALL) -m 755 -d $(DESTDIR)$(ipath)
+ $(INSTALL) -m 755 $(bindir)/astyle $(DESTDIR)$(ipath)
+- @if [ -d $(SYSCONF_PATH)/html ]; then \
+- rm -rf $(SYSCONF_PATH)/html; \
++ @if [ -d $(DESTDIR)$(SYSCONF_PATH)/html ]; then \
++ rm -rf $(DESTDIR)$(SYSCONF_PATH)/html; \
+ fi
+
- $(INSTALL) -m 755 -d $(SYSCONF_PATH)
- @mkdir -p $(SYSCONF_PATH)/html;
+ $(INSTALL) -m 755 -d $(DESTDIR)$(SYSCONF_PATH)
@@ -41,17 +69,23 @@
- $(INSTALL) -m 644 $$files $(SYSCONF_PATH)/html; \
+ $(INSTALL) -m 644 $$files $(DESTDIR)$(SYSCONF_PATH)/html; \
done
+
- @if [ -d $(SYSCONF_PATH_OLD) ]; then \
- rm -rf $(SYSCONF_PATH_OLD); \
-- fi
++ @if [ -d $(DESTDIR)$(SYSCONF_PATH_OLD) ]; then \
++ rm -rf $(DESTDIR)$(SYSCONF_PATH_OLD); \
+ fi
+
++install-lib: static shared
++ $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/lib
++ $(INSTALL) $(bindir)/libastyle.a $(bindir)/libastyle-2.05.1.$(dylib) $(DESTDIR)$(prefix)/lib
++ ln -s libastyle-2.05.1.$(dylib) $(DESTDIR)$(prefix)/lib/libastyle.$(dylib)
+
-+install-lib: libastyle.a libastyle.dylib
++install-jnilib: java
+ $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/lib
-+ $(INSTALL) $(bindir)/libastyle.a $(bindir)/libastyle.dylib $(DESTDIR)$(prefix)/lib
++ $(INSTALL) $(bindir)/libastyle-2.05.1j.$(dylib) $(DESTDIR)$(prefix)/lib
++ ln -s libastyle-2.05.1j.$(dylib) $(DESTDIR)$(prefix)/lib/libastylej.$(dylib)
+
-+install-jnilib: libastylej.dylib
-+ $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/lib
-+ $(INSTALL) $(bindir)/libastylej.dylib $(DESTDIR)$(prefix)/lib
-
uninstall:
rm -f $(ipath)/astyle
+ rm -rf $(SYSCONF_PATH)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160110/ce262c2f/attachment.html>
More information about the macports-changes
mailing list