Merge branch '3.0' into 3.1
Conflicts: perl/.md5sum perl/Pkgfile
This commit is contained in:
commit
0414d29810
@ -1 +1 @@
|
|||||||
ec43582b8febae24e5b440ae816120c8 nasm-2.11.02.tar.xz
|
97ae0ecd007750f776099fcb9fccc7af nasm-2.11.04.tar.xz
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||||
|
|
||||||
name=nasm
|
name=nasm
|
||||||
version=2.11.02
|
version=2.11.04
|
||||||
release=1
|
release=1
|
||||||
source=(http://www.nasm.us/pub/nasm/releasebuilds/$version/$name-$version.tar.xz)
|
source=(http://www.nasm.us/pub/nasm/releasebuilds/$version/$name-$version.tar.xz)
|
||||||
|
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
cd1eb9bce381be0d6a35337f593aca18 tzcode-makefile.patch
|
cd1eb9bce381be0d6a35337f593aca18 tzcode-makefile.patch
|
||||||
7629513a4dbd107b7da946123d498c6b tzcode2014b.tar.gz
|
657636f201ae8b561225afde49d274af tzcode2014c.tar.gz
|
||||||
c58d556612396d4ca5a17807a79924e5 tzdata2014b.tar.gz
|
fa7f3dc1c6f6238253a6f2b850467e2e tzdata2014c.tar.gz
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||||
|
|
||||||
name=tzdata
|
name=tzdata
|
||||||
version=2014b
|
version=2014c
|
||||||
release=1
|
release=1
|
||||||
source=(http://www.iana.org/time-zones/repository/releases/$name$version.tar.gz
|
source=(http://www.iana.org/time-zones/repository/releases/$name$version.tar.gz
|
||||||
http://www.iana.org/time-zones/repository/releases/tzcode$version.tar.gz
|
http://www.iana.org/time-zones/repository/releases/tzcode$version.tar.gz
|
||||||
|
Loading…
Reference in New Issue
Block a user