upgpkg: herwig 7.0.4-2

3 files changed, 27 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 88c1a5834614..7736273b4756 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = herwig
 	pkgdesc = Herwig is a multi-purpose particle physics event generator.
 	pkgver = 7.0.4
-	pkgrel = 1
+	pkgrel = 2
 	url = http://herwig.hepforge.org
 	arch = i686
 	arch = x86_64
@@ -14,7 +14,9 @@ pkgbase = herwig
 	depends = boost-libs
 	depends = lhapdf
 	source = http://www.hepforge.org/archive/herwig/Herwig-7.0.4.tar.bz2
+	source = pdf_install_dir.patch
 	sha256sums = e6265f6cae2944b022ee2f1495b0abdd7ed1b50fdda81063f8c17acf8a2f4ced
+	sha256sums = ed711d2dd12ce6d476f88cc40a72f983bf873effe7f73b9eb3c4fa289369f970
 
 pkgname = herwig
 
diff --git a/PKGBUILD b/PKGBUILD
index c38102725d81..a3c792354d74 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,17 +3,21 @@
 _pkgname=Herwig
 pkgname=herwig
 pkgver=7.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Herwig is a multi-purpose particle physics event generator."
 arch=('i686' 'x86_64')
 url="http://herwig.hepforge.org"
 license=('GPL2')
 depends=("gcc-fortran" "thepeg>=2.0.4" "fastjet" "gsl" "boost-libs" "lhapdf")
 makedepends=("sed")
-source=("http://www.hepforge.org/archive/${pkgname}/${_pkgname}-${pkgver}.tar.bz2")
-sha256sums=('e6265f6cae2944b022ee2f1495b0abdd7ed1b50fdda81063f8c17acf8a2f4ced')
+source=("http://www.hepforge.org/archive/${pkgname}/${_pkgname}-${pkgver}.tar.bz2"
+        "pdf_install_dir.patch")
+sha256sums=('e6265f6cae2944b022ee2f1495b0abdd7ed1b50fdda81063f8c17acf8a2f4ced'
+            'ed711d2dd12ce6d476f88cc40a72f983bf873effe7f73b9eb3c4fa289369f970')
 
 prepare() {
+  patch -p 1 < pdf_install_dir.patch
+
   pdfs=(MMHT2014nlo68cl MMHT2014lo68cl)
   for p in "${pdfs[@]}"; do
     if [ ! -d "/usr/share/LHAPDF/$p" ]; then
@@ -63,6 +67,7 @@ build() {
   cd "$srcdir/${_pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
+              --with-pdf=/usr \
               --with-gsl=/usr \
               --with-thepeg=/usr \
               --with-boost=/usr \
diff --git a/pdf_install_dir.patch b/pdf_install_dir.patch
new file mode 100644
index 000000000000..9f9cffb661b5
--- /dev/null
+++ b/pdf_install_dir.patch
@@ -0,0 +1,16 @@
+diff -u -rupN a/Herwig-7.0.4/src/defaults/Makefile.am b/Herwig-7.0.4/src/defaults/Makefile.am
+--- a/Herwig-7.0.4/src/defaults/Makefile.am	2016-03-29 19:37:00.000000000 +0900
++++ b/Herwig-7.0.4/src/defaults/Makefile.am	2017-04-01 21:45:48.585678010 +0900
+@@ -23,9 +23,9 @@ CLEANFILES = PDF.in done-all-links
+ ## For an explanation of this magic, see autoconf book 4.7.2
+ if WANT_LOCAL_PDF
+ edit    = sed -e "s,@HERWIG_PDF_DEFAULT\@,`cd $(top_srcdir) && pwd`/$(HERWIG_PDF_DEFAULT)," -e "s,@HERWIG_PDF_NLO\@,`cd $(top_srcdir) && pwd`/$(HERWIG_PDF_NLO)," -e "s,@HERWIG_PDF_POMERON\@,`cd $(top_srcdir) && pwd`/$(HERWIG_PDF_POMERON),"
+-installname = $(DESTDIR)$(pkgdatadir)/$(HERWIG_PDF_DEFAULT)
+-installnameNLO = $(DESTDIR)$(pkgdatadir)/$(HERWIG_PDF_NLO)
+-installnamePOMERON = $(DESTDIR)$(pkgdatadir)/$(HERWIG_PDF_POMERON)
++installname = /usr/share/Herwig/$(HERWIG_PDF_DEFAULT)
++installnameNLO = /usr/share/Herwig/$(HERWIG_PDF_NLO)
++installnamePOMERON = /usr/share/Herwig/$(HERWIG_PDF_POMERON)
+ install-data-hook:
+ 	rm -f $(DESTDIR)$(defaultsdir)/PDF.in
+ 	sed -e 's,@HERWIG_PDF_DEFAULT\@,$(installname),' \