Changeset 89159


Ignore:
Timestamp:
Jan 20, 2012, 3:49:56 AM (7 years ago)
Author:
ryandesign@…
Message:

astyle: simplify overcomplicated Makefile patch and return to the standard meaning of DESTDIR, and no longer try to set ownership to $(USER) when installing items, thus fixing build on buildbot

Location:
trunk/dports/devel/astyle
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/devel/astyle/Portfile

    r89157 r89159  
    3030
    3131build.target      release
    32 build.env-append  PREFIX=${prefix}
    33 build.args-append CXX="${configure.cxx} [get_canonical_archflags cxx]"
     32build.args-append   prefix=${prefix} \
     33                    CXX="${configure.cxx} [get_canonical_archflags cxx]"
    3434
    3535destroot.args-append \
    36                   CXX="${configure.cxx} [get_canonical_archflags cxx]"
    37 destroot.destdir  PREFIX=${prefix} DESTROOT=${destroot} DESTDIR=${destroot}${prefix}
     36                    prefix=${prefix} \
     37                    CXX="${configure.cxx} [get_canonical_archflags cxx]"
    3838
    3939variant lib description {Build and install the libraries} {
  • trunk/dports/devel/astyle/files/patch-Makefile.diff

    r87829 r89159  
    1 diff -uNr astyle.orig/build/mac/Makefile astyle/build/mac/Makefile
    2 --- Makefile    2011-12-07 10:15:54.000000000 -0500
    3 +++ Makefile    2011-12-07 10:15:21.000000000 -0500
    4 @@ -18,12 +18,12 @@
     1--- Makefile.orig       2011-11-21 09:15:43.000000000 -0600
     2+++ Makefile    2012-01-19 21:43:19.000000000 -0600
     3@@ -18,7 +18,7 @@
    54 # NOTE for java compiles the environment variable $JAVA_HOME must be set
    65 # example: export JAVA_HOME=/usr/lib/jvm/java-6-sun-1.6.0.00
     
    1110 
    1211 # set prefix if not defined on the command line
    13  ifndef prefix
    14 -    prefix=/usr
    15 +    prefix=$(PREFIX)
    16  endif
    17  SYSCONF_PATH=$(prefix)/share/doc/astyle
    18  # the path was changed in release 2.01
    1912@@ -37,9 +37,9 @@
    2013 objdir = obj
     
    2518 CXX = g++
    2619-INSTALL=install -o $(USER) -g $(USER)
    27 +INSTALL=install -o $(USER)
     20+INSTALL=install
    2821 # INSTALL=install -o 0 -g 0
    2922 
    3023 # for testing on linux
    31 @@ -186,19 +186,23 @@
     24@@ -186,19 +186,24 @@
    3225 cleanobj:
    3326        rm -f $(objdir)/*.o
     
    3629-       $(INSTALL) -m 755 -d $(ipath)
    3730-       @$(INSTALL) -m 755 $(bindir)/astyle  $(ipath)
    38 -
     31+install:  release
     32+       $(INSTALL) -m 755 -d $(DESTDIR)$(ipath)
     33+       $(INSTALL) -m 755 $(bindir)/astyle  $(DESTDIR)$(ipath)
     34 
    3935-       $(INSTALL) -m 755 -d $(SYSCONF_PATH)
    4036-       @mkdir -p $(SYSCONF_PATH)/html;
    41 +install:  release
    42 +       @ $(INSTALL) -d $(DESTDIR)/bin
    43 +       $(INSTALL) $(bindir)/astyle  $(DESTDIR)/bin
    44 +       $(INSTALL) -m 755 -d $(DESTROOT)/$(SYSCONF_PATH)
    45 +       @mkdir -p $(DESTROOT)/$(SYSCONF_PATH)/html;
     37+       $(INSTALL) -m 755 -d $(DESTDIR)$(SYSCONF_PATH)
     38+       @mkdir -p $(DESTDIR)$(SYSCONF_PATH)/html;
    4639        @for files in ../../doc/*.html  ../../doc/*.css; \
    4740        do \
    4841-               $(INSTALL)  -m 644  $$files  $(SYSCONF_PATH)/html; \
    49 +               $(INSTALL)  -m 644  $$files  $(DESTROOT)/$(SYSCONF_PATH)/html; \
     42+               $(INSTALL)  -m 644  $$files  $(DESTDIR)$(SYSCONF_PATH)/html; \
    5043        done
    5144-       @if [ -d $(SYSCONF_PATH_OLD) ];  then \
     
    5447+
    5548+install-lib:  libastyle.a libastyle.dylib
    56 +       @ $(INSTALL) -d $(DESTDIR)/lib
    57 +       $(INSTALL) ./bin/libastyle.a ./bin/libastyle.dylib $(DESTDIR)/lib
     49+       $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/lib
     50+       $(INSTALL) $(bindir)/libastyle.a $(bindir)/libastyle.dylib $(DESTDIR)$(prefix)/lib
    5851+
    59 +install-jnilib:        libastylej.dylib
    60 +       @ $(INSTALL) -d $(DESTDIR)/lib
    61 +       $(INSTALL) ./bin/libastylej.dylib $(DESTDIR)/lib
     52+install-jnilib:  libastylej.dylib
     53+       $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/lib
     54+       $(INSTALL) $(bindir)/libastylej.dylib $(DESTDIR)$(prefix)/lib
    6255 
    6356 uninstall:
Note: See TracChangeset for help on using the changeset viewer.