Fri Jun 13 11:38:03 2014 UTC ()
(pkgsrc):
  - DEPENDS+= mozilla-rootcerts are removed, cert included now.
  - Deleted SUBST_CLASSES+= macro_S to avoid name (_S) conflicts on NetBSD-5.*
    (The probelm no longer exists)
  - Correct MESSAGE (but this is to be committed separately)

(Upstream): Bump version 2.0 to 2.0.2RC4
---------------
This commit log compiled from that of wip/trustedQSL/Makefile by mef@
Sorry if typo or too compact.

2.0.2RC4 2014/06/07
 - No pop up when prompting user for password when batch mode
 - If QSO database is corrupted and can not be repaired, delete it
2.0.2RC3 2014/05/09
 - Ensure station locations added (sign a log -> list of stn loc.)
 - Restore from .tbk to restore multiple pending callsign
   certificates for a given callsign
 - Correct message when callsign cert. is uploaded
 - Delete any older version, when renewed callsign is installed
 - Correct the behaviour for non ascii directory name on Windows
 - Correct the number of QSO in some case when signing
   (ignoring might have shown negative number)
2.0.2RC2 2014/04/22
 - Windows only
2.0.2RC1 2014/04/16
 - OpenSSL update (Heartbleed). no practical attack anyway
   (Windows only)
2.0.1RC9 2014/03/01
 - Avoid application crash when database conversion for Open/Close
 - Faster conversion of database
2.0.1RC8 2014/02/27
 - Limit the number of copies of application running
   (multiple run might have database corrution)
2.0.1RC7 2014/02/13
 - When a callsign cert is about to expire (within 60 days), TQSL
   warns. But even after user submitted renewal, it continued
 - Correct the automatic backup directory (by from preference pane)
 - Search Log files with .ADI, .ADIF also
2.0.1RC6 2014/02/05
 - Copyright notice / date (only)
2.0.1RC5 2014/01/29
 - Avoid crash at starting if certifiacate status file is empty
 - Corrected for checking for new release even with -RC change
2.0.1RC4 2014/01/22
 - Canadian province PQ/QC issue
 - Correct start-up threads management
 - (OpenSuSE Linux) for pending callsign requests
 - Accept valid callsign only based on location
 - Correct hang if command line argument is wrong
 - Update message during callsign certificate creation

2.0.1RC3, 2014/01/13 (but hangs when reading cert_status.xml)
Two additional changes in TQSL 2.0 RC3:
  -------------
  A. Because new modes may not yet be specified in ADIF, and because
  LoTW may not accept all modes specified in ADIF, TQSL enables you to
  "map" a new mode to a mode or mode group recognized by LoTW; this
  most often takes the form of mapping a new digital mode to the DATA
  mode group. Versions of TQSL prior to 2.0 would allow you to map
  modes accepted by LoTW. This version of TQSL will refuse to map a
  mode that is accepted by LoTW. Any existing mappings of modes
  accepted by LoTW will be automatically removed on startup; you will
  be notified if this happens.

  B. When submitting log files in Cabrillo format, previous versions of
  TQSL submitted FM and PH modes as PHONE. TQSL 2.0 RC2 submits FM mode
  as FM, and PH mode as SSB.
  ----------------------------
2.0.1RC2 2013/09/01
  Contest name recognition is corrected (Re: JIDX)


(mef)
diff -r1.12 -r1.13 pkgsrc/ham/trustedQSL/Makefile
diff -r1.3 -r1.4 pkgsrc/ham/trustedQSL/PLIST
diff -r1.7 -r1.8 pkgsrc/ham/trustedQSL/distinfo
diff -r1.2 -r1.3 pkgsrc/ham/trustedQSL/patches/patch-apps_CMakeLists.txt
diff -r1.1 -r1.2 pkgsrc/ham/trustedQSL/patches/patch-apps_tqsl_cpp
diff -r1.1 -r1.2 pkgsrc/ham/trustedQSL/patches/patch-src_tqslconvert_cpp

