[153697] trunk/dports/sysutils/bacula

[g5pw at macports.org]

Revision: 153697
          https://trac.macports.org/changeset/153697
Author:   g5pw at macports.org
Date:     2016-10-08 01:34:05 -0700 (Sat, 08 Oct 2016)
Log Message:
-----------
Fix QT4 detection, remove maintainer

Remove maintainer as per his request
(https://lists.macosforge.org/pipermail/macports-dev/2016-October/033950.html)
Add patch to fix QT4 detection
substitute patchfiles with patchfiles-append since the +console_bat variant can
be active with either of the +mysql* and +postgres* variants, and setting the
patchfiles again would clobber the first patch
Closes #49203

Modified Paths:
--------------
    trunk/dports/sysutils/bacula/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/bacula/files/patch-configure-qt4.diff

Modified: trunk/dports/sysutils/bacula/Portfile
===================================================================
--- trunk/dports/sysutils/bacula/Portfile	2016-10-08 08:15:08 UTC (rev 153696)
+++ trunk/dports/sysutils/bacula/Portfile	2016-10-08 08:34:05 UTC (rev 153697)
@@ -5,11 +5,11 @@
 
 name                bacula
 version             7.0.4
-revision            2
+revision            3
 categories          sysutils
 platforms           darwin
 license             {AGPL-3 OpenSSLException}
-maintainers         googlemail.com:robertoschwald
+maintainers         nomaintainer
 
 description         network based backup program
 long_description    Bacula is a set of computer programs that permit you to \
@@ -84,6 +84,9 @@
     depends_lib-append    port:qt4-mac \
                           port:qwt52
     configure.args-append --enable-bat
+
+    patchfiles-append     patch-configure-qt4.diff
+
     post-patch {
         system "makeicns -in ${worksrcpath}/src/qt-console/images/bat_icon.png -out ${worksrcpath}/src/qt-console/images/bat_icon.icns"
     }
@@ -103,7 +106,7 @@
     configure.args-append --enable-batch-insert
     configure.cppflags-append   -I${prefix}/include/mysql51/mysql
 
-    patchfiles          patch-configure-mysql.diff
+    patchfiles-append     patch-configure-mysql.diff
     post-patch {
                      reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure
     }
@@ -124,7 +127,7 @@
     configure.args-append --enable-batch-insert
     configure.cppflags-append   -I${prefix}/include/mysql55/mysql
 
-    patchfiles          patch-configure-mysql.diff
+    patchfiles-append     patch-configure-mysql.diff
     post-patch {
                      reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure
     }
@@ -145,7 +148,7 @@
     configure.args-append --enable-batch-insert
     configure.env-append  PATH=${prefix}/lib/postgresql83/bin:$env(PATH)
 
-    patchfiles          patch-create_postgresql_database.diff
+    patchfiles-append     patch-create_postgresql_database.diff
 
     notes-append "
        To use the Bacula Director, you'll need to perform the following steps:
@@ -164,7 +167,7 @@
     configure.args-append --enable-batch-insert
     configure.env-append  PATH=${prefix}/lib/postgresql84/bin:$env(PATH)
 
-    patchfiles          patch-create_postgresql_database.diff
+    patchfiles-append     patch-create_postgresql_database.diff
 
     notes-append "
        To use the Bacula Director, you'll need to perform the following steps:

Added: trunk/dports/sysutils/bacula/files/patch-configure-qt4.diff
===================================================================
--- trunk/dports/sysutils/bacula/files/patch-configure-qt4.diff	                        (rev 0)
+++ trunk/dports/sysutils/bacula/files/patch-configure-qt4.diff	2016-10-08 08:34:05 UTC (rev 153697)
@@ -0,0 +1,14 @@
+--- configure.org	2016-04-19 18:47:42.000000000 +0200
++++ configure	2016-04-19 18:49:24.000000000 +0200
+@@ -21792,6 +21792,10 @@
+ 
+ BAT_DIR=
+ if test x$support_bat = xyes; then
++   # by MacPorts patch
++   export QMAKE='/opt/local/libexec/qt4/bin/qmake'
++   export PKG_CONFIG_PATH='/opt/local/libexec/qt4/lib/pkgconfig'
++   # by MacPorts patch end
+    abc=`$PKGCONFIG --atleast-version=4.2 QtGui`
+    pkg=$?
+    if test $pkg = 0; then
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161008/009c1fa0/attachment-0002.html>