[74859] trunk/dports/devel/astyle

adfernandes at macports.org adfernandes at macports.org
Tue Jan 4 11:56:13 PST 2011


Revision: 74859
          http://trac.macports.org/changeset/74859
Author:   adfernandes at macports.org
Date:     2011-01-04 11:56:02 -0800 (Tue, 04 Jan 2011)
Log Message:
-----------
devel/astyle : version bump from 1.24 to 2.01

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	2011-01-04 18:58:53 UTC (rev 74858)
+++ trunk/dports/devel/astyle/Portfile	2011-01-04 19:56:02 UTC (rev 74859)
@@ -4,7 +4,7 @@
 PortSystem        1.0
 
 name              astyle
-version           1.24
+version           2.01
 categories        devel
 platforms         darwin
 maintainers       wyuenho openmaintainer
@@ -17,15 +17,16 @@
 homepage          http://astyle.sourceforge.net
 master_sites      sourceforge::macosx
 distfiles         ${name}_${version}_macosx.tar.gz:macosx
-checksums         md5 9b63dadac58e867f14b3894befbdc9b3 \
-                  sha1 6f5d727fb19e716223e14cd2b94d2c1d7fdab13f
+checksums         md5     f81408554bf93ea4ad4feb008a76202c \
+                  sha1    02d0887acc820b7a413892af8cf4c21bcd55253b \
+                  rmd160  1a20a8a7ae8b1146c65f030189fe4e1108cb58c0
 
 worksrcdir        ${name}/build/mac
 patchfiles        patch-Makefile.diff
 use_configure     no
 universal_variant no
 build.target      release
-destroot.destdir  DESTDIR=${destroot}${prefix}
+destroot.destdir  DESTDIR=${destroot}${prefix} DESTROOT=${destroot}
 
 variant lib description {Build and install the libraries} {
     build.target-append shared static

Modified: trunk/dports/devel/astyle/files/patch-Makefile.diff
===================================================================
--- trunk/dports/devel/astyle/files/patch-Makefile.diff	2011-01-04 18:58:53 UTC (rev 74858)
+++ trunk/dports/devel/astyle/files/patch-Makefile.diff	2011-01-04 19:56:02 UTC (rev 74859)
@@ -1,65 +1,64 @@
---- Makefile.orig	2010-01-31 06:55:40.000000000 +1100
-+++ Makefile	2010-03-17 10:38:07.000000000 +1100
-@@ -14,15 +14,9 @@
- vpath %.cpp ../../src
- vpath %.h   ../../src
+diff -uNr astyle.orig/build/mac/Makefile astyle/build/mac/Makefile
+--- Makefile	2011-01-04 14:47:01.000000000 -0500
++++ Makefile	2011-01-04 14:48:34.000000000 -0500
+@@ -17,12 +17,12 @@
+ # 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
  
--# 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.16
--endif
--
  # set prefix if not defined on the command line
  ifndef prefix
 -    prefix=/usr
-+    prefix=/usr/local
++    prefix=/opt/local
  endif
- SYSCONF_PATH=$(prefix)/share/astyle
- 
-@@ -31,11 +25,11 @@
- dynamiclib = -dynamiclib
- bindir = bin
+ SYSCONF_PATH=$(prefix)/share/doc/astyle
+ # the path was changed in release 2.01
+@@ -36,9 +36,9 @@
  objdir = obj
--ipath=$(prefix)/bin
-+DESTDIR=$(prefix)
+ ipath=$(prefix)/bin
  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
+-JAVAINCS   = -I$(JAVA_HOME)/include
++JAVAINCS   = -I$(JAVA_HOME)/Headers
  CXX = g++
 -INSTALL=install -o $(USER) -g $(USER)
 +INSTALL=install -o $(USER)
  
  # for testing on linux
  ifdef linux
-@@ -170,16 +164,19 @@
+@@ -184,19 +184,23 @@
  cleanobj:
  	rm -f $(objdir)/*.o
- 	
+ 
 -install:
 -	$(INSTALL) -m 755 -d $(ipath)
 -	@$(INSTALL) -m 755 $(bindir)/astyle  $(ipath)
 -
 -	$(INSTALL) -m 755 -d $(SYSCONF_PATH)
--	@for files in ../../doc/*.html  ../../doc/*.css; \
--	do \
--		$(INSTALL)  -m 644  $$files  $(SYSCONF_PATH); \
--	done
--
+-	@mkdir -p $(SYSCONF_PATH)/html;
 +install:  release
 +	@ $(INSTALL) -d $(DESTDIR)/bin
 +	$(INSTALL) $(bindir)/astyle  $(DESTDIR)/bin
++	$(INSTALL) -m 755 -d $(DESTROOT)/$(SYSCONF_PATH)
++	@mkdir -p $(DESTROOT)/$(SYSCONF_PATH)/html;
+ 	@for files in ../../doc/*.html  ../../doc/*.css; \
+ 	do \
+-		$(INSTALL)  -m 644  $$files  $(SYSCONF_PATH)/html; \
++		$(INSTALL)  -m 644  $$files  $(DESTROOT)/$(SYSCONF_PATH)/html; \
+ 	done
+-	@if [ -d $(SYSCONF_PATH_OLD) ];  then \
+-		rm -rf $(SYSCONF_PATH_OLD); \
+-	fi
 +
 +install-lib:  libastyle.a libastyle.dylib
 +	@ $(INSTALL) -d $(DESTDIR)/lib
-+	$(INSTALL) ../bin/libastyle.a ../bin/libastyle.dylib $(DESTDIR)/lib
++	$(INSTALL) ./bin/libastyle.a ./bin/libastyle.dylib $(DESTDIR)/lib
 +
 +install-jnilib:	 libastylej.dylib
 +	@ $(INSTALL) -d $(DESTDIR)/lib
-+	$(INSTALL) ../bin/libastylej.dylib $(DESTDIR)/lib
-+ 
++	$(INSTALL) ./bin/libastylej.dylib $(DESTDIR)/lib
+ 
  uninstall:
--	rm -f $(ipath)/astyle
-+	rm -f $(DESTDIR)/bin/astyle
-+	rm -f $(DESTDIR)/lib/libastyle%
- 	rm -rf $(SYSCONF_PATH)
+ 	rm -f $(ipath)/astyle
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110104/3bff748f/attachment.html>


More information about the macports-changes mailing list