[csw-devel] SF.net SVN: gar:[14558] csw/mgar/pkg/unrealircd/trunk

[dmichelsen at users.sourceforge.net]

Revision: 14558
          http://gar.svn.sourceforge.net/gar/?rev=14558&view=rev
Author:   dmichelsen
Date:     2011-05-11 11:20:15 +0000 (Wed, 11 May 2011)

Log Message:
-----------
unrealircd: Make it compile

Modified Paths:
--------------
    csw/mgar/pkg/unrealircd/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/unrealircd/trunk/files/0001-Remove-inline-as-it-confuses-the-compiler.patch

Modified: csw/mgar/pkg/unrealircd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/unrealircd/trunk/Makefile	2011-05-11 09:06:23 UTC (rev 14557)
+++ csw/mgar/pkg/unrealircd/trunk/Makefile	2011-05-11 11:20:15 UTC (rev 14558)
@@ -2,39 +2,50 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# Compilation with GCC fails:
-# /opt/csw/gcc4/lib/gcc/sparc-sun-solaris2.8/4.3.3/include-fixed/ctype.h:58:
-# error: expected ')' before '>=' token
-
 NAME = Unreal
 VERSION = 3.2.8.1
-CATEGORIES = lib
+CATEGORIES = server
+
 DESCRIPTION = Open Source IRC Server
 DISTNAME = $(NAME)3.2
+
 define BLURB
 endef
-SPKG_SOURCEURL = http://www.unrealircd.com
+
 MASTER_SITES = http://www.unrealircd.com/downloads/
+
 DISTFILES  = $(NAME)$(VERSION).tar.gz
-CONFIGURE_ARGS += $(DIRPATHS)
-CONFIGURE_ARGS += --with-showlistmodes
-CONFIGURE_ARGS += --enable-hub
-CONFIGURE_ARGS += --enable-ssl=/opt/csw
-CONFIGURE_ARGS += --enable-ziplinks=/opt/csw/lib
-CONFIGURE_ARGS += --enable-inet6
-CONFIGURE_ARGS += --enable-prefixaq
-CONFIGURE_ARGS += --with-listen=5
-CONFIGURE_ARGS += --with-dpath=/etc/opt/csw
-CONFIGURE_ARGS += --with-spath=/opt/csw/bin/ircd
-CONFIGURE_ARGS += --with-nick-history=2000
-CONFIGURE_ARGS += --with-sendq=3000000
-CONFIGURE_ARGS += --with-bufferpool=18
-CONFIGURE_ARGS += --with-hostname=unstable9s
-CONFIGURE_ARGS += --with-permissions=0600
-CONFIGURE_ARGS += --with-fd-setsize=1024
-CONFIGURE_ARGS += --enable-dynamic-linking
+PATCHFILES += 0001-Remove-inline-as-it-confuses-the-compiler.patch
 
-BUILD_DEP_PKGS = CSWtre-dev
-GARCOMPILER = GNU
+VENDOR_URL = http://www.unrealircd.com
 
+
+CONFIGURE_ARGS += --prefix=$(prefix)
+#CONFIGURE_ARGS += $(DIRPATHS)
+#CONFIGURE_ARGS += --with-showlistmodes
+#CONFIGURE_ARGS += --enable-hub
+#CONFIGURE_ARGS += --enable-ssl=/opt/csw
+#CONFIGURE_ARGS += --enable-ziplinks=/opt/csw/lib
+#CONFIGURE_ARGS += --enable-inet6
+#CONFIGURE_ARGS += --enable-prefixaq
+#CONFIGURE_ARGS += --with-listen=5
+#CONFIGURE_ARGS += --with-dpath=/etc/opt/csw
+#CONFIGURE_ARGS += --with-spath=/opt/csw/bin/ircd
+#CONFIGURE_ARGS += --with-nick-history=2000
+#CONFIGURE_ARGS += --with-sendq=3000000
+#CONFIGURE_ARGS += --with-bufferpool=18
+#CONFIGURE_ARGS += --with-hostname=unstable9s
+#CONFIGURE_ARGS += --with-permissions=0600
+#CONFIGURE_ARGS += --with-fd-setsize=1024
+#CONFIGURE_ARGS += --enable-dynamic-linking
+
+# BUILD_DEP_PKGS = CSWtre-dev
+# GARCOMPILER = GNU
+
+CFLAGS =
+CPPFLAGS =
+LDFLAGS = -ldl
+CONFIGURE_ENV =
+BUILD_ENV =
+
 include gar/category.mk

Added: csw/mgar/pkg/unrealircd/trunk/files/0001-Remove-inline-as-it-confuses-the-compiler.patch
===================================================================
--- csw/mgar/pkg/unrealircd/trunk/files/0001-Remove-inline-as-it-confuses-the-compiler.patch	                        (rev 0)
+++ csw/mgar/pkg/unrealircd/trunk/files/0001-Remove-inline-as-it-confuses-the-compiler.patch	2011-05-11 11:20:15 UTC (rev 14558)
@@ -0,0 +1,62 @@
+From 4950c61a325c468aa31c6bc75377ad2ece76bfef Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 11 May 2011 12:41:05 +0200
+Subject: [PATCH] Remove 'inline' as it confuses the compiler
+
+---
+ src/modules.c |    4 ++--
+ src/packet.c  |    2 +-
+ src/parse.c   |    2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/modules.c b/src/modules.c
+index 4d4e6c9..62e5190 100644
+--- a/src/modules.c
++++ b/src/modules.c
+@@ -946,7 +946,7 @@ void	module_loadall(int module_load)
+ #endif
+ }
+ 
+-inline int	Module_IsAlreadyChild(Module *parent, Module *child)
++int	Module_IsAlreadyChild(Module *parent, Module *child)
+ {
+ 	ModuleChild *mcp;
+ 	
+@@ -958,7 +958,7 @@ inline int	Module_IsAlreadyChild(Module *parent, Module *child)
+ 	return 0;
+ }
+ 
+-inline void	Module_AddAsChild(Module *parent, Module *child)
++void	Module_AddAsChild(Module *parent, Module *child)
+ {
+ 	ModuleChild	*childp = NULL;
+ 	
+diff --git a/src/packet.c b/src/packet.c
+index fa64d9a..8e4f9c9 100644
+--- a/src/packet.c
++++ b/src/packet.c
+@@ -304,7 +304,7 @@ void    add_CommandX(char *name, char *token, int (*func)(), unsigned char param
+ 		cmd->friend = NULL;
+ }
+ 
+-inline aCommand *find_CommandEx(char *cmd, int (*func)(), int token)
++aCommand *find_CommandEx(char *cmd, int (*func)(), int token)
+ {
+ 	aCommand *p;
+ 	
+diff --git a/src/parse.c b/src/parse.c
+index 25f03a2..790341b 100644
+--- a/src/parse.c
++++ b/src/parse.c
+@@ -156,7 +156,7 @@ void ban_flooder(aClient *cptr)
+ /*
+  * This routine adds fake lag if needed.
+  */
+-inline void parse_addlag(aClient *cptr, int cmdbytes)
++void parse_addlag(aClient *cptr, int cmdbytes)
+ {
+ 	if (!IsServer(cptr) && !IsNoFakeLag(cptr) &&
+ #ifdef FAKELAG_CONFIGURABLE
+-- 
+1.7.3.2
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.