Attachment #59424 for bug #89430

View | Details | Raw Unified | Return to bug 89430
Collapse All | Expand All




#

PORTNAME=	trustedqsl
PORTVERSION=	1.11
PORTREVISION=	4
CATEGORIES=	comms
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	trustedqsl
DISTFILES=	tqsllib-1.4.tar.gz TrustedQSL-1.11.tar.gz

MAINTAINER=	db@db.net
COMMENT=	Amateur Radio Station electronic trusted logbook

LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2 \
		wx_base-2.6:${PORTSDIR}/x11-toolkits/wxgtk26

USE_PERL5=	yes
USE_GETOPT_LONG=	yes
USE_REINPLACE=	yes
MAKE_ENV=	INCDIR="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"

post-patch:
	${CP} ${FILESDIR}/Makefile  ${WRKSRC}
	${CP} ${FILESDIR}/Makefile.tqsllib  ${WRKSRC}/tqsllib/Makefile
	${CP} ${FILESDIR}/Makefile.TrustedQSL-1.11  ${WRKSRC}/TrustedQSL-1.11/Makefile
	${CP} ${FILESDIR}/sysconfig.h.tqsllib  ${WRKSRC}/tqsllib/sysconfig.h
	${CP} ${FILESDIR}/sysconfig.h.TrustedQSL-1.11  ${WRKSRC}/TrustedQSL-1.11/sysconfig.h

do-extract:
	@${RM} -rf ${WRKDIR}
	@${MKDIR} ${WRKDIR}
	@${MKDIR} ${WRKSRC}
	@for f in ${EXTRACT_ONLY}; do  \
		if ! (cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$f ${EXTRACT_AFTER_ARGS});\
		then \
			exit 1; \
		fi \

