Update to 2.6.10.

PR:		146641
Submitted by:	maintainer

sysutils/gosa/Makefile

@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	gosa
-PORTVERSION=	2.6.5
-PORTREVISION=	1
-DISTVERSIONPREFIX=	complete-
+PORTVERSION=	2.6.10
+DISTVERSIONPREFIX=	combined-
 CATEGORIES=	sysutils www
 MASTER_SITES=	http://oss.gonicus.de/pub/gosa/ \
 		http://oss.gonicus.de/pub/gosa/archive/
@@ -49,6 +48,7 @@ post-patch:
 .endfor
 
 	${MV} -f ${WRKSRC}/contrib/gosa.conf.5 ${WRKSRC}
+	${FIND} ${WRKSRC} -type f -name '*.orig' -exec ${RM} -f {} +
 
 do-install:
 	${MKDIR} ${WWWDIR}

sysutils/gosa/distinfo

@@ -1,3 +1,2 @@
-MD5 (gosa-complete-2.6.5.tar.bz2) = fbabbd5bfa046f4b813194186123905e
-SHA256 (gosa-complete-2.6.5.tar.bz2) = faf78e0958d987aa2e2b086f6623ddcae5fb3b5a4c867d8de971ce4139bed2fd
-SIZE (gosa-complete-2.6.5.tar.bz2) = 4133614
+SHA256 (gosa-combined-2.6.10.tar.bz2) = b5c51daaa22b5895fdf1520fc70876e2d2a6933b35767218b9b2a648cc4170b2
+SIZE (gosa-combined-2.6.10.tar.bz2) = 4307172

sysutils/gosa/files/patch-class_opsiware.inc

@@ -0,0 +1,37 @@
+--- plugins/admin/opsi/class_opsiware.inc.orig	2008-09-05 12:38:26.000000000 +0400
++++ plugins/admin/opsi/class_opsiware.inc	2010-05-15 21:53:22.000000000 +0400
+@@ -1,16 +1,5 @@
+ <?php
+ 
+-class opsiSoftware extends opsiWare
+-{
+-  protected $type = 0;
+-}
+-
+-class opsiHardware extends opsiWare
+-{
+-  protected $type = 1;
+-}
+-
+-
+ class opsiWare extends plugin
+ {
+   private $opsi;
+@@ -57,5 +46,17 @@
+     return($smarty->fetch(get_template_path("opsiware.tpl",TRUE,dirname(__FILE__))));
+   }
+ }
++
++
++class opsiSoftware extends opsiWare
++{
++  protected $type = 0;
++}
++
++class opsiHardware extends opsiWare
++{
++  protected $type = 1;
++}
++
+ // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
+ ?>