kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated trustedqsl and removed tqsllib port which is no longer needed

Browse source 
Some cleanups and fixes needed.

Original comment from shurd@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@sasktel.net>
This commit is contained in:
Diane Bruce 2013-07-03 17:45:02 +00:00
parent 0db52e9970
commit 94d43048e5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=322238
14 changed files with 98 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
UPDATING
View file

@ -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@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@FreeBSD.org

1
comms/Makefile
View file

@ -156,7 +156,6 @@
SUBDIR += tkhylafax
SUBDIR += tkscanfax
SUBDIR += tlf
SUBDIR += tqsllib
SUBDIR += trustedqsl
SUBDIR += twpsk
SUBDIR += uarduno

43
comms/tqsllib/Makefile
View file

@ -1,43 +0,0 @@
#
# $FreeBSD$
#
PORTNAME= tqsllib
PORTVERSION= 2.2
PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= SF/trustedqsl/tqsllib/V2.2/
MAINTAINER= db@FreeBSD.org
COMMENT= Amateur Radio Station electronic trusted logbook libraries
LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2
GNU_CONFIGURE= YES
USE_LDCONFIG= YES
CONFIGURE_ARGS+= "CXXFLAGS=${CXXFLAGS} -fpermissive" --enable-docs=no
.include <bsd.port.pre.mk>
WITH_OPENSSL_HACK7= yes
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
pre-install:
(cd ${WRKSRC}; \
make converter;make gen_crq; \
make load_cert;make station_loc)
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/converter ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/gen_crq ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/load_cert ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/station_loc ${PREFIX}/bin
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/tqsllib
${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/tqsllib
${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/tqsllib
.endif
.include <bsd.port.post.mk>

2
comms/tqsllib/distinfo
View file

@ -1,2 +0,0 @@
SHA256 (tqsllib-2.2.tar.gz) = 1865a642e7e414eb47758ad26c527b84850d4cc4f2f7f1f119700b765ce636ea
SIZE (tqsllib-2.2.tar.gz) = 616257

7
comms/tqsllib/pkg-descr
View file

@ -1,7 +0,0 @@
tqsllibs for TrustedQSL
The mission of the Trusted QSL Group is to keep eQSL an open and free
activity for amateur radio operators by promoting the
Digital Signature Standard (DSS).
WWW: http://www.trustedqsl.org/trusted-qsl

19
comms/tqsllib/pkg-plist
View file

@ -1,19 +0,0 @@
bin/converter
bin/dumptqsldata
bin/gen_crq
bin/load_cert
bin/station_loc
include/tqsllib.h
include/tqslerrno.h
include/cabrillo.h
include/adif.h
include/tqslconvert.h
lib/libtqsllib.so.1
lib/libtqsllib.so
lib/libtqsllib.la
lib/libtqsllib.a
share/tqsl/config.xml
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm share/tqsl

30
comms/trustedqsl/Makefile
View file

@ -1,39 +1,27 @@
# New ports collection makefile for: TrustedQSL
# Date created: 20th July 2004
# Whom: Diane Bruce <db@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@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
USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
pre-configure:
@${REINPLACE_CMD} -e 's|%%WX_CONFIG%%|${WX_CONFIG}|g' \
${WRKSRC}/configure
post-install:
@${ECHO_MSG}
@${ECHO_MSG} trustedqsl is now installed. You will have to create a directory .tqsl in

4
comms/trustedqsl/distinfo
View file

@ -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

42
comms/trustedqsl/files/patch-Makefile.in
View file

@ -1,42 +0,0 @@
--- Makefile.in.orig 2010-09-29 11:41:29.000000000 -0500
+++ Makefile.in 2012-08-11 18:44:55.000000000 -0500
@@ -105,9 +105,9 @@
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
+AUTOCONF =
+AUTOHEADER =
+AUTOMAKE =
AWK = @AWK@
BUILD = @BUILD@
CC = @CC@
@@ -143,7 +143,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR = @MKDIR@
-MKDIR_P = @MKDIR_P@
+MKDIR_P = /bin/mkdir -p
OBJEXT = @OBJEXT@
OPENSSL = @OPENSSL@
PACKAGE = @PACKAGE@
@@ -208,7 +208,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
-mkdir_p = @mkdir_p@
+mkdir_p = /bin/mkdir
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
platform = @platform@
@@ -226,7 +226,7 @@
tqslresources = @tqslresources@
wxwin_libs = @wxwin_libs@
WXWIN_STATIC = @wxwin_static@
-WXCONFIG = "$(WXDIR)/bin/wx-config"
+WXCONFIG = "$(WXDIR)"
helpdir = $(datadir)
AM_CXXFLAGS = -Wall `$(WXCONFIG) --cxxflags` -I$(TQSLINC) -I$(ZLIB)/include -I$(EXPAT)/include
AM_LDFLAGS = -L$(TQSLLIB) -L$(ZLIB)/lib -L$(EXPAT)/lib -L$(OPENSSL)/lib

13
comms/trustedqsl/files/patch-apps_CMakeLists.txt Normal file
View file

@ -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()

18
comms/trustedqsl/files/patch-cmakemodules_FindBDB.cmake Normal file
View file

@ -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)

24
comms/trustedqsl/files/patch-configure
View file

@ -1,24 +0,0 @@
--- configure.orig 2012-08-11 14:24:17.000000000 -0500
+++ configure 2012-08-11 14:28:58.000000000 -0500
@@ -4601,7 +4601,7 @@
checkwxdir(){
if test -z "$WXDIR"; then
- if test -e "$1/bin/wx-config"; then
+ if test -e "%%WX_CONFIG%%"; then
WXDIR="$1"
fi
fi
@@ -4813,10 +4813,10 @@
fi
-wxwin_libs=`$WXDIR/bin/wx-config --libs`
+wxwin_libs=`%%WX_CONFIG%% --libs`
# Check whether --enable-wxwin-static was given.
if test "${enable_wxwin_static+set}" = set; then
- enableval=$enable_wxwin_static; if test "$enableval" = "yes"; then wxwin_libs=`$WXDIR/bin/wx-config --static --libs`; fi
+ enableval=$enable_wxwin_static; if test "$enableval" = "yes"; then wxwin_libs=`%%WX_CONFIG%% --static --libs`; fi
fi

11
comms/trustedqsl/files/patch-src_tqslconvert.cpp Normal file
View file

@ -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>

41
comms/trustedqsl/pkg-plist
View file

@ -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