.if !defined(NOPORTDOCS)
	@${MKDIR} ${PREFIX}/share/doc/tqslcert
	@${MKDIR} ${PREFIX}/share/doc/tqslapp
	@${CP} ${WRKSRC}/TrustedQSL-1.11/help/tqslcert/* ${PREFIX}/share/doc/tqslcert/
	@${CP} ${WRKSRC}/TrustedQSL-1.11/help/tqslapp/* ${PREFIX}/share/doc/tqslapp/
.endif

.include <bsd.port.mk>

Lines 1-4 Link Here

(-)/usr/home/db/trustedqsl/distinfo (-2 / +4 lines)
1	MD5 (tqsllib-1.4.tar.gz) = 008705afbf39f52e0984e195d32e8378	1	MD5 (tqsllib-1.4.tar.gz) = 008705afbf39f52e0984e195d32e8378
		2	SHA256 (tqsllib-1.4.tar.gz) = 3b21fa2734c95c872847c9ce81590cf34b97d48274f307cdf784eed57f76643c
2	SIZE (tqsllib-1.4.tar.gz) = 160585	3	SIZE (tqsllib-1.4.tar.gz) = 160585
3	MD5 (TrustedQSL-1.10.tar.gz) = c0b8108c744d574204649cd375474982	4	MD5 (TrustedQSL-1.11.tar.gz) = 2b39274763ec27823489f2eca975fdab
4	SIZE (TrustedQSL-1.10.tar.gz) = 223927	5	SHA256 (TrustedQSL-1.11.tar.gz) = 1b208e6f84602c161d936dae161e40b555ebc53883b4eda33d6e8f5fa84d68d9
		6	SIZE (TrustedQSL-1.11.tar.gz) = 346049

Lines 2-9 Link Here

(-)/usr/home/db/trustedqsl/files/Makefile (-2 / +2 lines)
2		2
3	all:	3	all:
4	(cd tqsllib;make)	4	(cd tqsllib;make)
5	(cd tqsllib-apps;make)	5	(cd TrustedQSL-1.11;make)
6		6
7	install:	7	install:
8	(cd tqsllib;make install)	8	(cd tqsllib;make install)
9	(cd tqsllib-apps;make install)	9	(cd TrustedQSL-1.11;make install)




TQSLLIB=../tqsllib
TQSLINC=../tqsllib
TQSL_VERSION_MAJOR = 1
TQSL_VERSION_MINOR = 11
OPENSSL=/usr/local
LIBS=-lz -lexpat -lcrypto
INCDIR = -I$(TQSLINC)
BUILD = unofficial
WXFLAGS=`wxgtk2-2.6-config --cflags`
WXLIBS=`wxgtk2-2.6-config --libs`
DEFS = -DHAVE_CONFIG_H
CXXFLAGS +=  $(DEFS) $(INCDIR)  -DHAVE_LIBCRYPTO=1 -DSTDC_HEADERS=1 -DHAVE_MKDIR=1 -DHAVE_STRERROR=1  $(WXFLAGS)

LDLIBS = -L$(TQSLLIB) -L$(OPENSSL)/lib -ltqsllib $(LIBS)  $(WXLIBS)
TQSLLIBFILE=$(TQSLLIB)/libtqsllib.a
CCDEPMODE = depmode=gcc3
BINDIR=${PREFIX}/bin
DOCDIR=${PREFIX}/share/doc
ETCDIR=${PREFIX}/etc
PERL	?=perl
CP	?=cp
TOUCH	?=touch

TARGETS = tqslcert tqsl

all: tqslcertbuild.h tqslbuild.h $(TARGETS)

TQSLCERT_OBJ = tqslcert.o crqwiz.o dxcc.o certtree.o tqslcert_prefs.o \
	getpassword.o extwizard.o loadcertwiz.o wxutil.o

TQSL_OBJ = tqsl.o extwizard.o tqslwiz.o dxcc.o stationdial.o qsodatadialog.o \
	tqslvalidator.o tqsl_prefs.o wxutil.o

tqslcert: $(TQSLCERT_OBJ) $(TQSLLIBFILE)
	$(CC) $(CXXFLAGS) -o $@ $(TQSLCERT_OBJ) $(LDLIBS) -lstdc++

tqsl: $(TQSL_OBJ) $(TQSLLIBFILE)
	$(CC) $(CXXFLAGS) -o $@ $(TQSL_OBJ) $(LDLIBS) -lstdc++

tqslcert.o:
	${CXX} $(CXXFLAGS) -c -o $@ $*.cpp

tqslcertbuild.h: tqslcertbuild.h.in Makefile
	$(PERL) touchver.pl tqslcertbuild.h.in BUILD $(BUILD)
	$(CP) tqslcertbuild.h.in tqslcertbuild.h
	$(TOUCH) tqslcertbuild.h.in
	
tqslbuild.h: tqslbuild.h.in Makefile
	$(PERL) touchver.pl tqslbuild.h.in BUILD $(BUILD)
	$(CP) tqslbuild.h.in tqslbuild.h
	$(TOUCH) tqslbuild.h.in

tqsl.o:
	${CXX} $(CXXFLAGS) -c -o $@ $*.cpp
	
%.o: %.cpp
	${CXX} $(CXXFLAGS) -c -o $@ $*.cpp

clean:
	rm -f $(TARGETS) *.o *.a *~ xxx.*

install:
	${INSTALL} -d $(BINDIR) $(ETCDIR)/tqsl
	${INSTALL} -C $(TARGETS) $(BINDIR)
	${INSTALL} -C ../tqsllib/config.xml $(ETCDIR)/tqsl

Lines 1-8 Link Here

(-)/usr/home/db/trustedqsl/files/Makefile.tqsllib (-2 / +2 lines)
1	CXX = g++	1	CXX = g++
2	CC ?= gcc	2	CC ?= gcc
3	LIBS=-lcrypto -lexpat	3	LIBS=-lcrypto -lexpat
4	CXXFLAGS += -I. $(INCDIR) -DHAVE_CONFIG_H	4	CXXFLAGS += -I. -I${LOCALBASE}/include -DHAVE_CONFIG_H
5	LDFLAGS += -L. $(LIBS) -lstdc++	5	LDFLAGS = -L. $(LIBS) -L${LOCALBASE}/lib -lstdc++
6	TARGETS = gen_crq load_cert station_loc dumptqsldata converter	6	TARGETS = gen_crq load_cert station_loc dumptqsldata converter
7	ZLIB=z	7	ZLIB=z
8	MYLIB=tqsllib	8	MYLIB=tqsllib




TQSLLIB=../tqsllib
TQSLINC=../tqsllib
OPENSSL=/usr
LIBS=-lz -lexpat -lcrypto
INCDIR = -I$(TQSLINC)
BUILD=unofficial
WXFLAGS=`wxgtk2-2.4-config --cflags`
WXLIBS=`wxgtk2-2.4-config --libs`
CXXFLAGS +=  $(INCDIR)  -DHAVE_LIBCRYPTO=1 -DSTDC_HEADERS=1 -DHAVE_MKDIR=1 -DHAVE_STRERROR=1  $(WXFLAGS)
LDLIBS = -L$(OPENSSL)/lib -L$(TQSLLIB) -ltqsllib $(LIBS)  $(WXLIBS)
TQSLLIBFILE=$(TQSLLIB)/libtqsllib.a

BINDIR=${PREFIX}/bin
DOCDIR=${PREFIX}/share/doc
ETCDIR=${PREFIX}/etc

TARGETS = tqslcert tqsl

all: $(TARGETS)

TQSLCERT_OBJ = tqslcert.o crqwiz.o dxcc.o certtree.o tqslcert_prefs.o \
	getpassword.o extwizard.o loadcertwiz.o wxutil.o

TQSL_OBJ = tqsl.o extwizard.o tqslwiz.o dxcc.o stationdial.o qsodatadialog.o \
	tqslvalidator.o tqsl_prefs.o wxutil.o

tqslcert: $(TQSLCERT_OBJ) $(TQSLLIBFILE)
	$(CC) $(CXXFLAGS) $(LDFLAGS) -o $@ $(TQSLCERT_OBJ) $(LDLIBS) -lstdc++

tqsl: $(TQSL_OBJ) $(TQSLLIBFILE)
	$(CC) $(CXXFLAGS) $(LDFLAGS) -o $@ $(TQSL_OBJ) $(LDLIBS) -lstdc++

include apps.depends

tqslcertbuild.h: buildskel.h
	cp buildskel.h tqslcertbuild.h

tqslcert.o:
	${CXX} $(CXXFLAGS) -c -o $@ $*.cpp
	
tqslbuild.h: buildskel.h
	cp buildskel.h tqslbuild.h

tqsl.o:
	${CXX} $(CXXFLAGS) -c -o $@ $*.cpp
	
%.o: %.cpp
	${CXX} $(CXXFLAGS) -c -o $@ $*.cpp

clean:
	rm -f $(TARGETS) *.o *.a *~ xxx.*

install:
	${INSTALL} -d $(BINDIR) $(ETCDIR)/tqsl
	${INSTALL} -C $(TARGETS) $(BINDIR)
	${INSTALL} -C ../tqsllib/config.xml $(ETCDIR)/tqsl

Line 0 Link Here

(-)/usr/home/db/trustedqsl/files/patch-TrustedQSL-1.11_left.xpm (+9 lines)
	1	--- TrustedQSL-1.11/left.xpm.orig Mon Nov 21 21:27:38 2005
	2	+++ TrustedQSL-1.11/left.xpm Mon Nov 21 21:33:47 2005
	3	@@ -1,5 +1,5 @@
	4	/* XPM */
	5	-static char *left[]={
	6	+static char *left_i[]={
	7	"10 10 29 1",
	8	". c None",
	9	"d c #000000",




--- TrustedQSL-1.11/qsodatadialog.cpp.orig	Mon Nov 21 21:27:29 2005
+++ TrustedQSL-1.11/qsodatadialog.cpp	Mon Nov 21 21:34:00 2005
@@ -302,13 +302,13 @@
 		sizer = new wxBoxSizer(wxHORIZONTAL);
 		_recbottom_ctrl = new wxBitmapButton(this, QD_RECBOTTOM, wxBitmap(bottom), wxDefaultPosition, wxSize(18, TEXT_HEIGHT)),
 		sizer->Add(_recbottom_ctrl, 0, wxTOP|wxBOTTOM, 5);
-		_recdown_ctrl = new wxBitmapButton(this, QD_RECDOWN, wxBitmap(left), wxDefaultPosition, wxSize(18, TEXT_HEIGHT));
+		_recdown_ctrl = new wxBitmapButton(this, QD_RECDOWN, wxBitmap(left_i), wxDefaultPosition, wxSize(18, TEXT_HEIGHT));
 		sizer->Add(_recdown_ctrl, 0, wxTOP|wxBOTTOM, 5);
 		_recno_ctrl = new wxTextCtrl(this, QD_RECNO, wxT("1"), wxDefaultPosition,
 			wxSize(4*TEXT_WIDTH,TEXT_HEIGHT));
 		_recno_ctrl->Enable(FALSE);
 		sizer->Add(_recno_ctrl, 0, wxALL, 5);
-		_recup_ctrl = new wxBitmapButton(this, QD_RECUP, wxBitmap(right), wxDefaultPosition, wxSize(18, TEXT_HEIGHT));
+		_recup_ctrl = new wxBitmapButton(this, QD_RECUP, wxBitmap(right_i), wxDefaultPosition, wxSize(18, TEXT_HEIGHT));
 		sizer->Add(_recup_ctrl, 0, wxTOP|wxBOTTOM, 5);
 		_rectop_ctrl = new wxBitmapButton(this, QD_RECTOP, wxBitmap(top), wxDefaultPosition, wxSize(18, TEXT_HEIGHT)),
 		sizer->Add(_rectop_ctrl, 0, wxTOP|wxBOTTOM, 5);

Line 0 Link Here

(-)/usr/home/db/trustedqsl/files/patch-TrustedQSL-1.11_right.xpm (+9 lines)
	1	--- TrustedQSL-1.11/right.xpm.orig Mon Nov 21 21:27:56 2005
	2	+++ TrustedQSL-1.11/right.xpm Mon Nov 21 21:33:41 2005
	3	@@ -1,5 +1,5 @@
	4	/* XPM */
	5	-static char *right[]={
	6	+static char *right_i[]={
	7	"10 10 30 1",
	8	"a c None",
	9	"g c #000000",




--- tqsllib/sysconfig.h.orig	Wed Jul 21 11:51:59 2004
+++ tqsllib/sysconfig.h	Wed Jul 21 11:54:05 2004
@@ -14,7 +14,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Defined if this is LOTW server code */
-#define LOTW_SERVER 1
+#undef LOTW_SERVER
 
 /* Define if you have the mkdir function.  */
 #define HAVE_MKDIR 1
@@ -29,7 +29,7 @@
 #define HAVE_UNISTD_H 1
 
 /* Define if you have the <getopt.h> header file.  */
-/* #undef HAVE_GETOPT_H */
+#define HAVE_GETOPT_H 
 
 /* Define if you have the crypto library (-lcrypto).  */
 #define HAVE_LIBCRYPTO 1
@@ -38,8 +38,8 @@
 #define HAVE_LIBDL 1
 
 /* Define if you have the pcrl library (-lpcrl).  */
-#define HAVE_LIBPCRL 1
+#undef HAVE_LIBPCRL
 
 /* Define if you have the sqlca library (-lsqlca).  */
-#define HAVE_LIBSQLCA 1
+#undef HAVE_LIBSQLCA 
 




/* sysconfig.h.  Generated by configure.  */
/* sysconfig.h.in.  Generated from configure.in by autoheader.  */

/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1

/* Define to 1 if you have the `crypto' library (-lcrypto). */
#define HAVE_LIBCRYPTO 1

/* Define to 1 if you have the `expat' library (-lexpat). */
#define HAVE_LIBEXPAT 1

/* Define to 1 if you have the `tqsllib' library (-ltqsllib). */
#define HAVE_LIBTQSLLIB 1

/* Define to 1 if you have the `tqsllibd' library (-ltqsllibd). */
/* #undef HAVE_LIBTQSLLIBD */

/* Define to 1 if you have the `z' library (-lz). */
#define HAVE_LIBZ 1

/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1

/* Define to 1 if you have the `mkdir' function. */
#define HAVE_MKDIR 1

/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1

/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1

/* Define to 1 if you have the `strerror' function. */
#define HAVE_STRERROR 1

/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1

/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1

/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1

/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1

/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1

/* Name of package */
#define PACKAGE "TrustedQSL"

/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "lotw-help@arrl.org"

/* Define to the full name of this package. */
#define PACKAGE_NAME "TrustedQSL"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "TrustedQSL 1.11"

/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "TrustedQSL"

/* Define to the version of this package. */
#define PACKAGE_VERSION "1.11"

/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1

/* Version number of package */
#define VERSION "1.11"

/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */

/* Define to `unsigned' if <sys/types.h> does not define. */
/* #undef size_t */




/* tqsllib/sysconfig.h.  Generated automatically by configure.  */
/* lotwdb/sysconfig.h.in.  Generated automatically from configure.in by autoheader.  */

/* Define to empty if the keyword does not work.  */
/* #undef const */

/* Define to `int' if <sys/types.h> doesn't define.  */
/* #undef mode_t */

/* Define if you have the ANSI C header files.  */
#define STDC_HEADERS 1

/* Define if your <sys/time.h> declares struct tm.  */
/* #undef TM_IN_SYS_TIME */

/* Defined if this is LOTW server code */
#undef LOTW_SERVER

/* Define if you have the mkdir function.  */
#define HAVE_MKDIR 1

/* Define if you have the strerror function.  */
#define HAVE_STRERROR 1

/* Define if you have the snprintf function.  */
#define HAVE_SNPRINTF 1

/* Define if you have the <unistd.h> header file.  */
#define HAVE_UNISTD_H 1

/* Define if you have the <getopt.h> header file.  */
#define HAVE_GETOPT_H 

/* Define if you have the crypto library (-lcrypto).  */
#define HAVE_LIBCRYPTO 1

/* Define if you have the dl library (-ldl).  */
#define HAVE_LIBDL 1

/* Define if you have the pcrl library (-lpcrl).  */
#undef HAVE_LIBPCRL

/* Define if you have the sqlca library (-lsqlca).  */
#undef HAVE_LIBSQLCA 


Return to bug 89430

Lines 6-24 Link Here

(-)/usr/home/db/trustedqsl/Makefile (-9 / +11 lines)
6	#	6	#
7		7
8	PORTNAME= trustedqsl	8	PORTNAME= trustedqsl
9	PORTVERSION= 1.10	9	PORTVERSION= 1.11
10	PORTREVISION= 4
11	CATEGORIES= comms	10	CATEGORIES= comms
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= trustedqsl	12	MASTER_SITE_SUBDIR= trustedqsl
14	DISTFILES= tqsllib-1.4.tar.gz TrustedQSL-1.10.tar.gz	13	DISTFILES= tqsllib-1.4.tar.gz TrustedQSL-1.11.tar.gz
15		14
16	MAINTAINER= db@db.net	15	MAINTAINER= db@db.net
17	COMMENT= Amateur Radio Station electronic trusted logbook	16	COMMENT= Amateur Radio Station electronic trusted logbook
18		17
19	LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 \	18	LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 \
20	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24	19	wx_base-2.6:${PORTSDIR}/x11-toolkits/wxgtk26
21		20
		21	USE_PERL5= yes
22	USE_GETOPT_LONG= yes	22	USE_GETOPT_LONG= yes
23	USE_REINPLACE= yes	23	USE_REINPLACE= yes
24	MAKE_ENV= INCDIR="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"	24	MAKE_ENV= INCDIR="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
Lines 28-41 Link Here
28	post-patch:	28	post-patch:
29	${CP} ${FILESDIR}/Makefile ${WRKSRC}	29	${CP} ${FILESDIR}/Makefile ${WRKSRC}
30	${CP} ${FILESDIR}/Makefile.tqsllib ${WRKSRC}/tqsllib/Makefile	30	${CP} ${FILESDIR}/Makefile.tqsllib ${WRKSRC}/tqsllib/Makefile
31	${CP} ${FILESDIR}/Makefile.tqsllib-apps ${WRKSRC}/tqsllib-apps/Makefile	31	${CP} ${FILESDIR}/Makefile.TrustedQSL-1.11 ${WRKSRC}/TrustedQSL-1.11/Makefile
		32	${CP} ${FILESDIR}/sysconfig.h.tqsllib ${WRKSRC}/tqsllib/sysconfig.h
		33	${CP} ${FILESDIR}/sysconfig.h.TrustedQSL-1.11 ${WRKSRC}/TrustedQSL-1.11/sysconfig.h
32		34
33	do-extract:	35	do-extract:
34	@${RM} -rf ${WRKDIR}	36	@${RM} -rf ${WRKDIR}
35	@${MKDIR} ${WRKDIR}	37	@${MKDIR} ${WRKDIR}
36	@${MKDIR} ${WRKSRC}	38	@${MKDIR} ${WRKSRC}
37	@for file in ${EXTRACT_ONLY}; do \	39	@for f in ${EXTRACT_ONLY}; do \
38	if ! (cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\	40	if ! (cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$f ${EXTRACT_AFTER_ARGS});\
39	then \	41	then \
40	exit 1; \	42	exit 1; \
41	fi \	43	fi \
Lines 45-52 Link Here
45	.if !defined(NOPORTDOCS)	47	.if !defined(NOPORTDOCS)
46	@${MKDIR} ${PREFIX}/share/doc/tqslcert	48	@${MKDIR} ${PREFIX}/share/doc/tqslcert
47	@${MKDIR} ${PREFIX}/share/doc/tqslapp	49	@${MKDIR} ${PREFIX}/share/doc/tqslapp
48	@${CP} ${WRKSRC}/tqsllib-apps/tqslcert_help/* ${PREFIX}/share/doc/tqslcert/	50	@${CP} ${WRKSRC}/TrustedQSL-1.11/help/tqslcert/* ${PREFIX}/share/doc/tqslcert/
49	@${CP} ${WRKSRC}/tqsllib-apps/tqsl_help/* ${PREFIX}/share/doc/tqslapp/	51	@${CP} ${WRKSRC}/TrustedQSL-1.11/help/tqslapp/* ${PREFIX}/share/doc/tqslapp/
50	.endif	52	.endif
51		53
52	.include <bsd.port.mk>	54	.include <bsd.port.mk>

Line 0 Link Here

(-)/usr/home/db/trustedqsl/files/Makefile.TrustedQSL-1.11 (+65 lines)
		1	TQSLLIB=../tqsllib
		2	TQSLINC=../tqsllib
		3	TQSL_VERSION_MAJOR = 1
		4	TQSL_VERSION_MINOR = 11
		5	OPENSSL=/usr/local
		6	LIBS=-lz -lexpat -lcrypto
		7	INCDIR = -I$(TQSLINC)
		8	BUILD = unofficial
		9	WXFLAGS=`wxgtk2-2.6-config --cflags`
		10	WXLIBS=`wxgtk2-2.6-config --libs`
		11	DEFS = -DHAVE_CONFIG_H
		12	CXXFLAGS += $(DEFS) $(INCDIR) -DHAVE_LIBCRYPTO=1 -DSTDC_HEADERS=1 -DHAVE_MKDIR=1 -DHAVE_STRERROR=1 $(WXFLAGS)
		13
		14	LDLIBS = -L$(TQSLLIB) -L$(OPENSSL)/lib -ltqsllib $(LIBS) $(WXLIBS)
		15	TQSLLIBFILE=$(TQSLLIB)/libtqsllib.a
		16	CCDEPMODE = depmode=gcc3
		17	BINDIR=${PREFIX}/bin
		18	DOCDIR=${PREFIX}/share/doc
		19	ETCDIR=${PREFIX}/etc
		20	PERL ?=perl
		21	CP ?=cp
		22	TOUCH ?=touch
		23
		24	TARGETS = tqslcert tqsl
		25
		26	all: tqslcertbuild.h tqslbuild.h $(TARGETS)
		27
		28	TQSLCERT_OBJ = tqslcert.o crqwiz.o dxcc.o certtree.o tqslcert_prefs.o \
		29	getpassword.o extwizard.o loadcertwiz.o wxutil.o
		30
		31	TQSL_OBJ = tqsl.o extwizard.o tqslwiz.o dxcc.o stationdial.o qsodatadialog.o \
		32	tqslvalidator.o tqsl_prefs.o wxutil.o
		33
		34	tqslcert: $(TQSLCERT_OBJ) $(TQSLLIBFILE)
		35	$(CC) $(CXXFLAGS) -o $@ $(TQSLCERT_OBJ) $(LDLIBS) -lstdc++
		36
		37	tqsl: $(TQSL_OBJ) $(TQSLLIBFILE)
		38	$(CC) $(CXXFLAGS) -o $@ $(TQSL_OBJ) $(LDLIBS) -lstdc++
		39
		40	tqslcert.o:
		41	${CXX} $(CXXFLAGS) -c -o $@ $*.cpp
		42
		43	tqslcertbuild.h: tqslcertbuild.h.in Makefile
		44	$(PERL) touchver.pl tqslcertbuild.h.in BUILD $(BUILD)
		45	$(CP) tqslcertbuild.h.in tqslcertbuild.h
		46	$(TOUCH) tqslcertbuild.h.in
		47
		48	tqslbuild.h: tqslbuild.h.in Makefile
		49	$(PERL) touchver.pl tqslbuild.h.in BUILD $(BUILD)
		50	$(CP) tqslbuild.h.in tqslbuild.h
		51	$(TOUCH) tqslbuild.h.in
		52
		53	tqsl.o:
		54	${CXX} $(CXXFLAGS) -c -o $@ $*.cpp
		55
		56	%.o: %.cpp
		57	${CXX} $(CXXFLAGS) -c -o $@ $*.cpp
		58
		59	clean:
		60	rm -f $(TARGETS) .o .a ~ xxx.
		61
		62	install:
		63	${INSTALL} -d $(BINDIR) $(ETCDIR)/tqsl
		64	${INSTALL} -C $(TARGETS) $(BINDIR)
65	${INSTALL} -C ../tqsllib/config.xml $(ETCDIR)/tqsl

Line 0 Link Here

(-)/usr/home/db/trustedqsl/files/patch-TrustedQSL-1.11_qsodatadialog.cpp (+18 lines)
	1	--- TrustedQSL-1.11/qsodatadialog.cpp.orig Mon Nov 21 21:27:29 2005
	2	+++ TrustedQSL-1.11/qsodatadialog.cpp Mon Nov 21 21:34:00 2005
	3	@@ -302,13 +302,13 @@
	4	sizer = new wxBoxSizer(wxHORIZONTAL);
	5	_recbottom_ctrl = new wxBitmapButton(this, QD_RECBOTTOM, wxBitmap(bottom), wxDefaultPosition, wxSize(18, TEXT_HEIGHT)),
	6	sizer->Add(_recbottom_ctrl, 0, wxTOP\|wxBOTTOM, 5);
	7	- _recdown_ctrl = new wxBitmapButton(this, QD_RECDOWN, wxBitmap(left), wxDefaultPosition, wxSize(18, TEXT_HEIGHT));
	8	+ _recdown_ctrl = new wxBitmapButton(this, QD_RECDOWN, wxBitmap(left_i), wxDefaultPosition, wxSize(18, TEXT_HEIGHT));
	9	sizer->Add(_recdown_ctrl, 0, wxTOP\|wxBOTTOM, 5);
	10	_recno_ctrl = new wxTextCtrl(this, QD_RECNO, wxT("1"), wxDefaultPosition,
	11	wxSize(4*TEXT_WIDTH,TEXT_HEIGHT));
	12	_recno_ctrl->Enable(FALSE);
	13	sizer->Add(_recno_ctrl, 0, wxALL, 5);
	14	- _recup_ctrl = new wxBitmapButton(this, QD_RECUP, wxBitmap(right), wxDefaultPosition, wxSize(18, TEXT_HEIGHT));
	15	+ _recup_ctrl = new wxBitmapButton(this, QD_RECUP, wxBitmap(right_i), wxDefaultPosition, wxSize(18, TEXT_HEIGHT));
	16	sizer->Add(_recup_ctrl, 0, wxTOP\|wxBOTTOM, 5);
	17	_rectop_ctrl = new wxBitmapButton(this, QD_RECTOP, wxBitmap(top), wxDefaultPosition, wxSize(18, TEXT_HEIGHT)),
	18	sizer->Add(_rectop_ctrl, 0, wxTOP\|wxBOTTOM, 5);

Lines 1-31 Link Here

(-)/usr/home/db/trustedqsl/files/patch-tqsllib_sysconfig.h (-31 lines)
1	--- tqsllib/sysconfig.h.orig Wed Jul 21 11:51:59 2004
2	+++ tqsllib/sysconfig.h Wed Jul 21 11:54:05 2004
3	@@ -14,7 +14,7 @@
4	/* #undef TM_IN_SYS_TIME */
5
6	/* Defined if this is LOTW server code */
7	-#define LOTW_SERVER 1
8	+#undef LOTW_SERVER
9
10	/* Define if you have the mkdir function. */
11	#define HAVE_MKDIR 1
12	@@ -29,7 +29,7 @@
13	#define HAVE_UNISTD_H 1
14
15	/* Define if you have the <getopt.h> header file. */
16	-/* #undef HAVE_GETOPT_H */
17	+#define HAVE_GETOPT_H
18
19	/* Define if you have the crypto library (-lcrypto). */
20	#define HAVE_LIBCRYPTO 1
21	@@ -38,8 +38,8 @@
22	#define HAVE_LIBDL 1
23
24	/* Define if you have the pcrl library (-lpcrl). */
25	-#define HAVE_LIBPCRL 1
26	+#undef HAVE_LIBPCRL
27
28	/* Define if you have the sqlca library (-lsqlca). */
29	-#define HAVE_LIBSQLCA 1
30	+#undef HAVE_LIBSQLCA
31

Line 0 Link Here

(-)/usr/home/db/trustedqsl/files/sysconfig.h.TrustedQSL-1.11 (+80 lines)
		1	/* sysconfig.h. Generated by configure. */
		2	/* sysconfig.h.in. Generated from configure.in by autoheader. */
		3
		4	/* Define to 1 if you have the <inttypes.h> header file. */
		5	#define HAVE_INTTYPES_H 1
		6
		7	/* Define to 1 if you have the `crypto' library (-lcrypto). */
		8	#define HAVE_LIBCRYPTO 1
		9
		10	/* Define to 1 if you have the `expat' library (-lexpat). */
		11	#define HAVE_LIBEXPAT 1
		12
		13	/* Define to 1 if you have the `tqsllib' library (-ltqsllib). */
		14	#define HAVE_LIBTQSLLIB 1
		15
		16	/* Define to 1 if you have the `tqsllibd' library (-ltqsllibd). */
		17	/* #undef HAVE_LIBTQSLLIBD */
		18
		19	/* Define to 1 if you have the `z' library (-lz). */
		20	#define HAVE_LIBZ 1
		21
		22	/* Define to 1 if you have the <memory.h> header file. */
		23	#define HAVE_MEMORY_H 1
		24
		25	/* Define to 1 if you have the `mkdir' function. */
		26	#define HAVE_MKDIR 1
		27
		28	/* Define to 1 if you have the <stdint.h> header file. */
		29	#define HAVE_STDINT_H 1
		30
		31	/* Define to 1 if you have the <stdlib.h> header file. */
		32	#define HAVE_STDLIB_H 1
		33
		34	/* Define to 1 if you have the `strerror' function. */
		35	#define HAVE_STRERROR 1
		36
		37	/* Define to 1 if you have the <strings.h> header file. */
		38	#define HAVE_STRINGS_H 1
		39
		40	/* Define to 1 if you have the <string.h> header file. */
		41	#define HAVE_STRING_H 1
		42
		43	/* Define to 1 if you have the <sys/stat.h> header file. */
		44	#define HAVE_SYS_STAT_H 1
		45
		46	/* Define to 1 if you have the <sys/types.h> header file. */
		47	#define HAVE_SYS_TYPES_H 1
		48
		49	/* Define to 1 if you have the <unistd.h> header file. */
		50	#define HAVE_UNISTD_H 1
		51
		52	/* Name of package */
		53	#define PACKAGE "TrustedQSL"
		54
		55	/* Define to the address where bug reports for this package should be sent. */
		56	#define PACKAGE_BUGREPORT "lotw-help@arrl.org"
		57
		58	/* Define to the full name of this package. */
		59	#define PACKAGE_NAME "TrustedQSL"
		60
		61	/* Define to the full name and version of this package. */
		62	#define PACKAGE_STRING "TrustedQSL 1.11"
		63
		64	/* Define to the one symbol short name of this package. */
65	#define PACKAGE_TARNAME "TrustedQSL"
66
67	/* Define to the version of this package. */
68	#define PACKAGE_VERSION "1.11"
69
70	/* Define to 1 if you have the ANSI C header files. */
71	#define STDC_HEADERS 1
72
73	/* Version number of package */
74	#define VERSION "1.11"
75
76	/* Define to empty if `const' does not conform to ANSI C. */
77	/* #undef const */
78
79	/* Define to `unsigned' if <sys/types.h> does not define. */
80	/* #undef size_t */

Line 0 Link Here

(-)/usr/home/db/trustedqsl/files/sysconfig.h.tqsllib (+45 lines)
	1	/* tqsllib/sysconfig.h. Generated automatically by configure. */
	2	/* lotwdb/sysconfig.h.in. Generated automatically from configure.in by autoheader. */
	3
	4	/* Define to empty if the keyword does not work. */
	5	/* #undef const */
	6
	7	/* Define to `int' if <sys/types.h> doesn't define. */
	8	/* #undef mode_t */
	9
	10	/* Define if you have the ANSI C header files. */
	11	#define STDC_HEADERS 1
	12
	13	/* Define if your <sys/time.h> declares struct tm. */
	14	/* #undef TM_IN_SYS_TIME */
	15
	16	/* Defined if this is LOTW server code */
	17	#undef LOTW_SERVER
	18
	19	/* Define if you have the mkdir function. */
	20	#define HAVE_MKDIR 1
	21
	22	/* Define if you have the strerror function. */
	23	#define HAVE_STRERROR 1
	24
	25	/* Define if you have the snprintf function. */
	26	#define HAVE_SNPRINTF 1
	27
	28	/* Define if you have the <unistd.h> header file. */
	29	#define HAVE_UNISTD_H 1
	30
	31	/* Define if you have the <getopt.h> header file. */
	32	#define HAVE_GETOPT_H
	33
	34	/* Define if you have the crypto library (-lcrypto). */
	35	#define HAVE_LIBCRYPTO 1
	36
	37	/* Define if you have the dl library (-ldl). */
	38	#define HAVE_LIBDL 1
	39
	40	/* Define if you have the pcrl library (-lpcrl). */
	41	#undef HAVE_LIBPCRL
	42
	43	/* Define if you have the sqlca library (-lsqlca). */
	44	#undef HAVE_LIBSQLCA
	45