Import from pkgbuild.com service

2 files changed, 19 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 40164550d9f3..5c53492a2bce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = slic3r-git
 	pkgdesc = Slic3r is an STL-to-GCODE translator for RepRap 3D printers, aiming to be a modern and fast alternative to Skeinforge.
 	pkgver = 0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://slic3r.org/
 	arch = any
 	license = GPL
@@ -17,7 +17,6 @@ pkgbase = slic3r-git
 	depends = perl-io-stringy
 	depends = perl-encode-locale
 	optdepends = perl-wx: GUI support
-	optdepends = perl-growl-gntp: notifications support via growl
 	optdepends = perl-net-dbus: notifications support via any dbus-based notifier
 	optdepends = perl-xml-sax-expatxs: make AMF parsing faster
 	optdepends = perl-xml-sax: Additive Manufacturing File Format (AMF) support
diff --git a/PKGBUILD b/PKGBUILD
index 602683c53688..dd17e7cc1fb4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=slic3r-git
 pkgver=0
-pkgrel=3
+pkgrel=4
 pkgdesc="Slic3r is an STL-to-GCODE translator for RepRap 3D printers, aiming to be a modern and fast alternative to Skeinforge."
 arch=('any')
 url="http://slic3r.org/"
@@ -11,11 +11,11 @@ license=('GPL')
 depends=('perl' 'perl-moo' 'perl-boost-geometry-utils' 'perl-math-clipper' 'perl-math-convexhull' 'perl-math-geometry-voronoi' 'perl-math-planepath' 'perl-math-convexhull-monotonechain' 'perl-io-stringy' 'perl-encode-locale')
 makedepends=('git')
 optdepends=('perl-wx: GUI support'
-            'perl-growl-gntp: notifications support via growl'
             'perl-net-dbus: notifications support via any dbus-based notifier'
             'perl-xml-sax-expatxs: make AMF parsing faster'
             'perl-xml-sax: Additive Manufacturing File Format (AMF) support'
             'perl-class-xsaccessor: creating faster accessor methods')
+#             'perl-growl-gntp: notifications support via growl'
 provides=('slic3r')
 conflicts=('slic3r')
 source=('slic3r.desktop')
@@ -24,7 +24,14 @@ md5sums=('c997a07f658061d29b221cf7fd07ff97')
 _gitroot="git://github.com/alexrj/Slic3r"
 _gitname="Slic3r"
 
-build() {
+prepare() {
+  export _src_dir="$srcdir/$_gitname-build"
+  # Setting these env variables overwrites any command-line-options we don't want...
+  export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps \
+    PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \
+    PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
+    MODULEBUILDRC=/dev/null
+  export SLIC3R_NO_AUTO="true"
   cd "$srcdir"
   msg "Connecting to GIT server...."
 
@@ -42,21 +49,22 @@ build() {
   cp -R "$srcdir/$_gitname" "$srcdir/$_gitname-build"
   cd "$srcdir/$_gitname-build"
 
-  # ENV for perl
-  export PERL_MM_USE_DEFAULT=0 PERL_AUTOINSTALL="--skipdeps" \
-  PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \
-  PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
-  MODULEBUILDRC=/dev/null SLIC3R_NO_AUTO=1
-
   # Nasty fix for useless Growl dependency ... please post in comment real fix, if u know one ;)
-  # sed -i "s/        'Growl/\#&/" Build.PL
+  sed -i "s/        'Growl/\#&/" Build.PL
+}
 
+build() {
+  cd "$_src_dir"
   msg " ⚠  DO NOT respond to any question with 'yes'. Report a bug in comment instead.\n"
   # Cuz cpan will install fixes to $HOME ... which is not the point of this package
 
   # Build stage
   /usr/bin/perl Build.PL
   ./Build
+}
+
+check () {
+  cd "$_src_dir"
   ./Build test
 }