cvs diff -r1.12 -r1.13 pkgsrc/ham/trustedQSL/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/trustedQSL/Makefile 2014/05/29 23:36:42 1.12
+++ pkgsrc/ham/trustedQSL/Makefile 2014/06/13 11:38:03 1.13
@@ -1,61 +1,40 @@ @@ -1,61 +1,40 @@
1# $NetBSD: Makefile,v 1.12 2014/05/29 23:36:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.13 2014/06/13 11:38:03 mef Exp $
2 2
3DISTNAME= tqsl-2.0 3DISTNAME= tqsl-2.0.2
4PKGREVISION= 3 4PKGNAME= tqsl-2.0.2RC4
5CATEGORIES= ham 5CATEGORIES= ham
6MASTER_SITES= http://sourceforge.net/projects/trustedqsl/files/TrustedQSL/v2.0/ 6MASTER_SITES= http://sourceforge.net/projects/trustedqsl/files/TrustedQSL/v2.0.2/
7EXTRACT_SUFX= .tgz 7DIST_SUBDIR= tqsl-2.0.2RC4
8 8
9MAINTAINER= makoto@ki.nu 9MAINTAINER= makoto@ki.nu
10HOMEPAGE= http://sourceforge.net/projects/trustedqsl/ 10HOMEPAGE= http://sourceforge.net/projects/trustedqsl/
11COMMENT= TrustedQSL, uploading QSL Data to LoTW of ARRL 11COMMENT= TrustedQSL, uploading QSL Data to LoTW of ARRL
12LICENSE= arrl-license 12LICENSE= arrl-license
13 13
14# A macro _S in /usr/include/ctype.h conflicts with one in apps/tqsltrace.h 14# A macro _S in /usr/include/ctype.h conflicts with one in apps/tqsltrace.h
15# NOT_FOR_PLATFORM+= NetBSD-5.* 15# NOT_FOR_PLATFORM+= NetBSD-5.*
16 16
17DEPENDS+= mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts 
18 
19USE_TOOLS+= perl gmake cmake 17USE_TOOLS+= perl gmake cmake
20USE_LANGUAGES+= c c++ 18USE_LANGUAGES+= c c++
21USE_LIBTOOL= yes 19USE_LIBTOOL= yes
22USE_CMAKE= yes 20USE_CMAKE= yes
23 21
24# There is an unresolved build failure, where -R for /usr/pkg/lib does 22# There is an unresolved build failure, where -R for /usr/pkg/lib does
25# not precede /usr/X11R7/lib, and on a netbsd-5 system with base xorg, 23# not precede /usr/X11R7/lib, and on a netbsd-5 system with base xorg,
26# an old version of pixman is found by the pkgsrc cairo. The root 24# an old version of pixman is found by the pkgsrc cairo. The root
27# cause (aside from having two pixman versions installed) is ad hoc -L 25# cause (aside from having two pixman versions installed) is ad hoc -L
28# usage in Makefile.am, without matching -R. 26# usage in Makefile.am, without matching -R.
29 27
30# Following SUBST is really necessary only on NetBSD-5.* 
31SUBST_CLASSES+= macro_S 
32SUBST_MESSAGE.macro_S= Replace _S with _SS to avoid conflicts on include/ctypes.h and apps/tqsltrace.h 
33SUBST_STAGE.macro_S= pre-configure 
34SUBST_FILES.macro_S = \ 
35 apps/crqwiz.cpp \ 
36 apps/extwizard.cpp \ 
37 apps/getpassword.cpp \ 
38 apps/loadcertwiz.cpp \ 
39 apps/qsodatadialog.cpp \ 
40 apps/stationdial.cpp \ 
41 apps/tqsl.cpp \ 
42 apps/tqsl_prefs.cpp \ 
43 apps/tqslhelp.cpp \ 
44 apps/tqsltrace.h \ 
45 apps/tqslvalidator.cpp \ 
46 apps/tqslwiz.cpp 
47SUBST_SED.macro_S= -e 's,_S(,_SS(,g' 
48 
49do-configure: 28do-configure:
50 (cd $(WRKSRC) ; \ 29 (cd $(WRKSRC) ; \
51 cmake \ 30 cmake \
52 -DBDB_PREFIX=${PREFIX} \ 31 -DBDB_PREFIX=${PREFIX} \
53 -DBDB_INCLUDE_DIR=${PREFIX}/include \ 32 -DBDB_INCLUDE_DIR=${PREFIX}/include \
54 -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \ 33 -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \
55 -DCMAKE_INSTALL_PREFIX=${PREFIX} \ 34 -DCMAKE_INSTALL_PREFIX=${PREFIX} \
56 -DCMAKE_INSTALL_RPATH=${PREFIX}/lib \ 35 -DCMAKE_INSTALL_RPATH=${PREFIX}/lib \
57 -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE \ 36 -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE \
58 .) 37 .)
59 38
60post-install: 39post-install:
61 (cd ${WRKSRC} ;\ 40 (cd ${WRKSRC} ;\

cvs diff -r1.3 -r1.4 pkgsrc/ham/trustedQSL/PLIST (expand / switch to unified diff)

--- pkgsrc/ham/trustedQSL/PLIST 2013/12/06 05:52:42 1.3
+++ pkgsrc/ham/trustedQSL/PLIST 2014/06/13 11:38:03 1.4
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1@comment $NetBSD: PLIST,v 1.3 2013/12/06 05:52:42 mef Exp $ 1@comment $NetBSD: PLIST,v 1.4 2014/06/13 11:38:03 mef Exp $
2bin/tqsl 2bin/tqsl
3include/adif.h 3include/adif.h
4include/cabrillo.h 4include/cabrillo.h
5include/tqslconvert.h 5include/tqslconvert.h
6include/tqslerrno.h 6include/tqslerrno.h
7include/tqsllib.h 7include/tqsllib.h
8lib/libtqsllib.so 8lib/libtqsllib.so
9man/man5/tqsl.5 9man/man5/tqsl.5
10share/TrustedQSL/LICENSE.txt 10share/TrustedQSL/LICENSE.txt
 11share/TrustedQSL/ca-bundle.crt
11share/TrustedQSL/config.xml 12share/TrustedQSL/config.xml
12share/TrustedQSL/help/tqslapp/P12.bmp 13share/TrustedQSL/help/tqslapp/P12.bmp
13share/TrustedQSL/help/tqslapp/Pending.bmp 14share/TrustedQSL/help/tqslapp/Pending.bmp
14share/TrustedQSL/help/tqslapp/TQ5.bmp 15share/TrustedQSL/help/tqslapp/TQ5.bmp
15share/TrustedQSL/help/tqslapp/TQ6.bmp 16share/TrustedQSL/help/tqslapp/TQ6.bmp
16share/TrustedQSL/help/tqslapp/TQ8.bmp 17share/TrustedQSL/help/tqslapp/TQ8.bmp
17share/TrustedQSL/help/tqslapp/TQSLCert.bmp 18share/TrustedQSL/help/tqslapp/TQSLCert.bmp
18share/TrustedQSL/help/tqslapp/about.bmp 19share/TrustedQSL/help/tqslapp/about.bmp
19share/TrustedQSL/help/tqslapp/addcert1.bmp 20share/TrustedQSL/help/tqslapp/addcert1.bmp
20share/TrustedQSL/help/tqslapp/addcertaccept.htm 21share/TrustedQSL/help/tqslapp/addcertaccept.htm
21share/TrustedQSL/help/tqslapp/addcertreq.htm 22share/TrustedQSL/help/tqslapp/addcertreq.htm
22share/TrustedQSL/help/tqslapp/additional-info.htm 23share/TrustedQSL/help/tqslapp/additional-info.htm
23share/TrustedQSL/help/tqslapp/addstnl0.bmp 24share/TrustedQSL/help/tqslapp/addstnl0.bmp

cvs diff -r1.7 -r1.8 pkgsrc/ham/trustedQSL/distinfo (expand / switch to unified diff)

--- pkgsrc/ham/trustedQSL/distinfo 2013/12/06 05:52:42 1.7
+++ pkgsrc/ham/trustedQSL/distinfo 2014/06/13 11:38:03 1.8
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.7 2013/12/06 05:52:42 mef Exp $ 1$NetBSD: distinfo,v 1.8 2014/06/13 11:38:03 mef Exp $
2 2
3SHA1 (tqsl-2.0.tgz) = c132d83bb7bd2e805fe9d6df52ea235d55153153 3SHA1 (tqsl-2.0.2RC4/tqsl-2.0.2.tar.gz) = f117aa6af448724a051be0817c9be119a9cc3aca
4RMD160 (tqsl-2.0.tgz) = 7f3e3af2336e43851fb419484e7cfea0ec0089e0 4RMD160 (tqsl-2.0.2RC4/tqsl-2.0.2.tar.gz) = 6ffe02a8c5f51f4129af1202c4aa6a5f7c57eaf6
5Size (tqsl-2.0.tgz) = 2626483 bytes 5Size (tqsl-2.0.2RC4/tqsl-2.0.2.tar.gz) = 2763698 bytes
6SHA1 (patch-apps_CMakeLists.txt) = 6057dd58f9297b5f23158e5a959564c864d46147 6SHA1 (patch-apps_CMakeLists.txt) = eed3a7eb926cfe6c384b10a3488f8b6e47ef3795
7SHA1 (patch-apps_tqsl_cpp) = 93ba43c8ad0955d77b47622ac722765ba146586b 7SHA1 (patch-apps_tqsl_cpp) = 7feb48d6070abdccd59c404ffadf1e507cebd9d4
8SHA1 (patch-src_tqslconvert_cpp) = 6a0a4e54c1f351a0bd8e0e6f8c04a87ea975330e 8SHA1 (patch-src_tqslconvert_cpp) = 212530497270d7354d2081f2a985e266e8569896

cvs diff -r1.2 -r1.3 pkgsrc/ham/trustedQSL/patches/Attic/patch-apps_CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/ham/trustedQSL/patches/Attic/patch-apps_CMakeLists.txt 2013/09/24 11:16:04 1.2
+++ pkgsrc/ham/trustedQSL/patches/Attic/patch-apps_CMakeLists.txt 2014/06/13 11:38:03 1.3
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: patch-apps_CMakeLists.txt,v 1.2 2013/09/24 11:16:04 mef Exp $ 1$NetBSD: patch-apps_CMakeLists.txt,v 1.3 2014/06/13 11:38:03 mef Exp $
2 2
3(1) Avoid ${WRKSRC} included in RPATH. 3(1) Avoid ${WRKSRC} included in RPATH.
4(2) WARN: PLIST:105: Man pages should be installed into man/, not share/man/. 4(2) WARN: PLIST:105: Man pages should be installed into man/, not share/man/.
5 5
6--- apps/CMakeLists.txt.orig 2013-09-22 00:44:59.000000000 +0900 6--- apps/CMakeLists.txt.orig 2014-01-12 23:39:24.000000000 +0900
7+++ apps/CMakeLists.txt 2013-09-22 15:44:50.000000000 +0900 7+++ apps/CMakeLists.txt 2014-01-14 00:13:12.000000000 +0900
8@@ -93,8 +93,8 @@ set(TQSL_RCFILE ${OSX_ICONFILE}) 8@@ -115,8 +115,8 @@ if(APPLE)
9 endif() 9 endif()
10  10
11 if(NOT WIN32) #rpath setup 11 if(NOT WIN32) #rpath setup
12-SET(CMAKE_SKIP_BUILD_RPATH FALSE) 12- SET(CMAKE_SKIP_BUILD_RPATH FALSE)
13-SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)  13- SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
14+SET(CMAKE_SKIP_BUILD_RPATH TRUE) 14+ SET(CMAKE_SKIP_BUILD_RPATH TRUE)
15+SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)  15+ SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
16 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 16 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
17 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") 17 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
18 endif() 18 endif()
19@@ -121,6 +121,6 @@ if(NOT APPLE AND NOT WIN32) 19@@ -144,6 +144,6 @@ if(NOT APPLE AND NOT WIN32)
20 add_definitions("-DCONFDIR=\"${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/\"") 20 install(TARGETS tqsl DESTINATION bin)
21 install(TARGETS tqsl DESTINATION bin) 21 install(DIRECTORY help DESTINATION share/TrustedQSL)
22 install(DIRECTORY help DESTINATION share/TrustedQSL) 22 install(FILES ca-bundle.crt DESTINATION share/TrustedQSL)
23-install(FILES tqsl.5 DESTINATION share/man/man5) 23- install(FILES tqsl.5 DESTINATION share/man/man5)
24+install(FILES tqsl.5 DESTINATION man/man5) 24+ install(FILES tqsl.5 DESTINATION man/man5)
25 install(FILES icons/key48.png DESTINATION share/pixmaps RENAME TrustedQSL.png) 25 install(FILES icons/key48.png DESTINATION share/pixmaps RENAME TrustedQSL.png)
26 endif() 26 endif()

