[125945] trunk/dports/office/goldendict/Portfile

[ryandesign at macports.org]

Revision: 125945
          https://trac.macports.org/changeset/125945
Author:   ryandesign at macports.org
Date:     2014-09-29 22:15:29 -0700 (Mon, 29 Sep 2014)
Log Message:
-----------
goldendict: use qmake portgroup (#39424); make myself maintainer; use $(CXX) not $(CC) to compile lionsupport.o

Modified Paths:
--------------
    trunk/dports/office/goldendict/Portfile

Modified: trunk/dports/office/goldendict/Portfile
===================================================================
--- trunk/dports/office/goldendict/Portfile	2014-09-30 03:36:40 UTC (rev 125944)
+++ trunk/dports/office/goldendict/Portfile	2014-09-30 05:15:29 UTC (rev 125945)
@@ -3,14 +3,14 @@
 
 PortSystem          1.0
 PortGroup           github 1.0
-PortGroup           qt4 1.0
+PortGroup           qmake 1.0
 
 github.setup        goldendict goldendict e4adc5f
 version             1.0.1-20120825
 # FIXME: add proper categories
 categories          office
 platforms           darwin
-maintainers         nomaintainer
+maintainers         ryandesign openmaintainer
 license             GPL-3+
 
 description         Dictionary lookup program
@@ -43,25 +43,14 @@
     reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/goldendict.pro
 }
 
-configure.cmd       ${qt_qmake_cmd}
-configure.pre_args
-configure.universal_args-delete --disable-dependency-tracking
-
 post-configure {
-    # For some reason the Makefile qmake generates hardcodes the compiler
+    # For some reason the Makefile qmake generates hardcodes the C++ compiler
     # that qt4-mac was made with as the one used to build lionsupport.o.
-    # Replace it with $(CC) which we set up for the correct compiler and
+    # Replace it with $(CXX) which we set up for the correct compiler and
     # -arch flags with the build.args below.
-    reinplace -E "/-o build\\/lionsupport.o/s/^(\[\[:space:\]\]+)\[^\[:space:\]\]+/\\1\\$\\(CC\\)/" ${worksrcpath}/Makefile
+    reinplace -E "/-o build\\/lionsupport.o/s/^(\[\[:space:\]\]+)\[^\[:space:\]\]+/\\1\\$\\(CXX\\)/" ${worksrcpath}/Makefile
 }
 
-variant universal {}
-
-build.args          CC="${configure.cc} [get_canonical_archflags cc]" \
-                    CXX="${configure.cxx} [get_canonical_archflags cxx]" \
-                    LINK="${configure.cxx} [get_canonical_archflags cxx]" \
-                    XXXOBJC="${configure.cc} [get_canonical_archflags cc]"
-
 destroot {
     copy ${worksrcpath}/GoldenDict.app ${destroot}${applications_dir}
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140929/ced5a8b4/attachment.html>