ports/95228: [Update Port] print/kaspaliste: fix build on 6-stable (needs testing on 5-stable)

[Kay Lehmann]

>Number:         95228
>Category:       ports
>Synopsis:       [Update Port] print/kaspaliste: fix build on 6-stable (needs testing on 5-stable)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 02 13:50:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Kay Lehmann
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
>Environment:


System: FreeBSD 6.1-PRERELEASE #10: Wed Mar 22 21:10:50 CET 2006
    root at bippes.finkenkrug.ev:/usr/obj/usr/src/sys/bippes



>Description:


kaspaliste fails to compile on 6-stable systems, because the newer gcc behaves more strictly. 
This patch unbreak kaspaliste on 6-stable. I could not test it on 5-stable, so this is still necessary.
Maintainer has been informed and is CC'ed.



>How-To-Repeat:





>Fix:


--- kaspaliste-unbreak-6stable.patch begins here ---
diff -urN kaspaliste.orig/Makefile kaspaliste/Makefile
--- kaspaliste.orig/Makefile	Sun Mar 19 12:48:25 2006
+++ kaspaliste/Makefile	Sat Mar 18 20:13:08 2006
@@ -28,10 +28,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 600031
-BROKEN=			"Does not compile on FreeBSD >= 6.0"
-.endif
-
 pre-configure:
 	@${RM} ${WRKSRC}/config.cache
 
diff -urN kaspaliste.orig/files/patch-kaspaliste_klib_kaspabase.cpp kaspaliste/files/patch-kaspaliste_klib_kaspabase.cpp
--- kaspaliste.orig/files/patch-kaspaliste_klib_kaspabase.cpp	Thu Jan  1 01:00:00 1970
+++ kaspaliste/files/patch-kaspaliste_klib_kaspabase.cpp	Sun Mar 19 12:37:19 2006
@@ -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
--- kaspaliste-unbreak-6stable.patch ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: