--- Portfile.orig	2015-05-06 08:01:49.000000000 -0700
+++ Portfile	2015-08-14 16:44:15.000000000 -0700
@@ -22,7 +22,7 @@
     version         5.1.2
     distname        qwt-${version}
     revision        2
-    conflicts       qwt52 qwt60 qwt-60 qwt-devel
+    conflicts       qwt52 qwt60 qwt61 qwt-devel
     checksums       sha1 2fc04b78c438635a78e41a22fea6f9e016f7ca17 \
                     rmd160 a5a94aa3870a631f9605e6370c4d04fb1c79347e
     patchfiles      patch-qwtconfig.pri.51.diff
@@ -35,7 +35,7 @@
 
     version         5.2.3
     distname        qwt-${version}
-    conflicts       qwt qwt60 qwt-60 qwt-devel
+    conflicts       qwt qwt60 qwt61 qwt-devel
     checksums       sha1    ff81595a1641a8b431f98d6091bb134bc94e0003 \
                     rmd160  9b2128ad2b53a65678f9ea57d34cdc73a3674d21
     patchfiles      patch-qwtconfig.pri.52.diff
@@ -48,7 +48,7 @@
 
     version         6.0.2
     distname        qwt-${version}
-    conflicts       qwt qwt52 qwt-devel
+    conflicts       qwt qwt52 qwt61 qwt-devel
     checksums       sha1    cbdd00b29521987c9e7bc6aa51092f0474b9428d \
                     rmd160  c9d31f40b6001f09c59dbf4c0628ddd860474821
     patchfiles      patch-qwtconfig.pri.60.diff \
@@ -60,22 +60,39 @@
 
 }
 
-subport qwt-devel {
+subport qwt61 {
 
-    version         6.1.0-rc3
-    distname        qwt-6.1-rc3
-    conflicts       qwt qwt52 qwt60 qwt-60
-    checksums       sha1    0ee2e80fd9a5d5cc1efc2e09783d20fc4f76aa13 \
-                    rmd160  560fb2e91eb3a825bcc93fc970ab574b85f3390d
-    patchfiles      patch-qwtconfig.pri.610rc3.diff \
-                    patch-qwtbuild.pri.610rc3.diff \
-                    patch-qwtfunctions.pri.610rc3.diff \
-                    patch-designer_designer.pro.610rc3.diff
+    version         6.1.2
+    distname        qwt-6.1.2
+    conflicts       qwt qwt52 qwt60 qwt-devel
+    checksums       sha1    6af82b6ee4132f779d1c8c2db872f01463b0d61c \
+                    rmd160  6c8ba1b974aae55f5a0614d345d59af8fb77f21a
+    patchfiles      patch-qwtconfig.pri.61.diff \
+                    patch-qwtbuild.pri.61.diff \
+                    patch-designer_designer.pro.61.diff
     livecheck.url   http://sourceforge.net/api/file/index/project-id/13693/mtime/desc/rss
     livecheck.regex \\/(6\\.1\\.\\d-rc\\d)\\/
 
 }
 
+subport qwt-devel {
+
+    version         6.1.0-rc3
+    revision        1
+    distfiles
+    distname
+    conflicts       qwt qwt52 qwt60 qwt61
+    replaced_by     qwt61
+    livecheck.url   none
+
+pre-configure {
+    ui_error "Please do not install this subport since it has been replaced by 'qwt61'."
+    return -code error
+}
+
+}
+
+
 # get qwt's version numbers
 
 global qwt_major, qwt_minor, qwt_patch