5.0.4

2 files changed, 11 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 304e1b378bb1..41eb3ca27a4d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = meme
 	pkgdesc = The MEME suite provides tools for discovering and using protein and DNA sequence motifs
-	pkgver = 4.12.0
-	pkgrel = 3
+	pkgver = 5.0.4
+	pkgrel = 1
 	url = http://meme-suite.org/
 	arch = i686
 	arch = x86_64
@@ -13,8 +13,8 @@ pkgbase = meme
 	depends = openmpi
 	depends = imagemagick
 	depends = perl-xml-simple
-	source = http://meme-suite.org/meme-software/4.12.0/meme_4.12.0.tar.gz
-	sha1sums = 4325c6a558412dac277592b8c0493efbaf07a931
+	source = http://meme-suite.org/meme-software/5.0.4/meme-5.0.4.tar.gz
+	sha1sums = ac7920ae76ab454c1a3e434c1a76980de09be0c3
 
 pkgname = meme
 
diff --git a/PKGBUILD b/PKGBUILD
index 7e5918933af5..58854053e168 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,19 @@
 #Maintainer: allencch <allencch at hotmail dot com>
 #Contributor: Charles E. Vejnar
 pkgname=meme
-pkgver=4.12.0
-pkgrel=3
+pkgver=5.0.4
+pkgrel=1
 _minor=
 pkgdesc="The MEME suite provides tools for discovering and using protein and DNA sequence motifs"
 arch=("i686" "x86_64")
 url="http://meme-suite.org/"
 license=("custom")
 depends=(perl-html-template tcsh python2 perl-xml-parser openmpi imagemagick perl-xml-simple)
-source=("http://meme-suite.org/meme-software/${pkgver}/meme_${pkgver}${_minor}.tar.gz")
-sha1sums=('4325c6a558412dac277592b8c0493efbaf07a931')
+source=("http://meme-suite.org/meme-software/${pkgver}/meme-${pkgver}${_minor}.tar.gz")
+sha1sums=('ac7920ae76ab454c1a3e434c1a76980de09be0c3')
 
 build() {
-    cd $srcdir/${pkgname}_${pkgver%_*}
+    cd $srcdir/${pkgname}-${pkgver%_*}
 
     export MEME_ETC_DIR="/etc/meme"
     LDFLAGS="-Wl,--allow-multiple-definition" \
@@ -26,7 +26,7 @@ build() {
 }
 
 package() {
-    cd "${srcdir}/${pkgname}_${pkgver%_*}"
+    cd "${srcdir}/${pkgname}-${pkgver%_*}"
 
     make prefix="${pkgdir}/usr" install
 
@@ -40,16 +40,10 @@ package() {
     perl_major=$(perl -e '$^V =~ /^v(\d+)/ and print $1; print "\n"')
     perl_minor=$(perl -e '$^V =~ /\.(\d+)\./ and print $1; print "\n"')
     mkdir -p "${pkgdir}/usr/lib/perl${perl_major}/${perl_major}.${perl_minor}"
-    mv "${pkgdir}/usr/lib/perl" "${pkgdir}/usr/lib/perl${perl_major}/${perl_major}.${perl_minor}/vendor_perl"
+    mv "${pkgdir}/usr/lib/meme-${pkgver}${_minor}/perl" "${pkgdir}/usr/lib/perl${perl_major}/${perl_major}.${perl_minor}/vendor_perl"
 
     sed -i -e "s/\(PROG => \)/\1'meme-'./g" "${pkgdir}/usr/bin/meme-meme-chip"
 
-    # get_meme_bin_file in src/utils.c does not deal well with meme- prefixes.
-    # It is being called three times in the source code:
-    # > grep 'get_meme_bin_file' src/meme_4.10.2/src/*.c
-    # src/meme_4.10.2/src/glam2_glam2.c:  glam2html = get_meme_bin_file("glam2html");
-    # src/meme_4.10.2/src/glam2_glam2.c:  glam2psfm = get_meme_bin_file("glam2psfm");
-    # src/meme_4.10.2/src/meme.c:    prog = get_meme_bin_file("meme_xml_to_html");
     # Add symlinks for those files:
     ln -s "meme-meme_xml_to_html" "${pkgdir}/usr/bin/meme_xml_to_html"
     ln -s "meme-glam2html" "${pkgdir}/usr/bin/glam2html"