i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated optionalpackages for apr, apr-util, curl,subversion, git, mercurial, openssh, sqlite,

Browse Source 
cdrtools, man, p7zip, tar, libxml2, and yasm.
This commit is contained in:
Scott McCreary
2012-06-25 21:11:56 +00:00
parent d1556a0e0f
commit cc41587c17
1 changed files with 75 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackages
+75 -54
View File
@@ -50,6 +50,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
# friss - RSS/ATOM/... feeds reader # friss - RSS/ATOM/... feeds reader
# GetText - a framework to help produce multi-lingual messages. # GetText - a framework to help produce multi-lingual messages.
# Git - the distributed version control system # Git - the distributed version control system
# GitDoc - documentation for the distributed version control system
# GPerf - the perfect hash function generator. # GPerf - the perfect hash function generator.
# Groff - text formatter used for man pages # Groff - text formatter used for man pages
# ICU-devel - the headers and lib-links for ICU (for development) # ICU-devel - the headers and lib-links for ICU (for development)
@@ -122,13 +123,13 @@ if [ IsOptionalHaikuImagePackageAdded APR ] {
Echo "No optional package APR available for $(TARGET_ARCH)" ; Echo "No optional package APR available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
apr-1.4.5-x86-gcc4-2011-08-03.zip apr-1.4.6-x86-gcc4-2012-06-19.zip
: $(baseURL)/apr-1.4.5-x86-gcc4-2011-08-03.zip : $(baseURL)/apr-1.4.6-x86-gcc4-2012-06-19.zip
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
apr-1.4.5-x86-gcc2-2011-08-02.zip apr-1.4.6-x86-gcc2-2012-06-20.zip
: $(baseURL)/apr-1.4.5-x86-gcc2-2011-08-02.zip : $(baseURL)/apr-1.4.6-x86-gcc2-2012-06-20.zip
: : true ; : : true ;
} }
} }
@@ -140,13 +141,13 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] {
Echo "No optional package APR-util available for $(TARGET_ARCH)" ; Echo "No optional package APR-util available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
apr-util-1.3.12-x86-gcc4-2011-08-03.zip apr-util-1.4.1-x86-gcc4-2012-06-19.zip
: $(baseURL)/apr-util-1.3.12-x86-gcc4-2011-08-03.zip : $(baseURL)/apr-util-1.4.1-x86-gcc4-2012-06-19.zip
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
apr-util-1.3.12-x86-gcc2-2011-08-02.zip apr-util-1.4.1-x86-gcc2-2012-06-20.zip
: $(baseURL)/apr-util-1.3.12-x86-gcc2-2011-08-02.zip : $(baseURL)/apr-util-1.4.1-x86-gcc2-2012-06-20.zip
: : true ; : : true ;
} }
} }
@@ -408,12 +409,12 @@ if [ IsOptionalHaikuImagePackageAdded CDRecord ] {
Echo "No optional package CDRecord available for $(TARGET_ARCH)" ; Echo "No optional package CDRecord available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
cdrtools-3.01a01-r1a3-x86-gcc4-2011-05-23.zip cdrtools-3.01a06-x86-gcc4-2012-06-19.zip
: $(baseURL)/cdrtools-3.01a01-r1a3-x86-gcc4-2011-05-23.zip ; : $(baseURL)/cdrtools-3.01a06-x86-gcc4-2012-06-19.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
cdrtools-3.01a01-r1a3-x86-gcc2-2011-05-17.zip cdrtools-3.01a06-x86-gcc2-2012-06-20.zip
: $(baseURL)/cdrtools-3.01a01-r1a3-x86-gcc2-2011-05-17.zip ; : $(baseURL)/cdrtools-3.01a06-x86-gcc2-2012-06-20.zip ;
} }
} }
@@ -532,11 +533,11 @@ if [ IsOptionalHaikuImagePackageAdded Curl ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package Curl available for $(TARGET_ARCH)" ; Echo "No optional package Curl available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage curl-7.26.0-x86-gcc4-2012-06-15.zip InstallOptionalHaikuImagePackage curl-7.26.0-x86-gcc4-2012-06-20.zip
: $(baseURL)/curl-7.26.0-x86-gcc4-2012-06-15.zip ; : $(baseURL)/curl-7.26.0-x86-gcc4-2012-06-20.zip ;
} else { } else {
InstallOptionalHaikuImagePackage curl-7.26.0-x86-gcc2-2012-06-15.zip InstallOptionalHaikuImagePackage curl-7.26.0-x86-gcc2-2012-06-20.zip
: $(baseURL)/curl-7.26.0-x86-gcc2-2012-06-15.zip ; : $(baseURL)/curl-7.26.0-x86-gcc2-2012-06-20.zip ;
} }
} }
@@ -548,13 +549,13 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] {
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
cvs-1.12.13.1-r1a3-x86-gcc4-2011-05-24.zip cvs-1.12.13.1-x86-gcc4-2012-06-19.zip
: $(baseURL)/cvs-1.12.13.1-r1a3-x86-gcc4-2011-05-24.zip : $(baseURL)/cvs-1.12.13.1-x86-gcc4-2012-06-19.zip
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
cvs-1.12.13.1-r1a3-x86-gcc2-2011-05-18.zip cvs-1.12.13.1-r1a3-x86-gcc2-2012-06-20.zip
: $(baseURL)/cvs-1.12.13.1-r1a3-x86-gcc2-2011-05-18.zip : $(baseURL)/cvs-1.12.13.1-r1a3-x86-gcc2-2012-06-20.zip
: : true ; : : true ;
} }
} }
@@ -983,13 +984,33 @@ if [ IsOptionalHaikuImagePackageAdded Git ] {
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
git-1.7.7.2-x86-gcc4-2011-11-04.zip git-1.7.10.2-x86-gcc4-2012-06-20.zip
: $(baseURL)/git-1.7.7.2-x86-gcc4-2011-11-04.zip : $(baseURL)/git-1.7.10.2-x86-gcc4-2012-06-20.zip
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
git-1.7.7.2-x86-gcc2-2011-11-04.zip git-1.7.10.2-x86-gcc2-2012-06-20.zip
: $(baseURL)/git-1.7.7.2-x86-gcc2-2011-11-04.zip : $(baseURL)/git-1.7.10.2-x86-gcc2-2012-06-20.zip
: : true ;
}
}
}
# GitDoc
if [ IsOptionalHaikuImagePackageAdded GitDoc ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package GitDoc available for $(TARGET_ARCH)" ;
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
gitdoc-1.7.10.2-x86-gcc4-2012-06-20.zip
: $(baseURL)/gitdoc-1.7.10.2-x86-gcc4-2012-06-20.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
gitdoc-1.7.10.2-x86-gcc2-2012-06-20.zip
: $(baseURL)/gitdoc-1.7.10.2-x86-gcc2-2012-06-20.zip
: : true ; : : true ;
} }
} }
@@ -1185,8 +1206,8 @@ if [ IsOptionalHaikuImagePackageAdded LibXML2 ] {
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libxml2-2.8.0-x86-gcc4-2012-06-15.zip libxml2-2.8.0-x86-gcc4-2012-06-18.zip
: $(baseURL)/libxml2-2.8.0-x86-gcc4-2012-06-15.zip ; : $(baseURL)/libxml2-2.8.0-x86-gcc4-2012-06-18.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libxml2-2.8.0-x86-gcc2-2012-06-15.zip libxml2-2.8.0-x86-gcc2-2012-06-15.zip
@@ -1254,12 +1275,12 @@ if [ IsOptionalHaikuImagePackageAdded Man ] {
Echo "No optional package Man available for $(TARGET_ARCH)" ; Echo "No optional package Man available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
man-1.6f-r1a3-x86-gcc4-2011-05-24.zip man-1.6g-x86-gcc4-2012-06-19.zip
: $(baseURL)/man-1.6f-r1a3-x86-gcc4-2011-05-24.zip ; : $(baseURL)/man-1.6g-x86-gcc4-2012-06-19.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
man-1.6f-r1a3-x86-gcc2-2011-05-18.zip man-1.6g-x86-gcc2-2012-06-20.zip
: $(baseURL)/man-1.6f-r1a3-x86-gcc2-2011-05-18.zip ; : $(baseURL)/man-1.6g-x86-gcc2-2012-06-20.zip ;
} }
} }
@@ -1277,8 +1298,8 @@ if [ IsOptionalHaikuImagePackageAdded Mercurial ] {
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
mercurial-2.2.2-x86-gcc4-2012-06-15.zip mercurial-2.2.2-x86-gcc4-2012-06-19.zip
: $(baseURL)/mercurial-2.2.2-x86-gcc4-2012-06-15.zip : $(baseURL)/mercurial-2.2.2-x86-gcc4-2012-06-19.zip
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
@@ -1315,12 +1336,12 @@ if [ IsOptionalHaikuImagePackageAdded Neon ] {
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
neon-0.29.6-r1a3-x86-gcc4-2011-05-24.zip neon-0.29.6-x86-gcc4-2012-06-19.zip
: $(baseURL)/neon-0.29.6-r1a3-x86-gcc4-2011-05-24.zip ; : $(baseURL)/neon-0.29.6-x86-gcc4-2012-06-19.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
neon-0.29.6-r1a3-x86-gcc2-2011-05-18.zip neon-0.29.6-x86-gcc2-2012-06-19.zip
: $(baseURL)/neon-0.29.6-r1a3-x86-gcc2-2011-05-18.zip ; : $(baseURL)/neon-0.29.6-x86-gcc2-2012-06-19.zip ;
} }
} }
} }
@@ -1412,12 +1433,12 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
openssh-5.9p1-x86-gcc4-2011-11-30.zip openssh-6.0p1-x86-gcc4-2012-06-20.zip
: $(baseURL)/openssh-5.9p1-x86-gcc4-2011-11-30.zip ; : $(baseURL)/openssh-6.0p1-x86-gcc4-2012-06-20.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
openssh-5.9p1-x86-gcc2-2011-11-30.zip openssh-6.0p1-x86-gcc2-2012-06-20.zip
: $(baseURL)/openssh-5.9p1-x86-gcc2-2011-11-30.zip ; : $(baseURL)/openssh-6.0p1-x86-gcc2-2012-06-20.zip ;
} }
AddUserToHaikuImage sshd : 1001 : 100 : /var/empty : /bin/true AddUserToHaikuImage sshd : 1001 : 100 : /var/empty : /bin/true
@@ -1449,8 +1470,8 @@ if [ IsOptionalHaikuImagePackageAdded P7zip ] {
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
p7zip-9.20.1-x86-gcc4-2012-06-15.zip p7zip-9.20.1-x86-gcc4-2012-06-19.zip
: $(baseURL)/p7zip-9.20.1-x86-gcc4-2011-06-15.zip ; : $(baseURL)/p7zip-9.20.1-x86-gcc4-2011-06-19.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
p7zip-9.20.1-x86-gcc2-2012-06-15.zip p7zip-9.20.1-x86-gcc2-2012-06-15.zip
@@ -1627,12 +1648,12 @@ if [ IsOptionalHaikuImagePackageAdded SQLite ] {
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sqlite-3.7.7.1-x86-gcc4-2012-03-30.zip sqlite-3.7.13-x86-gcc4-2012-06-19.zip
: $(baseURL)/sqlite-3.7.7.1-x86-gcc4-2012-03-30.zip ; : $(baseURL)/sqlite-3.7.13-x86-gcc4-2012-06-19.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sqlite-3.7.7.1-x86-gcc2-2012-03-31.zip sqlite-3.7.13-x86-gcc2-2012-06-20.zip
: $(baseURL)/sqlite-3.7.7.1-x86-gcc2-2012-03-31.zip ; : $(baseURL)/sqlite-3.7.13-x86-gcc2-2012-06-20.zip ;
} }
} }
} }
@@ -1645,13 +1666,13 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] {
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
subversion-1.6.17-x86-gcc4-2011-08-03.zip subversion-1.6.18-x86-gcc4-2012-06-19.zip
: $(baseURL)/subversion-1.6.17-x86-gcc4-2011-08-03.zip : $(baseURL)/subversion-1.6.18-x86-gcc4-2012-06-19.zip
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
subversion-1.6.17-x86-gcc2-2011-08-02.zip subversion-1.6.18-x86-gcc2-2012-06-20.zip
: $(baseURL)/subversion-1.6.17-x86-gcc2-2011-08-02.zip : $(baseURL)/subversion-1.6.18-x86-gcc2-2012-06-20.zip
: : true ; : : true ;
} }
} }
@@ -1681,8 +1702,8 @@ if [ IsOptionalHaikuImagePackageAdded Tar ] {
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
tar-1.26-x86-gcc4-2012-06-15.zip tar-1.26-x86-gcc4-2012-06-19.zip
: $(baseURL)/tar-1.26-x86-gcc4-2012-06-15.zip ; : $(baseURL)/tar-1.26-x86-gcc4-2012-06-19.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
tar-1.26-x86-gcc2-2012-06-15.zip tar-1.26-x86-gcc2-2012-06-15.zip
@@ -1973,8 +1994,8 @@ if [ IsOptionalHaikuImagePackageAdded Yasm ] {
Echo "No optional package Yasm available for $(TARGET_ARCH)" ; Echo "No optional package Yasm available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
yasm-1.2.0-x86-gcc4-2012-06-15.zip yasm-1.2.0-x86-gcc4-2012-06-18.zip
: $(baseURL)/yasm-1.2.0-x86-gcc4-2012-06-15.zip ; : $(baseURL)/yasm-1.2.0-x86-gcc4-2012-06-18.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
yasm-1.2.0-x86-gcc2-2012-06-15.zip yasm-1.2.0-x86-gcc2-2012-06-15.zip