[89159] trunk/dports/devel/astyle

[ryandesign at macports.org]

Revision: 89159
          http://trac.macports.org/changeset/89159
Author:   ryandesign at macports.org
Date:     2012-01-19 19:49:56 -0800 (Thu, 19 Jan 2012)
Log Message:
-----------
astyle: simplify overcomplicated Makefile patch and return to the standard meaning of DESTDIR

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	2012-01-20 03:32:23 UTC (rev 89158)
+++ trunk/dports/devel/astyle/Portfile	2012-01-20 03:49:56 UTC (rev 89159)
@@ -29,12 +29,12 @@
 variant universal {}
 
 build.target      release
-build.env-append  PREFIX=${prefix}
-build.args-append CXX="${configure.cxx} [get_canonical_archflags cxx]"
+build.args-append   prefix=${prefix} \
+                    CXX="${configure.cxx} [get_canonical_archflags cxx]"
 
 destroot.args-append \
-                  CXX="${configure.cxx} [get_canonical_archflags cxx]"
-destroot.destdir  PREFIX=${prefix} DESTROOT=${destroot} DESTDIR=${destroot}${prefix}
+                    prefix=${prefix} \
+                    CXX="${configure.cxx} [get_canonical_archflags cxx]"
 
 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	2012-01-20 03:32:23 UTC (rev 89158)
+++ trunk/dports/devel/astyle/files/patch-Makefile.diff	2012-01-20 03:49:56 UTC (rev 89159)
@@ -1,7 +1,6 @@
-diff -uNr astyle.orig/build/mac/Makefile astyle/build/mac/Makefile
---- Makefile	2011-12-07 10:15:54.000000000 -0500
-+++ Makefile	2011-12-07 10:15:21.000000000 -0500
-@@ -18,12 +18,12 @@
+--- 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
@@ -10,12 +9,6 @@
  endif
  
  # set prefix if not defined on the command line
- ifndef prefix
--    prefix=/usr
-+    prefix=$(PREFIX)
- endif
- SYSCONF_PATH=$(prefix)/share/doc/astyle
- # the path was changed in release 2.01
 @@ -37,9 +37,9 @@
  objdir = obj
  ipath=$(prefix)/bin
@@ -24,41 +17,41 @@
 +JAVAINCS   = -I$(JAVA_HOME)/Headers
  CXX = g++
 -INSTALL=install -o $(USER) -g $(USER)
-+INSTALL=install -o $(USER)
++INSTALL=install
  # INSTALL=install -o 0 -g 0
  
  # for testing on linux
-@@ -186,19 +186,23 @@
+@@ -186,19 +186,24 @@
  cleanobj:
  	rm -f $(objdir)/*.o
  
 -install:
 -	$(INSTALL) -m 755 -d $(ipath)
 -	@$(INSTALL) -m 755 $(bindir)/astyle  $(ipath)
--
++install:  release
++	$(INSTALL) -m 755 -d $(DESTDIR)$(ipath)
++	$(INSTALL) -m 755 $(bindir)/astyle  $(DESTDIR)$(ipath)
+ 
 -	$(INSTALL) -m 755 -d $(SYSCONF_PATH)
 -	@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;
++	$(INSTALL) -m 755 -d $(DESTDIR)$(SYSCONF_PATH)
++	@mkdir -p $(DESTDIR)$(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; \
++		$(INSTALL)  -m 644  $$files  $(DESTDIR)$(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) -m 755 -d $(DESTDIR)$(prefix)/lib
++	$(INSTALL) $(bindir)/libastyle.a $(bindir)/libastyle.dylib $(DESTDIR)$(prefix)/lib
 +
-+install-jnilib:	 libastylej.dylib
-+	@ $(INSTALL) -d $(DESTDIR)/lib
-+	$(INSTALL) ./bin/libastylej.dylib $(DESTDIR)/lib
++install-jnilib:  libastylej.dylib
++	$(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/lib
++	$(INSTALL) $(bindir)/libastylej.dylib $(DESTDIR)$(prefix)/lib
  
  uninstall:
  	rm -f $(ipath)/astyle
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120119/2ebbf8c6/attachment.html>