svn commit: r322238 - in head: . comms comms/tqsllib comms/trustedqsl comms/trustedqsl/files
Diane Bruce
db at FreeBSD.org
Wed Jul 3 17:45:04 UTC 2013
Author: db
Date: Wed Jul 3 17:45:02 2013
New Revision: 322238
URL: http://svnweb.freebsd.org/changeset/ports/322238
Log:
Updated trustedqsl and removed tqsllib port which is no longer needed
Some cleanups and fixes needed.
Original comment from shurd at sasktel.net
I noticed that the new version allows uploading directly from the tqsl
app, so I've updated the port. The tqsllib is no longer a separate
package from upstream, so I added the CONFLICTS_INSTALL for it. A note
will be needed in ports/UPDATING regarding this.
Submitted by: Stephen Hurd <shurd at sasktel.net>
Added:
head/comms/trustedqsl/files/patch-apps_CMakeLists.txt (contents, props changed)
head/comms/trustedqsl/files/patch-cmakemodules_FindBDB.cmake (contents, props changed)
head/comms/trustedqsl/files/patch-src_tqslconvert.cpp (contents, props changed)
Deleted:
head/comms/tqsllib/
head/comms/trustedqsl/files/patch-Makefile.in
head/comms/trustedqsl/files/patch-configure
Modified:
head/UPDATING
head/comms/Makefile
head/comms/trustedqsl/Makefile
head/comms/trustedqsl/distinfo
head/comms/trustedqsl/pkg-plist
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Wed Jul 3 17:18:04 2013 (r322237)
+++ head/UPDATING Wed Jul 3 17:45:02 2013 (r322238)
@@ -5,6 +5,14 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20130703:
+ AFFECTS: users of comms/trustedqsl and comms/tqsllib
+ AUTHOR: db at FreeBSD.org
+
+ Upstream have removed the need for a separate port for the library
+ formerly found in comms/tqsllib. Please remove tqsllib before installing
+ trustedqsl
+
20130627:
AFFECTS: users of ports-mgmt/portmaster
AUTHOR: bdrewery at FreeBSD.org
Modified: head/comms/Makefile
==============================================================================
--- head/comms/Makefile Wed Jul 3 17:18:04 2013 (r322237)
+++ head/comms/Makefile Wed Jul 3 17:45:02 2013 (r322238)
@@ -156,7 +156,6 @@
SUBDIR += tkhylafax
SUBDIR += tkscanfax
SUBDIR += tlf
- SUBDIR += tqsllib
SUBDIR += trustedqsl
SUBDIR += twpsk
SUBDIR += uarduno
Modified: head/comms/trustedqsl/Makefile
==============================================================================
--- head/comms/trustedqsl/Makefile Wed Jul 3 17:18:04 2013 (r322237)
+++ head/comms/trustedqsl/Makefile Wed Jul 3 17:45:02 2013 (r322238)
@@ -1,38 +1,26 @@
-# New ports collection makefile for: TrustedQSL
-# Date created: 20th July 2004
-# Whom: Diane Bruce <db at db.net>
-#
# $FreeBSD$
-#
PORTNAME= trustedqsl
-PORTVERSION= 1.13
+PORTVERSION= 1.14.2
CATEGORIES= comms hamradio
-MASTER_SITES= SF/${PORTNAME}/TrustedQSL/V1.13/
-DISTFILES= TrustedQSL-1.13.tar.gz
+MASTER_SITES= SF/${PORTNAME}/TrustedQSL/v1.14.2/
+DISTNAME= tqsl-1.14.2
MAINTAINER= db at FreeBSD.org
COMMENT= Amateur Radio Station electronic trusted logbook
-LIB_DEPENDS= tqsllib:${PORTSDIR}/comms/tqsllib
+LIB_DEPENDS= db-5:${PORTSDIR}/databases/db5 \
+ curl:${PORTSDIR}/ftp/curl
-GNU_CONFIGURE= yes
+USES= cmake
USE_WX= 2.8+
WX_UNICODE= yes
-CONFIGURE_ARGS= --with-wxwindows=${WX_CONFIG}
-USE_PERL5= yes
-USE_LDCONFIG= yes
-MAKE_ENV= INCDIR="-I${LOCALBASE}/include"
-LDFLAGS+= -L${LOCALBASE}/lib
-MAKE_JOBS_UNSAFE= yes
-WRKSRC= ${WRKDIR}/TrustedQSL-1.13
+MAN5= trustedqsl.5
-.include <bsd.port.pre.mk>
+USE_LDCONFIG= yes
-pre-configure:
- @${REINPLACE_CMD} -e 's|%%WX_CONFIG%%|${WX_CONFIG}|g' \
- ${WRKSRC}/configure
+.include <bsd.port.pre.mk>
post-install:
@${ECHO_MSG}
Modified: head/comms/trustedqsl/distinfo
==============================================================================
--- head/comms/trustedqsl/distinfo Wed Jul 3 17:18:04 2013 (r322237)
+++ head/comms/trustedqsl/distinfo Wed Jul 3 17:45:02 2013 (r322238)
@@ -1,2 +1,2 @@
-SHA256 (TrustedQSL-1.13.tar.gz) = 4272bc1d9f525c38dc33d7977879161459694df50d41f89e069e1f92e0aac832
-SIZE (TrustedQSL-1.13.tar.gz) = 362767
+SHA256 (tqsl-1.14.2.tar.gz) = 7644a8236493035848c3f10df5f05929bca35a7b65df2a3eea39a1a8f7de3466
+SIZE (tqsl-1.14.2.tar.gz) = 796754
Added: head/comms/trustedqsl/files/patch-apps_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/trustedqsl/files/patch-apps_CMakeLists.txt Wed Jul 3 17:45:02 2013 (r322238)
@@ -0,0 +1,13 @@
+--- apps/CMakeLists.txt.orig 2013-06-25 20:03:58.000000000 -0500
++++ apps/CMakeLists.txt 2013-06-25 20:05:42.000000000 -0500
+@@ -101,5 +101,9 @@
+ install(TARGETS tqsl DESTINATION bin)
+ install(TARGETS tqslcert DESTINATION bin)
+ install(DIRECTORY help DESTINATION share/TrustedQSL)
+-install(FILES trustedqsl.5 DESTINATION share/man/man5)
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++ install(FILES trustedqsl.5 DESTINATION man/man5)
++else()
++ install(FILES trustedqsl.5 DESTINATION share/man/man5)
++endif()
+ endif()
Added: head/comms/trustedqsl/files/patch-cmakemodules_FindBDB.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/trustedqsl/files/patch-cmakemodules_FindBDB.cmake Wed Jul 3 17:45:02 2013 (r322238)
@@ -0,0 +1,18 @@
+--- cmakemodules/FindBDB.cmake.orig 2013-06-23 17:20:25.000000000 -0700
++++ cmakemodules/FindBDB.cmake 2013-06-23 17:24:59.000000000 -0700
+@@ -4,6 +4,7 @@
+ if(APPLE) #exclude obsolete default OSX db
+ FIND_PATH(BDB_INCLUDE_DIR db.h NO_DEFAULT_PATH PATHS
+ "/usr/local/BerkeleyDB.5.3/include"
++ "/usr/local/include/db5"
+ "${BDB_PREFIX}/include"
+ )
+ else()
+@@ -26,6 +27,7 @@
+ "C:\\db-5.3.21\\build_windows\\Win32\\Static_Release\\" #vc08 adds underscore
+ #OSX (and probably other unix) src build
+ "/usr/local/BerkeleyDB.5.3/lib"
++ "/usr/local/lib/db5"
+ "${BDB_PREFIX}/lib"
+ )
+ MARK_AS_ADVANCED(BDB_LIBRARY)
Added: head/comms/trustedqsl/files/patch-src_tqslconvert.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/trustedqsl/files/patch-src_tqslconvert.cpp Wed Jul 3 17:45:02 2013 (r322238)
@@ -0,0 +1,11 @@
+--- src/tqslconvert.cpp.orig 2013-06-23 17:30:50.000000000 -0700
++++ src/tqslconvert.cpp 2013-06-23 17:31:00.000000000 -0700
+@@ -22,7 +22,7 @@
+ #include <vector>
+ #include <ctype.h>
+ #include <set>
+-#include <db.h>
++#include <db5/db.h>
+
+ #include <locale.h>
+ //#include <iostream>
Modified: head/comms/trustedqsl/pkg-plist
==============================================================================
--- head/comms/trustedqsl/pkg-plist Wed Jul 3 17:18:04 2013 (r322237)
+++ head/comms/trustedqsl/pkg-plist Wed Jul 3 17:45:02 2013 (r322238)
@@ -1,34 +1,67 @@
bin/tqsl
bin/tqslcert
+lib/libtqsllib.so
+share/TrustedQSL/config.xml
+include/tqsllib.h
+include/tqslerrno.h
+include/cabrillo.h
+include/adif.h
+include/tqslconvert.h
+share/TrustedQSL/help/tqslapp/P12.bmp
+share/TrustedQSL/help/tqslapp/Pending.bmp
+share/TrustedQSL/help/tqslapp/TQ5.bmp
+share/TrustedQSL/help/tqslapp/TQ6.bmp
+share/TrustedQSL/help/tqslapp/TQ8.bmp
+share/TrustedQSL/help/tqslapp/TQSLCert.bmp
+share/TrustedQSL/help/tqslapp/addcertaccept.htm
+share/TrustedQSL/help/tqslapp/addcertreq.htm
share/TrustedQSL/help/tqslapp/addcont.bmp
+share/TrustedQSL/help/tqslapp/additional-info.htm
share/TrustedQSL/help/tqslapp/addstnl.bmp
share/TrustedQSL/help/tqslapp/addstnl0.bmp
share/TrustedQSL/help/tqslapp/adifdial.bmp
+share/TrustedQSL/help/tqslapp/cabrillo.htm
+share/TrustedQSL/help/tqslapp/certaccept.htm
+share/TrustedQSL/help/tqslapp/certreq.htm
share/TrustedQSL/help/tqslapp/cmdline.htm
+share/TrustedQSL/help/tqslapp/configops.htm
+share/TrustedQSL/help/tqslapp/configxml.htm
share/TrustedQSL/help/tqslapp/contents.hhc
share/TrustedQSL/help/tqslapp/daterng.bmp
share/TrustedQSL/help/tqslapp/daterng.htm
+share/TrustedQSL/help/tqslapp/duplicate.bmp
+share/TrustedQSL/help/tqslapp/example1.htm
+share/TrustedQSL/help/tqslapp/expiration.htm
+share/TrustedQSL/help/tqslapp/fileops.htm
+share/TrustedQSL/help/tqslapp/files-icons.htm
share/TrustedQSL/help/tqslapp/glossary.htm
+share/TrustedQSL/help/tqslapp/index.htm
+share/TrustedQSL/help/tqslapp/installation.htm
+share/TrustedQSL/help/tqslapp/lotw.htm
share/TrustedQSL/help/tqslapp/main.htm
+share/TrustedQSL/help/tqslapp/moving.htm
share/TrustedQSL/help/tqslapp/pref-adi.bmp
share/TrustedQSL/help/tqslapp/pref-adi.htm
share/TrustedQSL/help/tqslapp/pref-cab.bmp
share/TrustedQSL/help/tqslapp/pref-cab.htm
share/TrustedQSL/help/tqslapp/pref-opt.bmp
share/TrustedQSL/help/tqslapp/pref-opt.htm
-share/TrustedQSL/help/tqslapp/pref.htm
+share/TrustedQSL/help/tqslapp/primary.htm
share/TrustedQSL/help/tqslapp/qsodata.bmp
share/TrustedQSL/help/tqslapp/qsodata.htm
+share/TrustedQSL/help/tqslapp/renewing.htm
share/TrustedQSL/help/tqslapp/savestnl.bmp
+share/TrustedQSL/help/tqslapp/secondarycertops.htm
share/TrustedQSL/help/tqslapp/signconf.bmp
share/TrustedQSL/help/tqslapp/signdone.bmp
share/TrustedQSL/help/tqslapp/signing.htm
+share/TrustedQSL/help/tqslapp/signupload.htm
share/TrustedQSL/help/tqslapp/stnloc.bmp
share/TrustedQSL/help/tqslapp/stnloc.htm
-share/TrustedQSL/help/tqslapp/stnloc1.htm
-share/TrustedQSL/help/tqslapp/stnloc2.htm
-share/TrustedQSL/help/tqslapp/tqsl.htm
+share/TrustedQSL/help/tqslapp/tqslapp.chm
share/TrustedQSL/help/tqslapp/tqslapp.hhp
+share/TrustedQSL/help/tqslapp/tqslstyle.css
+share/TrustedQSL/help/tqslapp/update.htm
%%PORTDOCS%%share/TrustedQSL/help/tqslcert/broken-cert.bmp
%%PORTDOCS%%share/TrustedQSL/help/tqslcert/contents.hhc
%%PORTDOCS%%share/TrustedQSL/help/tqslcert/crq.bmp
More information about the svn-ports-head
mailing list