[83987] trunk/dports/comms/cutecom-qt4-mac
ryandesign at macports.org
ryandesign at macports.org
Wed Sep 14 01:39:22 PDT 2011
Revision: 83987
http://trac.macports.org/changeset/83987
Author: ryandesign at macports.org
Date: 2011-09-14 01:39:20 -0700 (Wed, 14 Sep 2011)
Log Message:
-----------
cutecom-qt4-mac: update to 0.22.0, use cmake portgroup; see #30779 (maintainer timeout)
Modified Paths:
--------------
trunk/dports/comms/cutecom-qt4-mac/Portfile
trunk/dports/comms/cutecom-qt4-mac/files/patch-qcppdialogimpl.cpp
trunk/dports/comms/cutecom-qt4-mac/files/patch-qcppdialogimpl.h
Added Paths:
-----------
trunk/dports/comms/cutecom-qt4-mac/files/patch-CMakeLists.txt.diff
Removed Paths:
-------------
trunk/dports/comms/cutecom-qt4-mac/files/patch-cutecommdlg.ui
Modified: trunk/dports/comms/cutecom-qt4-mac/Portfile
===================================================================
--- trunk/dports/comms/cutecom-qt4-mac/Portfile 2011-09-14 08:25:11 UTC (rev 83986)
+++ trunk/dports/comms/cutecom-qt4-mac/Portfile 2011-09-14 08:39:20 UTC (rev 83987)
@@ -2,10 +2,10 @@
PortSystem 1.0
PortGroup qt4 1.0
+PortGroup cmake 1.0
name cutecom-qt4-mac
-version 0.20.0
-revision 2
+version 0.22.0
categories comms
maintainers jwbacon at tds.net
distname cutecom-${version}
@@ -19,23 +19,14 @@
homepage http://cutecom.sourceforge.net
platforms darwin
-depends_build-append port:cmake
-patchfiles patch-qcppdialogimpl.cpp \
- patch-qcppdialogimpl.h \
- patch-cutecommdlg.ui
+patchfiles patch-CMakeLists.txt.diff \
+ patch-qcppdialogimpl.cpp \
+ patch-qcppdialogimpl.h
-checksums md5 a42394c3a29a2dc30edab721469f5eee \
- sha1 36d430ab25e7f53128c27f39f67a0fe9a2dd18af \
- rmd160 e8e3caf133ac19b320f66a898069f4c0698ad0a0
+checksums rmd160 32111bcf756b7972e5428f96e2b4352083794c39 \
+ sha256 1b6620a6159cf3d50bb36cce544e91486817df7f1d553bf239d6db6108dd2ea5
-configure {
- system "cd ${worksrcpath} && cmake ${qt_cmake_defines} ."
+post-destroot {
+ move ${destroot}${prefix}/bin/CuteCom.app ${destroot}${applications_dir}
}
-
-destroot {
- xinstall ${worksrcpath}/cutecom ${destroot}${prefix}/bin
- xinstall -d ${destroot}${prefix}/share/applnk/Utilities
- xinstall ${worksrcpath}/cutecom.desktop ${destroot}${prefix}/share/applnk/Utilities
-}
-
Added: trunk/dports/comms/cutecom-qt4-mac/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/comms/cutecom-qt4-mac/files/patch-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/comms/cutecom-qt4-mac/files/patch-CMakeLists.txt.diff 2011-09-14 08:39:20 UTC (rev 83987)
@@ -0,0 +1,14 @@
+--- CMakeLists.txt.orig 2009-06-24 15:30:01.000000000 -0500
++++ CMakeLists.txt 2011-09-14 03:26:48.000000000 -0500
+@@ -20,11 +20,6 @@
+ # with cmake < 2.6 install(TARGETS ... BUNDLE DESTINATION ... ) doesn't work:
+ cmake_minimum_required(VERSION 2.6 FATAL_ERROR )
+ set(exeType MACOSX_BUNDLE)
+- set(binInstallDir /Applications )
+- # hint to linker for indirect referenced libs inside qt3support
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -dylib_file QtSql.framework/Versions/4/QtSql:/Library/Frameworks/QtSql.framework/Versions/4/QtSql")
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -dylib_file QtNetwork.framework/Versions/4/QtNetwork:/Library/Frameworks/QtNetwork.framework/Versions/4/QtNetwork")
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -dylib_file QtXml.framework/Versions/4/QtXml:/Library/Frameworks/QtXml.framework/Versions/4/QtXml")
+ endif(APPLE)
+
+ add_executable(cutecom ${exeType} ${cutecomSrcs} ${uiHeaders})
Deleted: trunk/dports/comms/cutecom-qt4-mac/files/patch-cutecommdlg.ui
===================================================================
--- trunk/dports/comms/cutecom-qt4-mac/files/patch-cutecommdlg.ui 2011-09-14 08:25:11 UTC (rev 83986)
+++ trunk/dports/comms/cutecom-qt4-mac/files/patch-cutecommdlg.ui 2011-09-14 08:39:20 UTC (rev 83987)
@@ -1,24 +0,0 @@
---- cutecommdlg.ui.orig 2009-03-28 12:36:33.000000000 -0500
-+++ cutecommdlg.ui 2009-03-28 12:36:48.000000000 -0500
-@@ -213,21 +213,6 @@
- <string>230400</string>
- </property>
- </item>
-- <item>
-- <property name="text" >
-- <string>460800</string>
-- </property>
-- </item>
-- <item>
-- <property name="text" >
-- <string>576000</string>
-- </property>
-- </item>
-- <item>
-- <property name="text" >
-- <string>921600</string>
-- </property>
-- </item>
- </widget>
- </item>
- <item rowspan="4" row="0" column="3" >
Modified: trunk/dports/comms/cutecom-qt4-mac/files/patch-qcppdialogimpl.cpp
===================================================================
--- trunk/dports/comms/cutecom-qt4-mac/files/patch-qcppdialogimpl.cpp 2011-09-14 08:25:11 UTC (rev 83986)
+++ trunk/dports/comms/cutecom-qt4-mac/files/patch-qcppdialogimpl.cpp 2011-09-14 08:39:20 UTC (rev 83987)
@@ -1,41 +1,17 @@
---- qcppdialogimpl.cpp.orig 2008-03-12 16:09:50.000000000 -0500
-+++ qcppdialogimpl.cpp 2009-03-28 10:13:13.000000000 -0500
-@@ -243,11 +243,10 @@
- bool entryFound=false;
- QStringList devices=settings.readListEntry("/cutecom/AllDevices", &entryFound);
+--- qcppdialogimpl.cpp.orig 2009-06-25 15:10:49.000000000 -0500
++++ qcppdialogimpl.cpp 2011-09-13 23:58:27.000000000 -0500
+@@ -351,12 +351,12 @@
+ QStringList devices=settings.value("/cutecom/AllDevices").toStringList();
if (!entryFound)
+ {
- devices<<"/dev/ttyS0"<<"/dev/ttyS1"<<"/dev/ttyS2"<<"/dev/ttyS3";
+ devices<<DEVLIST;
+ }
- m_deviceCb->insertStringList(devices);
--
-- m_deviceCb->setCurrentText(settings.readEntry("/cutecom/CurrentDevice", "/dev/ttyS0"));
-+ m_deviceCb->setCurrentText(settings.readEntry("/cutecom/CurrentDevice", DEFAULT_DEV));
+ m_deviceCb->insertItems(0, devices);
- QStringList history=settings.readListEntry("/cutecom/History");
-
-@@ -929,15 +928,15 @@
- case 230400:
- _baud=B230400;
- break;
-- case 460800:
-- _baud=B460800;
-- break;
-- case 576000:
-- _baud=B576000;
-- break;
-- case 921600:
-- _baud=B921600;
-- break;
-+// case 460800:
-+// _baud=B460800;
-+// break;
-+// case 576000:
-+// _baud=B576000;
-+// break;
-+// case 921600:
-+// _baud=B921600;
-+// break;
- // case 128000:
- // _baud=B128000;
- // break;
+- int indexOfCurrentDevice = devices.indexOf(settings.value("/cutecom/CurrentDevice", "/dev/ttyS0").toString());
++ int indexOfCurrentDevice = devices.indexOf(settings.value("/cutecom/CurrentDevice", DEFAULT_DEV).toString());
+ // fprintf(stderr, "currentDEev: -%s - index: %d\n", settings.value("/cutecom/CurrentDevice", "/dev/ttyS0").toString().toLatin1().constData(), indexOfCurrentDevice);
+ if (indexOfCurrentDevice!=-1)
+ {
Modified: trunk/dports/comms/cutecom-qt4-mac/files/patch-qcppdialogimpl.h
===================================================================
--- trunk/dports/comms/cutecom-qt4-mac/files/patch-qcppdialogimpl.h 2011-09-14 08:25:11 UTC (rev 83986)
+++ trunk/dports/comms/cutecom-qt4-mac/files/patch-qcppdialogimpl.h 2011-09-14 08:39:20 UTC (rev 83987)
@@ -1,6 +1,6 @@
---- qcppdialogimpl.h.orig 2008-03-12 16:09:50.000000000 -0500
-+++ qcppdialogimpl.h 2009-03-28 09:05:42.000000000 -0500
-@@ -103,4 +103,21 @@
+--- qcppdialogimpl.h.orig 2009-06-23 15:35:06.000000000 -0500
++++ qcppdialogimpl.h 2011-09-14 03:18:04.000000000 -0500
+@@ -105,4 +105,21 @@
};
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110914/1d7f4186/attachment.html>
More information about the macports-changes
mailing list