Merge branch '3.5' into 3.6

imagemagick/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/RTkff+X6YWU6L4727KtkIDp1vK0Erz7UdrIfz/I5mzTGu5fyQP/+I2lGVf3KJzxAvaJyLa6Y+VysQs5mTXQPAc=
-SHA256 (Pkgfile) = 4d5ae42682bf9bb915d14f98c547e76451cf020902428fd70b294d167ff5de35
+RWSE3ohX2g5d/a5sEI8nOb2CjX9892Oj6vXQsQ/H+G3i0PFSsJrcjo2Szepiwx8bgv7xqItxFaJSsQeBwdhlpKfr1rqWy08/MQk=
+SHA256 (Pkgfile) = d6af918cc095bd3ae7d83560d96190e04113131768f2381e2e36006b30f46c57
 SHA256 (.footprint) = 8efa90fe8e473cf4edd088353ec2bc27c7a9dd1dcf020e05bdff27def1097dab
-SHA256 (ImageMagick-7.0.10-24.tar.xz) = 8f8d4715ac995aaae14dc1567608a05833764c13cd0c16cbac2a3a8e229e7f43
+SHA256 (ImageMagick-7.0.10-25.tar.xz) = 0a125992e63b2a7f13fb966718304fe5f8142192c275d55b497a3bfe1f554ae6

imagemagick/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  libtool lcms2 pango xorg-libxt chrpath
 
 name=imagemagick
-version=7.0.10-24
+version=7.0.10-25
 release=1
 source=(https://www.imagemagick.org/download/releases/ImageMagick-$version.tar.xz)
 

imlib2/.footprint

@@ -54,9 +54,9 @@ drwxr-xr-x	root/root	usr/lib/imlib2/loaders/
 -rwxr-xr-x	root/root	usr/lib/imlib2/loaders/zlib.so
 -rw-r--r--	root/root	usr/lib/libImlib2.a
 -rwxr-xr-x	root/root	usr/lib/libImlib2.la
-lrwxrwxrwx	root/root	usr/lib/libImlib2.so -> libImlib2.so.1.6.1
-lrwxrwxrwx	root/root	usr/lib/libImlib2.so.1 -> libImlib2.so.1.6.1
--rwxr-xr-x	root/root	usr/lib/libImlib2.so.1.6.1
+lrwxrwxrwx	root/root	usr/lib/libImlib2.so -> libImlib2.so.1.7.0
+lrwxrwxrwx	root/root	usr/lib/libImlib2.so.1 -> libImlib2.so.1.7.0
+-rwxr-xr-x	root/root	usr/lib/libImlib2.so.1.7.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/imlib2.pc
 drwxr-xr-x	root/root	usr/share/

imlib2/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/R5RriLthmn5d97BVAmyxlQeWsahZtAXz7hl6B7VblImpXDfwz/l6YAXy/yfmVAzMJYVPXoHmGd/yPMo5c31IQA=
-SHA256 (Pkgfile) = 21f999ddbdf3dddfa79621dbcbba2bd093a98177a507295c4b2455810a0871b5
-SHA256 (.footprint) = 6953097564bfa5fb7dd2109df016508fb740a16faef8ac624236c054fc6dbe2c
-SHA256 (imlib2-1.6.1.tar.bz2) = 4d393a77e13da883c8ee2da3b029da3570210fe37d000c9ac33d9fce751b166d
+RWSE3ohX2g5d/Xx9bWsbiJkoWjVfCqB6ErsVOGctekK2uU9XZ5GiU/EcqxSTc7K4V7tqBOgVsnl2EGKRBFQriKW+/ChjJS238Aw=
+SHA256 (Pkgfile) = 98b753f75640398d972c1b3edb020f3c2ae9ed0d18409bc3e3bd55105176b22c
+SHA256 (.footprint) = 6f2d117f87e9ff628841d24f291952e40266804d98819ec92af664a5fb01c74b
+SHA256 (imlib2-1.7.0.tar.bz2) = 1976ca3db48cbae79cd0fc737dabe39cc81494fc2560e1d22821e7dc9c22b37d

imlib2/Pkgfile

@@ -4,15 +4,15 @@
 # Depends on: freetype, libid3tag, libtiff, giflib, xorg-libsm, xorg-libxext
 
 name=imlib2
-version=1.6.1
+version=1.7.0
 release=1
 source=(http://download.sourceforge.net/enlightenment/$name-$version.tar.bz2)
 
 build() {
-  cd $name-$version
+	cd $name-$version
 
-  ./configure --prefix=/usr
+	./configure --prefix=/usr
 
-  make
-  make DESTDIR=$PKG install
+	make
+	make DESTDIR=$PKG install
 }

samhain/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/eD7ZZeaRwR9yD5FiN0zUhQOdaq+gkHtPY7vmWEuPXF2TIV38Gul+ANgTrc/rqw2pZV2zg5p9iXkFmskPPTtdwk=
-SHA256 (Pkgfile) = ae36f65935518dd9572a244195fa51a28ec7991d7a9eaa5a09b95ec6eae3b47b
+RWSE3ohX2g5d/a4Xc0RvSikS/jzgR999HnN3wwNclBSIGrHlLf5dLclqQ2IYn56iEoDGXgtsKVdfmzb/rbPCgwJvVk6QIreQ8gY=
+SHA256 (Pkgfile) = 4e38e8eb7d565a61125caa69f9ac718657f690dfa90f7adc74c950ab7e7194a1
 SHA256 (.footprint) = f610f3827e9a899df9a6d0c6d32cad6be2431494be3f891fbd0ed08d6ce98670
-SHA256 (samhain_signed-4.4.1.tar.gz) = a15516f6809b1daf812b39fb5aa6be3fac1a51b5efca53568759fdf54572a2e9
+SHA256 (samhain_signed-4.4.2.tar.gz) = 2bb2750b32646be32517d0b2259402559c72b96979800f6c33774fcdea327fff

samhain/Pkgfile

@@ -3,7 +3,7 @@
 # Maintainer:  Juergen Daubert, jue at crux dot nu
 
 name=samhain
-version=4.4.1
+version=4.4.2
 release=1
 source=(http://la-samhna.de/archive/${name}_signed-$version.tar.gz)