cvs diff -r1.1 -r1.2 pkgsrc/ham/trustedQSL/patches/Attic/patch-apps_tqsl_cpp (expand / switch to unified diff)

--- pkgsrc/ham/trustedQSL/patches/Attic/patch-apps_tqsl_cpp 2013/09/13 08:45:52 1.1
+++ pkgsrc/ham/trustedQSL/patches/Attic/patch-apps_tqsl_cpp 2014/06/13 11:38:03 1.2
@@ -1,18 +1,41 @@ @@ -1,18 +1,41 @@
1$NetBSD: patch-apps_tqsl_cpp,v 1.1 2013/09/13 08:45:52 mef Exp $ 1$NetBSD: patch-apps_tqsl_cpp,v 1.2 2014/06/13 11:38:03 mef Exp $
2 2
 3(1)
3Avoid following error (interim, only valid with db5) 4Avoid following error (interim, only valid with db5)
4/usr/pkgsrc/wip/trustedQSL/work/tqsl-2.0/apps/tqsl.cpp:1133:36: error: 'DB_VERSION_STRING' was not declared in this scope 5/usr/pkgsrc/wip/trustedQSL/work/tqsl-2.0/apps/tqsl.cpp:1133:36: error: 'DB_VERSION_STRING' was not declared in this scope
5gmake[2]: *** [apps/CMakeFiles/tqsl.dir/tqsl.cpp.o] Error 1 6gmake[2]: *** [apps/CMakeFiles/tqsl.dir/tqsl.cpp.o] Error 1
6gmake[1]: *** [apps/CMakeFiles/tqsl.dir/all] Error 2 7gmake[1]: *** [apps/CMakeFiles/tqsl.dir/all] Error 2
7 8
8--- apps/tqsl.cpp.orig 2013-08-18 22:07:48.000000000 +0900 9(2)
9+++ apps/tqsl.cpp 2013-09-01 00:39:30.000000000 +0900 10tqsl-2.0.1/apps/tqsl.cpp:2963:10: error: #pragma GCC diagnostic not allowed inside functions
10@@ -71,7 +71,7 @@ 11tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed inside functions
 12
 13--- apps/tqsl.cpp.orig 2014-02-27 03:07:41.000000000 +0900
 14+++ apps/tqsl.cpp 2014-02-27 20:21:11.000000000 +0900
 15@@ -55,7 +55,7 @@
11 #endif 16 #endif
12 #include <zlib.h> 17 #include <zlib.h>
13 #include <openssl/opensslv.h> // only for version info! 18 #include <openssl/opensslv.h> // only for version info!
14-#include <db.h> //only for version info! 19-#include <db.h> //only for version info!
15+#include <db5/db.h> //only for version info! 20+#include <db5/db.h> //only for version info!
16 #include "tqslwiz.h" 21
17 #include "qsodatadialog.h" 22 #include <iostream>
18 #include "tqslerrno.h" 23 #include <fstream>
 24@@ -3022,7 +3022,7 @@ MyFrame::OnUpdateCheckDone(wxCommandEven
 25 // The macro for declaring a hash map defines a couple of typedefs
 26 // that it never uses. Current GCC warns about those. The pragma
 27 // below suppresses those warnings for those.
 28-#if !defined(__APPLE__) && !defined(_WIN32)
 29+#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__)
 30 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 31 #endif
 32 void
 33@@ -3192,7 +3192,7 @@ MyFrame::DoCheckForUpdates(bool silent,
 34 DoCheckExpiringCerts(noGUI);
 35 return;
 36 }
 37-#if !defined(__APPLE__) && !defined(_WIN32)
 38+#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__)
 39 #pragma GCC diagnostic warning "-Wunused-local-typedefs"
 40 #endif
 41

cvs diff -r1.1 -r1.2 pkgsrc/ham/trustedQSL/patches/Attic/patch-src_tqslconvert_cpp (expand / switch to unified diff)

--- pkgsrc/ham/trustedQSL/patches/Attic/patch-src_tqslconvert_cpp 2013/09/13 08:45:52 1.1
+++ pkgsrc/ham/trustedQSL/patches/Attic/patch-src_tqslconvert_cpp 2014/06/13 11:38:03 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-src_tqslconvert_cpp,v 1.1 2013/09/13 08:45:52 mef Exp $ 1$NetBSD: patch-src_tqslconvert_cpp,v 1.2 2014/06/13 11:38:03 mef Exp $
2 2
3Convert db.h name to pkgsrc current name 3Convert db.h name to pkgsrc current name
4 4
5--- src/tqslconvert.cpp.orig 2013-04-20 21:51:36.000000000 +0900 5--- src/tqslconvert.cpp.orig 2014-01-12 23:39:24.000000000 +0900
6+++ src/tqslconvert.cpp 2013-04-25 10:54:50.000000000 +0900 6+++ src/tqslconvert.cpp 2014-01-14 00:46:23.000000000 +0900
7@@ -22,7 +22,7 @@ 7@@ -22,7 +22,7 @@
8 #include <vector> 8 #include <string>
9 #include <ctype.h> 9 #include <ctype.h>
10 #include <set> 10 #include <set>
11-#include <db.h> 11-#include <db.h>
12+#include <db5/db.h> 12+#include <db5/db.h>
13  13
14 #include <locale.h> 14 #include <locale.h>
15 //#include <iostream> 15 //#include <iostream>