Changeset 95476 for trunk/dports/java


Ignore:
Timestamp:
Jul 13, 2012, 7:28:51 PM (7 years ago)
Author:
blair@…
Message:

maven{2,3}: whitespace changes: move to 4-space indentation.

Location:
trunk/dports/java
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/java/maven2/Portfile

    r84550 r95476  
    5050
    5151destroot {
    52         set mavendir ${destroot}${prefix}/share/java/${name}
     52    set mavendir ${destroot}${prefix}/share/java/${name}
    5353
    54         # Create the target java directory exists
    55         xinstall -m 755 -d ${mavendir}
     54    # Create the target java directory exists
     55    xinstall -m 755 -d ${mavendir}
    5656
    57         # Copy over the needed elements of our directory tree
    58         file copy \
    59                 ${worksrcpath}/bin \
    60                 ${worksrcpath}/boot \
    61                 ${worksrcpath}/conf \
    62                 ${worksrcpath}/lib \
    63                 ${mavendir}
     57    # Copy over the needed elements of our directory tree
     58    file copy \
     59        ${worksrcpath}/bin \
     60        ${worksrcpath}/boot \
     61        ${worksrcpath}/conf \
     62        ${worksrcpath}/lib \
     63        ${mavendir}
    6464
    65         # Remove extraneous bat files
    66         foreach f [glob -directory ${mavendir}/bin *.bat] {
    67                 file delete $f
     65    # Remove extraneous bat files
     66    foreach f [glob -directory ${mavendir}/bin *.bat] {
     67        file delete $f
     68    }
     69
     70    # Fix permissions on shell scripts
     71    foreach f { maven install_repo.sh } {
     72        if [file exists ${mavendir}/bin/$f] {
     73            file attributes ${mavendir}/bin/$f -permissions +x
    6874        }
     75    }
    6976
    70         # Fix permissions on shell scripts
    71         foreach f { maven install_repo.sh } {
    72                 if [file exists ${mavendir}/bin/$f] {
    73                         file attributes ${mavendir}/bin/$f -permissions +x
    74                 }
    75         }
     77    # Reduce the permissions on the distribution files.
     78    file attributes ${mavendir}/conf -permissions 0755
     79    file attributes ${mavendir}/conf/settings.xml -permissions 0644
     80    foreach f [glob -directory ${mavendir}/lib *.jar] {
     81        file attributes $f -permissions 0644
     82    }
    7683
    77         # Reduce the permissions on the distribution files.
    78         file attributes ${mavendir}/conf -permissions 0755
    79         file attributes ${mavendir}/conf/settings.xml -permissions 0644
    80         foreach f [glob -directory ${mavendir}/lib *.jar] {
    81                 file attributes $f -permissions 0644
    82         }
    83 
    84         # Symlink maven into the bin directory
    85         system "cd ${destroot}${prefix}/bin && ln -s ../share/java/${name}/bin/mvn mvn2"
     84    # Symlink maven into the bin directory
     85    system "cd ${destroot}${prefix}/bin && ln -s ../share/java/${name}/bin/mvn mvn2"
    8686}
    8787
  • trunk/dports/java/maven3/Portfile

    r89279 r95476  
    5050
    5151destroot {
    52         set mavendir ${destroot}${prefix}/share/java/${name}
     52    set mavendir ${destroot}${prefix}/share/java/${name}
    5353
    54         # Create the target java directory exists
    55         xinstall -m 755 -d ${mavendir}
     54    # Create the target java directory exists
     55    xinstall -m 755 -d ${mavendir}
    5656
    57         # Copy over the needed elements of our directory tree
    58         file copy \
    59                 ${worksrcpath}/bin \
    60                 ${worksrcpath}/boot \
    61                 ${worksrcpath}/conf \
    62                 ${worksrcpath}/lib \
    63                 ${mavendir}
     57    # Copy over the needed elements of our directory tree
     58    file copy \
     59        ${worksrcpath}/bin \
     60        ${worksrcpath}/boot \
     61        ${worksrcpath}/conf \
     62        ${worksrcpath}/lib \
     63        ${mavendir}
    6464
    65         # Remove extraneous bat files
    66         foreach f [glob -directory ${mavendir}/bin *.bat] {
    67                 file delete $f
     65    # Remove extraneous bat files
     66    foreach f [glob -directory ${mavendir}/bin *.bat] {
     67        file delete $f
     68    }
     69
     70    # Fix permissions on shell scripts
     71    foreach f { maven install_repo.sh } {
     72        if [file exists ${mavendir}/bin/$f] {
     73            file attributes ${mavendir}/bin/$f -permissions +x
    6874        }
     75    }
    6976
    70         # Fix permissions on shell scripts
    71         foreach f { maven install_repo.sh } {
    72                 if [file exists ${mavendir}/bin/$f] {
    73                         file attributes ${mavendir}/bin/$f -permissions +x
    74                 }
    75         }
     77    # Reduce the permissions on the distribution files.
     78    file attributes ${mavendir}/conf -permissions 0755
     79    file attributes ${mavendir}/conf/settings.xml -permissions 0644
     80    foreach f [glob -directory ${mavendir}/boot *.jar] {
     81        file attributes $f -permissions 0644
     82    }
     83    foreach f [glob -directory ${mavendir}/lib *.jar] {
     84        file attributes $f -permissions 0644
     85    }
    7686
    77         # Reduce the permissions on the distribution files.
    78         file attributes ${mavendir}/conf -permissions 0755
    79         file attributes ${mavendir}/conf/settings.xml -permissions 0644
    80         foreach f [glob -directory ${mavendir}/boot *.jar] {
    81                 file attributes $f -permissions 0644
    82         }
    83         foreach f [glob -directory ${mavendir}/lib *.jar] {
    84                 file attributes $f -permissions 0644
    85         }
    86 
    87         # Symlink maven into the bin directory
    88         system "cd ${destroot}${prefix}/bin && ln -s ../share/java/${name}/bin/mvn mvn3"
     87    # Symlink maven into the bin directory
     88    system "cd ${destroot}${prefix}/bin && ln -s ../share/java/${name}/bin/mvn mvn3"
    8989}
    9090
Note: See TracChangeset for help on using the changeset viewer.