[107011] trunk/dports/graphics/libQGLViewer

[raphael at macports.org]

Revision: 107011
          https://trac.macports.org/changeset/107011
Author:   raphael at macports.org
Date:     2013-06-14 03:41:33 -0700 (Fri, 14 Jun 2013)
Log Message:
-----------
libQGLViewer: update to 2.4.0; use qmake portgroup (see #39424)

Modified Paths:
--------------
    trunk/dports/graphics/libQGLViewer/Portfile
    trunk/dports/graphics/libQGLViewer/files/patch-QGLViewer.pro.diff
    trunk/dports/graphics/libQGLViewer/files/patch-designerPlugin.pro.diff

Modified: trunk/dports/graphics/libQGLViewer/Portfile
===================================================================
--- trunk/dports/graphics/libQGLViewer/Portfile	2013-06-14 07:35:36 UTC (rev 107010)
+++ trunk/dports/graphics/libQGLViewer/Portfile	2013-06-14 10:41:33 UTC (rev 107011)
@@ -4,7 +4,7 @@
 PortSystem                      1.0
 
 name                            libQGLViewer
-version                         2.3.16
+version                         2.4.0
 platforms                       darwin
 maintainers                     raphael openmaintainer
 license                         {GPL-2+ Commercial}
@@ -24,12 +24,9 @@
 
 master_sites                    ${homepage}src/
 
-checksums                       rmd160  7a2393428c72e8da9deb685aa0c8d1f64745f7f7 \
-                                sha256  f1f5e95a4ca96ea94417292422a91be3e5d5e877d1be00c233cb07dc9b1fe6e9
+checksums                       rmd160  2283aefd96b8c20aa890899d19f869883fef612c \
+                                sha256  6135b97502bde59486e2398a6f0cedff6042dfcfd0e03892a471e85fc1fa362a
 
-# exclude extended attributes of all files from extraction
-extract.post_args-append        "--exclude='._*'"
-
 patchfiles                      patch-QGLViewer.pro.diff \
                                 patch-designerPlugin.pro.diff
 # the terrain example does not compile on Lion; see #30886
@@ -42,11 +39,12 @@
 variant x11 {}
 
 if {![variant_isset x11]} {
-    PortGroup                   qt4 1.0
-    configure.cmd               ${qt_qmake_cmd}
+    PortGroup                   qmake 1.0
 } else {
     depends_lib-append          port:qt4-x11
     configure.cmd               ${prefix}/libexec/qt4-x11/bin/qmake
+    configure.pre_args          PREFIX=${prefix}
+    configure.universal_args
     set qt_plugins_dir          ${prefix}/libexec/qt4-x11/plugins/designer
 }
 
@@ -61,10 +59,8 @@
     }
 }
 
-configure.pre_args              PREFIX=${prefix} \
-                                DOC_DIR=${prefix}/share/doc/${name} \
-                                -after QMAKE_POST_LINK=
-configure.universal_args
+configure.pre_args-append       DOC_DIR=${prefix}/share/doc/${name}
+configure.post_args-append      -after QMAKE_POST_LINK=\"\"
 
 use_parallel_build              no
 

Modified: trunk/dports/graphics/libQGLViewer/files/patch-QGLViewer.pro.diff
===================================================================
--- trunk/dports/graphics/libQGLViewer/files/patch-QGLViewer.pro.diff	2013-06-14 07:35:36 UTC (rev 107010)
+++ trunk/dports/graphics/libQGLViewer/files/patch-QGLViewer.pro.diff	2013-06-14 10:41:33 UTC (rev 107011)
@@ -1,12 +1,11 @@
---- QGLViewer/QGLViewer.pro.orig	2012-02-18 18:44:57.000000000 -0600
-+++ QGLViewer/QGLViewer.pro	2012-02-23 18:52:19.000000000 -0600
-@@ -234,9 +234,6 @@
- # --  M a c O S X  --
+--- QGLViewer/QGLViewer.pro.orig	2013-06-12 16:14:03.000000000 +0200
++++ QGLViewer/QGLViewer.pro	2013-06-12 16:14:39.000000000 +0200
+@@ -239,7 +239,7 @@
  # -------------------
  macx|darwin-g++ {
--  # This setting creates a Mac framework. Comment out this line to create a dylib instead.
--  CONFIG *= lib_bundle
--
+   # This setting creates a Mac framework. Comment out this line to create a dylib instead.
+-  !staticlib: CONFIG *= lib_bundle
++  #!staticlib: CONFIG *= lib_bundle
+ 
    include.files *= qglviewer.icns
  
-   lib_bundle {

Modified: trunk/dports/graphics/libQGLViewer/files/patch-designerPlugin.pro.diff
===================================================================
--- trunk/dports/graphics/libQGLViewer/files/patch-designerPlugin.pro.diff	2013-06-14 07:35:36 UTC (rev 107010)
+++ trunk/dports/graphics/libQGLViewer/files/patch-designerPlugin.pro.diff	2013-06-14 10:41:33 UTC (rev 107011)
@@ -1,6 +1,6 @@
---- designerPlugin/designerPlugin.pro.orig	2009-04-07 16:14:40.000000000 +0200
-+++ designerPlugin/designerPlugin.pro	2009-04-07 16:15:37.000000000 +0200
-@@ -19,7 +19,7 @@
+--- designerPlugin/designerPlugin.pro.orig	2013-06-12 16:17:08.000000000 +0200
++++ designerPlugin/designerPlugin.pro	2013-06-12 16:17:29.000000000 +0200
+@@ -20,7 +20,7 @@
    }
  }
  
@@ -8,4 +8,4 @@
 +target.path = @@QT_PLUGINS_DIR@@/designer
  INSTALLS += target
  
- contains( QT_VERSION, "^4.*" ) {
+ HEADERS = qglviewerPlugin.h
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130614/3d4901af/attachment.html>