diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/Makefile /usr/home/db/trustedqsl/Makefile --- /usr/ports/comms/trustedqsl/Makefile Sat Nov 12 11:57:08 2005 +++ /usr/home/db/trustedqsl/Makefile Tue Nov 22 14:01:22 2005 @@ -6,19 +6,19 @@ # PORTNAME= trustedqsl -PORTVERSION= 1.10 -PORTREVISION= 4 +PORTVERSION= 1.11 CATEGORIES= comms MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= trustedqsl -DISTFILES= tqsllib-1.4.tar.gz TrustedQSL-1.10.tar.gz +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_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 + 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" @@ -28,14 +28,16 @@ post-patch: ${CP} ${FILESDIR}/Makefile ${WRKSRC} ${CP} ${FILESDIR}/Makefile.tqsllib ${WRKSRC}/tqsllib/Makefile - ${CP} ${FILESDIR}/Makefile.tqsllib-apps ${WRKSRC}/tqsllib-apps/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 file in ${EXTRACT_ONLY}; do \ - if ! (cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\ + @for f in ${EXTRACT_ONLY}; do \ + if ! (cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$f ${EXTRACT_AFTER_ARGS});\ then \ exit 1; \ fi \ @@ -45,8 +47,8 @@ .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/tqslcert @${MKDIR} ${PREFIX}/share/doc/tqslapp - @${CP} ${WRKSRC}/tqsllib-apps/tqslcert_help/* ${PREFIX}/share/doc/tqslcert/ - @${CP} ${WRKSRC}/tqsllib-apps/tqsl_help/* ${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 diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/distinfo /usr/home/db/trustedqsl/distinfo --- /usr/ports/comms/trustedqsl/distinfo Sat Aug 21 18:07:26 2004 +++ /usr/home/db/trustedqsl/distinfo Mon Nov 21 18:24:28 2005 @@ -1,4 +1,6 @@ MD5 (tqsllib-1.4.tar.gz) = 008705afbf39f52e0984e195d32e8378 +SHA256 (tqsllib-1.4.tar.gz) = 3b21fa2734c95c872847c9ce81590cf34b97d48274f307cdf784eed57f76643c SIZE (tqsllib-1.4.tar.gz) = 160585 -MD5 (TrustedQSL-1.10.tar.gz) = c0b8108c744d574204649cd375474982 -SIZE (TrustedQSL-1.10.tar.gz) = 223927 +MD5 (TrustedQSL-1.11.tar.gz) = 2b39274763ec27823489f2eca975fdab +SHA256 (TrustedQSL-1.11.tar.gz) = 1b208e6f84602c161d936dae161e40b555ebc53883b4eda33d6e8f5fa84d68d9 +SIZE (TrustedQSL-1.11.tar.gz) = 346049 diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/files/Makefile /usr/home/db/trustedqsl/files/Makefile --- /usr/ports/comms/trustedqsl/files/Makefile Sat Aug 21 18:07:26 2004 +++ /usr/home/db/trustedqsl/files/Makefile Mon Nov 21 20:40:15 2005 @@ -2,8 +2,8 @@ all: (cd tqsllib;make) - (cd tqsllib-apps;make) + (cd TrustedQSL-1.11;make) install: (cd tqsllib;make install) - (cd tqsllib-apps;make install) + (cd TrustedQSL-1.11;make install) diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/files/Makefile.TrustedQSL-1.11 /usr/home/db/trustedqsl/files/Makefile.TrustedQSL-1.11 --- /usr/ports/comms/trustedqsl/files/Makefile.TrustedQSL-1.11 Wed Dec 31 19:00:00 1969 +++ /usr/home/db/trustedqsl/files/Makefile.TrustedQSL-1.11 Tue Nov 22 12:57:44 2005 @@ -0,0 +1,65 @@ +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 diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/files/Makefile.tqsllib /usr/home/db/trustedqsl/files/Makefile.tqsllib --- /usr/ports/comms/trustedqsl/files/Makefile.tqsllib Sat Aug 21 18:07:26 2004 +++ /usr/home/db/trustedqsl/files/Makefile.tqsllib Mon Nov 21 23:37:27 2005 @@ -1,8 +1,8 @@ CXX = g++ CC ?= gcc LIBS=-lcrypto -lexpat -CXXFLAGS += -I. $(INCDIR) -DHAVE_CONFIG_H -LDFLAGS += -L. $(LIBS) -lstdc++ +CXXFLAGS += -I. -I${LOCALBASE}/include -DHAVE_CONFIG_H +LDFLAGS = -L. $(LIBS) -L${LOCALBASE}/lib -lstdc++ TARGETS = gen_crq load_cert station_loc dumptqsldata converter ZLIB=z MYLIB=tqsllib diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/files/Makefile.tqsllib-apps /usr/home/db/trustedqsl/files/Makefile.tqsllib-apps --- /usr/ports/comms/trustedqsl/files/Makefile.tqsllib-apps Wed Jul 6 20:26:33 2005 +++ /usr/home/db/trustedqsl/files/Makefile.tqsllib-apps Wed Dec 31 19:00:00 1969 @@ -1,56 +0,0 @@ -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 diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/files/patch-TrustedQSL-1.11_left.xpm /usr/home/db/trustedqsl/files/patch-TrustedQSL-1.11_left.xpm --- /usr/ports/comms/trustedqsl/files/patch-TrustedQSL-1.11_left.xpm Wed Dec 31 19:00:00 1969 +++ /usr/home/db/trustedqsl/files/patch-TrustedQSL-1.11_left.xpm Mon Nov 21 22:27:24 2005 @@ -0,0 +1,9 @@ +--- TrustedQSL-1.11/left.xpm.orig Mon Nov 21 21:27:38 2005 ++++ TrustedQSL-1.11/left.xpm Mon Nov 21 21:33:47 2005 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *left[]={ ++static char *left_i[]={ + "10 10 29 1", + ". c None", + "d c #000000", diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/files/patch-TrustedQSL-1.11_qsodatadialog.cpp /usr/home/db/trustedqsl/files/patch-TrustedQSL-1.11_qsodatadialog.cpp --- /usr/ports/comms/trustedqsl/files/patch-TrustedQSL-1.11_qsodatadialog.cpp Wed Dec 31 19:00:00 1969 +++ /usr/home/db/trustedqsl/files/patch-TrustedQSL-1.11_qsodatadialog.cpp Mon Nov 21 22:28:35 2005 @@ -0,0 +1,18 @@ +--- 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); diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/files/patch-TrustedQSL-1.11_right.xpm /usr/home/db/trustedqsl/files/patch-TrustedQSL-1.11_right.xpm --- /usr/ports/comms/trustedqsl/files/patch-TrustedQSL-1.11_right.xpm Wed Dec 31 19:00:00 1969 +++ /usr/home/db/trustedqsl/files/patch-TrustedQSL-1.11_right.xpm Mon Nov 21 22:27:05 2005 @@ -0,0 +1,9 @@ +--- TrustedQSL-1.11/right.xpm.orig Mon Nov 21 21:27:56 2005 ++++ TrustedQSL-1.11/right.xpm Mon Nov 21 21:33:41 2005 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *right[]={ ++static char *right_i[]={ + "10 10 30 1", + "a c None", + "g c #000000", diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/files/patch-tqsllib_sysconfig.h /usr/home/db/trustedqsl/files/patch-tqsllib_sysconfig.h --- /usr/ports/comms/trustedqsl/files/patch-tqsllib_sysconfig.h Sat Aug 21 18:07:26 2004 +++ /usr/home/db/trustedqsl/files/patch-tqsllib_sysconfig.h Wed Dec 31 19:00:00 1969 @@ -1,31 +0,0 @@ ---- 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 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 - diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/files/sysconfig.h.TrustedQSL-1.11 /usr/home/db/trustedqsl/files/sysconfig.h.TrustedQSL-1.11 --- /usr/ports/comms/trustedqsl/files/sysconfig.h.TrustedQSL-1.11 Wed Dec 31 19:00:00 1969 +++ /usr/home/db/trustedqsl/files/sysconfig.h.TrustedQSL-1.11 Tue Nov 22 11:48:44 2005 @@ -0,0 +1,80 @@ +/* sysconfig.h. Generated by configure. */ +/* sysconfig.h.in. Generated from configure.in by autoheader. */ + +/* Define to 1 if you have the 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 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 header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the 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 header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the 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 does not define. */ +/* #undef size_t */ diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/files/sysconfig.h.tqsllib /usr/home/db/trustedqsl/files/sysconfig.h.tqsllib --- /usr/ports/comms/trustedqsl/files/sysconfig.h.tqsllib Wed Dec 31 19:00:00 1969 +++ /usr/home/db/trustedqsl/files/sysconfig.h.tqsllib Tue Nov 22 12:14:56 2005 @@ -0,0 +1,45 @@ +/* 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 doesn't define. */ +/* #undef mode_t */ + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define if your 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 header file. */ +#define HAVE_UNISTD_H 1 + +/* Define if you have the 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 +