diff options
| author | Johan van Selst <johans@FreeBSD.org> | 2006-06-25 17:04:49 +0000 |
|---|---|---|
| committer | Johan van Selst <johans@FreeBSD.org> | 2006-06-25 17:04:49 +0000 |
| commit | e5df9d136d1124e2e0936b167d0ec639f6482686 (patch) | |
| tree | 240a8f12fd3841645574fe5df7b01522392d981b /print | |
| parent | f7e2749df2ca2e9a0ae0e404cab28dffdd91c404 (diff) | |
- Unbreak on 6.x (with a patch to please gcc)
PR: 95228
Submitted by: Kay Lehmann
Approved by: Jaap Boender (maintainer), flz (mentor)
Notes
Notes:
svn path=/head/; revision=166320
Diffstat (limited to 'print')
| -rw-r--r-- | print/kaspaliste/Makefile | 4 | ||||
| -rw-r--r-- | print/kaspaliste/files/patch-kaspaliste_klib_kaspabase.cpp | 23 |
2 files changed, 23 insertions, 4 deletions
diff --git a/print/kaspaliste/Makefile b/print/kaspaliste/Makefile index f4759c47dfa2..c06fbee77274 100644 --- a/print/kaspaliste/Makefile +++ b/print/kaspaliste/Makefile @@ -28,10 +28,6 @@ PKGMESSAGE= ${WRKDIR}/pkg-message .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 600031 -BROKEN= "Does not compile on FreeBSD >= 6.0" -.endif - pre-configure: @${RM} ${WRKSRC}/config.cache diff --git a/print/kaspaliste/files/patch-kaspaliste_klib_kaspabase.cpp b/print/kaspaliste/files/patch-kaspaliste_klib_kaspabase.cpp new file mode 100644 index 000000000000..bce8c9bfa000 --- /dev/null +++ b/print/kaspaliste/files/patch-kaspaliste_klib_kaspabase.cpp @@ -0,0 +1,23 @@ +--- kaspaliste/klib/kaspabase.cpp.orig Sat Feb 7 10:54:32 2004 ++++ kaspaliste/klib/kaspabase.cpp Sun Mar 19 12:34:42 2006 +@@ -184,7 +184,19 @@ + LockTableItem *KaspaBase::locktable=0L; + + Oid KaspaBase::getNo(Str tab, Oid o) { +- exec("select no from "+tab+" where oid="+oid2str(o)); ++ char* cdummy1 = "select no from "; ++ char* cdummy2 = " where oid="; ++ ++ Str sdummy1, sdummy2, sdummy_all; ++ sdummy1 = cdummy1; ++ sdummy2 = cdummy2; ++ sdummy_all = sdummy1; ++ sdummy_all += tab; ++ sdummy_all += sdummy2; ++ sdummy_all += oid2str(o); ++ ++ const char* cdummy_all = sdummy_all.data(); ++ exec(cdummy_all); + if(tuples()) + return str2oid(getValue(0, "no")); + else |