(wip/trustedQSL) (1) sync to proper (2) Add code to migrate wxGTK30, not build yet

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: (wip/trustedQSL) (1) sync to proper (2) Add code to migrate wxGTK30, not build yet
From: Makoto Fujiwara <makoto%ki.nu@localhost>
Date: Thu, 05 Nov 2015 14:49:40 +0000
Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Thu Nov 5 23:49:40 2015 +0900
Changeset:	5725b73254fcc95fd3e3ff27865a88df60566420

Modified Files:
	trustedQSL/MESSAGE
	trustedQSL/Makefile
	trustedQSL/PLIST
	trustedQSL/distinfo
	trustedQSL/patches/patch-apps_CMakeLists.txt
	trustedQSL/patches/patch-apps_tqsl_cpp
	trustedQSL/patches/patch-src_tqslconvert_cpp

Log Message:
(wip/trustedQSL) (1) sync to proper (2) Add code to migrate wxGTK30, not build yet

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5725b73254fcc95fd3e3ff27865a88df60566420

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 trustedQSL/MESSAGE                           |  2 +-
 trustedQSL/Makefile                          | 15 ++++++---------
 trustedQSL/PLIST                             | 15 +++++++++++++--
 trustedQSL/distinfo                          | 13 +++++++------
 trustedQSL/patches/patch-apps_CMakeLists.txt | 10 +++++-----
 trustedQSL/patches/patch-apps_tqsl_cpp       | 12 ++++++------
 trustedQSL/patches/patch-src_tqslconvert_cpp |  2 +-
 7 files changed, 39 insertions(+), 30 deletions(-)

diffs:
diff --git a/trustedQSL/MESSAGE b/trustedQSL/MESSAGE
index 892c0f6..dbf9c41 100644
--- a/trustedQSL/MESSAGE
+++ b/trustedQSL/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.14 2014/06/13 09:54:43 makoto Exp $
+$NetBSD: MESSAGE,v 1.2 2014/06/13 11:38:54 mef Exp $
 To start the application, just type tqsl in shell. You will see
 the icons for operations (with Window facility).
 
diff --git a/trustedQSL/Makefile b/trustedQSL/Makefile
index a4ed30e..df79133 100644
--- a/trustedQSL/Makefile
+++ b/trustedQSL/Makefile
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2015/01/07 14:44:34 makoto Exp $
+# $NetBSD: Makefile,v 1.17 2015/10/11 02:59:07 mef Exp $
 
-DISTNAME=		tqsl-2.1
-PKGNAME=		${DISTNAME}RC3
+DISTNAME=		tqsl-2.1.2
 CATEGORIES=		ham
-MASTER_SITES=		http://sourceforge.net/projects/trustedqsl/files/TrustedQSL/v2.1-beta/
-MASTER_SITES+=		http://www.rickmurphy.net/lotw/
-DIST_SUBDIR=		${PKGNAME_NOREV}
+MASTER_SITES=		http://sourceforge.net/projects/trustedqsl/files/TrustedQSL/v2.1.2/
 
 MAINTAINER=		makoto%ki.nu@localhost
 HOMEPAGE=		http://sourceforge.net/projects/trustedqsl/
@@ -41,12 +38,12 @@ post-install:
 	(cd ${WRKSRC} ;\
 	${INSTALL_DATA} LICENSE.txt ${DESTDIR}${PREFIX}/share/TrustedQSL/ \
 	)
