[56637] trunk/dports/devel/astyle

[wyuenho at macports.org]

Revision: 56637
          http://trac.macports.org/changeset/56637
Author:   wyuenho at macports.org
Date:     2009-08-31 01:15:28 -0700 (Mon, 31 Aug 2009)
Log Message:
-----------
Updated Astyle to 1.23

Modified Paths:
--------------
    trunk/dports/devel/astyle/Portfile

Added Paths:
-----------
    trunk/dports/devel/astyle/files/
    trunk/dports/devel/astyle/files/patch-Makefile.diff

Modified: trunk/dports/devel/astyle/Portfile
===================================================================
--- trunk/dports/devel/astyle/Portfile	2009-08-31 07:53:48 UTC (rev 56636)
+++ trunk/dports/devel/astyle/Portfile	2009-08-31 08:15:28 UTC (rev 56637)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem        1.0
@@ -3,17 +4,35 @@
 
 name              astyle
-version           1.20.2
+version           1.23
 categories        devel
 platforms         darwin
-maintainers       wyuenho
+maintainers       wyuenho openmaintainer
 
 description       source code beautifier for the C, C++, C# and Java programming
 long_description  Artistic Style is a source code indenter, source code formatter, \
-		  and source code beautifier for the C, C++, C# and Java \
-		  programming languages.
+                  and source code beautifier for the C, C++, C# and Java \
+                  programming languages.
 
 homepage          http://astyle.sourceforge.net
-master_sites      macports:wyuenho
-checksums         md5 e40f6e007b9617bfc13df2f4a2558a23 \
-		  sha e04ad5e59e40a149c3461a22eefeac8d8b5cc731 \
-		  rmd160 c77ecaa2247ca2bc49f96eefcd97aa580e90eac0
+master_sites      sourceforge::macosx
+distfiles         ${name}_${version}_macosx.tar.gz:macosx
+checksums         md5 9f7f3237996776d01bc6837cd445a442 \
+                  sha1 1ab3e36bc2f0f8e669fb6bbceaf051cafa043119 \
+                  rmd160 6940ac4e2f0351c141abf605d31931fefa1e7727
+
+worksrcdir        ${name}/buildmac
+patchfiles        patch-Makefile.diff
+use_configure     no
+universal_variant no
+build.target      release
+destroot.destdir  DESTDIR=${destroot}${prefix}
+
+variant lib description {Build and install the libraries} {
+    build.target-append shared static
+    destroot.target-append install-lib
+}
+
+variant java description {Build and install the JNI library} {
+    build.target-append java
+    destroot.target-append install-jnilib
+}

Added: trunk/dports/devel/astyle/files/patch-Makefile.diff
===================================================================
--- trunk/dports/devel/astyle/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/devel/astyle/files/patch-Makefile.diff	2009-08-31 08:15:28 UTC (rev 56637)
@@ -0,0 +1,102 @@
+--- Makefile.old	2009-08-30 20:18:44.000000000 -0400
++++ Makefile	2009-08-31 04:07:39.000000000 -0400
+@@ -14,27 +14,20 @@
+ vpath %.cpp ../src
+ vpath %.h   ../src
+ 
+-# 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/java-6-sun-1.6.0.06
+-	JAVA_HOME = /usr/lib/jvm/java-6-sun-1.6.0.10
+-endif
+-
+ # set prefix if not defined on the command line
+ ifndef prefix
+-    prefix=/usr
++    prefix=/usr/local
+ endif
+ 
+ # define macros
+ dynamiclib = -dynamiclib
+ bindir = ../bin
+ objdir = obj
+-ipath=$(prefix)/bin
++DESTDIR=$(prefix)
+ CBASEFLAGS = -W -Wall -fno-rtti -fno-exceptions
+-JAVAINCS   = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
++JAVAINCS   = -I/System/Library/Frameworks/JavaVM.framework/Headers
+ CXX = g++
+-INSTALL=install -o $(USER) -g $(USER)
++INSTALL=install -o $(USER)
+ 
+ # for testing on linux
+ ifdef test
+@@ -122,14 +115,14 @@
+ 	$(CXX) -o $(bindir)/$@ $^
+ 	@ echo
+ 
+-shared:  libastyle.so
+-libastyle.so:  $(OBJs)
++shared:  libastyle.dylib
++libastyle.dylib:  $(OBJs)
+ 	@ mkdir -p $(bindir)
+ 	$(CXX) $(dynamiclib) -o $(bindir)/$@ $^
+ 	@ echo
+ 
+-shareddebug:  libastyled.so
+-libastyled.so:  $(OBJsd)
++shareddebug:  libastyled.dylib
++libastyled.dylib:  $(OBJsd)
+ 	@ mkdir -p $(bindir)
+ 	$(CXX) $(dynamiclib) -o $(bindir)/$@ $^
+ 	@ echo
+@@ -146,16 +139,16 @@
+ 	ar crs $(bindir)/$@ $^
+ 	@ echo
+ 
+-java:  libastylej.so
+-libastylej.so:  $(OBJsj)
++java:  libastylej.dylib
++libastylej.dylib:  $(OBJsj)
+ 	@ mkdir -p $(bindir)
+-	$(CXX) $(dynamiclib) -o $(bindir)/$@ $^
++	$(CXX) $(dynamiclib) -framework JavaVM -o $(bindir)/$@ $^
+ 	@ echo
+ 
+-javadebug:  libastylejd.so
+-libastylejd.so:  $(OBJsjd)
++javadebug:  libastylejd.dylib
++libastylejd.dylib:  $(OBJsjd)
+ 	@ mkdir -p $(bindir)
+-	$(CXX) $(dynamiclib) -o $(bindir)/$@ $^
++	$(CXX) $(dynamiclib) -framework JavaVM -o $(bindir)/$@ $^
+ 	@ echo
+ 
+ all:  release debug shared shareddebug static staticdebug
+@@ -167,10 +160,19 @@
+ 
+ cleanobj:
+ 	rm -f $(objdir)/*.o
+-	
+-install:
+-	@ $(INSTALL) -m 755 -d $(ipath)
+-	$(INSTALL) -m 755 $(bindir)/astyle  $(ipath)
++
++install:  release
++	@$(INSTALL) -d $(DESTDIR)
++	$(INSTALL) $(bindir)/astyle  $(DESTDIR)/bin
++
++install-lib:  libastyle.a libastyle.dylib
++	@ $(INSTALL) -d $(DESTDIR)
++	$(INSTALL) ../bin/libastyle.a ../bin/libastyle.dylib $(DESTDIR)/lib
++
++install-jnilib:	 libastylej.dylib
++	@ $(INSTALL) -d $(DESTDIR)
++	$(INSTALL) ../bin/libastylej.dylib $(DESTDIR)/lib
+ 
+ uninstall:
+-	rm -f $(ipath)/astyle
++	rm -f $(DESTDIR)/bin/astyle
++	rm -f $(DESTDIR)/lib/libastyle%
+\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090831/db6cbdeb/attachment-0001.html>