Merge branch '3.0' into 3.1
Conflicts: llvm/.footprint llvm/.md5sum llvm/Pkgfile
This commit is contained in:
commit
baf2654992
@ -257,6 +257,7 @@ drwxr-xr-x root/root usr/include/dovecot/
|
||||
-rw-r--r-- root/root usr/include/dovecot/istream-seekable.h
|
||||
-rw-r--r-- root/root usr/include/dovecot/istream-sized.h
|
||||
-rw-r--r-- root/root usr/include/dovecot/istream-tee.h
|
||||
-rw-r--r-- root/root usr/include/dovecot/istream-timeout.h
|
||||
-rw-r--r-- root/root usr/include/dovecot/istream-zlib.h
|
||||
-rw-r--r-- root/root usr/include/dovecot/istream.h
|
||||
-rw-r--r-- root/root usr/include/dovecot/json-parser.h
|
||||
@ -368,6 +369,7 @@ drwxr-xr-x root/root usr/include/dovecot/
|
||||
-rw-r--r-- root/root usr/include/dovecot/message-id.h
|
||||
-rw-r--r-- root/root usr/include/dovecot/message-parser.h
|
||||
-rw-r--r-- root/root usr/include/dovecot/message-part-serialize.h
|
||||
-rw-r--r-- root/root usr/include/dovecot/message-part.h
|
||||
-rw-r--r-- root/root usr/include/dovecot/message-search.h
|
||||
-rw-r--r-- root/root usr/include/dovecot/message-size.h
|
||||
-rw-r--r-- root/root usr/include/dovecot/mkdir-parents.h
|
||||
|
@ -1,3 +1,3 @@
|
||||
7eaa958040fbd7169c86134439d4b632 dovecot
|
||||
25395269fa2e0525e2d144d71d0450eb dovecot-2.2.12.tar.gz
|
||||
a3eb1c0b1822c4f2b0fe9247776baa71 dovecot-2.2.13.tar.gz
|
||||
346f4af957cd9fabaee1bc3c729f300f dovecot-config.patch
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: zlib bzip2 openssl tcp_wrappers libcap
|
||||
|
||||
name=dovecot
|
||||
version=2.2.12
|
||||
version=2.2.13
|
||||
release=1
|
||||
source=(http://dovecot.org/releases/2.2/$name-$version.tar.gz \
|
||||
dovecot-config.patch dovecot)
|
||||
|
@ -1,3 +1,3 @@
|
||||
e11816b7a028e356626e4ccc359b0c95 fcron
|
||||
36bf213e15f3a480f2274f8e46cced0a fcron-3.1.2.src.tar.gz
|
||||
b58ce88344eb4c80a353066547d20a24 fcron-3.1.3.src.tar.gz
|
||||
0153ce1b5ac57ab970abafbde26a9b62 systab.orig
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: readline
|
||||
|
||||
name=fcron
|
||||
version=3.1.2
|
||||
version=3.1.3
|
||||
release=1
|
||||
source=(http://fcron.free.fr/archives/$name-$version.src.tar.gz
|
||||
fcron systab.orig)
|
||||
|
21
grub2/README
21
grub2/README
@ -23,5 +23,22 @@ CONFIGURATION
|
||||
|
||||
# grub-mkconfig > /boot/grub/grub.cfg
|
||||
|
||||
It can also be created manually. A sample grub.cfg file is included in the
|
||||
port.
|
||||
NOTE: For grub-mkconfig to work properly the following conditions should
|
||||
be met:
|
||||
|
||||
1) The kernel is expected to be named one of these ways:
|
||||
/boot/vmlinuz-*
|
||||
/vmlinuz-*
|
||||
/boot/kernel-*
|
||||
|
||||
If the kernel is located somewhere else grub-mkconfig will NOT
|
||||
find it! For example, '/boot/vmlinuz-3.10.28' is good and
|
||||
'/boot/linux-3.10.28' would not be found.
|
||||
|
||||
2) When dual-booting with Linux installations on other partitions
|
||||
or drives, grub-mkconfig will not find them without the extra
|
||||
program 'os-prober' installed.
|
||||
|
||||
The configuration file can also be created manually. A sample grub.cfg
|
||||
is included in the port.
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
name=mutt
|
||||
version=1.5.23
|
||||
release=1
|
||||
source=(ftp://ftp.mutt.org/mutt/$name-$version.tar.gz)
|
||||
source=(https://bitbucket.org/mutt/mutt/downloads/$name-$version.tar.gz)
|
||||
|
||||
build () {
|
||||
cd $name-$version
|
||||
|
@ -1,2 +1,2 @@
|
||||
22355256693393779b2d366d312c4577 spectrwm-2.5.0.tgz
|
||||
12a904c0dd99879c18abb51e5e697bac spectrwm-remove_libswmhack.patch
|
||||
d9aec3342920e31cbe60f1032571043a spectrwm-2.5.1.tgz
|
||||
1d3da28ec67022021725f739f2684148 spectrwm-remove_libswmhack.patch
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: xorg-libxrender fontconfig xorg-xcb-util-keysyms xorg-xcb-util-wm
|
||||
|
||||
name=spectrwm
|
||||
version=2.5.0
|
||||
version=2.5.1
|
||||
release=1
|
||||
source=(https://opensource.conformal.com/snapshots/$name/$name-$version.tgz
|
||||
$name-remove_libswmhack.patch)
|
||||
|
@ -1,6 +1,6 @@
|
||||
diff -Nru spectrwm-2.5.0.orig/linux/Makefile spectrwm-2.5.0/linux/Makefile
|
||||
--- spectrwm-2.5.0.orig/linux/Makefile 2014-02-27 10:30:41.708091165 +0100
|
||||
+++ spectrwm-2.5.0/linux/Makefile 2014-02-27 10:32:12.751479280 +0100
|
||||
diff -Nru spectrwm-2.5.1.orig/linux/Makefile spectrwm-2.5.1/linux/Makefile
|
||||
--- spectrwm-2.5.1.orig/linux/Makefile 2014-05-09 10:02:47.399230659 +0200
|
||||
+++ spectrwm-2.5.1/linux/Makefile 2014-05-09 10:03:07.311852348 +0200
|
||||
@@ -6,7 +6,7 @@
|
||||
LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor)
|
||||
|
||||
@ -35,9 +35,9 @@ diff -Nru spectrwm-2.5.0.orig/linux/Makefile spectrwm-2.5.0/linux/Makefile
|
||||
|
||||
clean:
|
||||
rm -f spectrwm *.o *.so libswmhack.so.* spectrwm.c swm_hack.c version.h
|
||||
diff -Nru spectrwm-2.5.0.orig/spectrwm.c spectrwm-2.5.0/spectrwm.c
|
||||
--- spectrwm-2.5.0.orig/spectrwm.c 2014-02-27 10:30:41.708091165 +0100
|
||||
+++ spectrwm-2.5.0/spectrwm.c 2014-02-27 10:31:08.557124812 +0100
|
||||
diff -Nru spectrwm-2.5.1.orig/spectrwm.c spectrwm-2.5.1/spectrwm.c
|
||||
--- spectrwm-2.5.1.orig/spectrwm.c 2014-05-09 10:02:47.399230659 +0200
|
||||
+++ spectrwm-2.5.1/spectrwm.c 2014-05-09 10:03:07.311852348 +0200
|
||||
@@ -299,9 +299,9 @@
|
||||
#define SWM_CONF_DEFAULT (0)
|
||||
#define SWM_CONF_KEYMAPPING (1)
|
||||
@ -50,7 +50,7 @@ diff -Nru spectrwm-2.5.0.orig/spectrwm.c spectrwm-2.5.0/spectrwm.c
|
||||
|
||||
char **start_argv;
|
||||
xcb_atom_t a_state;
|
||||
@@ -3317,7 +3317,7 @@
|
||||
@@ -3324,7 +3324,7 @@
|
||||
|
||||
close(xcb_get_file_descriptor(conn));
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user