-# Conflicting PLIST with wxGTK28-2.8.12nb
-	(cd ${WRKSRC} ; ${RM} ${DESTDIR}${PREFIX}/share/locale/*/LC_MESSAGES/wxstd.mo)
+	# Conflicting PLIST with wxGTK28-2.8.12nb8:
+	${RM} ${DESTDIR}${PREFIX}/share/locale/*/LC_MESSAGES/wxstd.mo
 
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../databases/db5/buildlink3.mk"
-.include "../../x11/wxGTK28/buildlink3.mk"
+.include "../../wip/mk/wxGTK.mk"
 .include "../../www/curl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/trustedQSL/PLIST b/trustedQSL/PLIST
index 1558100..c40957f 100644
--- a/trustedQSL/PLIST
+++ b/trustedQSL/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2015/01/07 14:44:34 makoto Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/10/11 02:59:07 mef Exp $
 bin/tqsl
 include/adif.h
 include/cabrillo.h
@@ -8,8 +8,10 @@ include/tqsllib.h
 lib/libtqsllib.so
 man/man5/tqsl.5
 share/TrustedQSL/LICENSE.txt
-share/TrustedQSL/ca-bundle.crt
 share/TrustedQSL/config.xml
+share/TrustedQSL/help/tqslapp/CertProp.bmp
+share/TrustedQSL/help/tqslapp/EnterPassword.bmp
+share/TrustedQSL/help/tqslapp/LoTWCerts.bmp
 share/TrustedQSL/help/tqslapp/P12.bmp
 share/TrustedQSL/help/tqslapp/Pending.bmp
 share/TrustedQSL/help/tqslapp/RenewUpload.bmp
@@ -28,6 +30,10 @@ share/TrustedQSL/help/tqslapp/cabrillo.htm
 share/TrustedQSL/help/tqslapp/certaccept.htm
 share/TrustedQSL/help/tqslapp/certaccept1.bmp
 share/TrustedQSL/help/tqslapp/certaccept2.bmp
+share/TrustedQSL/help/tqslapp/certificateproperties.htm
+share/TrustedQSL/help/tqslapp/certificatesecurity.htm
+share/TrustedQSL/help/tqslapp/certificatevalidity.htm
+share/TrustedQSL/help/tqslapp/certreplace.htm
 share/TrustedQSL/help/tqslapp/certreq.htm
 share/TrustedQSL/help/tqslapp/certreq1.bmp
 share/TrustedQSL/help/tqslapp/certs-icons.htm
@@ -56,6 +62,7 @@ share/TrustedQSL/help/tqslapp/index.htm
 share/TrustedQSL/help/tqslapp/installation.htm
 share/TrustedQSL/help/tqslapp/key-concepts.htm
 share/TrustedQSL/help/tqslapp/load-certificate.htm
+share/TrustedQSL/help/tqslapp/localization.htm
 share/TrustedQSL/help/tqslapp/login.htm
 share/TrustedQSL/help/tqslapp/logopstab.bmp
 share/TrustedQSL/help/tqslapp/lotw.htm
@@ -82,9 +89,13 @@ share/TrustedQSL/help/tqslapp/renewing.htm
 share/TrustedQSL/help/tqslapp/renewing1.bmp
 share/TrustedQSL/help/tqslapp/renewing2.bmp
 share/TrustedQSL/help/tqslapp/replaced.bmp
+share/TrustedQSL/help/tqslapp/restoredeletedcert.htm
+share/TrustedQSL/help/tqslapp/restoredeletedstnloc.htm
 share/TrustedQSL/help/tqslapp/save-certificate.htm
 share/TrustedQSL/help/tqslapp/savestnl.bmp
 share/TrustedQSL/help/tqslapp/secondarycertops.htm
+share/TrustedQSL/help/tqslapp/secondarystnlocops.htm
+share/TrustedQSL/help/tqslapp/selectlanguage.htm
 share/TrustedQSL/help/tqslapp/sign1.bmp
 share/TrustedQSL/help/tqslapp/signconf.bmp
 share/TrustedQSL/help/tqslapp/signdone.bmp
diff --git a/trustedQSL/distinfo b/trustedQSL/distinfo
index e52cd42..0c33a5a 100644
--- a/trustedQSL/distinfo
+++ b/trustedQSL/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.36 2015/01/07 14:44:34 makoto Exp $
+$NetBSD: distinfo,v 1.10 2015/10/11 02:59:07 mef Exp $
 
-SHA1 (tqsl-2.1RC3/tqsl-2.1.tar.gz) = bba60d505eeefe0d0c448f37cb34917d38cddece
-RMD160 (tqsl-2.1RC3/tqsl-2.1.tar.gz) = c9386e4cf6fc32052f86b6631463950ce0977243
-Size (tqsl-2.1RC3/tqsl-2.1.tar.gz) = 3339822 bytes
-SHA1 (patch-apps_CMakeLists.txt) = 50821d321528ef80c2a2918f637e8b790b6aa8b2
-SHA1 (patch-apps_tqsl_cpp) = 9dc76e7e4e3b2e7cdd39879ce46d923709b9d189
+SHA1 (tqsl-2.1.2.tar.gz) = b84416aba4736ddc39f638da74fb1fd8b3a52aaf
+RMD160 (tqsl-2.1.2.tar.gz) = cdf040eb24c4ad29785c360b8d93600ffcb67f75
+Size (tqsl-2.1.2.tar.gz) = 3442792 bytes
+SHA1 (patch-apps_CMakeLists.txt) = e685f6dba817c783dfe18796b714785923c42982
+SHA1 (patch-apps_tqsl_cpp) = fc6d0fc61b8002945d73b9275ffe5fe163c2dda1
+SHA1 (patch-openssl__cert.cpp) = 158c7086014f9cef05835beb1fb9aa52f091343f
 SHA1 (patch-src_tqslconvert_cpp) = 212530497270d7354d2081f2a985e266e8569896
diff --git a/trustedQSL/patches/patch-apps_CMakeLists.txt b/trustedQSL/patches/patch-apps_CMakeLists.txt
index a1668a4..ec5b162 100644
--- a/trustedQSL/patches/patch-apps_CMakeLists.txt
+++ b/trustedQSL/patches/patch-apps_CMakeLists.txt
@@ -1,10 +1,10 @@
-$NetBSD: patch-apps_CMakeLists.txt,v 1.5 2015/01/07 14:44:34 makoto Exp $
+$NetBSD: patch-apps_CMakeLists.txt,v 1.4 2015/10/11 02:59:07 mef Exp $
 
 (1) Avoid ${WRKSRC} included in RPATH.
 (2) WARN: PLIST:105: Man pages should be installed into man/, not share/man/.
 
---- apps/CMakeLists.txt.orig	2014-11-07 20:03:26.000000000 +0900
-+++ apps/CMakeLists.txt	2014-11-19 22:36:36.000000000 +0900
+--- apps/CMakeLists.txt.orig	2015-09-20 09:15:24.000000000 +0900
++++ apps/CMakeLists.txt	2015-10-11 00:57:52.000000000 +0900
 @@ -120,8 +120,8 @@ if(APPLE)
  endif()
  
@@ -16,10 +16,10 @@ $NetBSD: patch-apps_CMakeLists.txt,v 1.5 2015/01/07 14:44:34 makoto Exp $
  	SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
  	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
  endif()
-@@ -149,7 +149,7 @@ if(NOT APPLE AND NOT WIN32)
+@@ -148,7 +148,7 @@ if(NOT APPLE AND NOT WIN32)
+ 	add_definitions("-DCONFDIR=\"${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/\"")
  	install(TARGETS tqsl DESTINATION bin)
  	install(DIRECTORY help DESTINATION share/TrustedQSL)
- 	install(FILES ca-bundle.crt DESTINATION share/TrustedQSL)
 -	install(FILES tqsl.5 DESTINATION share/man/man5)
 +	install(FILES tqsl.5 DESTINATION man/man5)
  	install(FILES icons/key48.png DESTINATION share/pixmaps RENAME TrustedQSL.png)
diff --git a/trustedQSL/patches/patch-apps_tqsl_cpp b/trustedQSL/patches/patch-apps_tqsl_cpp
index f37d60a..9e53ac3 100644
--- a/trustedQSL/patches/patch-apps_tqsl_cpp
+++ b/trustedQSL/patches/patch-apps_tqsl_cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-apps_tqsl_cpp,v 1.8 2015/01/07 14:44:34 makoto Exp $
+$NetBSD: patch-apps_tqsl_cpp,v 1.3 2015/10/11 02:59:07 mef Exp $
 
 (1)
 Avoid following error (interim, only valid with db5)
@@ -10,9 +10,9 @@ gmake[1]: *** [apps/CMakeFiles/tqsl.dir/all] Error 2
 tqsl-2.0.1/apps/tqsl.cpp:2963:10: error: #pragma GCC diagnostic not allowed inside functions
 tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed inside functions
 
---- apps/tqsl.cpp.orig	2014-11-07 20:03:26.000000000 +0900
-+++ apps/tqsl.cpp	2014-11-19 22:33:57.000000000 +0900
-@@ -56,7 +56,7 @@
+--- apps/tqsl.cpp.orig	2015-09-20 09:15:24.000000000 +0900
++++ apps/tqsl.cpp	2015-10-11 01:19:49.000000000 +0900
+@@ -55,7 +55,7 @@
  #endif
  #include <zlib.h>
  #include <openssl/opensslv.h> // only for version info!
@@ -21,7 +21,7 @@ tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed insi
  
  #include <iostream>
  #include <fstream>
-@@ -3270,7 +3270,7 @@ MyFrame::OnUpdateCheckDone(wxCommandEven
+@@ -3022,7 +3022,7 @@ MyFrame::OnUpdateCheckDone(wxCommandEven
  // The macro for declaring a hash map defines a couple of typedefs
  // that it never uses. Current GCC warns about those. The pragma
  // below suppresses those warnings for those.
@@ -30,7 +30,7 @@ tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed insi
  	#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
  #endif
  void
-@@ -3467,7 +3467,7 @@ MyFrame::DoCheckForUpdates(bool silent, 
+@@ -3632,7 +3632,7 @@ MyFrame::DoCheckForUpdates(bool silent, 
  		DoCheckExpiringCerts(noGUI);
  	return;
  }
diff --git a/trustedQSL/patches/patch-src_tqslconvert_cpp b/trustedQSL/patches/patch-src_tqslconvert_cpp
index b263b14..2cce15b 100644
--- a/trustedQSL/patches/patch-src_tqslconvert_cpp
+++ b/trustedQSL/patches/patch-src_tqslconvert_cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_tqslconvert_cpp,v 1.3 2014/01/13 15:51:21 makoto Exp $
+$NetBSD: patch-src_tqslconvert_cpp,v 1.2 2014/06/13 11:38:03 mef Exp $
 
 Convert db.h name to pkgsrc current name
Prev by Date: +py-sdeint
Next by Date: (wip/trustedQSL) Add patch for wxGTK30
Previous by Thread: +py-sdeint
Next by Thread: (wip/trustedQSL) Add patch for wxGTK30
Indexes:
Home | Main Index | Thread Index | Old Index