diff options
| author | Diane Bruce <db@FreeBSD.org> | 2007-06-22 20:52:16 +0000 |
|---|---|---|
| committer | Diane Bruce <db@FreeBSD.org> | 2007-06-22 20:52:16 +0000 |
| commit | 5a5d7aa8f73a58523587abc8e9eee96af28b30a8 (patch) | |
| tree | 20aedc68a0224f5d0ffcfa87540a00bb3b528d1d /comms | |
| parent | - Remove support for 4.x (diff) | |
- Correct problem under gcc 4.1 and amd64 [1]
- Remove support for FreeBSD 4.x
Notified by: kris (via pointyhat) [1]
Approved by: ehaupt (mentor)
Notes
Notes:
svn path=/head/; revision=194096
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/trustedqsl/Makefile | 9 | ||||
| -rw-r--r-- | comms/trustedqsl/files/patch-TrustedQSL-1.11_crqwiz.cpp | 28 |
2 files changed, 30 insertions, 7 deletions
diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile index 2a3f8a6ad2c4..ae46ea036a94 100644 --- a/comms/trustedqsl/Makefile +++ b/comms/trustedqsl/Makefile @@ -26,12 +26,6 @@ MAKE_ENV= INCDIR="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= can not build on 4.x -.endif - post-patch: @${CP} ${FILESDIR}/Makefile ${WRKSRC} @${REINPLACE_CMD} -e 's|%%INSTALL%%|${INSTALL_PROGRAM}|' \ @@ -70,4 +64,5 @@ post-install: @${ECHO} before this program will run correctly. @${ECHO} -.include <bsd.port.post.mk> +.include <bsd.port.mk> + diff --git a/comms/trustedqsl/files/patch-TrustedQSL-1.11_crqwiz.cpp b/comms/trustedqsl/files/patch-TrustedQSL-1.11_crqwiz.cpp new file mode 100644 index 000000000000..ab29053abae4 --- /dev/null +++ b/comms/trustedqsl/files/patch-TrustedQSL-1.11_crqwiz.cpp @@ -0,0 +1,28 @@ +--- TrustedQSL-1.11/crqwiz.cpp.orig Fri Mar 11 07:47:06 2005 ++++ TrustedQSL-1.11/crqwiz.cpp Fri May 11 12:23:38 2007 +@@ -9,6 +9,7 @@ + ***************************************************************************/ + + #include <ctype.h> ++#include <stdint.h> + #include "crqwiz.h" + #include "dxcc.h" + #include "util.h" +@@ -104,7 +105,7 @@ + CRQ_ProviderPage::DoUpdateInfo() { + int sel = tc_provider->GetSelection(); + if (sel >= 0) { +- int idx = (int)(tc_provider->GetClientData(sel)); ++ int idx = (int)((intptr_t)(tc_provider->GetClientData(sel))); + if (idx >=0 && idx < (int)providers.size()) { + Parent()->provider = providers[idx]; + wxString info; +@@ -521,7 +522,7 @@ + } + ok = (ok && havealpha && havenumeric); + } +- Parent()->dxcc = (int)(tc_dxcc->GetClientData(tc_dxcc->GetSelection())); ++ Parent()->dxcc = (int)((intptr_t)(tc_dxcc->GetClientData(tc_dxcc->GetSelection()))); + if (Parent()->dxcc < 0) { + msg = wxT("You must select a DXCC entity."); + ok = false; |